Commit 7b53eb4d authored by Jayachandran C's avatar Jayachandran C Committed by John Crispin

MIPS: PCI: Multi-node PCI support for Netlogic XLP

On a multi-chip XLP board, each node can have 4 PCIe links. Update
XLP PCI code to initialize PCIe on all the nodes.
Signed-off-by: default avatarJayachandran C <jchandra@broadcom.com>
Patchwork: http://patchwork.linux-mips.org/patch/4803/Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent cba3b643
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <asm/netlogic/interrupt.h> #include <asm/netlogic/interrupt.h>
#include <asm/netlogic/haldefs.h> #include <asm/netlogic/haldefs.h>
#include <asm/netlogic/common.h>
#include <asm/netlogic/xlp-hal/iomap.h> #include <asm/netlogic/xlp-hal/iomap.h>
#include <asm/netlogic/xlp-hal/pic.h> #include <asm/netlogic/xlp-hal/pic.h>
...@@ -161,32 +162,38 @@ struct pci_controller nlm_pci_controller = { ...@@ -161,32 +162,38 @@ struct pci_controller nlm_pci_controller = {
.io_offset = 0x00000000UL, .io_offset = 0x00000000UL,
}; };
static int get_irq_vector(const struct pci_dev *dev) static struct pci_dev *xlp_get_pcie_link(const struct pci_dev *dev)
{ {
/* struct pci_bus *bus, *p;
* For XLP PCIe, there is an IRQ per Link, find out which
* link the device is on to assign interrupts
*/
if (dev->bus->self == NULL)
return 0;
switch (dev->bus->self->devfn) { /* Find the bridge on bus 0 */
case 0x8: bus = dev->bus;
return PIC_PCIE_LINK_0_IRQ; for (p = bus->parent; p && p->number != 0; p = p->parent)
case 0x9: bus = p;
return PIC_PCIE_LINK_1_IRQ;
case 0xa: return p ? bus->self : NULL;
return PIC_PCIE_LINK_2_IRQ; }
case 0xb:
return PIC_PCIE_LINK_3_IRQ; static inline int nlm_pci_link_to_irq(int link)
} {
WARN(1, "Unexpected devfn %d\n", dev->bus->self->devfn); return PIC_PCIE_LINK_0_IRQ + link;
return 0;
} }
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
return get_irq_vector(dev); struct pci_dev *lnkdev;
int lnkslot, lnkfunc;
/*
* For XLP PCIe, there is an IRQ per Link, find out which
* link the device is on to assign interrupts
*/
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));
} }
/* Do platform specific device initialization at pci_enable_device() time */ /* Do platform specific device initialization at pci_enable_device() time */
...@@ -201,45 +208,42 @@ int pcibios_plat_dev_init(struct pci_dev *dev) ...@@ -201,45 +208,42 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
* readl/writel. * readl/writel.
*/ */
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
static void xlp_config_pci_bswap(void) static void xlp_config_pci_bswap(int node, int link)
{ {
uint64_t pciebase, sysbase; uint64_t nbubase, lnkbase;
int node, i;
u32 reg; u32 reg;
/* Chip-0 so node set to 0 */ nbubase = nlm_get_bridge_regbase(node);
node = 0; lnkbase = nlm_get_pcie_base(node, link);
sysbase = nlm_get_bridge_regbase(node);
/* /*
* Enable byte swap in hardware. Program each link's PCIe SWAP regions * Enable byte swap in hardware. Program each link's PCIe SWAP regions
* from the link's address ranges. * from the link's address ranges.
*/ */
for (i = 0; i < 4; i++) { reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEMEM_BASE0 + link);
pciebase = nlm_pcicfg_base(XLP_IO_PCIE_OFFSET(node, i)); nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_MEM_BASE, reg);
if (nlm_read_pci_reg(pciebase, 0) == 0xffffffff)
continue;
reg = nlm_read_bridge_reg(sysbase, BRIDGE_PCIEMEM_BASE0 + i);
nlm_write_pci_reg(pciebase, PCIE_BYTE_SWAP_MEM_BASE, reg);
reg = nlm_read_bridge_reg(sysbase, BRIDGE_PCIEMEM_LIMIT0 + i); reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEMEM_LIMIT0 + link);
nlm_write_pci_reg(pciebase, PCIE_BYTE_SWAP_MEM_LIM, nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_MEM_LIM, reg | 0xfff);
reg | 0xfff);
reg = nlm_read_bridge_reg(sysbase, BRIDGE_PCIEIO_BASE0 + i); reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEIO_BASE0 + link);
nlm_write_pci_reg(pciebase, PCIE_BYTE_SWAP_IO_BASE, reg); nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_IO_BASE, reg);
reg = nlm_read_bridge_reg(sysbase, BRIDGE_PCIEIO_LIMIT0 + i); reg = nlm_read_bridge_reg(nbubase, BRIDGE_PCIEIO_LIMIT0 + link);
nlm_write_pci_reg(pciebase, PCIE_BYTE_SWAP_IO_LIM, reg | 0xfff); nlm_write_pci_reg(lnkbase, PCIE_BYTE_SWAP_IO_LIM, reg | 0xfff);
}
} }
#else #else
/* Swap configuration not needed in little-endian mode */ /* Swap configuration not needed in little-endian mode */
static inline void xlp_config_pci_bswap(void) {} static inline void xlp_config_pci_bswap(int node, int link) {}
#endif /* __BIG_ENDIAN */ #endif /* __BIG_ENDIAN */
static int __init pcibios_init(void) static int __init pcibios_init(void)
{ {
struct nlm_soc_info *nodep;
uint64_t pciebase;
int link, n;
u32 reg;
/* Firmware assigns PCI resources */ /* Firmware assigns PCI resources */
pci_set_flags(PCI_PROBE_ONLY); pci_set_flags(PCI_PROBE_ONLY);
pci_config_base = ioremap(XLP_DEFAULT_PCI_ECFG_BASE, 64 << 20); pci_config_base = ioremap(XLP_DEFAULT_PCI_ECFG_BASE, 64 << 20);
...@@ -248,7 +252,26 @@ static int __init pcibios_init(void) ...@@ -248,7 +252,26 @@ static int __init pcibios_init(void)
ioport_resource.start = 0; ioport_resource.start = 0;
ioport_resource.end = ~0; ioport_resource.end = ~0;
xlp_config_pci_bswap(); for (n = 0; n < NLM_NR_NODES; n++) {
nodep = nlm_get_node(n);
if (!nodep->coremask)
continue; /* node does not exist */
for (link = 0; link < 4; link++) {
pciebase = nlm_get_pcie_base(n, link);
if (nlm_read_pci_reg(pciebase, 0) == 0xffffffff)
continue;
xlp_config_pci_bswap(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);
nlm_write_pci_reg(pciebase, 0xf, reg);
pr_info("XLP PCIe: Link %d-%d initialized.\n", n, link);
}
}
set_io_port_base(CKSEG1); set_io_port_base(CKSEG1);
nlm_pci_controller.io_map_base = CKSEG1; nlm_pci_controller.io_map_base = CKSEG1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment