[PATCH v2] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

Subsystems: pci subsystem, the rest

STALE5105d

5 messages, 5 authors, 2012-09-09 · open the first message on its own page

[PATCH v2] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

From: Shengzhou Liu <hidden>
Date: 2012-07-18 06:28:50 

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 <redacted>
---
 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

RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

From: Liu Shengzhou-B36685 <hidden>
Date: 2012-07-26 03:45:20 

Hello,=20

A gentle reminder!
Any comments are appreciated.


Regards,
Shengzhou
quoted hunk
-----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
=20
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.
=20
Signed-off-by: Shengzhou Liu <redacted>
---
 drivers/pci/pcie/portdrv_core.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
=20
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_c=
ore.c
quoted hunk
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, i=
nt
*irqs, int mask)  {
 	int i, irq =3D -1;
=20
-	/* 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=
)
quoted hunk
+	 * 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 =3D dev->irq;
 		goto no_msi;
 	}
@@ -212,8 +215,13 @@ static int init_service_irqs(struct pci_dev *dev, in=
t
*irqs, int mask)
 	if (!pcie_port_enable_msix(dev, irqs, mask))
 		return 0;
=20
-	/* 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 =3D dev->irq;
=20
  no_msi:
--
1.6.4

RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

From: Zang Roy-R61911 <hidden>
Date: 2012-08-07 03:45:52 

-----Original Message-----
From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie-
fei.zang=3Dfreescale.com@lists.ozlabs.org] On Behalf Of Liu Shengzhou-B36=
685
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-B3668=
5
Subject: RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable n=
on
MSI/INTx interrupt
=20
Hello,
=20
A gentle reminder!
Any comments are appreciated.
Who can help to review and pick up this patch?
Thanks.
Roy





  

    
Re: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

    

      From: Bjorn Helgaas <bhelgaas@google.com>

      Date: 2012-09-07 22:08:51 
    

  

  
On Mon, Aug 6, 2012 at 8:45 PM, Zang Roy-R61911 [off-list ref] wrote:
quoted
-----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





  

    
Re: [PATCH v2] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt

    

      From: Kumar Gala <hidden>

      Date: 2012-09-09 14:43:01 
    

  

  
On Sep 7, 2012, at 5:08 PM, Bjorn Helgaas wrote:

On Mon, Aug 6, 2012 at 8:45 PM, Zang Roy-R61911 [off-list ref] =
wrote:
quoted
=20
=20
quoted
-----Original Message-----
From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie-
fei.zang=3Dfreescale.com@lists.ozlabs.org] On Behalf Of Liu =
Shengzhou-B36685
quoted
quoted
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
quoted
quoted
Subject: RE: [PATCH v2] PCI: use dev->irq instead of dev->pin to =
enable non
quoted
quoted
MSI/INTx interrupt
=20
Hello,
=20
A gentle reminder!
Any comments are appreciated.
=20
Who can help to review and pick up this patch?
=20
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!
=20
Bjorn
Thanks

- k=




    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help