| Message ID | 1342591614-1840-1-git-send-email-Shengzhou.Liu@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Hello, A gentle reminder! Any comments are appreciated. Regards, Shengzhou > -----Original Message----- > From: Liu Shengzhou-B36685 > Sent: Wednesday, July 18, 2012 2:07 PM > To: bhelgaas@google.com; linux-pci@vger.kernel.org > Cc: linuxppc-dev@lists.ozlabs.org; Liu Shengzhou-B36685 > Subject: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non > MSI/INTx interrupt > > On some platforms, root port has neither MSI/MSI-X nor INTx interrupt > generated in RC mode. In this case, we have to use other interrupt(e.g. > system shared interrupt) for port service irq to have AER, Hot-plug, etc, > services to work. > > Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> > --- > drivers/pci/pcie/portdrv_core.c | 16 ++++++++++++---- > 1 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > index 75915b3..49acf72 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -200,10 +200,13 @@ static int init_service_irqs(struct pci_dev *dev, int > *irqs, int mask) { > int i, irq = -1; > > - /* We have to use INTx if MSI cannot be used for PCIe PME or pciehp. */ > + /* > + * We have to use INTx or other interrupts(e.g. system shared interrupt) > + * if MSI cannot be used for PCIe PME or pciehp. > + */ > if (((mask & PCIE_PORT_SERVICE_PME) && pcie_pme_no_msi()) || > ((mask & PCIE_PORT_SERVICE_HP) && pciehp_no_msi())) { > - if (dev->pin) > + if (dev->irq) > irq = dev->irq; > goto no_msi; > } > @@ -212,8 +215,13 @@ static int init_service_irqs(struct pci_dev *dev, int > *irqs, int mask) > if (!pcie_port_enable_msix(dev, irqs, mask)) > return 0; > > - /* We're not going to use MSI-X, so try MSI and fall back to INTx */ > - if (!pci_enable_msi(dev) || dev->pin) > + /* > + * We're not going to use MSI-X, so try MSI and fall back to INTx. > + * If neither MSI/MSI-X nor INTx available, try other interrupt. (On > + * some platforms, root port doesn't support generating MSI/MSI-X/INTx > + * in RC mode) > + */ > + if (!pci_enable_msi(dev) || dev->irq) > irq = dev->irq; > > no_msi: > -- > 1.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Liu Shengzhou-B36685 > Sent: Thursday, July 26, 2012 11:45 AM > To: bhelgaas@google.com; linux-pci@vger.kernel.org; akpm@linux- > foundation.org > Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org; Liu Shengzhou-B36685 > Subject: RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non > MSI/INTx interrupt > > Hello, > > A gentle reminder! > Any comments are appreciated. Who can help to review and pick up this patch? Thanks. Roy -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 6, 2012 at 8:45 PM, Zang Roy-R61911 <r61911@freescale.com> wrote: > > >> -----Original Message----- >> From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- >> fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Liu Shengzhou-B36685 >> Sent: Thursday, July 26, 2012 11:45 AM >> To: bhelgaas@google.com; linux-pci@vger.kernel.org; akpm@linux- >> foundation.org >> Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org; Liu Shengzhou-B36685 >> Subject: RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non >> MSI/INTx interrupt >> >> Hello, >> >> A gentle reminder! >> Any comments are appreciated. > > Who can help to review and pick up this patch? I merged this to a staging branch and will merge it to my "next" branch as soon as it gets a build/smoke test by Fengguang. Thanks! Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sep 7, 2012, at 5:08 PM, Bjorn Helgaas wrote: > On Mon, Aug 6, 2012 at 8:45 PM, Zang Roy-R61911 <r61911@freescale.com> wrote: >> >> >>> -----Original Message----- >>> From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- >>> fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Liu Shengzhou-B36685 >>> Sent: Thursday, July 26, 2012 11:45 AM >>> To: bhelgaas@google.com; linux-pci@vger.kernel.org; akpm@linux- >>> foundation.org >>> Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org; Liu Shengzhou-B36685 >>> Subject: RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non >>> MSI/INTx interrupt >>> >>> Hello, >>> >>> A gentle reminder! >>> Any comments are appreciated. >> >> Who can help to review and pick up this patch? > > I merged this to a staging branch and will merge it to my "next" > branch as soon as it gets a build/smoke test by Fengguang. Thanks! > > Bjorn Thanks - k-- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 75915b3..49acf72 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -200,10 +200,13 @@ static int init_service_irqs(struct pci_dev *dev, int *irqs, int mask) { int i, irq = -1; - /* We have to use INTx if MSI cannot be used for PCIe PME or pciehp. */ + /* + * We have to use INTx or other interrupts(e.g. system shared interrupt) + * if MSI cannot be used for PCIe PME or pciehp. + */ if (((mask & PCIE_PORT_SERVICE_PME) && pcie_pme_no_msi()) || ((mask & PCIE_PORT_SERVICE_HP) && pciehp_no_msi())) { - if (dev->pin) + if (dev->irq) irq = dev->irq; goto no_msi; } @@ -212,8 +215,13 @@ static int init_service_irqs(struct pci_dev *dev, int *irqs, int mask) if (!pcie_port_enable_msix(dev, irqs, mask)) return 0; - /* We're not going to use MSI-X, so try MSI and fall back to INTx */ - if (!pci_enable_msi(dev) || dev->pin) + /* + * We're not going to use MSI-X, so try MSI and fall back to INTx. + * If neither MSI/MSI-X nor INTx available, try other interrupt. (On + * some platforms, root port doesn't support generating MSI/MSI-X/INTx + * in RC mode) + */ + if (!pci_enable_msi(dev) || dev->irq) irq = dev->irq; no_msi:
On some platforms, root port has neither MSI/MSI-X nor INTx interrupt generated in RC mode. In this case, we have to use other interrupt(e.g. system shared interrupt) for port service irq to have AER, Hot-plug, etc, services to work. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> --- drivers/pci/pcie/portdrv_core.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)