18 files changed, 589 insertions, 48 deletions

diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 719e4557e22e..137f2a6feb25 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -60,4 +60,5 @@ obj-$(CONFIG_CPU_XLP)		+= pci-xlp.o
 
 ifdef CONFIG_PCI_MSI
 obj-$(CONFIG_CAVIUM_OCTEON_SOC) += msi-octeon.o
+obj-$(CONFIG_CPU_XLP)           += msi-xlp.o
 endif
diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c
index df36e2327c54..7a0eda782e35 100644
--- a/arch/mips/pci/fixup-malta.c
+++ b/arch/mips/pci/fixup-malta.c
@@ -54,6 +54,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
 static void malta_piix_func0_fixup(struct pci_dev *pdev)
 {
         unsigned char reg_val;
+        u32 reg_val32;
         /* PIIX PIRQC[A:D] irq mappings */
         static int piixirqmap[PIIX4_FUNC0_PIRQRC_IRQ_ROUTING_MAX] = {
                 0,  0,  0,  3,
@@ -83,6 +84,16 @@ static void malta_piix_func0_fixup(struct pci_dev *pdev)
                 pci_write_config_byte(pdev, PIIX4_FUNC0_TOM, reg_val |
                                 PIIX4_FUNC0_TOM_TOP_OF_MEMORY_MASK);
         }
+
+        /* Mux SERIRQ to its pin */
+        pci_read_config_dword(pdev, PIIX4_FUNC0_GENCFG, &reg_val32);
+        pci_write_config_dword(pdev, PIIX4_FUNC0_GENCFG,
+                               reg_val32 | PIIX4_FUNC0_GENCFG_SERIRQ);
+
+        /* Enable SERIRQ */
+        pci_read_config_byte(pdev, PIIX4_FUNC0_SERIRQC, &reg_val);
+        reg_val |= PIIX4_FUNC0_SERIRQC_EN | PIIX4_FUNC0_SERIRQC_CONT;
+        pci_write_config_byte(pdev, PIIX4_FUNC0_SERIRQC, reg_val);
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0,
diff --git a/arch/mips/pci/fixup-rc32434.c b/arch/mips/pci/fixup-rc32434.c
index d0f6ecbf35f7..7fcafd5da7da 100644
--- a/arch/mips/pci/fixup-rc32434.c
+++ b/arch/mips/pci/fixup-rc32434.c
@@ -27,7 +27,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 
 #include <asm/mach-rc32434/rc32434.h>
 #include <asm/mach-rc32434/irq.h>
diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c
index 1441becdcb6c..8feae9154baf 100644
--- a/arch/mips/pci/fixup-sb1250.c
+++ b/arch/mips/pci/fixup-sb1250.c
@@ -8,7 +8,6 @@
  *      2 of the License, or (at your option) any later version.
  */
 
-#include <linux/init.h>
 #include <linux/pci.h>
 
 /*
diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
index d37be36dc659..2b91b0e61566 100644
--- a/arch/mips/pci/msi-octeon.c
+++ b/arch/mips/pci/msi-octeon.c
@@ -150,6 +150,7 @@ msi_irq_allocated:
                 msg.address_lo =
                         ((128ul << 20) + CVMX_PCI_MSI_RCV) & 0xffffffff;
                 msg.address_hi = ((128ul << 20) + CVMX_PCI_MSI_RCV) >> 32;
+                break;
         case OCTEON_DMA_BAR_TYPE_BIG:
                 /* When using big bar, Bar 0 is based at 0 */
                 msg.address_lo = (0 + CVMX_PCI_MSI_RCV) & 0xffffffff;
diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c
new file mode 100644
index 000000000000..afd8405e0188
--- /dev/null
+++ b/arch/mips/pci/msi-xlp.c
@@ -0,0 +1,494 @@
+/*
+ * Copyright (c) 2003-2012 Broadcom Corporation
+ * All Rights Reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the Broadcom
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BROADCOM ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/msi.h>
+#include <linux/mm.h>
+#include <linux/irq.h>
+#include <linux/irqdesc.h>
+#include <linux/console.h>
+
+#include <asm/io.h>
+
+#include <asm/netlogic/interrupt.h>
+#include <asm/netlogic/haldefs.h>
+#include <asm/netlogic/common.h>
+#include <asm/netlogic/mips-extns.h>
+
+#include <asm/netlogic/xlp-hal/iomap.h>
+#include <asm/netlogic/xlp-hal/xlp.h>
+#include <asm/netlogic/xlp-hal/pic.h>
+#include <asm/netlogic/xlp-hal/pcibus.h>
+#include <asm/netlogic/xlp-hal/bridge.h>
+
+#define XLP_MSIVEC_PER_LINK     32
+#define XLP_MSIXVEC_TOTAL       32
+#define XLP_MSIXVEC_PER_LINK    8
+
+/* 128 MSI irqs per node, mapped starting at NLM_MSI_VEC_BASE */
+static inline int nlm_link_msiirq(int link, int msivec)
+{
+        return NLM_MSI_VEC_BASE + link * XLP_MSIVEC_PER_LINK + msivec;
+}
+
+static inline int nlm_irq_msivec(int irq)
+{
+        return irq % XLP_MSIVEC_PER_LINK;
+}
+
+static inline int nlm_irq_msilink(int irq)
+{
+        return (irq % (XLP_MSIVEC_PER_LINK * PCIE_NLINKS)) /
+                                                XLP_MSIVEC_PER_LINK;
+}
+
+/*
+ * Only 32 MSI-X vectors are possible because there are only 32 PIC
+ * interrupts for MSI. We split them statically and use 8 MSI-X vectors
+ * per link - this keeps the allocation and lookup simple.
+ */
+static inline int nlm_link_msixirq(int link, int bit)
+{
+        return NLM_MSIX_VEC_BASE + link * XLP_MSIXVEC_PER_LINK + bit;
+}
+
+static inline int nlm_irq_msixvec(int irq)
+{
+        return irq % XLP_MSIXVEC_TOTAL;  /* works when given xirq */
+}
+
+static inline int nlm_irq_msixlink(int irq)
+{
+        return nlm_irq_msixvec(irq) / XLP_MSIXVEC_PER_LINK;
+}
+
+/*
+ * Per link MSI and MSI-X information, set as IRQ handler data for
+ * MSI and MSI-X interrupts.
+ */
+struct xlp_msi_data {
+        struct nlm_soc_info *node;
+        uint64_t        lnkbase;
+        uint32_t        msi_enabled_mask;
+        uint32_t        msi_alloc_mask;
+        uint32_t        msix_alloc_mask;
+        spinlock_t      msi_lock;
+};
+
+/*
+ * MSI Chip definitions
+ *
+ * On XLP, there is a PIC interrupt associated with each PCIe link on the
+ * chip (which appears as a PCI bridge to us). This gives us 32 MSI irqa
+ * per link and 128 overall.
+ *
+ * When a device connected to the link raises a MSI interrupt, we get a
+ * link interrupt and we then have to look at PCIE_MSI_STATUS register at
+ * the bridge to map it to the IRQ
+ */
+static void xlp_msi_enable(struct irq_data *d)
+{
+        struct xlp_msi_data *md = irq_data_get_irq_handler_data(d);
+        unsigned long flags;
+        int vec;
+
+        vec = nlm_irq_msivec(d->irq);
+        spin_lock_irqsave(&md->msi_lock, flags);
+        md->msi_enabled_mask |= 1u << vec;
+        nlm_write_reg(md->lnkbase, PCIE_MSI_EN, md->msi_enabled_mask);
+        spin_unlock_irqrestore(&md->msi_lock, flags);
+}
+
+static void xlp_msi_disable(struct irq_data *d)
+{
+        struct xlp_msi_data *md = irq_data_get_irq_handler_data(d);
+        unsigned long flags;
+        int vec;
+
+        vec = nlm_irq_msivec(d->irq);
+        spin_lock_irqsave(&md->msi_lock, flags);
+        md->msi_enabled_mask &= ~(1u << vec);
+        nlm_write_reg(md->lnkbase, PCIE_MSI_EN, md->msi_enabled_mask);
+        spin_unlock_irqrestore(&md->msi_lock, flags);
+}
+
+static void xlp_msi_mask_ack(struct irq_data *d)
+{
+        struct xlp_msi_data *md = irq_data_get_irq_handler_data(d);
+        int link, vec;
+
+        link = nlm_irq_msilink(d->irq);
+        vec = nlm_irq_msivec(d->irq);
+        xlp_msi_disable(d);
+
+        /* Ack MSI on bridge */
+        nlm_write_reg(md->lnkbase, PCIE_MSI_STATUS, 1u << vec);
+
+        /* Ack at eirr and PIC */
+        ack_c0_eirr(PIC_PCIE_LINK_MSI_IRQ(link));
+        nlm_pic_ack(md->node->picbase, PIC_IRT_PCIE_LINK_INDEX(link));
+}
+
+static struct irq_chip xlp_msi_chip = {
+        .name           = "XLP-MSI",
+        .irq_enable     = xlp_msi_enable,
+        .irq_disable    = xlp_msi_disable,
+        .irq_mask_ack   = xlp_msi_mask_ack,
+        .irq_unmask     = xlp_msi_enable,
+};
+
+/*
+ * The MSI-X interrupt handling is different from MSI, there are 32
+ * MSI-X interrupts generated by the PIC and each of these correspond
+ * to a MSI-X vector (0-31) that can be assigned.
+ *
+ * We divide the MSI-X vectors to 8 per link and do a per-link
+ * allocation
+ *
+ * Enable and disable done using standard MSI functions.
+ */
+static void xlp_msix_mask_ack(struct irq_data *d)
+{
+        struct xlp_msi_data *md = irq_data_get_irq_handler_data(d);
+        int link, msixvec;
+
+        msixvec = nlm_irq_msixvec(d->irq);
+        link = nlm_irq_msixlink(d->irq);
+        mask_msi_irq(d);
+
+        /* Ack MSI on bridge */
+        nlm_write_reg(md->lnkbase, PCIE_MSIX_STATUS, 1u << msixvec);
+
+        /* Ack at eirr and PIC */
+        ack_c0_eirr(PIC_PCIE_MSIX_IRQ(link));
+        nlm_pic_ack(md->node->picbase, PIC_IRT_PCIE_MSIX_INDEX(msixvec));
+}
+
+static struct irq_chip xlp_msix_chip = {
+        .name           = "XLP-MSIX",
+        .irq_enable     = unmask_msi_irq,
+        .irq_disable    = mask_msi_irq,
+        .irq_mask_ack   = xlp_msix_mask_ack,
+        .irq_unmask     = unmask_msi_irq,
+};
+
+void destroy_irq(unsigned int irq)
+{
+            /* nothing to do yet */
+}
+
+void arch_teardown_msi_irq(unsigned int irq)
+{
+        destroy_irq(irq);
+}
+
+/*
+ * Setup a PCIe link for MSI.  By default, the links are in
+ * legacy interrupt mode.  We will switch them to MSI mode
+ * at the first MSI request.
+ */
+static void xlp_config_link_msi(uint64_t lnkbase, int lirq, uint64_t msiaddr)
+{
+        u32 val;
+
+        val = nlm_read_reg(lnkbase, PCIE_INT_EN0);
+        if ((val & 0x200) == 0) {
+                val |= 0x200;           /* MSI Interrupt enable */
+                nlm_write_reg(lnkbase, PCIE_INT_EN0, val);
+        }
+
+        val = nlm_read_reg(lnkbase, 0x1);       /* CMD */
+        if ((val & 0x0400) == 0) {
+                val |= 0x0400;
+                nlm_write_reg(lnkbase, 0x1, val);
+        }
+
+        /* Update IRQ in the PCI irq reg */
+        val = nlm_read_pci_reg(lnkbase, 0xf);
+        val &= ~0x1fu;
+        val |= (1 << 8) | lirq;
+        nlm_write_pci_reg(lnkbase, 0xf, val);
+
+        /* MSI addr */
+        nlm_write_reg(lnkbase, PCIE_BRIDGE_MSI_ADDRH, msiaddr >> 32);
+        nlm_write_reg(lnkbase, PCIE_BRIDGE_MSI_ADDRL, msiaddr & 0xffffffff);
+
+        /* MSI cap for bridge */
+        val = nlm_read_reg(lnkbase, PCIE_BRIDGE_MSI_CAP);
+        if ((val & (1 << 16)) == 0) {
+                val |= 0xb << 16;               /* mmc32, msi enable */
+                nlm_write_reg(lnkbase, PCIE_BRIDGE_MSI_CAP, val);
+        }
+}
+
+/*
+ * Allocate a MSI vector on a link
+ */
+static int xlp_setup_msi(uint64_t lnkbase, int node, int link,
+        struct msi_desc *desc)
+{
+        struct xlp_msi_data *md;
+        struct msi_msg msg;
+        unsigned long flags;
+        int msivec, irt, lirq, xirq, ret;
+        uint64_t msiaddr;
+
+        /* Get MSI data for the link */
+        lirq = PIC_PCIE_LINK_MSI_IRQ(link);
+        xirq = nlm_irq_to_xirq(node, nlm_link_msiirq(link, 0));
+        md = irq_get_handler_data(xirq);
+        msiaddr = MSI_LINK_ADDR(node, link);
+
+        spin_lock_irqsave(&md->msi_lock, flags);
+        if (md->msi_alloc_mask == 0) {
+                /* switch the link IRQ to MSI range */
+                xlp_config_link_msi(lnkbase, lirq, msiaddr);
+                irt = PIC_IRT_PCIE_LINK_INDEX(link);
+                nlm_setup_pic_irq(node, lirq, lirq, irt);
+                nlm_pic_init_irt(nlm_get_node(node)->picbase, irt, lirq,
+                                 node * nlm_threads_per_node(), 1 /*en */);
+        }
+
+        /* allocate a MSI vec, and tell the bridge about it */
+        msivec = fls(md->msi_alloc_mask);
+        if (msivec == XLP_MSIVEC_PER_LINK) {
+                spin_unlock_irqrestore(&md->msi_lock, flags);
+                return -ENOMEM;
+        }
+        md->msi_alloc_mask |= (1u << msivec);
+        spin_unlock_irqrestore(&md->msi_lock, flags);
+
+        msg.address_hi = msiaddr >> 32;
+        msg.address_lo = msiaddr & 0xffffffff;
+        msg.data = 0xc00 | msivec;
+
+        xirq = xirq + msivec;           /* msi mapped to global irq space */
+        ret = irq_set_msi_desc(xirq, desc);
+        if (ret < 0) {
+                destroy_irq(xirq);
+                return ret;
+        }
+
+        write_msi_msg(xirq, &msg);
+        return 0;
+}
+
+/*
+ * Switch a link to MSI-X mode
+ */
+static void xlp_config_link_msix(uint64_t lnkbase, int lirq, uint64_t msixaddr)
+{
+        u32 val;
+
+        val = nlm_read_reg(lnkbase, 0x2C);
+        if ((val & 0x80000000U) == 0) {
+                val |= 0x80000000U;
+                nlm_write_reg(lnkbase, 0x2C, val);
+        }
+        val = nlm_read_reg(lnkbase, PCIE_INT_EN0);
+        if ((val & 0x200) == 0) {
+                val |= 0x200;           /* MSI Interrupt enable */
+                nlm_write_reg(lnkbase, PCIE_INT_EN0, val);
+        }
+
+        val = nlm_read_reg(lnkbase, 0x1);       /* CMD */
+        if ((val & 0x0400) == 0) {
+                val |= 0x0400;
+                nlm_write_reg(lnkbase, 0x1, val);
+        }
+
+        /* Update IRQ in the PCI irq reg */
+        val = nlm_read_pci_reg(lnkbase, 0xf);
+        val &= ~0x1fu;
+        val |= (1 << 8) | lirq;
+        nlm_write_pci_reg(lnkbase, 0xf, val);
+
+        /* MSI-X addresses */
+        nlm_write_reg(lnkbase, PCIE_BRIDGE_MSIX_ADDR_BASE, msixaddr >> 8);
+        nlm_write_reg(lnkbase, PCIE_BRIDGE_MSIX_ADDR_LIMIT,
+                                        (msixaddr + MSI_ADDR_SZ) >> 8);
+}
+
+/*
+ *  Allocate a MSI-X vector
+ */
+static int xlp_setup_msix(uint64_t lnkbase, int node, int link,
+        struct msi_desc *desc)
+{
+        struct xlp_msi_data *md;
+        struct msi_msg msg;
+        unsigned long flags;
+        int t, msixvec, lirq, xirq, ret;
+        uint64_t msixaddr;
+
+        /* Get MSI data for the link */
+        lirq = PIC_PCIE_MSIX_IRQ(link);
+        xirq = nlm_irq_to_xirq(node, nlm_link_msixirq(link, 0));
+        md = irq_get_handler_data(xirq);
+        msixaddr = MSIX_LINK_ADDR(node, link);
+
+        spin_lock_irqsave(&md->msi_lock, flags);
+        /* switch the PCIe link to MSI-X mode at the first alloc */
+        if (md->msix_alloc_mask == 0)
+                xlp_config_link_msix(lnkbase, lirq, msixaddr);
+
+        /* allocate a MSI-X vec, and tell the bridge about it */
+        t = fls(md->msix_alloc_mask);
+        if (t == XLP_MSIXVEC_PER_LINK) {
+                spin_unlock_irqrestore(&md->msi_lock, flags);
+                return -ENOMEM;
+        }
+        md->msix_alloc_mask |= (1u << t);
+        spin_unlock_irqrestore(&md->msi_lock, flags);
+
+        xirq += t;
+        msixvec = nlm_irq_msixvec(xirq);
+        msg.address_hi = msixaddr >> 32;
+        msg.address_lo = msixaddr & 0xffffffff;
+        msg.data = 0xc00 | msixvec;
+
+        ret = irq_set_msi_desc(xirq, desc);
+        if (ret < 0) {
+                destroy_irq(xirq);
+                return ret;
+        }
+
+        write_msi_msg(xirq, &msg);
+        return 0;
+}
+
+int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
+{
+        struct pci_dev *lnkdev;
+        uint64_t lnkbase;
+        int node, link, slot;
+
+        lnkdev = xlp_get_pcie_link(dev);
+        if (lnkdev == NULL) {
+                dev_err(&dev->dev, "Could not find bridge\n");
+                return 1;
+        }
+        slot = PCI_SLOT(lnkdev->devfn);
+        link = PCI_FUNC(lnkdev->devfn);
+        node = slot / 8;
+        lnkbase = nlm_get_pcie_base(node, link);
+
+        if (desc->msi_attrib.is_msix)
+                return xlp_setup_msix(lnkbase, node, link, desc);
+        else
+                return xlp_setup_msi(lnkbase, node, link, desc);
+}
+
+void __init xlp_init_node_msi_irqs(int node, int link)
+{
+        struct nlm_soc_info *nodep;
+        struct xlp_msi_data *md;
+        int irq, i, irt, msixvec;
+
+        pr_info("[%d %d] Init node PCI IRT\n", node, link);
+        nodep = nlm_get_node(node);
+
+        /* Alloc an MSI block for the link */
+        md = kzalloc(sizeof(*md), GFP_KERNEL);
+        spin_lock_init(&md->msi_lock);
+        md->msi_enabled_mask = 0;
+        md->msi_alloc_mask = 0;
+        md->msix_alloc_mask = 0;
+        md->node = nodep;
+        md->lnkbase = nlm_get_pcie_base(node, link);
+
+        /* extended space for MSI interrupts */
+        irq = nlm_irq_to_xirq(node, nlm_link_msiirq(link, 0));
+        for (i = irq; i < irq + XLP_MSIVEC_PER_LINK; i++) {
+                irq_set_chip_and_handler(i, &xlp_msi_chip, handle_level_irq);
+                irq_set_handler_data(i, md);
+        }
+
+        for (i = 0; i < XLP_MSIXVEC_PER_LINK; i++) {
+                /* Initialize MSI-X irts to generate one interrupt per link */
+                msixvec = link * XLP_MSIXVEC_PER_LINK + i;
+                irt = PIC_IRT_PCIE_MSIX_INDEX(msixvec);
+                nlm_pic_init_irt(nodep->picbase, irt, PIC_PCIE_MSIX_IRQ(link),
+                        node * nlm_threads_per_node(), 1 /* enable */);
+
+                /* Initialize MSI-X extended irq space for the link  */
+                irq = nlm_irq_to_xirq(node, nlm_link_msixirq(link, i));
+                irq_set_chip_and_handler(irq, &xlp_msix_chip, handle_level_irq);
+                irq_set_handler_data(irq, md);
+        }
+
+}
+
+void nlm_dispatch_msi(int node, int lirq)
+{
+        struct xlp_msi_data *md;
+        int link, i, irqbase;
+        u32 status;
+
+        link = lirq - PIC_PCIE_LINK_MSI_IRQ_BASE;
+        irqbase = nlm_irq_to_xirq(node, nlm_link_msiirq(link, 0));
+        md = irq_get_handler_data(irqbase);
+        status = nlm_read_reg(md->lnkbase, PCIE_MSI_STATUS) &
+                                                md->msi_enabled_mask;
+        while (status) {
+                i = __ffs(status);
+                do_IRQ(irqbase + i);
+                status &= status - 1;
+        }
+}
+
+void nlm_dispatch_msix(int node, int lirq)
+{
+        struct xlp_msi_data *md;
+        int link, i, irqbase;
+        u32 status;
+
+        link = lirq - PIC_PCIE_MSIX_IRQ_BASE;
+        irqbase = nlm_irq_to_xirq(node, nlm_link_msixirq(link, 0));
+        md = irq_get_handler_data(irqbase);
+        status = nlm_read_reg(md->lnkbase, PCIE_MSIX_STATUS);
+
+        /* narrow it down to the MSI-x vectors for our link */
+        status = (status >> (link * XLP_MSIXVEC_PER_LINK)) &
+                        ((1 << XLP_MSIXVEC_PER_LINK) - 1);
+
+        while (status) {
+                i = __ffs(status);
+                do_IRQ(irqbase + i);
+                status &= status - 1;
+        }
+}
diff --git a/arch/mips/pci/ops-bcm63xx.c b/arch/mips/pci/ops-bcm63xx.c
index 6144bb337e44..13eea696bbe7 100644
--- a/arch/mips/pci/ops-bcm63xx.c
+++ b/arch/mips/pci/ops-bcm63xx.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/arch/mips/pci/ops-bonito64.c b/arch/mips/pci/ops-bonito64.c
index 830352e3aeda..c06205a87348 100644
--- a/arch/mips/pci/ops-bonito64.c
+++ b/arch/mips/pci/ops-bonito64.c
@@ -22,7 +22,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 
 #include <asm/mips-boards/bonito64.h>
 
diff --git a/arch/mips/pci/ops-lantiq.c b/arch/mips/pci/ops-lantiq.c
index 16e7c2526d77..e5738ee26f4f 100644
--- a/arch/mips/pci/ops-lantiq.c
+++ b/arch/mips/pci/ops-lantiq.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <asm/addrspace.h>
diff --git a/arch/mips/pci/ops-loongson2.c b/arch/mips/pci/ops-loongson2.c
index 98254afa0287..24138bb0cbe1 100644
--- a/arch/mips/pci/ops-loongson2.c
+++ b/arch/mips/pci/ops-loongson2.c
@@ -14,7 +14,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/export.h>
 
 #include <loongson.h>
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index 1cfb5588699f..6b5821febc38 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -6,7 +6,6 @@
  * Copyright (C) 2000, 2001 Keith M Wesolowski
  */
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/types.h>
 #include <asm/pci.h>
diff --git a/arch/mips/pci/ops-msc.c b/arch/mips/pci/ops-msc.c
index 92a8543361bb..dbbf3657896c 100644
--- a/arch/mips/pci/ops-msc.c
+++ b/arch/mips/pci/ops-msc.c
@@ -24,7 +24,6 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 
 #include <asm/mips-boards/msc01_pci.h>
 
diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c
index 499e35c3eb35..a1a7c9f4096e 100644
--- a/arch/mips/pci/ops-nile4.c
+++ b/arch/mips/pci/ops-nile4.c
@@ -1,5 +1,4 @@
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/bootinfo.h>
 
diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c
index 7c7182e2350a..874ed6df9768 100644
--- a/arch/mips/pci/ops-rc32434.c
+++ b/arch/mips/pci/ops-rc32434.c
@@ -26,7 +26,6 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/pci.h>
 #include <linux/types.h>
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index 162b4cb29dba..0f09eafa5e3a 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -7,7 +7,6 @@
  * Copyright (C) 1999, 2000, 04 Ralf Baechle (ralf@linux-mips.org)
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <linux/pci.h>
diff --git a/arch/mips/pci/pci-malta.c b/arch/mips/pci/pci-malta.c
index 37134ddfeaa5..f1a73890dd4f 100644
--- a/arch/mips/pci/pci-malta.c
+++ b/arch/mips/pci/pci-malta.c
@@ -241,9 +241,9 @@ void __init mips_pcibios_init(void)
                 return;
         }
 
