Commit 8f5b3f5b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-keystone' into next 

* pci/host-keystone:
  PCI: keystone: Use PCI_NUM_INTX
  PCI: keystone: Remove duplicate MAX_*_IRQS defs
  PCI: keystone-dw: Remove unused ks_pcie, pci variables
parents 352948c4 da4c4be3

drivers/pci/dwc/pci-keystone-dw.c

+2 −10
Original line number Diff line number Diff line
@@ -168,16 +168,12 @@ void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq) 


static void ks_dw_pcie_msi_irq_mask(struct irq_data *d)

{

	struct keystone_pcie *ks_pcie;

	struct msi_desc *msi;

	struct pcie_port *pp;

	struct dw_pcie *pci;

	u32 offset;



	msi = irq_data_get_msi_desc(d);

	pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);

	pci = to_dw_pcie_from_pp(pp);

	ks_pcie = to_keystone_pcie(pci);

	offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);



	/* Mask the end point if PVM implemented */
@@ -191,16 +187,12 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d) 


static void ks_dw_pcie_msi_irq_unmask(struct irq_data *d)

{

	struct keystone_pcie *ks_pcie;

	struct msi_desc *msi;

	struct pcie_port *pp;

	struct dw_pcie *pci;

	u32 offset;



	msi = irq_data_get_msi_desc(d);

	pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);

	pci = to_dw_pcie_from_pp(pp);

	ks_pcie = to_keystone_pcie(pci);

	offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);



	/* Mask the end point if PVM implemented */
@@ -259,7 +251,7 @@ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie) 
{

	int i;



	for (i = 0; i < MAX_LEGACY_IRQS; i++)

	for (i = 0; i < PCI_NUM_INTX; i++)

		ks_dw_app_writel(ks_pcie, IRQ_ENABLE_SET + (i << 4), 0x1);

}
@@ -565,7 +557,7 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie, 
	/* Create legacy IRQ domain */

	ks_pcie->legacy_irq_domain =

			irq_domain_add_linear(ks_pcie->legacy_intc_np,

					MAX_LEGACY_IRQS,

					PCI_NUM_INTX,

					&ks_dw_pcie_legacy_irq_domain_ops,

					NULL);

	if (!ks_pcie->legacy_irq_domain) {

drivers/pci/dwc/pci-keystone.c

+1 −5
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ 


#define DRIVER_NAME	"keystone-pcie"



/* driver specific constants */

#define MAX_MSI_HOST_IRQS		8

#define MAX_LEGACY_HOST_IRQS		4



/* DEV_STAT_CTRL */

#define PCIE_CAP_BASE		0x70
@@ -173,7 +169,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, 


	if (legacy) {

		np_temp = &ks_pcie->legacy_intc_np;

		max_host_irqs = MAX_LEGACY_HOST_IRQS;

		max_host_irqs = PCI_NUM_INTX;

		host_irqs = &ks_pcie->legacy_host_irqs[0];

	} else {

		np_temp = &ks_pcie->msi_intc_np;

drivers/pci/dwc/pci-keystone.h

+1 −3
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ 
 * published by the Free Software Foundation.

 */



#define MAX_LEGACY_IRQS			4

#define MAX_MSI_HOST_IRQS		8

#define MAX_LEGACY_HOST_IRQS		4



struct keystone_pcie {

	struct dw_pcie		*pci;
@@ -22,7 +20,7 @@ struct keystone_pcie { 
	/* PCI Device ID */

	u32			device_id;

	int			num_legacy_host_irqs;

	int			legacy_host_irqs[MAX_LEGACY_HOST_IRQS];

	int			legacy_host_irqs[PCI_NUM_INTX];

	struct			device_node *legacy_intc_np;



	int			num_msi_host_irqs;