powerpc/44x: Fix PCI MSI support for Maui APM821xx SoC and Bluestone board

This patch consists of:
- Enable PCI MSI as default for Bluestone board
- Change definition of number of MSI interrupts as it depends on SoC
- Fix returning ENODEV as finding MSI node
- Fix MSI physical high and low address
- Keep MSI data logically

Signed-off-by: Mai La <mla@apm.com>
Signed-off-by: Josh Boyer <jwboyer@gmail.com>

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 2e4e64abfab4ed751adb06dd2ffff0b476de35c9..8abf6fb8f41037232bc834ef0e87528ab456d8c7 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -23,6 +23,8 @@ config BLUESTONE
        default n
        select PPC44x_SIMPLE
        select APM821xx
+       select PCI_MSI
+       select PPC4xx_MSI
        select PPC4xx_PCI_EXPRESS
        select IBM_EMAC_RGMII
        help

diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
index 1c2d7af17bbe2f3501ff95060e119ced1ed565e8..cc17f591bd6626c6fcc16bb887c64cc2b8ba7ab6 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_msi.c
@@ -28,10 +28,11 @@
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
 #include <linux/export.h>
+#include <linux/kernel.h>
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
-#include <boot/dcr.h>
+#include <asm/dcr.h>
 #include <asm/dcr-regs.h>
 #include <asm/msi_bitmap.h>
 
@@ -43,13 +44,14 @@
 #define PEIH_FLUSH0    0x30
 #define PEIH_FLUSH1    0x38
 #define PEIH_CNTRST    0x48
-#define NR_MSI_IRQS    4
+
+static int msi_irqs;
 
 struct ppc4xx_msi {
        u32 msi_addr_lo;
        u32 msi_addr_hi;
        void __iomem *msi_regs;
-       int msi_virqs[NR_MSI_IRQS];
+       int *msi_virqs;
        struct msi_bitmap bitmap;
        struct device_node *msi_dev;
 };
@@ -61,7 +63,7 @@ static int ppc4xx_msi_init_allocator(struct platform_device *dev,
 {
        int err;
 
-       err = msi_bitmap_alloc(&msi_data->bitmap, NR_MSI_IRQS,
+       err = msi_bitmap_alloc(&msi_data->bitmap, msi_irqs,
                              dev->dev.of_node);
        if (err)
                return err;
@@ -83,6 +85,11 @@ static int ppc4xx_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
        struct msi_desc *entry;
        struct ppc4xx_msi *msi_data = &ppc4xx_msi;
 
+       msi_data->msi_virqs = kmalloc((msi_irqs) * sizeof(int),
+                                           GFP_KERNEL);
+       if (!msi_data->msi_virqs)
+               return -ENOMEM;
+
        list_for_each_entry(entry, &dev->msi_list, list) {
                int_no = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1);
                if (int_no >= 0)
@@ -150,12 +157,11 @@ static int ppc4xx_setup_pcieh_hw(struct platform_device *dev,
        if (!sdr_addr)
                return -1;
 
-       SDR0_WRITE(sdr_addr, (u64)res.start >> 32);      /*HIGH addr */
-       SDR0_WRITE(sdr_addr + 1, res.start & 0xFFFFFFFF); /* Low addr */
-
+       mtdcri(SDR0, *sdr_addr, upper_32_bits(res.start));      /*HIGH addr */
+       mtdcri(SDR0, *sdr_addr + 1, lower_32_bits(res.start));  /* Low addr */
 
        msi->msi_dev = of_find_node_by_name(NULL, "ppc4xx-msi");
-       if (msi->msi_dev)
+       if (!msi->msi_dev)
                return -ENODEV;
 
        msi->msi_regs = of_iomap(msi->msi_dev, 0);
@@ -167,9 +173,12 @@ static int ppc4xx_setup_pcieh_hw(struct platform_device *dev,
                (u32) (msi->msi_regs + PEIH_TERMADH), (u32) (msi->msi_regs));
 
        msi_virt = dma_alloc_coherent(&dev->dev, 64, &msi_phys, GFP_KERNEL);
-       msi->msi_addr_hi = 0x0;
-       msi->msi_addr_lo = (u32) msi_phys;
-       dev_dbg(&dev->dev, "PCIE-MSI: msi address 0x%x\n", msi->msi_addr_lo);
+       if (!msi_virt)
+               return -ENOMEM;
+       msi->msi_addr_hi = (u32)(msi_phys >> 32);
+       msi->msi_addr_lo = (u32)(msi_phys & 0xffffffff);
+       dev_dbg(&dev->dev, "PCIE-MSI: msi address high 0x%x, low 0x%x\n",
+               msi->msi_addr_hi, msi->msi_addr_lo);
 
        /* Progam the Interrupt handler Termination addr registers */
        out_be32(msi->msi_regs + PEIH_TERMADH, msi->msi_addr_hi);
@@ -185,6 +194,8 @@ static int ppc4xx_setup_pcieh_hw(struct platform_device *dev,
        out_be32(msi->msi_regs + PEIH_MSIED, *msi_data);
        out_be32(msi->msi_regs + PEIH_MSIMK, *msi_mask);
 
+       dma_free_coherent(&dev->dev, 64, msi_virt, msi_phys);
+
        return 0;
 }
 
@@ -194,7 +205,7 @@ static int ppc4xx_of_msi_remove(struct platform_device *dev)
        int i;
        int virq;
 
-       for (i = 0; i < NR_MSI_IRQS; i++) {
+       for (i = 0; i < msi_irqs; i++) {
                virq = msi->msi_virqs[i];
                if (virq != NO_IRQ)
                        irq_dispose_mapping(virq);
@@ -215,8 +226,6 @@ static int __devinit ppc4xx_msi_probe(struct platform_device *dev)
        struct resource res;
        int err = 0;
 
-       msi = &ppc4xx_msi;/*keep the msi data for further use*/
-
        dev_dbg(&dev->dev, "PCIE-MSI: Setting up MSI support...\n");
 
        msi = kzalloc(sizeof(struct ppc4xx_msi), GFP_KERNEL);
@@ -234,6 +243,10 @@ static int __devinit ppc4xx_msi_probe(struct platform_device *dev)
                goto error_out;
        }
 
+       msi_irqs = of_irq_count(dev->dev.of_node);
+       if (!msi_irqs)
+               return -ENODEV;
+
        if (ppc4xx_setup_pcieh_hw(dev, res, msi))
                goto error_out;
 
@@ -242,6 +255,7 @@ static int __devinit ppc4xx_msi_probe(struct platform_device *dev)
                dev_err(&dev->dev, "Error allocating MSI bitmap\n");
                goto error_out;
        }
+       ppc4xx_msi = *msi;
 
        ppc_md.setup_msi_irqs = ppc4xx_setup_msi_irqs;
        ppc_md.teardown_msi_irqs = ppc4xx_teardown_msi_irqs;