powerpc/fsl_msi: support vmpic msi with mpic 4.3

The new MSI block in MPIC 4.3 added the MSIIR1 register,
with a different layout, in order to support 16 MSIR
registers. The msi binding was also updated so that
the "reg" reflects the newly introduced MSIIR1 register.
Virtual machines advertise these msi nodes by using the
compatible "fsl,vmpic-msi-v4.3" so add support for it.

Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 77efbaec7b9cb84c4cdd0bac06f49d22d297a66b..9fadc6e4dc47a256aa7b5f145af9400c0735fd39 100644 (file)
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -180,7 +180,8 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
        np = of_parse_phandle(hose->dn, "fsl,msi", 0);
        if (np) {
                if (of_device_is_compatible(np, "fsl,mpic-msi") ||
-                   of_device_is_compatible(np, "fsl,vmpic-msi"))
+                   of_device_is_compatible(np, "fsl,vmpic-msi") ||
+                   of_device_is_compatible(np, "fsl,vmpic-msi-v4.3"))
                        phandle = np->phandle;
                else {
                        dev_err(&pdev->dev,
@@ -466,7 +467,8 @@ static int fsl_of_msi_probe(struct platform_device *dev)
 
        p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);
 
-       if (of_device_is_compatible(dev->dev.of_node, "fsl,mpic-msi-v4.3")) {
+       if (of_device_is_compatible(dev->dev.of_node, "fsl,mpic-msi-v4.3") ||
+           of_device_is_compatible(dev->dev.of_node, "fsl,vmpic-msi-v4.3")) {
                msi->srs_shift = MSIIR1_SRS_SHIFT;
                msi->ibs_shift = MSIIR1_IBS_SHIFT;
                if (p)
@@ -572,6 +574,10 @@ static const struct of_device_id fsl_of_msi_ids[] = {
                .compatible = "fsl,vmpic-msi",
                .data = &vmpic_msi_feature,
        },
+       {
+               .compatible = "fsl,vmpic-msi-v4.3",
+               .data = &vmpic_msi_feature,
+       },
 #endif
        {}
 };