-        /* Change start address to avoid conflicts with ACPI and SMB devices */
-        if (controller->io_resource->start < 0x00002000UL)
-                controller->io_resource->start = 0x00002000UL;
+        /* PIIX4 ACPI starts at 0x1000 */
+        if (controller->io_resource->start < 0x00001000UL)
+                controller->io_resource->start = 0x00001000UL;
 
         iomem_resource.end &= 0xfffffffffULL;                   /* 64 GB */
         ioport_resource.end = controller->io_resource->end;
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index adeff2bfe4cd..72919aeef42b 100644
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -436,9 +436,6 @@ static int rt3883_pci_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -EINVAL;
-
         rpc->base = devm_ioremap_resource(dev, res);
         if (IS_ERR(rpc->base))
                 return PTR_ERR(rpc->base);
diff --git a/arch/mips/pci/pci-xlp.c b/arch/mips/pci/pci-xlp.c
index 653d2db9e0c5..7babf01600cb 100644
--- a/arch/mips/pci/pci-xlp.c
+++ b/arch/mips/pci/pci-xlp.c
@@ -47,10 +47,11 @@
 #include <asm/netlogic/interrupt.h>
 #include <asm/netlogic/haldefs.h>
 #include <asm/netlogic/common.h>
+#include <asm/netlogic/mips-extns.h>
 
 #include <asm/netlogic/xlp-hal/iomap.h>
