[PATCH] powerpc/85xx: workaround for chips with MSI hareware errata to support MSI-X

[PATCH] powerpc/85xx: workaround for chips with MSI hareware errata to support MSI-X

[Jia Hongtao]

From: Liu Shuo <soniccat.liu@gmail.com>

The MPIC chip with version 2.0 has a MSI errata (errata PIC1 of mpc8544),
It causes that neither MSI nor MSI-X can work fine. There is a workaround
to allow MSI-X to function properly.

Signed-off-by: Liu Shuo <soniccat.liu@gmail.com>
Signed-off-by: Li Yang <leoli@freescale.com>
---
 arch/powerpc/include/asm/mpic.h |    3 ++
 arch/powerpc/sysdev/fsl_msi.c   |   63 +++++++++++++++++++++++++++++++++++++-
 arch/powerpc/sysdev/fsl_msi.h   |    3 ++
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index c9f698a..a9e4f937 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -110,6 +110,9 @@
 #define 	MPIC_VECPRI_SENSE_MASK			0x00400000
 #define MPIC_IRQ_DESTINATION		0x00010
 
+#define 	MPIC_FSL_BRR1				0x00000
+#define 	MPIC_FSL_BRR1_VER			0x0000ffff
+
 #define MPIC_MAX_IRQ_SOURCES	2048
 #define MPIC_MAX_CPUS		32
 #define MPIC_MAX_ISU		32
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 6e097de..f2d340a 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -98,8 +98,23 @@ static int fsl_msi_init_allocator(struct fsl_msi *msi_data)
 
 static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, int type)
 {
+	struct fsl_msi *msi;
+
 	if (type == PCI_CAP_ID_MSIX)
 		pr_debug("fslmsi: MSI-X untested, trying anyway.\n");
+	else if (type == PCI_CAP_ID_MSI) {
+		/*
+		 * MPIC chip with 2.0 version has erratum PIC1. It
+		 * causes that neither MSI nor MSI-X can work fine.
+		 * There is a workaround to allow MSI-X to function
+		 * properly.
+		 */
+		list_for_each_entry(msi, &msi_head, list) {
+			if ((msi->feature & MSI_HW_ERRATA_MASK)
+						== MSI_HW_ERRATA_ENDIAN)
+				return -EINVAL;
+		}
+	}
 
 	return 0;
 }
@@ -142,7 +157,11 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
 	msg->address_lo = lower_32_bits(address);
 	msg->address_hi = upper_32_bits(address);
 
-	msg->data = hwirq;
+	/* See the comment in fsl_msi_check_device() */
+	if ((msi_data->feature & MSI_HW_ERRATA_MASK) == MSI_HW_ERRATA_ENDIAN)
+		msg->data = __swab32(hwirq);
+	else
+		msg->data = hwirq;
 
 	pr_debug("%s: allocated srs: %d, ibs: %d\n",
 		__func__, hwirq / IRQS_PER_MSI_REG, hwirq % IRQS_PER_MSI_REG);
@@ -359,13 +378,43 @@ static int __devinit fsl_msi_setup_hwirq(struct fsl_msi *msi,
 	return 0;
 }
 
