redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller

Browse source 
The X-Gene MSI driver only uses the msi_controller structure as
a way to match the host bridge  with its MSI HW, and thus the
msi_domain.

But now that we can directly associate an msi_domain with a device,
there is no use keeping this msi_controller around.

Just remove all traces of msi_controller from the driver.

Tested-by: Duc Dang <dhdang@apm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Ma Jun <majun258@huawei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-19-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Marc Zyngier 2015-07-28 14:46:25 +01:00 committed by Thomas Gleixner
parent ef50645aa3
commit 8d63bc7bea
1 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/pci/host/pci-xgene-msi.c
View file

@ -40,8 +40,8 @@ struct xgene_msi_group {
struct xgene_msi { struct xgene_msi {
struct device_node *node; struct device_node *node;
struct msi_controller mchip; struct irq_domain *inner_domain;
struct irq_domain *domain; struct irq_domain *msi_domain;
u64 msi_addr; u64 msi_addr;
void __iomem *msi_regs; void __iomem *msi_regs;
unsigned long *bitmap; unsigned long *bitmap;
@ -252,17 +252,17 @@ static const struct irq_domain_ops msi_domain_ops = {
static int xgene_allocate_domains(struct xgene_msi *msi) static int xgene_allocate_domains(struct xgene_msi *msi)
{ {
msi->domain = irq_domain_add_linear(NULL, NR_MSI_VEC, msi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC,
&msi_domain_ops, msi); &msi_domain_ops, msi);
if (!msi->domain) if (!msi->inner_domain)
return -ENOMEM; return -ENOMEM;
msi->mchip.domain = pci_msi_create_irq_domain(msi->mchip.of_node, msi->msi_domain = pci_msi_create_irq_domain(msi->node,
&xgene_msi_domain_info, &xgene_msi_domain_info,
msi->domain); msi->inner_domain);
if (!msi->mchip.domain) { if (!msi->msi_domain) {
irq_domain_remove(msi->domain); irq_domain_remove(msi->inner_domain);
return -ENOMEM; return -ENOMEM;
} }
@ -271,10 +271,10 @@ static int xgene_allocate_domains(struct xgene_msi *msi)
static void xgene_free_domains(struct xgene_msi *msi) static void xgene_free_domains(struct xgene_msi *msi)
{ {
if (msi->mchip.domain) if (msi->msi_domain)
irq_domain_remove(msi->mchip.domain); irq_domain_remove(msi->msi_domain);
if (msi->domain) if (msi->inner_domain)
irq_domain_remove(msi->domain); irq_domain_remove(msi->inner_domain);
} }
static int xgene_msi_init_allocator(struct xgene_msi *xgene_msi) static int xgene_msi_init_allocator(struct xgene_msi *xgene_msi)
@ -340,7 +340,7 @@ static void xgene_msi_isr(unsigned int irq, struct irq_desc *desc)
* CPU0 * CPU0
*/ */
hw_irq = hwirq_to_canonical_hwirq(hw_irq); hw_irq = hwirq_to_canonical_hwirq(hw_irq);
virq = irq_find_mapping(xgene_msi->domain, hw_irq); virq = irq_find_mapping(xgene_msi->inner_domain, hw_irq);
WARN_ON(!virq); WARN_ON(!virq);
if (virq != 0) if (virq != 0)
generic_handle_irq(virq); generic_handle_irq(virq);
@ -497,7 +497,7 @@ static int xgene_msi_probe(struct platform_device *pdev)
goto error; goto error;
} }
xgene_msi->msi_addr = res->start; xgene_msi->msi_addr = res->start;
xgene_msi->node = pdev->dev.of_node;
xgene_msi->num_cpus = num_possible_cpus(); xgene_msi->num_cpus = num_possible_cpus();
rc = xgene_msi_init_allocator(xgene_msi); rc = xgene_msi_init_allocator(xgene_msi);
@ -561,19 +561,10 @@ static int xgene_msi_probe(struct platform_device *pdev)
cpu_notifier_register_done(); cpu_notifier_register_done();
xgene_msi->mchip.of_node = pdev->dev.of_node;
rc = of_pci_msi_chip_add(&xgene_msi->mchip);
if (rc) {
dev_err(&pdev->dev, "failed to add MSI controller chip\n");
goto error_notifier;
}
dev_info(&pdev->dev, "APM X-Gene PCIe MSI driver loaded\n"); dev_info(&pdev->dev, "APM X-Gene PCIe MSI driver loaded\n");
return 0; return 0;
error_notifier:
unregister_hotcpu_notifier(&xgene_msi_cpu_notifier);
error: error:
xgene_msi_remove(pdev); xgene_msi_remove(pdev);
return rc; return rc;