powerpc/85xx: workaround for chips with MSI hardware errata
PATCH 1/1 powerpc/85xx: workaround for chips with MSI hardware errata
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. This is a workaround to allow MSI-X to function properly.
--- arch/powerpc/sysdev/fsl_msi.c | 60 +++++++++++++++++++++++++++++++++++++++- arch/powerpc/sysdev/fsl_msi.h | 2 + 2 files changed, 60 insertions(+), 2 deletions(-)
arch/powerpc/sysdev/fsl_msi.c +58 -2
@@ -98,8 +98,20 @@ 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. +* This is a workaround to allow MSI-X to function +* properly. +*/ +list_for_each_entry (msi, &msi_head, list) +if (msi->feature &MSI_HW_ERRATA_ENDIAN ) +return -EINVAL ;return 0 ; }
@@ -142,7 +154,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_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 );
@@ -361,13 +377,43 @@ static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,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 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;const struct fsl_msi_feature *features;
@@ -423,6 +469,16 @@ static int 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.
arch/powerpc/sysdev/fsl_msi.h +2 -0
@@ -25,6 +25,8 @@#define FSL_PIC_IP_IPIC 0x00000002#define FSL_PIC_IP_VMPIC 0x00000003 +#define MSI_HW_ERRATA_ENDIAN 0x00000010 +struct fsl_msi {struct irq_domain *irqhost;
Signature · 1 line
1.7.5.1
Quoted 3 lines · Jia Hongtao
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. This is a workaround to allow MSI-X to function properly.
You say "neither MSI nor MSI-X can work fine", which I take to mean "both MSI and MSI-X do not work".
But then you say this is a workaround to allow MSI-X to work.
So what I think you mean is, the erratum prevents both MSI and MSI-X from working. This is a workaround that allows MSI-X to work, and in addition the patch prevents MSI from being used on chips with the erratum - because there is no workaround for MSI.
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 104
Quoted 12 lines
arch/powerpc/sysdev/fsl_msi.c +2
-0@@ -98,8 +98,20 @@ 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" );
Seeing as this patch is enabling a workaround for MSI-X you've obviously tested MSI-X, so you should remove the two lines above.
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 111
Quoted 7 lines
arch/powerpc/sysdev/fsl_msi.c +7
-0+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. +* This is a workaround to allow MSI-X to function +* properly. +*/
This is not a workaround. This is a check to prevent MSI from being used on buggy chipsets.
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 114
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c +3
-0+list_for_each_entry (msi, &msi_head, list) +if (msi->feature &MSI_HW_ERRATA_ENDIAN ) +return -EINVAL ;
I take it you're happy preventing MSI for all devices even if only a single chip in the machine has the erratum? In practice you probably have all or none with the erratum right?
I would suggest brackets on an if with such a large body, even though it is OK as it is.
arch/powerpc/sysdev/fsl_msi.c static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq, · line 161
Quoted 13 lines
arch/powerpc/sysdev/fsl_msi.c +5
-1return 0 ; }@@ -142,7 +154,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_ENDIAN ) + msg->data =__swab32 (hwirq); +else + msg->data = hwirq;
This is the workaround. The comment here should say, "this only works for MSI-X, we prevent MSI in on buggy chips in fsl_msi_check_device()".
Quoted 21 lines
arch/powerpc/sysdev/fsl_msi.c +14
-0pr_debug ("%s: allocated srs: %d, ibs: %d\n" , __func__, hwirq /IRQS_PER_MSI_REG , hwirq %IRQS_PER_MSI_REG );@@ -361,13 +377,43 @@ static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,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 ;
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev, · line 403
Quoted 10 lines
arch/powerpc/sysdev/fsl_msi.c +10
-0+ } + +/* 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);
You don't need the put here, you know it's NULL (you just checked).
Quoted 19 lines
arch/powerpc/sysdev/fsl_msi.c +7
-1+return -ENODEV ; + } + +return 0 ; +} +static const struct of_device_id fsl_of_msi_ids[];static int 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;const struct fsl_msi_feature *features;@@ -423,6 +469,16 @@ static int fsl_of_msi_probe(struct platform_device *dev)
arch/powerpc/sysdev/fsl_msi.c static int fsl_of_msi_probe(struct platform_device *dev) · line 479
Quoted 10 lines
arch/powerpc/sysdev/fsl_msi.c +8
-0msi->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; + }
I don't think you need errata here, "rc" would be fine.
cheers
Quoted 17 lines
-----Original Message-----
From: Michael Ellerman [mailto:[email protected]]
Sent: Wednesday, March 13, 2013 1:04 PM
To: Jia Hongtao-B38951
Cc: [email protected]; [email protected]; Wood Scott- B07421
Subject: Re: [PATCH] powerpc/85xx: workaround for chips with MSI hardware errata
=20Quoted 1 line · Jia Hongtao
The MPIC chip with version 2.0 has a MSI errata (errata PIC1 of
mpc8544),
Quoted 1 line
It causes that neither MSI nor MSI-X can work fine. This is a
workaround
Quoted 1 line
to allow MSI-X to function properly.
Quoted 11 lines
=20
You say "neither MSI nor MSI-X can work fine", which I take to mean "both MSI and MSI-X do not work".
=20
But then you say this is a workaround to allow MSI-X to work. =20
So what I think you mean is, the erratum prevents both MSI and MSI-X from working. This is a workaround that allows MSI-X to work, and in addition
the patch prevents MSI from being used on chips with the erratum - because there is no workaround for MSI.
I'm happy that you understand the patch.
Quoted 11 lines
=20
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/powerpc/sysdev/fsl_msi.carch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi
Quoted 4 lines
index 178c994..0dea680 100644
arch/powerpc/sysdev/fsl_msi.c +0
-0@@ -98,8 +98,20 @@ static int fsl_msi_init_allocator(struct fsl_msi
*msi_data)arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi · line 98
Quoted 2 lines
arch/powerpc/sysdev/fsl_msi.c +0
-0static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, inttype)
Quoted 8 lines
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 104
Quoted 5 lines
arch/powerpc/sysdev/fsl_msi.c +2
-0{ +struct fsl_msi *msi; + if (type =3D=3D PCI_CAP_ID_MSIX)pr_debug ("fslmsi: MSI-X untested, trying anyway.\n" );=20
Seeing as this patch is enabling a workaround for MSI-X you've obviously tested MSI-X, so you should remove the two lines above.
Right, will be removed.
Quoted 11 lines
=20
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 111
Quoted 7 lines
arch/powerpc/sysdev/fsl_msi.c +7
-0+ else if (type =3D=3D PCI_CAP_ID_MSI) +/* +* MPIC chip with 2.0 version has erratum PIC1. It +* causes that neither MSI nor MSI-X can work fine. +* This is a workaround to allow MSI-X to function +* properly. +*/ =20
This is not a workaround. This is a check to prevent MSI from being used on buggy chipsets.
Yes, I will move the comments to the right place.
Quoted 8 lines
=20
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 114
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c +3
-0+list_for_each_entry (msi, &msi_head, list) +if (msi->feature &MSI_HW_ERRATA_ENDIAN ) +return -EINVAL ;=20
I take it you're happy preventing MSI for all devices even if only a single chip in the machine has the erratum? In practice you probably have all or none with the erratum right?
Need more investigations for this comment.
Quoted 4 lines
=20
I would suggest brackets on an if with such a large body, even though it is OK as it is.
=20
Actually, I'd like to brackets on *if body* too. I just follow the kernel *CodingStyle*: "Do not unnecessarily use braces where a single statement wi= ll do."
In this case, I will use braces to make code clearer.
Quoted 8 lines
arch/powerpc/sysdev/fsl_msi.c static void fsl_compose_msi_msg(struct pci_dev
Quoted 4 lines
arch/powerpc/sysdev/fsl_msi.c +0
-0return 0 ; }@@ -142,7 +154,11 @@ static void fsl_compose_msi_msg(struct pci_dev*pdev, int hwirq,
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c +0
-0msg->address_lo =3D lower_32_bits(address); msg->address_hi =3D upper_32_bits(address);
Quoted 9 lines
arch/powerpc/sysdev/fsl_msi.c static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
Quoted 6 lines
arch/powerpc/sysdev/fsl_msi.c +5
-1- msg->data =3D hwirq; +/* See the comment in fsl_msi_check_device() */ +if (msi_data->feature &MSI_HW_ERRATA_ENDIAN ) + msg->data =3D __swab32(hwirq); +else + msg->data =3D hwirq;=20
This is the workaround. The comment here should say, "this only works for MSI-X, we prevent MSI in on buggy chips infsl_msi_check_device()".
Very helpful comment.
Quoted 27 lines
=20
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_setup_hwirq(struct fsl_msi
Quoted 4 lines
arch/powerpc/sysdev/fsl_msi.c +0
-0pr_debug ("%s: allocated srs: %d, ibs: %d\n" , __func__, hwirq /IRQS_PER_MSI_REG , hwirq %IRQS_PER_MSI_REG );@@ -361,13 +377,43 @@ static int fsl_msi_setup_hwirq(struct fsl_msi*msi, struct
platform_device*dev,Quoted 10 lines
arch/powerpc/sysdev/fsl_msi.c +7
-0return 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 =3D of_irq_find_parent(dev->dev.of_node); +if (mpic_node) {arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,
Quoted 10 lines
arch/powerpc/sysdev/fsl_msi.c +10
-0+ u32 *reg_base, brr1 =3D 0; +/* Get the PIC reg base */ + reg_base =3D 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 */
Quoted 9 lines
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev, · line 403
Quoted 7 lines
arch/powerpc/sysdev/fsl_msi.c +7
-0+ brr1 =3D in_be32(reg_base + MPIC_FSL_BRR1); +iounmap (reg_base); + if ((brr1 & MPIC_FSL_BRR1_VER) =3D=3D 0x0200) +return 1 ; + }else { +dev_err (&dev->dev,"MSI can't find his parent mpic node.\n" ); +of_node_put (mpic_node);=20
You don't need the put here, you know it's NULL (you just checked).
Yes.
Quoted 21 lines
=20
arch/powerpc/sysdev/fsl_msi.c static int fsl_of_msi_probe(struct platform_device
Quoted 18 lines
arch/powerpc/sysdev/fsl_msi.c +7
-1+return -ENODEV ; + } + +return 0 ; +} +static const struct of_device_id fsl_of_msi_ids[];static int 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;const struct fsl_msi_feature *features;@@ -423,6 +469,16 @@ static int fsl_of_msi_probe(struct platform_device*dev)
Quoted 1 line
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c +1
-0msi->feature =3D features->fsl_pic_ip; + if ((features->fsl_pic_ip & FSL_PIC_IP_MASK) =3D=3D FSL_PIC_IP_MPIC) =
{
Quoted 9 lines
arch/powerpc/sysdev/fsl_msi.c static int fsl_of_msi_probe(struct platform_device *dev) · line 479
Quoted 7 lines
arch/powerpc/sysdev/fsl_msi.c +7
-0+ errata =3D mpic_has_errata(dev); +if (errata >0 ) { + msi->feature |=3D MSI_HW_ERRATA_ENDIAN; + }else if (errata <0 ) { + err =3D errata; + goto error_out; + }=20
I don't think you need errata here, "rc" would be fine.
Sounds reasonable.
Quoted 2 lines
=20
cheers
Very grateful for all the constructive comments.
-Hongtao.
Quoted 6 lines · Michael Ellerman
Quoted 1 line · Jia Hongtao
The MPIC chip with version 2.0 has a MSI errata (errata PIC1 of =20
mpc8544),
Quoted 1 line
It causes that neither MSI nor MSI-X can work fine. This is a =20
workaround
Quoted 1 line
to allow MSI-X to function properly.
Quoted 11 lines
=20
You say "neither MSI nor MSI-X can work fine", which I take to mean "both MSI and MSI-X do not work".
=20
But then you say this is a workaround to allow MSI-X to work. =20
So what I think you mean is, the erratum prevents both MSI and MSI-X from working. This is a workaround that allows MSI-X to work, and in =20 addition
the patch prevents MSI from being used on chips with the erratum - because there is no workaround for MSI.
There actually is a workaround for MSI, but it's more complicated and =20 not implemented by this patch.
We could also possibly get away with allowing exactly one MSI =20 (byteswapping doesn't matter if the value is zero) -- not sure how hard =20 that would be.
Quoted 7 lines
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 114
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c +3
-0+list_for_each_entry (msi, &msi_head, list) +if (msi->feature &MSI_HW_ERRATA_ENDIAN ) +return -EINVAL ;=20
I take it you're happy preventing MSI for all devices even if only a single chip in the machine has the erratum? In practice you probably have all or none with the erratum right?
Yes, it's all integrated onto one chip (the SoC itself). In fact there =20 should only be one MSI block on these chips.
-Scott=
Quoted 28 lines
-----Original Message-----
From: Wood Scott-B07421
Sent: Thursday, March 14, 2013 4:24 AM
To: Michael Ellerman
Cc: Jia Hongtao-B38951; [email protected]; [email protected]; Wood Scott-B07421
Subject: Re: [PATCH] powerpc/85xx: workaround for chips with MSI hardware errata
=20Quoted 10 lines · Michael Ellerman
Quoted 1 line · Jia Hongtao
The MPIC chip with version 2.0 has a MSI errata (errata PIC1 of
mpc8544),
Quoted 1 line
It causes that neither MSI nor MSI-X can work fine. This is a
workaround
Quoted 1 line
to allow MSI-X to function properly.
You say "neither MSI nor MSI-X can work fine", which I take to mean "both MSI and MSI-X do not work".
Quoted 6 lines
But then you say this is a workaround to allow MSI-X to work.
So what I think you mean is, the erratum prevents both MSI and MSI-X from working. This is a workaround that allows MSI-X to work, and in addition the patch prevents MSI from being used on chips with the erratum - because there is no workaround for MSI.
Quoted 7 lines
=20
There actually is a workaround for MSI, but it's more complicated and not implemented by this patch.
=20
We could also possibly get away with allowing exactly one MSI (byteswapping doesn't matter if the value is zero) -- not sure how hard that would be.
For now we have no plan to support MSI workaround. Also MSI workaround deserve a new patch :)
I will sent V2 of this patch soon.
-Hongtao.
Quoted 13 lines
=20
Quoted 7 lines
arch/powerpc/sysdev/fsl_msi.c static int fsl_msi_init_allocator(struct fsl_msi *msi_data) · line 114
Quoted 3 lines
arch/powerpc/sysdev/fsl_msi.c +3
-0+list_for_each_entry (msi, &msi_head, list) +if (msi->feature &MSI_HW_ERRATA_ENDIAN ) +return -EINVAL ;I take it you're happy preventing MSI for all devices even if only a single chip in the machine has the erratum? In practice you probably have all or none with the erratum right?
=20
Yes, it's all integrated onto one chip (the SoC itself). In fact there should only be one MSI block on these chips.
=20
-Scott