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

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

[Shengzhou Liu]

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;
 
  no_msi:
-- 
1.6.4

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

[Shengzhou Liu]

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;
 
  no_msi:
-- 
1.6.4

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

[Scott Wood]

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

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

[Scott Wood]

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

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

[Liu Shengzhou-B36685]

DQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IFdvb2QgU2NvdHQtQjA3NDIx
DQo+IFNlbnQ6IFdlZG5lc2RheSwgSnVseSAxOCwgMjAxMiAxOjQyIEFNDQo+IFRvOiBMaXUgU2hl
bmd6aG91LUIzNjY4NQ0KPiBDYzogYmhlbGdhYXNAZ29vZ2xlLmNvbTsgbGludXgtcGNpQHZnZXIu
a2VybmVsLm9yZzsgbGludXhwcGMtDQo+IGRldkBsaXN0cy5vemxhYnMub3JnDQo+IFN1YmplY3Q6
IFJlOiBbUEFUQ0hdIFBDSTogdXNlIGRldi0+aXJxIGluc3RlYWQgb2YgZGV2LT5waW4gdG8gZW5h
YmxlIG5vbg0KPiBNU0kvSU5UeCBpbnRlcnJ1cHQNCj4gDQo+IE9uIDA3LzE2LzIwMTIgMDk6MzUg
UE0sIFNoZW5nemhvdSBMaXUgd3JvdGU6DQo+ID4gT24gc29tZSBwbGF0Zm9ybXMsIHJvb3QgcG9y
dCBoYXMgbmVpdGhlciBNU0kvTVNJLVggbm9yIElOVHggaW50ZXJydXB0DQo+ID4gZ2VuZXJhdGVk
IGluIFJDIG1vZGUuIEluIHRoaXMgY2FzZSwgd2UgaGF2ZSB0byB1c2Ugb3RoZXIgaW50ZXJydXB0
KGkuZS4NCj4gPiBzeXN0ZW0gc2hhcmVkIGludGVycnVwdCkgZm9yIHBvcnQgc2VydmljZSBpcnEg
dG8gaGF2ZSBBRVIsIEhvdC1wbHVnLA0KPiA+IGV0Yywgc2VydmljZXMgdG8gd29yay4NCj4gPg0K
PiA+IFNpZ25lZC1vZmYtYnk6IFNoZW5nemhvdSBMaXUgPFNoZW5nemhvdS5MaXVAZnJlZXNjYWxl
LmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9wY2kvcGNpZS9wb3J0ZHJ2X2NvcmUuYyB8ICAg
IDkgKysrKysrKy0tDQo+ID4gIDEgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAyIGRl
bGV0aW9ucygtKQ0KPiA+DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL3BjaWUvcG9ydGRy
dl9jb3JlLmMNCj4gPiBiL2RyaXZlcnMvcGNpL3BjaWUvcG9ydGRydl9jb3JlLmMgaW5kZXggNzU5
MTViMy4uYTg1NTI1NCAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL3BjaS9wY2llL3BvcnRkcnZf
Y29yZS5jDQo+ID4gKysrIGIvZHJpdmVycy9wY2kvcGNpZS9wb3J0ZHJ2X2NvcmUuYw0KPiA+IEBA
IC0yMTIsOCArMjEyLDEzIEBAIHN0YXRpYyBpbnQgaW5pdF9zZXJ2aWNlX2lycXMoc3RydWN0IHBj
aV9kZXYgKmRldiwgaW50DQo+ICppcnFzLCBpbnQgbWFzaykNCj4gPiAgCWlmICghcGNpZV9wb3J0
X2VuYWJsZV9tc2l4KGRldiwgaXJxcywgbWFzaykpDQo+ID4gIAkJcmV0dXJuIDA7DQo+ID4NCj4g
PiAtCS8qIFdlJ3JlIG5vdCBnb2luZyB0byB1c2UgTVNJLVgsIHNvIHRyeSBNU0kgYW5kIGZhbGwg
YmFjayB0byBJTlR4ICovDQo+ID4gLQlpZiAoIXBjaV9lbmFibGVfbXNpKGRldikgfHwgZGV2LT5w
aW4pDQo+ID4gKwkvKg0KPiA+ICsJICogV2UncmUgbm90IGdvaW5nIHRvIHVzZSBNU0ktWCwgc28g
dHJ5IE1TSSBhbmQgZmFsbCBiYWNrIHRvIElOVHguDQo+ID4gKwkgKiBJZiBuZWl0aGVyIE1TSS9N
U0ktWCBub3IgSU5UeCBhdmFpbGFibGUsIHRyeSBvdGhlciBpbnRlcnJ1cHQuIChPbg0KPiA+ICsJ
ICogc29tZSBwbGF0Zm9ybXMsIHJvb3QgcG9ydCBkb2Vzbid0IHN1cHBvcnQgZ2VuZXJhdGluZyBN
U0kvTVNJLVgvSU5UeA0KPiA+ICsJICogaW4gUkMgbW9kZSkNCj4gPiArCSAqLw0KPiA+ICsJaWYg
KCFwY2lfZW5hYmxlX21zaShkZXYpIHx8IGRldi0+aXJxKQ0KPiA+ICAJCWlycSA9IGRldi0+aXJx
Ow0KPiANCj4gV2hhdCBhYm91dCB0aGUgb3RoZXIgdXNhZ2Ugb2YgZGV2LT5waW4gYSBmZXcgbGlu
ZXMgdXA/DQo+IA0KPiAtU2NvdHQNClllcywgaXQgc2hvdWxkIGJlIGNvbnNpc3RlbnQgd2l0aCBi
b3R0b20sIGRvbmUgaW4gdjIuDQpUaGFua3MsDQpTaGVuZ3pob3UNCg==