Patchwork PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

login
register
mail settings
Submitter Shengzhou Liu
Date July 17, 2012, 2:35 a.m.
Message ID <1342492551-13766-1-git-send-email-Shengzhou.Liu@freescale.com>
Download mbox | patch
Permalink /patch/171311/
State Superseded
Headers show

Comments

Shengzhou Liu - July 17, 2012, 2:35 a.m.
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(i.e.
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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
Scott Wood - July 17, 2012, 5:41 p.m.
On 07/16/2012 09:35 PM, Shengzhou Liu wrote:
> 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(i.e.
> 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 |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
> index 75915b3..a855254 100644
> --- a/drivers/pci/pcie/portdrv_core.c
> +++ b/drivers/pci/pcie/portdrv_core.c
> @@ -212,8 +212,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;

What about the other usage of dev->pin a few lines up?

-Scott
Liu Shengzhou-B36685 - July 18, 2012, 6:36 a.m.
> -----Original Message-----
> From: Wood Scott-B07421
> Sent: Wednesday, July 18, 2012 1:42 AM
> To: Liu Shengzhou-B36685
> Cc: bhelgaas@google.com; linux-pci@vger.kernel.org; linuxppc-
> dev@lists.ozlabs.org
> Subject: Re: [PATCH] PCI: use dev->irq instead of dev->pin to enable non
> MSI/INTx interrupt
> 
> On 07/16/2012 09:35 PM, Shengzhou Liu wrote:
> > 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(i.e.
> > 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 |    9 +++++++--
> >  1 files changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/pci/pcie/portdrv_core.c
> > b/drivers/pci/pcie/portdrv_core.c index 75915b3..a855254 100644
> > --- a/drivers/pci/pcie/portdrv_core.c
> > +++ b/drivers/pci/pcie/portdrv_core.c
> > @@ -212,8 +212,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;
> 
> What about the other usage of dev->pin a few lines up?
> 
> -Scott
Yes, it should be consistent with bottom, done in v2.
Thanks,
Shengzhou

Patch

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 75915b3..a855254 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -212,8 +212,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: