| Message ID | 1413342435-7876-22-git-send-email-wangyijing@huawei.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 2014-10-15 at 11:07 +0800, Yijing Wang wrote: > Use MSI chip framework instead of arch MSI functions to configure > MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > --- > Hi Michael, > I dropped the Acked-by , because this version has a > lot changes compared to last. So, I guess you may want to check it again. OK thanks. Still looks OK and boots on one of my test systems that uses MSI. Acked-by: Michael Ellerman <mpe@ellerman.id.au> (for powerpc) cheers -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 2014/10/17 15:23, Michael Ellerman wrote: > On Wed, 2014-10-15 at 11:07 +0800, Yijing Wang wrote: >> Use MSI chip framework instead of arch MSI functions to configure >> MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework. >> >> Signed-off-by: Yijing Wang <wangyijing@huawei.com> >> --- >> Hi Michael, >> I dropped the Acked-by , because this version has a >> lot changes compared to last. So, I guess you may want to check it again. > > OK thanks. > > Still looks OK and boots on one of my test systems that uses MSI. Good! > > Acked-by: Michael Ellerman <mpe@ellerman.id.au> (for powerpc) Thanks very much! Thanks! Yijing. > > > cheers > > > > . >
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 4ca90a3..233553e 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -32,6 +32,10 @@ struct pci_controller { int self_busno; struct resource busn; +#ifdef CONFIG_PCI_MSI + struct msi_chip *msi_chip; +#endif + void __iomem *io_base_virt; #ifdef CONFIG_PPC64 void *io_base_alloc; @@ -94,6 +98,17 @@ struct pci_controller { void *private_data; }; +#ifdef CONFIG_PCI_MSI +extern struct msi_chip ppc_msi_chip; + +static inline struct msi_chip *pci_msi_chip(struct pci_bus *bus) +{ + struct pci_controller *hose = bus->sysdata; + + return hose->msi_chip; +} +#endif + /* These are used for config access before all the PCI probing has been done. */ extern int early_read_config_byte(struct pci_controller *hose, int bus, diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c index 71bd161..f38b67c 100644 --- a/arch/powerpc/kernel/msi.c +++ b/arch/powerpc/kernel/msi.c @@ -13,7 +13,8 @@ #include <asm/machdep.h> -int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) +static int ppc_setup_msi_irqs(struct msi_chip *chip, + struct pci_dev *dev, int nvec, int type) { if (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs) { pr_debug("msi: Platform doesn't provide MSI callbacks.\n"); @@ -27,7 +28,13 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) return ppc_md.setup_msi_irqs(dev, nvec, type); } -void arch_teardown_msi_irqs(struct pci_dev *dev) +static void ppc_teardown_msi_irqs(struct msi_chip *chip, + struct pci_dev *dev) { ppc_md.teardown_msi_irqs(dev); } + +struct msi_chip ppc_msi_chip = { + .setup_irqs = ppc_setup_msi_irqs, + .teardown_irqs = ppc_teardown_msi_irqs, +}; diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index b2814e2..9f18b42 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1594,6 +1594,9 @@ void pcibios_scan_phb(struct pci_controller *hose) /* Wire up PHB bus resources */ pcibios_setup_phb_resources(hose, &resources); +#ifdef CONFIG_PCI_MSI + hose->msi_chip = &ppc_msi_chip; +#endif hose->busn.start = hose->first_busno; hose->busn.end = hose->last_busno; hose->busn.flags = IORESOURCE_BUS;
Use MSI chip framework instead of arch MSI functions to configure MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework. Signed-off-by: Yijing Wang <wangyijing@huawei.com> --- Hi Michael, I dropped the Acked-by , because this version has a lot changes compared to last. So, I guess you may want to check it again. --- arch/powerpc/include/asm/pci-bridge.h | 15 +++++++++++++++ arch/powerpc/kernel/msi.c | 12 ++++++++++-- arch/powerpc/kernel/pci-common.c | 3 +++ 3 files changed, 28 insertions(+), 2 deletions(-)