-#include <asm/netlogic/xlp-hal/pic.h>
 #include <asm/netlogic/xlp-hal/xlp.h>
+#include <asm/netlogic/xlp-hal/pic.h>
 #include <asm/netlogic/xlp-hal/pcibus.h>
 #include <asm/netlogic/xlp-hal/bridge.h>
 
@@ -66,9 +67,22 @@ static inline u32 pci_cfg_read_32bit(struct pci_bus *bus, unsigned int devfn,
         u32 *cfgaddr;
 
         where &= ~3;
-        if (bus->number == 0 && PCI_SLOT(devfn) == 1 && where == 0x954)
+        if (cpu_is_xlp9xx()) {
+                /* be very careful on SoC buses */
+                if (bus->number == 0) {
+                        /* Scan only existing nodes - uboot bug? */
+                        if (PCI_SLOT(devfn) != 0 ||
+                                           !nlm_node_present(PCI_FUNC(devfn)))
+                                return 0xffffffff;
+                } else if (bus->parent->number == 0) {  /* SoC bus */
+                        if (PCI_SLOT(devfn) == 0)       /* b.0.0 hangs */
+                                return 0xffffffff;
+                        if (devfn == 44)                /* b.5.4 hangs */
+                                return 0xffffffff;
+                }
+        } else if (bus->number == 0 && PCI_SLOT(devfn) == 1 && where == 0x954) {
                 return 0xffffffff;
-
+        }
         cfgaddr = (u32 *)(pci_config_base +
                         pci_cfg_addr(bus->number, devfn, where));
         data = *cfgaddr;
@@ -162,27 +176,39 @@ struct pci_controller nlm_pci_controller = {
         .io_offset      = 0x00000000UL,
 };
 
-static struct pci_dev *xlp_get_pcie_link(const struct pci_dev *dev)
+struct pci_dev *xlp_get_pcie_link(const struct pci_dev *dev)
 {
         struct pci_bus *bus, *p;
 
-        /* Find the bridge on bus 0 */
         bus = dev->bus;
-        for (p = bus->parent; p && p->number != 0; p = p->parent)
-                bus = p;
 
-        return p ? bus->self : NULL;
+        if (cpu_is_xlp9xx()) {
+                /* find bus with grand parent number == 0 */
+                for (p = bus->parent; p && p->parent && p->parent->number != 0;
+                                p = p->parent)
+                        bus = p;
+                return (p && p->parent) ? bus->self : NULL;
+        } else {
+                /* Find the bridge on bus 0 */
+                for (p = bus->parent; p && p->number != 0; p = p->parent)
+                        bus = p;
+
+                return p ? bus->self : NULL;
+        }
 }
 
-static inline int nlm_pci_link_to_irq(int link)
+int xlp_socdev_to_node(const struct pci_dev *lnkdev)
 {
-        return PIC_PCIE_LINK_0_IRQ + link;
+        if (cpu_is_xlp9xx())
+                return PCI_FUNC(lnkdev->bus->self->devfn);
+        else
+                return PCI_SLOT(lnkdev->devfn) / 8;
 }
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
         struct pci_dev *lnkdev;
-        int lnkslot, lnkfunc;
+        int lnkfunc, node;
 
         /*
          * For XLP PCIe, there is an IRQ per Link, find out which
@@ -191,9 +217,11 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
         lnkdev = xlp_get_pcie_link(dev);
         if (lnkdev == NULL)
                 return 0;
+
         lnkfunc = PCI_FUNC(lnkdev->devfn);
-        lnkslot = PCI_SLOT(lnkdev->devfn);
-        return nlm_irq_to_xirq(lnkslot / 8, nlm_pci_link_to_irq(lnkfunc));
+        node = xlp_socdev_to_node(lnkdev);
+
+        return nlm_irq_to_xirq(node, PIC_PCIE_LINK_LEGACY_IRQ(lnkfunc));
 }
 
 /* Do platform specific device initialization at pci_enable_device() time */
@@ -220,17 +248,38 @@ static void xlp_config_pci_bswap(int node, int link)
          *  Enable byte swap in hardware. Program each link's PCIe SWAP regions
          * from the link's address ranges.
          */
-        reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEMEM_BASE0 + link);
-        nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_MEM_BASE, reg);
-
-        reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEMEM_LIMIT0 + link);
-        nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_MEM_LIM, reg | 0xfff);
-
-        reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEIO_BASE0 + link);
-        nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_IO_BASE, reg);
-
-        reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEIO_LIMIT0 + link);
-        nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_IO_LIM, reg | 0xfff);
+        if (cpu_is_xlp9xx()) {
+                reg = nlm_read_bridge_reg(nbubase,
+                                BRIDGE_9XX_PCIEMEM_BASE0 + link);
+                nlm_write_pci_reg(lnkbase, PCIE_9XX_BYTE_SWAP_MEM_BASE, reg);
+
+                reg = nlm_read_bridge_reg(nbubase,
+                                BRIDGE_9XX_PCIEMEM_LIMIT0 + link);
+                nlm_write_pci_reg(lnkbase,
+                                PCIE_9XX_BYTE_SWAP_MEM_LIM, reg | 0xfff);
+
+                reg = nlm_read_bridge_reg(nbubase,
+                                BRIDGE_9XX_PCIEIO_BASE0 + link);
+                nlm_write_pci_reg(lnkbase, PCIE_9XX_BYTE_SWAP_IO_BASE, reg);
+
+                reg = nlm_read_bridge_reg(nbubase,
+                                BRIDGE_9XX_PCIEIO_LIMIT0 + link);
+                nlm_write_pci_reg(lnkbase,
+                                PCIE_9XX_BYTE_SWAP_IO_LIM, reg | 0xfff);
+        } else {
+                reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEMEM_BASE0 + link);
+                nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_MEM_BASE, reg);
+
+                reg = nlm_read_bridge_reg(nbubase,
+                                        BRIDGE_PCIEMEM_LIMIT0 + link);
+                nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_MEM_LIM, reg | 0xfff);
+
+                reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEIO_BASE0 + link);
+                nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_IO_BASE, reg);
+
+                reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEIO_LIMIT0 + link);
+                nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_IO_LIM, reg | 0xfff);
+        }
 }
 #else
 /* Swap configuration not needed in little-endian mode */
