[PATCH] powerpc/fsl_msi: fix support for multiple MSI ranges

Commit 6820fead ("powerpc/fsl_msi: Handle msi-available-ranges better") added
support for multiple ranges in the msi-available-ranges property, but it
miscalculated the MSIR index when multiple ranges are used.

Signed-off-by: Timur Tabi <redacted>
---
 arch/powerpc/sysdev/fsl_msi.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 419a772..1cca251 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c

@@ -296,7 +296,7 @@ static int __devinit fsl_msi_setup_hwirq(struct fsl_msi *msi,
 	}
 
 	msi->msi_virqs[irq_index] = virt_msir;
-	cascade_data->index = offset + irq_index;
+	cascade_data->index = offset;
 	cascade_data->msi_data = msi;
 	irq_set_handler_data(virt_msir, cascade_data);
 	irq_set_chained_handler(virt_msir, fsl_msi_cascade);

@@ -376,8 +376,10 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)
 		goto error_out;
 	}
 
-	if (!p)
+	if (!p) {
 		p = all_avail;
+		len = sizeof(all_avail);
+	}
 
 	for (irq_index = 0, i = 0; i < len / (2 * sizeof(u32)); i++) {
 		if (p[i * 2] % IRQS_PER_MSI_REG ||

@@ -393,7 +395,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)
 		count = p[i * 2 + 1] / IRQS_PER_MSI_REG;
 
 		for (j = 0; j < count; j++, irq_index++) {
-			err = fsl_msi_setup_hwirq(msi, dev, offset, irq_index);
+			err = fsl_msi_setup_hwirq(msi, dev, offset + j, irq_index);
 			if (err)
 				goto error_out;
 		}

-- 
1.7.3.4

On 09/13/2011 04:17 PM, Timur Tabi wrote:

Commit 6820fead ("powerpc/fsl_msi: Handle msi-available-ranges better") added
support for multiple ranges in the msi-available-ranges property, but it
miscalculated the MSIR index when multiple ranges are used.

Signed-off-by: Timur Tabi <redacted>
---
 arch/powerpc/sysdev/fsl_msi.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Acked-by: Scott Wood <redacted>

-Scott

On Sep 13, 2011, at 4:17 PM, Timur Tabi wrote:

Commit 6820fead ("powerpc/fsl_msi: Handle msi-available-ranges =

better") added

support for multiple ranges in the msi-available-ranges property, but =

it

miscalculated the MSIR index when multiple ranges are used.
=20
Signed-off-by: Timur Tabi <redacted>
---
arch/powerpc/sysdev/fsl_msi.c |    8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)

applied

- k=