+/* MPIC chip with 2.0 version has erratum PIC1 */
+static int mpic_has_errata(struct platform_device *dev)
+{
+	struct device_node *mpic_node;
+
+	mpic_node = of_irq_find_parent(dev->dev.of_node);
+	if (mpic_node) {
+		u32 *reg_base, brr1 = 0;
+		/* Get the PIC reg base */
+		reg_base = of_iomap(mpic_node, 0);
+		of_node_put(mpic_node);
+		if (!reg_base) {
+			dev_err(&dev->dev, "ioremap problem failed.\n");
+			return -EIO;
+		}
+
+		/* Get the mpic chip version from block revision register 1 */
+		brr1 = in_be32(reg_base + MPIC_FSL_BRR1);
+		iounmap(reg_base);
+		if ((brr1 & MPIC_FSL_BRR1_VER) == 0x0200)
+			return 1;
+	} else {
+		dev_err(&dev->dev, "MSI can't find his parent mpic node.\n");
+		of_node_put(mpic_node);
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
 static const struct of_device_id fsl_of_msi_ids[];
 static int __devinit fsl_of_msi_probe(struct platform_device *dev)
 {
 	const struct of_device_id *match;
 	struct fsl_msi *msi;
 	struct resource res;
-	int err, i, j, irq_index, count;
+	int err, i, j, irq_index, count, errata;
 	int rc;
 	const u32 *p;
 	struct fsl_msi_feature *features;
@@ -421,6 +470,16 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)
 
 	msi->feature = features->fsl_pic_ip;
 
+	if ((features->fsl_pic_ip & FSL_PIC_IP_MASK) == FSL_PIC_IP_MPIC) {
+		errata = mpic_has_errata(dev);
+		if (errata > 0) {
+			msi->feature |= MSI_HW_ERRATA_ENDIAN;
+		} else if (errata < 0) {
+			err = errata;
+			goto error_out;
+		}
+	}
+
 	/*
 	 * Remember the phandle, so that we can match with any PCI nodes
 	 * that have an "fsl,msi" property.
diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h
index 8225f86..354d546 100644
--- a/arch/powerpc/sysdev/fsl_msi.h
+++ b/arch/powerpc/sysdev/fsl_msi.h
@@ -25,6 +25,9 @@
 #define FSL_PIC_IP_IPIC   0x00000002
 #define FSL_PIC_IP_VMPIC  0x00000003
 
+#define MSI_HW_ERRATA_MASK   0x000000F0
+#define MSI_HW_ERRATA_ENDIAN 0x00000010
+
 struct fsl_msi {
 	struct irq_domain *irqhost;
 
-- 
1.7.5.1

Re: [PATCH] powerpc/85xx: workaround for chips with MSI hareware errata to support MSI-X

[Scott Wood]

On 07/15/2012 10:35 PM, Jia Hongtao wrote:
> From: Liu Shuo <soniccat.liu@gmail.com>
> 
> The MPIC chip with version 2.0 has a MSI errata (errata PIC1 of mpc8544),
> It causes that neither MSI nor MSI-X can work fine. There is a workaround
> to allow MSI-X to function properly.

s/There is/This is/

There is also a workaround for regular MSI to function properly, though
this patch does not implement it.

> +/* MPIC chip with 2.0 version has erratum PIC1 */
> +static int mpic_has_errata(struct platform_device *dev)
> +{
> +	struct device_node *mpic_node;
> +
> +	mpic_node = of_irq_find_parent(dev->dev.of_node);
> +	if (mpic_node) {
> +		u32 *reg_base, brr1 = 0;
> +		/* Get the PIC reg base */
> +		reg_base = of_iomap(mpic_node, 0);
> +		of_node_put(mpic_node);
> +		if (!reg_base) {
> +			dev_err(&dev->dev, "ioremap problem failed.\n");
> +			return -EIO;
> +		}
> +
> +		/* Get the mpic chip version from block revision register 1 */
> +		brr1 = in_be32(reg_base + MPIC_FSL_BRR1);
> +		iounmap(reg_base);
> +		if ((brr1 & MPIC_FSL_BRR1_VER) == 0x0200)
> +			return 1;

There's already been a patch posted that includes BRR1 checking:
http://patchwork.ozlabs.org/patch/169713/

Please coordinate with that.  Have the MPIC code read the version once,
and expose it to the MSI driver, rather than digging directly into the
non-MSI MPIC registers from here.

> diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h
> index 8225f86..354d546 100644
> --- a/arch/powerpc/sysdev/fsl_msi.h
> +++ b/arch/powerpc/sysdev/fsl_msi.h
> @@ -25,6 +25,9 @@
>  #define FSL_PIC_IP_IPIC   0x00000002
>  #define FSL_PIC_IP_VMPIC  0x00000003
>  
> +#define MSI_HW_ERRATA_MASK   0x000000F0
> +#define MSI_HW_ERRATA_ENDIAN 0x00000010

Why do we need a mask for this?

-Scott

RE: [PATCH] powerpc/85xx: workaround for chips with MSI hareware errata to support MSI-X

[Jia Hongtao-B38951]

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogV29vZCBTY290dC1CMDc0
MjENCj4gU2VudDogVHVlc2RheSwgSnVseSAxNywgMjAxMiA3OjIwIEFNDQo+IFRvOiBKaWEgSG9u
Z3Rhby1CMzg5NTENCj4gQ2M6IGxpbnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnOyBnYWxha0Br
ZXJuZWwuY3Jhc2hpbmcub3JnOw0KPiBzb25pY2NhdC5saXVAZ21haWwuY29tDQo+IFN1YmplY3Q6
IFJlOiBbUEFUQ0hdIHBvd2VycGMvODV4eDogd29ya2Fyb3VuZCBmb3IgY2hpcHMgd2l0aCBNU0kg
aGFyZXdhcmUNCj4gZXJyYXRhIHRvIHN1cHBvcnQgTVNJLVgNCj4gDQo+IE9uIDA3LzE1LzIwMTIg
MTA6MzUgUE0sIEppYSBIb25ndGFvIHdyb3RlOg0KPiA+IEZyb206IExpdSBTaHVvIDxzb25pY2Nh
dC5saXVAZ21haWwuY29tPg0KPiA+DQo+ID4gVGhlIE1QSUMgY2hpcCB3aXRoIHZlcnNpb24gMi4w
IGhhcyBhIE1TSSBlcnJhdGEgKGVycmF0YSBQSUMxIG9mDQo+IG1wYzg1NDQpLA0KPiA+IEl0IGNh
dXNlcyB0aGF0IG5laXRoZXIgTVNJIG5vciBNU0ktWCBjYW4gd29yayBmaW5lLiBUaGVyZSBpcyBh
DQo+IHdvcmthcm91bmQNCj4gPiB0byBhbGxvdyBNU0ktWCB0byBmdW5jdGlvbiBwcm9wZXJseS4N
Cj4gDQo+IHMvVGhlcmUgaXMvVGhpcyBpcy8NCj4gDQo+IFRoZXJlIGlzIGFsc28gYSB3b3JrYXJv
dW5kIGZvciByZWd1bGFyIE1TSSB0byBmdW5jdGlvbiBwcm9wZXJseSwgdGhvdWdoDQo+IHRoaXMg
cGF0Y2ggZG9lcyBub3QgaW1wbGVtZW50IGl0Lg0KDQpZb3UgYXJlIHJpZ2h0LCB0aGlzIHBhdGNo
IG9ubHkgdG8gbWFrZSBNU0ktWCB3b3JrLiBGb3Igbm93IHdlIGhhdmUgbm8gcGxhbg0KdG8gbWFr
ZSBNU0kgd29yayB0b28uDQoNCj4gDQo+ID4gKy8qIE1QSUMgY2hpcCB3aXRoIDIuMCB2ZXJzaW9u
IGhhcyBlcnJhdHVtIFBJQzEgKi8NCj4gPiArc3RhdGljIGludCBtcGljX2hhc19lcnJhdGEoc3Ry
dWN0IHBsYXRmb3JtX2RldmljZSAqZGV2KQ0KPiA+ICt7DQo+ID4gKwlzdHJ1Y3QgZGV2aWNlX25v
ZGUgKm1waWNfbm9kZTsNCj4gPiArDQo+ID4gKwltcGljX25vZGUgPSBvZl9pcnFfZmluZF9wYXJl
bnQoZGV2LT5kZXYub2Zfbm9kZSk7DQo+ID4gKwlpZiAobXBpY19ub2RlKSB7DQo+ID4gKwkJdTMy
ICpyZWdfYmFzZSwgYnJyMSA9IDA7DQo+ID4gKwkJLyogR2V0IHRoZSBQSUMgcmVnIGJhc2UgKi8N
Cj4gPiArCQlyZWdfYmFzZSA9IG9mX2lvbWFwKG1waWNfbm9kZSwgMCk7DQo+ID4gKwkJb2Zfbm9k
ZV9wdXQobXBpY19ub2RlKTsNCj4gPiArCQlpZiAoIXJlZ19iYXNlKSB7DQo+ID4gKwkJCWRldl9l
cnIoJmRldi0+ZGV2LCAiaW9yZW1hcCBwcm9ibGVtIGZhaWxlZC5cbiIpOw0KPiA+ICsJCQlyZXR1
cm4gLUVJTzsNCj4gPiArCQl9DQo+ID4gKw0KPiA+ICsJCS8qIEdldCB0aGUgbXBpYyBjaGlwIHZl
cnNpb24gZnJvbSBibG9jayByZXZpc2lvbiByZWdpc3RlciAxDQo+ICovDQo+ID4gKwkJYnJyMSA9
IGluX2JlMzIocmVnX2Jhc2UgKyBNUElDX0ZTTF9CUlIxKTsNCj4gPiArCQlpb3VubWFwKHJlZ19i
YXNlKTsNCj4gPiArCQlpZiAoKGJycjEgJiBNUElDX0ZTTF9CUlIxX1ZFUikgPT0gMHgwMjAwKQ0K
PiA+ICsJCQlyZXR1cm4gMTsNCj4gDQo+IFRoZXJlJ3MgYWxyZWFkeSBiZWVuIGEgcGF0Y2ggcG9z
dGVkIHRoYXQgaW5jbHVkZXMgQlJSMSBjaGVja2luZzoNCj4gaHR0cDovL3BhdGNod29yay5vemxh
YnMub3JnL3BhdGNoLzE2OTcxMy8NCj4gDQo+IFBsZWFzZSBjb29yZGluYXRlIHdpdGggdGhhdC4g
IEhhdmUgdGhlIE1QSUMgY29kZSByZWFkIHRoZSB2ZXJzaW9uIG9uY2UsDQo+IGFuZCBleHBvc2Ug
aXQgdG8gdGhlIE1TSSBkcml2ZXIsIHJhdGhlciB0aGFuIGRpZ2dpbmcgZGlyZWN0bHkgaW50byB0
aGUNCj4gbm9uLU1TSSBNUElDIHJlZ2lzdGVycyBmcm9tIGhlcmUuDQoNCk9rLCBJIHJlYmFzZWQg
dGhlIHBhdGNoIGFnYWluc3Qga3VtYXJfbmV4dCBicmFuY2ggYW5kIHRoZSBwYXRjaCB5b3UgbWVu
dGlvbmVkDQpoYXMgbm90IGFwcGxpZWQgeWV0LiBBbnl3YXkgSSB3aWxsIGZpeCB0aGlzLg0KDQoN
Cj4gDQo+ID4gZGlmZiAtLWdpdCBhL2FyY2gvcG93ZXJwYy9zeXNkZXYvZnNsX21zaS5oDQo+IGIv
YXJjaC9wb3dlcnBjL3N5c2Rldi9mc2xfbXNpLmgNCj4gPiBpbmRleCA4MjI1Zjg2Li4zNTRkNTQ2
IDEwMDY0NA0KPiA+IC0tLSBhL2FyY2gvcG93ZXJwYy9zeXNkZXYvZnNsX21zaS5oDQo+ID4gKysr
IGIvYXJjaC9wb3dlcnBjL3N5c2Rldi9mc2xfbXNpLmgNCj4gPiBAQCAtMjUsNiArMjUsOSBAQA0K
PiA+ICAjZGVmaW5lIEZTTF9QSUNfSVBfSVBJQyAgIDB4MDAwMDAwMDINCj4gPiAgI2RlZmluZSBG
U0xfUElDX0lQX1ZNUElDICAweDAwMDAwMDAzDQo+ID4NCj4gPiArI2RlZmluZSBNU0lfSFdfRVJS
QVRBX01BU0sgICAweDAwMDAwMEYwDQo+ID4gKyNkZWZpbmUgTVNJX0hXX0VSUkFUQV9FTkRJQU4g
MHgwMDAwMDAxMA0KPiANCj4gV2h5IGRvIHdlIG5lZWQgYSBtYXNrIGZvciB0aGlzPw0KPiANCg0K
SSBkb24ndCBrbm93IHlldCBidXQgSSB3aWxsIGZpbmQgb3V0Lg0KVGhpcyBwYXRjaCB3YXMgZnJv
bSBMaXUgU2h1byBzbyBJIG5lZWQgdG8gZG8gbW9yZSBpbnZlc3RpZ2F0aW9uLg0KDQotSmlhIEhv
bmd0YW8uDQoNCg0K

RE: [PATCH] powerpc/85xx: workaround for chips with MSI hareware errata to support MSI-X

[Jia Hongtao-B38951]

DQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IFdvb2QgU2NvdHQtQjA3NDIx
DQo+IFNlbnQ6IFR1ZXNkYXksIEp1bHkgMTcsIDIwMTIgNzoyMCBBTQ0KPiBUbzogSmlhIEhvbmd0
YW8tQjM4OTUxDQo+IENjOiBsaW51eHBwYy1kZXZAbGlzdHMub3psYWJzLm9yZzsgZ2FsYWtAa2Vy
bmVsLmNyYXNoaW5nLm9yZzsNCj4gc29uaWNjYXQubGl1QGdtYWlsLmNvbQ0KPiBTdWJqZWN0OiBS
ZTogW1BBVENIXSBwb3dlcnBjLzg1eHg6IHdvcmthcm91bmQgZm9yIGNoaXBzIHdpdGggTVNJIGhh
cmV3YXJlDQo+IGVycmF0YSB0byBzdXBwb3J0IE1TSS1YDQo+ID4gZGlmZiAtLWdpdCBhL2FyY2gv
cG93ZXJwYy9zeXNkZXYvZnNsX21zaS5oDQo+IGIvYXJjaC9wb3dlcnBjL3N5c2Rldi9mc2xfbXNp
LmgNCj4gPiBpbmRleCA4MjI1Zjg2Li4zNTRkNTQ2IDEwMDY0NA0KPiA+IC0tLSBhL2FyY2gvcG93
ZXJwYy9zeXNkZXYvZnNsX21zaS5oDQo+ID4gKysrIGIvYXJjaC9wb3dlcnBjL3N5c2Rldi9mc2xf
bXNpLmgNCj4gPiBAQCAtMjUsNiArMjUsOSBAQA0KPiA+ICAjZGVmaW5lIEZTTF9QSUNfSVBfSVBJ
QyAgIDB4MDAwMDAwMDINCj4gPiAgI2RlZmluZSBGU0xfUElDX0lQX1ZNUElDICAweDAwMDAwMDAz
DQo+ID4NCj4gPiArI2RlZmluZSBNU0lfSFdfRVJSQVRBX01BU0sgICAweDAwMDAwMEYwDQo+ID4g
KyNkZWZpbmUgTVNJX0hXX0VSUkFUQV9FTkRJQU4gMHgwMDAwMDAxMA0KPiANCj4gV2h5IGRvIHdl
IG5lZWQgYSBtYXNrIGZvciB0aGlzPw0KPiANCg0KSXQgc2VlbXMgdGhpcyBtYXNrIGlzIG5vdCBu
ZWVkZWQuDQpJIHdpbGwgZml4IHRoaXMgaW4gdGhlIG5leHQgdmVyc2lvbi4NCg0KVGhhbmtzLg0K
LUhvbmd0YW8uDQo=