@@ -239,7 +288,6 @@ static inline void xlp_config_pci_bswap(int node, int link) {}
 
 static int __init pcibios_init(void)
 {
-        struct nlm_soc_info *nodep;
         uint64_t pciebase;
         int link, n;
         u32 reg;
@@ -253,20 +301,20 @@ static int __init pcibios_init(void)
         ioport_resource.end   = ~0;
 
         for (n = 0; n < NLM_NR_NODES; n++) {
-                nodep = nlm_get_node(n);
-                if (!nodep->coremask)
-                        continue;       /* node does not exist */
+                if (!nlm_node_present(n))
+                        continue;
 
-                for (link = 0; link < 4; link++) {
+                for (link = 0; link < PCIE_NLINKS; link++) {
                         pciebase = nlm_get_pcie_base(n, link);
                         if (nlm_read_pci_reg(pciebase, 0) == 0xffffffff)
                                 continue;
                         xlp_config_pci_bswap(n, link);
+                        xlp_init_node_msi_irqs(n, link);
 
                         /* put in intpin and irq - u-boot does not */
                         reg = nlm_read_pci_reg(pciebase, 0xf);
-                        reg &= ~0x1fu;
-                        reg |= (1 << 8) | nlm_pci_link_to_irq(link);
+                        reg &= ~0x1ffu;
+                        reg |= (1 << 8) | PIC_PCIE_LINK_LEGACY_IRQ(link);
                         nlm_write_pci_reg(pciebase, 0xf, reg);
                         pr_info("XLP PCIe: Link %d-%d initialized.\n", n, link);
                 }