Broadcom XLP Updates
cover Broadcom XLP Updates
The main change is to support the XLP9XX processor family:
http://www.broadcom.com/products/Processors/Enterprise/XLP900-Series
The other changes (patches 1-7) are updates to the existing XLP code, changes are to
* add MSI/MSI-X support for XLP PCIe interface,
* add topology.h for XLP,
* do some few minor fixes and cleanups.
JC.
Ganesan Ramalingam (1):
MIPS: Netlogic: XLP9XX USB support
Jayachandran C (16):
MIPS: Netlogic: Add MSI support for XLP
MIPS: Netlogic: Add topology.h for XLP family
MIPS: Netlogic: Some cleanups for assembly code
MIPS: Netlogic: Add macro for node present
MIPS: Netlogic: Get coremask from FUSE register
MIPS: Netlogic: Core wakeup improvements
MIPS: Netlogic: Identify XLP 9XX chip
MIPS: Netlogic: update iomap.h for XLP9XX
MIPS: Netlogic: XLP9XX PIC updates
MIPS: Netlogic: SYS block updates of XLP9XX
MIPS: Netlogic: XLP9XX UART offset
MIPS: Netlogic: XLP9XX bridge and DRAM code
MIPS: Netlogic: Add cpu to node mapping for XLP9XX
MIPS: PCI: Netlogic XLP9XX support
MIPS: Netlogic: XLP9XX PIC OF support
MIPS: Netlogic: Add default DTB for XLP9XX SoC
Yonghong Song (1):
MIPS: Netlogic: L1D cacheflush before thread enable on XLPII
arch/mips/Kconfig | 1 + arch/mips/include/asm/cpu.h | 1 + arch/mips/include/asm/mach-netlogic/irq.h | 3 +- arch/mips/include/asm/mach-netlogic/multi-node.h | 33 +- arch/mips/include/asm/mach-netlogic/topology.h | 20 + arch/mips/include/asm/netlogic/common.h | 24 +- arch/mips/include/asm/netlogic/mips-extns.h | 7 +- arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 69 ++- arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 ++- arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 41 +- arch/mips/include/asm/netlogic/xlp-hal/pic.h | 77 ++-- arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 +- arch/mips/include/asm/netlogic/xlp-hal/uart.h | 3 +- arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 38 +- arch/mips/kernel/cpu-probe.c | 1 + arch/mips/netlogic/Kconfig | 9 + arch/mips/netlogic/common/earlycons.c | 2 + arch/mips/netlogic/common/irq.c | 63 ++- arch/mips/netlogic/common/reset.S | 62 ++- arch/mips/netlogic/common/smp.c | 8 +- arch/mips/netlogic/common/smpboot.S | 3 +- arch/mips/netlogic/dts/Makefile | 1 + arch/mips/netlogic/dts/xlp_gvp.dts | 164 +++++++ arch/mips/netlogic/xlp/dt.c | 7 +- arch/mips/netlogic/xlp/nlm_hal.c | 71 +++- arch/mips/netlogic/xlp/setup.c | 25 +- arch/mips/netlogic/xlp/usb-init-xlp2.c | 88 +++- arch/mips/netlogic/xlp/wakeup.c | 93 +++- arch/mips/netlogic/xlr/wakeup.c | 2 +- arch/mips/pci/Makefile | 1 + arch/mips/pci/msi-xlp.c | 493 ++++++++++++++++++++++ arch/mips/pci/pci-xlp.c | 108 +++-- 32 files changed, 1360 insertions(+), 224 deletions(-) create mode 100644 arch/mips/include/asm/mach-netlogic/topology.h create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts create mode 100644 arch/mips/pci/msi-xlp.c
Signature · 1 line
1.7.9.5
PATCH 1/18 MIPS: Netlogic: Add MSI support for XLP
Add MSI chip and MSIX chip definitions.
For MSI, we map the link interrupt to a MSI link IRQ which will do a second level of dispatch based on the MSI status register.
The MSI chip definitions use the MSI enable register to enable and disable the MSI irqs.
For MSI-X, we split the 32 available MSI-X vectors across the four PCIe links (8 each). These PIC interrupts generate an IRQ per link which uses a second level dispatch as well.
The MSI-X chip definition uses the standard functions to enable and disable interrupts.
--- arch/mips/Kconfig | 1 + arch/mips/include/asm/mach-netlogic/irq.h | 3 +- arch/mips/include/asm/netlogic/common.h | 6 + arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 33 +- arch/mips/include/asm/netlogic/xlp-hal/pic.h | 5 - arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 24 +- arch/mips/netlogic/common/irq.c | 29 +- arch/mips/netlogic/xlp/nlm_hal.c | 12 +- arch/mips/pci/Makefile | 1 + arch/mips/pci/msi-xlp.c | 493 +++++++++++++++++++++++ arch/mips/pci/pci-xlp.c | 15 +- 11 files changed, 585 insertions(+), 37 deletions(-) create mode 100644 arch/mips/pci/msi-xlp.c
arch/mips/Kconfig +1 -0
@@ -790,6 +790,7 @@ config NLM_XLP_BOARD select CEVT_R4K select CSRC_R4K select IRQ_CPU + select ARCH_SUPPORTS_MSI select ZONE_DMA32 if 64BIT select SYNC_R4K select SYS_HAS_EARLY_PRINTK
arch/mips/include/asm/mach-netlogic/irq.h +2 -1
@@ -9,7 +9,8 @@#define __ASM_NETLOGIC_IRQ_H#include <asm/mach-netlogic/multi-node.h> -#define NR_IRQS (64 * NLM_NR_NODES) +#define NLM_IRQS_PER_NODE 1024 +#define NR_IRQS (NLM_IRQS_PER_NODE * NLM_NR_NODES)#define MIPS_CPU_IRQ_BASE 0
arch/mips/include/asm/netlogic/common.h +6 -0
@@ -112,8 +112,14 @@ struct nlm_soc_info {struct irq_data ;uint64_t nlm_pci_irqmask (int node); +void nlm_setup_pic_irq (int node,int picirq,int irq,int irt);void nlm_set_pic_extra_ack (int node,int irq,void (*xack)(struct irq_data *)); +#ifdef CONFIG_PCI_MSI +void nlm_dispatch_msi (int node,int lirq); +void nlm_dispatch_msix (int node,int msixirq); +#endif +/* * The NR_IRQs is divided between nodes, each of them has a separate irq space */
arch/mips/include/asm/netlogic/xlp-hal/pcibus.h +25 -8
@@ -52,25 +52,42 @@#define PCIE_BYTE_SWAP_MEM_LIM 0x248#define PCIE_BYTE_SWAP_IO_BASE 0x249#define PCIE_BYTE_SWAP_IO_LIM 0x24A + +#define PCIE_BRIDGE_MSIX_ADDR_BASE 0x24F +#define PCIE_BRIDGE_MSIX_ADDR_LIMIT 0x250#define PCIE_MSI_STATUS 0x25A#define PCIE_MSI_EN 0x25B +#define PCIE_MSIX_STATUS 0x25D +#define PCIE_INT_STATUS0 0x25F +#define PCIE_INT_STATUS1 0x260#define PCIE_INT_EN0 0x261 +#define PCIE_INT_EN1 0x262 -/* PCIE_MSI_EN */ -#define PCIE_MSI_VECTOR_INT_EN 0xFFFFFFFF - -/* PCIE_INT_EN0 */ -#define PCIE_MSI_INT_EN (1 << 9) +/* other */ +#define PCIE_NLINKS 4 +/* MSI addresses */ +#define MSI_ADDR_BASE 0xfffee00000ULL +#define MSI_ADDR_SZ 0x10000 +#define MSI_LINK_ADDR (n, l) (MSI_ADDR_BASE + \ + (PCIE_NLINKS * (n) + (l)) * MSI_ADDR_SZ) +#define MSIX_ADDR_BASE 0xfffef00000ULL +#define MSIX_LINK_ADDR (n, l) (MSIX_ADDR_BASE + \ + (PCIE_NLINKS * (n) + (l)) * MSI_ADDR_SZ)#ifndef __ASSEMBLY__#define nlm_read_pcie_reg (b, r) nlm_read_reg(b, r)#define nlm_write_pcie_reg (b, r, v) nlm_write_reg(b, r, v)#define nlm_get_pcie_base (node, inst) \ nlm_pcicfg_base(XLP_IO_PCIE_OFFSET(node, inst)) -#define nlm_get_pcie_regbase (node, inst) \ - (nlm_get_pcie_base(node, inst) + XLP_IO_PCI_HDRSZ) -int xlp_pcie_link_irt (int link); +#ifdef CONFIG_PCI_MSI +void xlp_init_node_msi_irqs (int node,int link); +#else +static inline void xlp_init_node_msi_irqs (int node,int link) {} +#endif + +struct pci_dev *xlp_get_pcie_link (const struct pci_dev *dev); +#endif #endif /* __NLM_HAL_PCIBUS_H__ */
arch/mips/include/asm/netlogic/xlp-hal/pic.h +0 -5
@@ -193,14 +193,9 @@#define PIC_IRT_PCIE_LINK_INDEX (num) ((num) + PIC_IRT_PCIE_LINK_0_INDEX)#define PIC_CLOCK_TIMER 7 -#define PIC_IRQ_BASE 8#if !defined(LOCORE ) && !defined(__ASSEMBLY__) -#define PIC_IRT_FIRST_IRQ (PIC_IRQ_BASE) -#define PIC_IRT_LAST_IRQ 63 -#define PIC_IRQ_IS_IRT (irq) ((irq) >= PIC_IRT_FIRST_IRQ) -/* * Misc */
arch/mips/include/asm/netlogic/xlp-hal/xlp.h +20 -4
@@ -37,10 +37,9 @@#define PIC_UART_0_IRQ 17#define PIC_UART_1_IRQ 18 -#define PIC_PCIE_LINK_0_IRQ 19 -#define PIC_PCIE_LINK_1_IRQ 20 -#define PIC_PCIE_LINK_2_IRQ 21 -#define PIC_PCIE_LINK_3_IRQ 22 + +#define PIC_PCIE_LINK_LEGACY_IRQ_BASE 19 +#define PIC_PCIE_LINK_LEGACY_IRQ (i) (19 + (i))#define PIC_EHCI_0_IRQ 23#define PIC_EHCI_1_IRQ 24
@@ -58,6 +57,23 @@#define PIC_I2C_2_IRQ 32#define PIC_I2C_3_IRQ 33 +#define PIC_PCIE_LINK_MSI_IRQ_BASE 44/* 44 - 47 MSI IRQ */ +#define PIC_PCIE_LINK_MSI_IRQ (i) (44 + (i)) + +/* MSI-X with second link-level dispatch */ +#define PIC_PCIE_MSIX_IRQ_BASE 48/* 48 - 51 MSI-X IRQ */ +#define PIC_PCIE_MSIX_IRQ (i) (48 + (i)) + +#define NLM_MSIX_VEC_BASE 96/* 96 - 127 - MSIX mapped */ +#define NLM_MSI_VEC_BASE 128/* 128 -255 - MSI mapped */ + +#define NLM_PIC_INDIRECT_VEC_BASE 512 +#define NLM_GPIO_VEC_BASE 768 + +#define PIC_IRQ_BASE 8 +#define PIC_IRT_FIRST_IRQ PIC_IRQ_BASE +#define PIC_IRT_LAST_IRQ 63 +#ifndef __ASSEMBLY__/* SMP support functions */
arch/mips/netlogic/common/irq.c +21 -8
@@ -180,6 +180,7 @@ static void __init nlm_init_percpu_irqs(void)#endif } +void nlm_setup_pic_irq (int node,int picirq,int irq,int irt) {struct nlm_pic_irq *pic_data;
@@ -207,24 +208,24 @@ void nlm_set_pic_extra_ack(int node, int irq, void (*xack)(struct irq_data *))static void nlm_init_node_irqs (int node) { -int i, irt; -uint64_t irqmask;struct nlm_soc_info *nodep; +int i, irt;pr_info ("Init IRQ for node %d\n" , node); nodep =nlm_get_node (node); - irqmask =PERCPU_IRQ_MASK ; + nodep->irqmask =PERCPU_IRQ_MASK ;for (i =PIC_IRT_FIRST_IRQ ; i <=PIC_IRT_LAST_IRQ ; i++) { irt =nlm_irq_to_irt (i); -if (irt ==-1 ) +if (irt ==-1 )/* unused irq */ continue ; -nlm_setup_pic_irq (node, i, i, irt); -/* set interrupts to first cpu in node */ + nodep->irqmask |=1ull << i; +if (irt ==-2 )/* not a direct PIC irq */ +continue ; +nlm_pic_init_irt (nodep->picbase, irt, i, node *NLM_CPUS_PER_NODE ,0 ); - irqmask |= (1ull << i); +nlm_setup_pic_irq (node, i, i, irt); } - nodep->irqmask = irqmask; }void nlm_smp_irq_init (int hwcpuid)
@@ -256,6 +257,18 @@ asmlinkage void plat_irq_dispatch(void)return ; } +#if defined(CONFIG_PCI_MSI ) && defined(CONFIG_CPU_XLP ) +/* PCI interrupts need a second level dispatch for MSI bits */ +if (i >=PIC_PCIE_LINK_MSI_IRQ (0 ) && i <=PIC_PCIE_LINK_MSI_IRQ (3 )) { +nlm_dispatch_msi (node, i); +return ; + } +if (i >=PIC_PCIE_MSIX_IRQ (0 ) && i <=PIC_PCIE_MSIX_IRQ (3 )) { +nlm_dispatch_msix (node, i); +return ; + } + +#endif /* top level irq handling */ do_IRQ (nlm_irq_to_xirq (node, i)); }
arch/mips/netlogic/xlp/nlm_hal.c +10 -2
@@ -135,9 +135,17 @@ int nlm_irq_to_irt(int irq)case PIC_I2C_3_IRQ : irt = irt +3 ;break ; } - }else if (irq >=PIC_PCIE_LINK_0_IRQ && irq <=PIC_PCIE_LINK_3_IRQ ) { + }else if (irq >=PIC_PCIE_LINK_LEGACY_IRQ (0 ) && + irq <=PIC_PCIE_LINK_LEGACY_IRQ (3 )) {/* HW bug, PCI IRT entries are bad on early silicon, fix */ - irt =PIC_IRT_PCIE_LINK_INDEX (irq -PIC_PCIE_LINK_0_IRQ ); + irt =PIC_IRT_PCIE_LINK_INDEX (irq - +PIC_PCIE_LINK_LEGACY_IRQ_BASE ); + }else if (irq >=PIC_PCIE_LINK_MSI_IRQ (0 ) && + irq <=PIC_PCIE_LINK_MSI_IRQ (3 )) { + irt =-2 ; + }else if (irq >=PIC_PCIE_MSIX_IRQ (0 ) && + irq <=PIC_PCIE_MSIX_IRQ (3 )) { + irt =-2 ; }else { irt =-1 ; }
arch/mips/pci/Makefile +1 -0
@@ -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
arch/mips/pci/msi-xlp.c new file +493 -0
493 lines not on this page · raw message
arch/mips/pci/pci-xlp.c +6 -9
@@ -47,6 +47,7 @@#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>
@@ -162,7 +163,7 @@ 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;
@@ -174,11 +175,6 @@ static struct pci_dev *xlp_get_pcie_link(const struct pci_dev *dev)return p ? bus->self :NULL ; } -static inline int nlm_pci_link_to_irq (int link) -{ -return PIC_PCIE_LINK_0_IRQ + link; -} -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {struct pci_dev *lnkdev;
@@ -193,7 +189,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)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)); +return nlm_irq_to_xirq (lnkslot /8 ,PIC_PCIE_LINK_LEGACY_IRQ (lnkfunc)); }/* Do platform specific device initialization at pci_enable_device() time */
@@ -257,16 +253,17 @@ static int __init pcibios_init(void)if (!nodep->coremask)continue ;/* node does not exist */ -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 |= (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); }
Signature · 1 line
1.7.9.5
PATCH 2/18 MIPS: Netlogic: Add topology.h for XLP family
In reply to Jayachandran CAdd mach-netlogic/topology.h which contains XLP cpu number to core and node mapping.
--- arch/mips/include/asm/mach-netlogic/multi-node.h | 19 +++++++++++++++++++ arch/mips/include/asm/mach-netlogic/topology.h | 20 ++++++++++++++++++++ arch/mips/include/asm/netlogic/common.h | 18 ------------------ 3 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 arch/mips/include/asm/mach-netlogic/topology.h
arch/mips/include/asm/mach-netlogic/multi-node.h +19 -0
@@ -51,4 +51,23 @@#define NLM_THREADS_PER_CORE 4#define NLM_CPUS_PER_NODE (NLM_CORES_PER_NODE * NLM_THREADS_PER_CORE) +struct nlm_soc_info { +unsigned long coremask;/* cores enabled on the soc */ +unsigned long ebase;/* not used now */ +uint64_t irqmask;/* EIMR for the node */ +uint64_t sysbase;/* only for XLP - sys block base */ +uint64_t picbase;/* PIC block base */ +spinlock_t piclock;/* lock for PIC access */ +cpumask_t cpumask;/* logical cpu mask for node */ +}; + +extern struct nlm_soc_info nlm_nodes[NLM_NR_NODES ]; +#define nlm_get_node (i) (&nlm_nodes[i]) +#ifdef CONFIG_CPU_XLR +#define nlm_current_node () (&nlm_nodes[0]) +#else +#define nlm_current_node () (&nlm_nodes[nlm_nodeid()]) +#endif +void nlm_node_init (int node); +#endif
arch/mips/include/asm/mach-netlogic/topology.h new file +20 -0
@@ -0,0 +1,20 @@ +/* +* This file is subject to the terms and conditions of the GNU General Public +* License. See the file "COPYING" in the main directory of this archive +* for more details. +* +* Copyright (C) 2013 Broadcom Corporation +*/ +#ifndef _ASM_MACH_NETLOGIC_TOPOLOGY_H +#define _ASM_MACH_NETLOGIC_TOPOLOGY_H + +#include <asm/mach-netlogic/multi-node.h> + +#define topology_physical_package_id (cpu) cpu_to_node(cpu) +#define topology_core_id (cpu) (cpu_logical_map(cpu) / NLM_THREADS_PER_CORE) +#define topology_thread_cpumask (cpu) (&cpu_sibling_map[cpu]) +#define topology_core_cpumask (cpu) cpumask_of_node(cpu_to_node(cpu)) + +#include <asm-generic/topology.h> + +#endif /* _ASM_MACH_NETLOGIC_TOPOLOGY_H */
arch/mips/include/asm/netlogic/common.h +0 -18
@@ -84,7 +84,6 @@ nlm_set_nmi_handler(void *handler)*/ void nlm_init_boot_cpu (void );unsigned int nlm_get_cpu_frequency (void ); -void nlm_node_init (int node);extern struct plat_smp_ops nlm_smp_ops;extern char nlm_reset_entry[], nlm_reset_entry_end[];
@@ -94,22 +93,6 @@ extern struct dma_map_ops nlm_swiotlb_dma_ops;extern unsigned int nlm_threads_per_core;extern cpumask_t nlm_cpumask; -struct nlm_soc_info { -unsigned long coremask;/* cores enabled on the soc */ -unsigned long ebase; -uint64_t irqmask; -uint64_t sysbase;/* only for XLP */ -uint64_t picbase; -spinlock_t piclock; -}; - -#define nlm_get_node (i) (&nlm_nodes[i]) -#ifdef CONFIG_CPU_XLR -#define nlm_current_node () (&nlm_nodes[0]) -#else -#define nlm_current_node () (&nlm_nodes[nlm_nodeid()]) -#endif -struct irq_data ;uint64_t nlm_pci_irqmask (int node);void nlm_setup_pic_irq (int node,int picirq,int irq,int irt);
@@ -128,7 +111,6 @@ static inline int nlm_irq_to_xirq(int node, int irq)return node *NR_IRQS /NLM_NR_NODES + irq; } -extern struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];extern int nlm_cpu_ready[];#endif #endif /* _NETLOGIC_COMMON_H_ */
Signature · 1 line
1.7.9.5
PATCH 3/18 MIPS: Netlogic: Some cleanups for assembly code
In reply to Jayachandran CNo change in logic, the changes are:
* cleanup some whitespace and comments
* remove confusing argument of SYS_CPU_COHERENT_BASE macro
* make the numerical labels in macros consistent
--- arch/mips/netlogic/common/reset.S | 29 +++++++++++++++-------------- arch/mips/netlogic/common/smpboot.S | 3 ++- 2 files changed, 17 insertions(+), 15 deletions(-)
arch/mips/netlogic/common/reset.S +15 -14
@@ -50,8 +50,8 @@ #include <asm/netlogic/xlp-hal/cpucontrol.h> #define CP0_EBASE $15 -#define SYS_CPU_COHERENT_BASE(node) CKSEG1ADDR(XLP_DEFAULT_IO_BASE) + \ - XLP_IO_SYS_OFFSET(node) + XLP_IO_PCI_HDRSZ + \ +#define SYS_CPU_COHERENT_BASE CKSEG1ADDR(XLP_DEFAULT_IO_BASE) + \ + XLP_IO_SYS_OFFSET(0) + XLP_IO_PCI_HDRSZ + \ SYS_CPU_NONCOHERENT_MODE * 4 /* Enable XLP features and workarounds in the LSU */
@@ -82,26 +82,26 @@ li t1, LSU_DEBUG_ADDR li t2, 0 /* index */ li t3, 0x1000 /* loop count */ -1: +11: sll v0, t2, 5 mtcr zero, t0 ori v1, v0, 0x3 /* way0 | write_enable | write_active */ mtcr v1, t1 -2: +12: mfcr v1, t1 andi v1, 0x1 /* wait for write_active == 0 */ - bnez v1, 2b + bnez v1, 12b nop mtcr zero, t0 ori v1, v0, 0x7 /* way1 | write_enable | write_active */ mtcr v1, t1 -3: +13: mfcr v1, t1 andi v1, 0x1 /* wait for write_active == 0 */ - bnez v1, 3b + bnez v1, 13b nop addi t2, 1 - bne t3, t2, 1b + bne t3, t2, 11b nop .endm
@@ -149,7 +149,7 @@ FEXPORT(nlm_reset_entry) li t1, 0x1 sll t0, t1, t0 nor t0, t0, zero /* t0 <- ~(1 << core) */ - li t2, SYS_CPU_COHERENT_BASE(0) + li t2, SYS_CPU_COHERENT_BASE add t2, t2, t3 /* t2 <- SYS offset for node */ lw t1, 0(t2) and t1, t1, t0
@@ -164,8 +164,7 @@ FEXPORT(nlm_reset_entry) /* FALL THROUGH */ /* - * Wake up sibling threads from the initial thread in - * a core. + * Wake up sibling threads from the initial thread in a core. */ EXPORT(nlm_boot_siblings) /* core L1D flush before enable threads */
@@ -181,8 +180,10 @@ EXPORT(nlm_boot_siblings) /* * The new hardware thread starts at the next instruction * For all the cases other than core 0 thread 0, we will - * jump to the secondary wait function. - */ + * jump to the secondary wait function. + + * NOTE: All GPR contents are lost after the mtcr above! + */ mfc0 v0, CP0_EBASE, 1 andi v0, 0x3ff /* v0 <- node/core */
@@ -196,7 +197,7 @@ EXPORT(nlm_boot_siblings) #endif mtc0 t1, CP0_STATUS - /* mark CPU ready, careful here, previous mtcr trashed registers */ + /* mark CPU ready */ li t3, CKSEG1ADDR(RESET_DATA_PHYS) ADDIU t1, t3, BOOT_CPU_READY sll v1, v0, 2
arch/mips/netlogic/common/smpboot.S +2 -1
@@ -98,7 +98,7 @@ END(nlm_boot_secondary_cpus) * In case of RMIboot bootloader which is used on XLR boards, the CPUs * be already woken up and waiting in bootloader code. * This will get them out of the bootloader code and into linux. Needed - * because the bootloader area will be taken and initialized by linux. + * because the bootloader area will be taken and initialized by linux. */ NESTED(nlm_rmiboot_preboot, 16, sp) mfc0 t0, $15, 1 /* read ebase */
@@ -133,6 +133,7 @@ NESTED(nlm_rmiboot_preboot, 16, sp) or t1, t2, v1 /* put in new value */ mtcr t1, t0 /* update core control */ + /* wait for NMI to hit */ 1: wait b 1b nop
Signature · 1 line
1.7.9.5
PATCH 4/18 MIPS: Netlogic: L1D cacheflush before thread enable on XLPII
In reply to Jayachandran CFrom: Yonghong Song <[email protected]>
On XLPII CPUs, the L1D cache has to be flushed with regular cache operations before enabling threads in a core.
--- arch/mips/netlogic/common/reset.S | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
arch/mips/netlogic/common/reset.S +23 -2
@@ -36,6 +36,7 @@ #include <asm/asm.h> #include <asm/asm-offsets.h> +#include <asm/cacheops.h> #include <asm/regdef.h> #include <asm/mipsregs.h> #include <asm/stackframe.h>
@@ -74,10 +75,18 @@ .endm /* - * Low level flush for L1D cache on XLP, the normal cache ops does - * not do the complete and correct cache flush. + * L1D cache has to be flushed before enabling threads in XLP. + * On XLP8xx/XLP3xx, we do a low level flush using processor control + * registers. On XLPII CPUs, usual cache instructions work. */ .macro xlp_flush_l1_dcache + mfc0 t0, CP0_EBASE, 0 + andi t0, t0, 0xff00 + slt t1, t0, 0x1200 + beqz t1, 15f + nop + + /* XLP8xx low level cache flush */ li t0, LSU_DEBUG_DATA0 li t1, LSU_DEBUG_ADDR li t2, 0 /* index */
@@ -103,6 +112,18 @@ addi t2, 1 bne t3, t2, 11b nop + b 17f + nop + + /* XLPII CPUs, Invalidate all 64k of L1 D-cache */ +15: + li t0, 0x80000000 + li t1, 0x80010000 +16: cache Index_Writeback_Inv_D, 0(t0) + addiu t0, t0, 32 + bne t0, t1, 16b + nop +17: .endm /*
Signature · 1 line
1.7.9.5
PATCH 5/18 MIPS: Netlogic: Add macro for node present
In reply to Jayachandran CAdd macro nlm_node_present() that can be used to check if a node is present in a multi-chip configuration. This can be used even when NUMA is not enabled.
--- arch/mips/include/asm/mach-netlogic/multi-node.h | 2 ++ arch/mips/pci/pci-xlp.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/mips/include/asm/mach-netlogic/multi-node.h +2 -0
@@ -63,6 +63,8 @@ struct nlm_soc_info {extern struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];#define nlm_get_node (i) (&nlm_nodes[i]) +#define nlm_node_present (n) ((n) >= 0 && (n) < NLM_NR_NODES && \ + nlm_get_node(n)->coremask != 0)#ifdef CONFIG_CPU_XLR #define nlm_current_node () (&nlm_nodes[0])#else
arch/mips/pci/pci-xlp.c +2 -4
@@ -235,7 +235,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;
@@ -249,9 +248,8 @@ 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 <PCIE_NLINKS ; link++) { pciebase =nlm_get_pcie_base (n, link);
Signature · 1 line
1.7.9.5
PATCH 6/18 MIPS: Netlogic: Get coremask from FUSE register
In reply to Jayachandran CUse the FUSE register to get the list of active cores in the CPU instead of using the CPU reset register, this is the recommended method.
Also add code to mask the coremask with the default number of cores for each processor series.
--- arch/mips/netlogic/xlp/wakeup.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
arch/mips/netlogic/xlp/wakeup.c +26 -5
@@ -99,7 +99,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask) {struct nlm_soc_info *nodep;uint64_t syspcibase; -uint32_t syscoremask; +uint32_t syscoremask, mask, fusemask;int core, n, cpu;for (n =0 ; n <NLM_NR_NODES ; n++) {
@@ -111,12 +111,33 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)if (n !=0 )nlm_node_init (n); nodep =nlm_get_node (n); - syscoremask =nlm_read_sys_reg (nodep->sysbase,SYS_CPU_RESET ); + + fusemask =nlm_read_sys_reg (nodep->sysbase, +SYS_EFUSE_DEVICE_CFG_STATUS0 ); +switch (read_c0_prid () &0xff00 ) { +case PRID_IMP_NETLOGIC_XLP3XX : + mask =0xf ; +break ; +case PRID_IMP_NETLOGIC_XLP2XX : + mask =0x3 ; +break ; +case PRID_IMP_NETLOGIC_XLP8XX : + mask =0xff ; +break ; +default : + mask =0xff ; +break ; + } + +/* +* Fused out cores are set in the fusemask, and the remaining +* cores are renumbered to range 0 .. nactive-1 +*/ + syscoremask = (1 <<hweight32 (~fusemask & mask)) -1 ; +/* The boot cpu */ -if (n ==0 ) { - syscoremask |=1 ; +if (n ==0 ) nodep->coremask =1 ; - }for (core =0 ; core <NLM_CORES_PER_NODE ; core++) {/* we will be on node 0 core 0 */
Signature · 1 line
1.7.9.5
Re: [PATCH 06/18] MIPS: Netlogic: Get coremask from FUSE register
Hello.
Quoted 16 lines · Jayachandran C
Use the FUSE register to get the list of active cores in the CPU instead of using the CPU reset register, this is the recommended method.
Also add code to mask the coremask with the default number of cores for each processor series.
Signed-off-by Jayachandran C <[email protected]>--- arch/mips/netlogic/xlp/wakeup.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)arch/mips/netlogic/xlp/wakeup.c +0
-0
[...]
Quoted 11 lines
arch/mips/netlogic/xlp/wakeup.c +6
-1@@ -111,12 +111,33 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)if (n !=0 )nlm_node_init (n); nodep =nlm_get_node (n); - syscoremask =nlm_read_sys_reg (nodep->sysbase,SYS_CPU_RESET ); + + fusemask =nlm_read_sys_reg (nodep->sysbase, +SYS_EFUSE_DEVICE_CFG_STATUS0 ); +switch (read_c0_prid () &0xff00 ) { +case PRID_IMP_NETLOGIC_XLP3XX : + mask =0xf ;
arch/mips/netlogic/xlp/wakeup.c static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask) · line 129
Quoted 10 lines
arch/mips/netlogic/xlp/wakeup.c +10
-0+break ; +case PRID_IMP_NETLOGIC_XLP2XX : + mask =0x3 ; +break ; +case PRID_IMP_NETLOGIC_XLP8XX : + mask =0xff ; +break ; +default : + mask =0xff ; +break ;
Why not merge the last 2 cases?
arch/mips/netlogic/xlp/wakeup.c static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask) · line 130
Quoted 1 line
arch/mips/netlogic/xlp/wakeup.c +1
-0+ }
WBR, Sergei
PATCH 6/18 MIPS: Netlogic: Get coremask from FUSE register
Use the FUSE register to get the list of active cores in the CPU instead of using the CPU reset register, this is the recommended method.
Also add code to mask the coremask with the default number of cores for each processor series.
---
Updated to merge two cases under a switch, suggested by Sergei Shtylyov <[email protected]>
arch/mips/netlogic/xlp/wakeup.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
arch/mips/netlogic/xlp/wakeup.c +24 -5
@@ -99,7 +99,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask) {struct nlm_soc_info *nodep;uint64_t syspcibase; -uint32_t syscoremask; +uint32_t syscoremask, mask, fusemask;int core, n, cpu;for (n =0 ; n <NLM_NR_NODES ; n++) {
@@ -111,12 +111,31 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)if (n !=0 )nlm_node_init (n); nodep =nlm_get_node (n); - syscoremask =nlm_read_sys_reg (nodep->sysbase,SYS_CPU_RESET ); + + fusemask =nlm_read_sys_reg (nodep->sysbase, +SYS_EFUSE_DEVICE_CFG_STATUS0 ); +switch (read_c0_prid () &0xff00 ) { +case PRID_IMP_NETLOGIC_XLP3XX : + mask =0xf ; +break ; +case PRID_IMP_NETLOGIC_XLP2XX : + mask =0x3 ; +break ; +case PRID_IMP_NETLOGIC_XLP8XX : +default : + mask =0xff ; +break ; + } + +/* +* Fused out cores are set in the fusemask, and the remaining +* cores are renumbered to range 0 .. nactive-1 +*/ + syscoremask = (1 <<hweight32 (~fusemask & mask)) -1 ; +/* The boot cpu */ -if (n ==0 ) { - syscoremask |=1 ; +if (n ==0 ) nodep->coremask =1 ; - }for (core =0 ; core <NLM_CORES_PER_NODE ; core++) {/* we will be on node 0 core 0 */
Signature · 1 line
1.7.9.5
PATCH 7/18 MIPS: Netlogic: Core wakeup improvements
In reply to Jayachandran CMove wakeup to after early console. This will allow us to display error messages when cores are not woken up. Also reduce the wait time for core to come up.
--- arch/mips/netlogic/xlp/setup.c | 14 ++++++++------ arch/mips/netlogic/xlp/wakeup.c | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-)
arch/mips/netlogic/xlp/setup.c +8 -6
@@ -92,6 +92,14 @@ static void __init xlp_init_mem_from_bars(void)void __init plat_mem_setup (void ) { +#ifdef CONFIG_SMP +nlm_wakeup_secondary_cpus (); + +/* update TLB size after waking up threads */ + current_cpu_data.tlbsize = ((read_c0_config6 () >>16 ) &0xffff ) +1 ; + +register_smp_ops (&nlm_smp_ops); +#endif panic_timeout =5 ; _machine_restart = (void (*)(char *))nlm_linux_exit; _machine_halt = nlm_linux_exit;
@@ -163,11 +171,5 @@ void __init prom_init(void)#ifdef CONFIG_SMP cpumask_setall (&nlm_cpumask); -nlm_wakeup_secondary_cpus (); - -/* update TLB size after waking up threads */ - current_cpu_data.tlbsize = ((read_c0_config6 () >>16 ) &0xffff ) +1 ; - -register_smp_ops (&nlm_smp_ops);#endif }
arch/mips/netlogic/xlp/wakeup.c +5 -3
@@ -84,7 +84,7 @@ static int wait_for_cpus(int cpu, int bootcpu)volatile uint32_t *cpu_ready =nlm_get_boot_data (BOOT_CPU_READY );int i, count, notready; - count =0x20000000 ; + count =0x800000 ; do { notready = nlm_threads_per_core; for (i = 0; i < nlm_threads_per_core; i++)
@@ -162,7 +162,8 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask) nodep->coremask |=1u << core;/* spin until the hw threads sets their ready */ -wait_for_cpus (cpu,0 ); +if (!wait_for_cpus (cpu,0 )) +pr_err ("Node %d : timeout core %d\n" , n, core); } } }
@@ -174,7 +175,8 @@ void xlp_wakeup_secondary_cpus()* first wakeup core 0 threads */ xlp_boot_core0_siblings (); -wait_for_cpus (0 ,0 ); +if (!wait_for_cpus (0 ,0 )) +pr_err ("Node 0 : timeout core 0\n" );/* now get other cores out of reset */ xlp_enable_secondary_cores (&nlm_cpumask);
Signature · 1 line
1.7.9.5
PATCH 8/18 MIPS: Netlogic: Identify XLP 9XX chip
In reply to Jayachandran CAdds processor ID of XLP 9XX to asm/cpu.h. Update netlogic/xlp-hal/xlp.h to add cpu_is_xlp9xx() and to update cpu_is_xlpii() to support XLP 9XX.
--- arch/mips/include/asm/cpu.h | 1 + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 9 ++++++++- arch/mips/kernel/cpu-probe.c | 1 + arch/mips/netlogic/xlp/setup.c | 1 + 4 files changed, 11 insertions(+), 1 deletion(-)
arch/mips/include/asm/cpu.h +1 -0
@@ -194,6 +194,7 @@#define PRID_IMP_NETLOGIC_XLP8XX 0x1000#define PRID_IMP_NETLOGIC_XLP3XX 0x1100#define PRID_IMP_NETLOGIC_XLP2XX 0x1200 +#define PRID_IMP_NETLOGIC_XLP9XX 0x1500/* * Particular Revision values for bits 7:0 of the PRId register.
arch/mips/include/asm/netlogic/xlp-hal/xlp.h +8 -1
@@ -91,8 +91,15 @@ static inline int cpu_is_xlpii(void) {int chip =read_c0_prid () &0xff00 ; -return chip ==PRID_IMP_NETLOGIC_XLP2XX ; +return chip ==PRID_IMP_NETLOGIC_XLP2XX || + chip ==PRID_IMP_NETLOGIC_XLP9XX ; } +static inline int cpu_is_xlp9xx (void ) +{ +int chip =read_c0_prid () &0xff00 ; + +return chip ==PRID_IMP_NETLOGIC_XLP9XX ; +}#endif /* !__ASSEMBLY__ */ #endif /* _ASM_NLM_XLP_H */
arch/mips/kernel/cpu-probe.c +1 -0
@@ -923,6 +923,7 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)switch (c->processor_id &PRID_IMP_MASK ) {case PRID_IMP_NETLOGIC_XLP2XX : +case PRID_IMP_NETLOGIC_XLP9XX : c->cputype =CPU_XLP ; __cpu_name[cpu] ="Broadcom XLPII" ;break ;
arch/mips/netlogic/xlp/setup.c +1 -0
@@ -119,6 +119,7 @@ void __init plat_mem_setup(void)const char *get_system_type (void ) {switch (read_c0_prid () &0xff00 ) { +case PRID_IMP_NETLOGIC_XLP9XX :case PRID_IMP_NETLOGIC_XLP2XX :return "Broadcom XLPII Series" ;default :
Signature · 1 line
1.7.9.5
PATCH 9/18 MIPS: Netlogic: update iomap.h for XLP9XX
In reply to Jayachandran CMost IO block offsets have changed in XLP9XX. Update iomap.h to add the new addresses of different SoC blocks like PIC, SYS, UART etc. that are needed by the base code.
On XLP9xx, the SoC blocks of other nodes are seen on a PCI bus corresponding to the node. Update iomap code to reflect this.
--- arch/mips/include/asm/mach-netlogic/multi-node.h | 1 + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 45 +++++++++++++++++++++- arch/mips/netlogic/xlp/nlm_hal.c | 4 ++ 3 files changed, 48 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-netlogic/multi-node.h +1 -0
@@ -59,6 +59,7 @@ struct nlm_soc_info {uint64_t picbase;/* PIC block base */ spinlock_t piclock;/* lock for PIC access */ cpumask_t cpumask;/* logical cpu mask for node */ +unsigned int socbus; };extern struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];
arch/mips/include/asm/netlogic/xlp-hal/iomap.h +43 -2
63 lines not on this page · raw message
arch/mips/netlogic/xlp/nlm_hal.c +4 -0
@@ -57,6 +57,10 @@ void nlm_node_init(int node) nodep->sysbase =nlm_get_sys_regbase (node); nodep->picbase =nlm_get_pic_regbase (node); nodep->ebase =read_c0_ebase () & (~((1 <<12 ) -1 )); +if (cpu_is_xlp9xx ()) + nodep->socbus =xlp9xx_get_socbus (node); +else + nodep->socbus =0 ;spin_lock_init (&nodep->piclock); }
Signature · 1 line
1.7.9.5
PATCH 10/18 MIPS: Netlogic: XLP9XX PIC updates
In reply to Jayachandran CFunctions for the XLP9XX interrupt table entry format and other PIC register changes.
--- arch/mips/include/asm/netlogic/xlp-hal/pic.h | 72 +++++++++++++++++--------- arch/mips/netlogic/xlp/nlm_hal.c | 15 ++++++ arch/mips/netlogic/xlp/wakeup.c | 2 +- arch/mips/pci/pci-xlp.c | 2 +- 4 files changed, 65 insertions(+), 26 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/pic.h +48 -24
@@ -150,12 +150,19 @@#define PIC_IRT0 0x74#define PIC_IRT (i) (PIC_IRT0 + ((i) * 2)) -#define TIMER_CYCLES_MAXVAL 0xffffffffffffffffULL +#define PIC_9XX_PENDING_0 0x6 +#define PIC_9XX_PENDING_1 0x8 +#define PIC_9XX_PENDING_2 0xa +#define PIC_9XX_PENDING_3 0xc + +#define PIC_9XX_IRT0 0x1c0 +#define PIC_9XX_IRT (i) (PIC_9XX_IRT0 + ((i) * 2))/* * IRT Map */ #define PIC_NUM_IRTS 160 +#define PIC_9XX_NUM_IRTS 256#define PIC_IRT_WD_0_INDEX 0#define PIC_IRT_WD_1_INDEX 1
@@ -205,30 +212,26 @@#define nlm_read_pic_reg (b, r) nlm_read_reg64(b, r)#define nlm_write_pic_reg (b, r, v) nlm_write_reg64(b, r, v) -#define nlm_get_pic_pcibase (node) nlm_pcicfg_base(XLP_IO_PIC_OFFSET(node)) +#define nlm_get_pic_pcibase (node) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_PIC_OFFSET(node) : XLP_IO_PIC_OFFSET(node))#define nlm_get_pic_regbase (node) (nlm_get_pic_pcibase(node) + XLP_IO_PCI_HDRSZ)/* We use PIC on node 0 as a timer */ #define pic_timer_freq () nlm_get_pic_frequency(0)/* IRT and h/w interrupt routines */ -static inline int -nlm_pic_read_irt (uint64_t base,int irt_index) -{ -return nlm_read_pic_reg (base,PIC_IRT (irt_index)); -} -static inline void -nlm_set_irt_to_cpu (uint64_t base,int irt,int cpu) +nlm_9xx_pic_write_irt (uint64_t base,int irt_num,int en,int nmi, +int sch,int vec,int dt,int db,int cpu) {uint64_t val; - val =nlm_read_pic_reg (base,PIC_IRT (irt)); -/* clear cpuset and mask */ - val &= ~((0x7ull <<16 ) |0xffff ); -/* set DB, cpuset and cpumask */ - val |= (1 <<19 ) | ((cpu >>4 ) <<16 ) | (1 << (cpu &0xf )); -nlm_write_pic_reg (base,PIC_IRT (irt), val); + val = (((uint64_t )en &0x1 ) <<22 ) | ((nmi &0x1 ) <<23 ) | + ((0 /*mc*/ ) <<20 ) | ((vec &0x3f ) <<24 ) | + ((dt &0x1 ) <<21 ) | (0 /*ptr*/ <<16 ) | + (cpu &0x3ff ); + +nlm_write_pic_reg (base,PIC_9XX_IRT (irt_num), val); } static inline void
@@ -249,9 +252,13 @@ static inline void nlm_pic_write_irt_direct(uint64_t base, int irt_num, int en, int nmi, int sch, int vec, int cpu) { - nlm_pic_write_irt(base, irt_num, en, nmi, sch, vec, 1, - (cpu >> 4), /* thread group */ - 1 << (cpu & 0xf)); /* thread mask */ + if (cpu_is_xlp9xx()) + nlm_9xx_pic_write_irt(base, irt_num, en, nmi, sch, vec, + 1, 0, cpu); + else + nlm_pic_write_irt(base, irt_num, en, nmi, sch, vec, 1, + (cpu >> 4), /* thread group */ + 1 << (cpu & 0xf)); /* thread mask */ } static inline uint64_t
@@ -293,8 +300,13 @@ nlm_pic_enable_irt(uint64_t base, int irt) {uint64_t reg; - reg =nlm_read_pic_reg (base,PIC_IRT (irt)); -nlm_write_pic_reg (base,PIC_IRT (irt), reg | (1u <<31 )); +if (cpu_is_xlp9xx ()) { + reg =nlm_read_pic_reg (base,PIC_9XX_IRT (irt)); +nlm_write_pic_reg (base,PIC_9XX_IRT (irt), reg | (1 <<22 )); + }else { + reg =nlm_read_pic_reg (base,PIC_IRT (irt)); +nlm_write_pic_reg (base,PIC_IRT (irt), reg | (1u <<31 )); + } } static inline void
@@ -302,8 +314,15 @@ nlm_pic_disable_irt(uint64_t base, int irt) {uint64_t reg; - reg =nlm_read_pic_reg (base,PIC_IRT (irt)); -nlm_write_pic_reg (base,PIC_IRT (irt), reg & ~((uint64_t )1 <<31 )); +if (cpu_is_xlp9xx ()) { + reg =nlm_read_pic_reg (base,PIC_9XX_IRT (irt)); + reg &= ~((uint64_t )1 <<22 ); +nlm_write_pic_reg (base,PIC_9XX_IRT (irt), reg); + }else { + reg =nlm_read_pic_reg (base,PIC_IRT (irt)); + reg &= ~((uint64_t )1 <<31 ); +nlm_write_pic_reg (base,PIC_IRT (irt), reg); + } } static inline void
@@ -311,8 +330,13 @@ nlm_pic_send_ipi(uint64_t base, int hwt, int irq, int nmi) {uint64_t ipi; - ipi = ((uint64_t )nmi <<31 ) | (irq <<20 ); - ipi |= ((hwt >>4 ) <<16 ) | (1 << (hwt &0xf ));/* cpuset and mask */ +if (cpu_is_xlp9xx ()) + ipi = (nmi <<23 ) | (irq <<24 ) | + (0 /*mcm*/ <<20 ) | (0 /*ptr*/ <<16 ) | hwt; +else + ipi = ((uint64_t )nmi <<31 ) | (irq <<20 ) | + ((hwt >>4 ) <<16 ) | (1 << (hwt &0xf )); +nlm_write_pic_reg (base,PIC_IPI_CTL , ipi); }
arch/mips/netlogic/xlp/nlm_hal.c +15 -0
@@ -69,6 +69,17 @@ int nlm_irq_to_irt(int irq)uint64_t pcibase;int devoff, irt; +/* bypass for 9xx */ +if (cpu_is_xlp9xx ()) { +switch (irq) { +case PIC_UART_0_IRQ : +return 133 ; +case PIC_UART_1_IRQ : +return 134 ; + } +return -1 ; + } + devoff =0 ;switch (irq) {case PIC_UART_0_IRQ :
@@ -277,6 +288,10 @@ static unsigned int nlm_2xx_get_pic_frequency(int node)unsigned int nlm_get_pic_frequency (int node) { +/* TODO Has to calculate freq as like 2xx */ +if (cpu_is_xlp9xx ()) +return 250000000 ; +if (cpu_is_xlpii ())return nlm_2xx_get_pic_frequency (node);else
arch/mips/netlogic/xlp/wakeup.c +1 -1
@@ -47,8 +47,8 @@#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/sys.h> static int xlp_wakeup_core (uint64_t sysbase,int node,int core)
arch/mips/pci/pci-xlp.c +1 -1
@@ -50,8 +50,8 @@#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>
Signature · 1 line
1.7.9.5
PATCH 11/18 MIPS: Netlogic: SYS block updates of XLP9XX
In reply to Jayachandran CAdd the SYS block registers for XLP9XX, most of them have changed. The wakeup sequence has been updated to set the coherent mode from the main thread rather than the woken up thread.
--- arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 +++++- arch/mips/netlogic/common/reset.S | 8 +++ arch/mips/netlogic/xlp/nlm_hal.c | 5 +- arch/mips/netlogic/xlp/setup.c | 5 +- arch/mips/netlogic/xlp/wakeup.c | 78 +++++++++++++++++--------- 5 files changed, 86 insertions(+), 28 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/sys.h +17 -1
@@ -147,13 +147,29 @@#define SYS_SYS_PLL_MEM_REQ 0x2a3#define SYS_PLL_MEM_STAT 0x2a4 +/* Registers changed on 9XX */ +#define SYS_9XX_POWER_ON_RESET_CFG 0x00 +#define SYS_9XX_CHIP_RESET 0x01 +#define SYS_9XX_CPU_RESET 0x02 +#define SYS_9XX_CPU_NONCOHERENT_MODE 0x03 + +/* XLP 9XX fuse block registers */ +#define FUSE_9XX_DEVCFG6 0xc6 +#ifndef __ASSEMBLY__#define nlm_read_sys_reg (b, r) nlm_read_reg(b, r)#define nlm_write_sys_reg (b, r, v) nlm_write_reg(b, r, v) -#define nlm_get_sys_pcibase (node) nlm_pcicfg_base(XLP_IO_SYS_OFFSET(node)) +#define nlm_get_sys_pcibase (node) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_SYS_OFFSET(node) : XLP_IO_SYS_OFFSET(node))#define nlm_get_sys_regbase (node) (nlm_get_sys_pcibase(node) + XLP_IO_PCI_HDRSZ) +/* XLP9XX fuse block */ +#define nlm_get_fuse_pcibase (node) \ + nlm_pcicfg_base(XLP9XX_IO_FUSE_OFFSET(node)) +#define nlm_get_fuse_regbase (node) \ + (nlm_get_fuse_pcibase(node) + XLP_IO_PCI_HDRSZ) +unsigned int nlm_get_pic_frequency (int node);#endif #endif
arch/mips/netlogic/common/reset.S +8 -0
@@ -159,6 +159,13 @@ FEXPORT(nlm_reset_entry) nop 1: /* Entry point on core wakeup */ + mfc0 t0, CP0_EBASE, 0 /* processor ID */ + andi t0, 0xff00 + li t1, 0x1500 /* XLP 9xx */ + beq t0, t1, 2f /* does not need to set coherent */ + nop + + /* set bit in SYS coherent register for the core */ mfc0 t0, CP0_EBASE, 1 mfc0 t1, CP0_EBASE, 1 srl t1, 5
@@ -180,6 +187,7 @@ FEXPORT(nlm_reset_entry) lw t1, 0(t2) sync +2: /* Configure LSU on Non-0 Cores. */ xlp_config_lsu /* FALL THROUGH */
arch/mips/netlogic/xlp/nlm_hal.c +4 -1
@@ -174,7 +174,10 @@ unsigned int nlm_get_core_frequency(int node, int core)uint64_t num, sysbase; sysbase =nlm_get_node (node)->sysbase; - rstval =nlm_read_sys_reg (sysbase,SYS_POWER_ON_RESET_CFG ); +if (cpu_is_xlp9xx ()) + rstval =nlm_read_sys_reg (sysbase,SYS_9XX_POWER_ON_RESET_CFG ); +else + rstval =nlm_read_sys_reg (sysbase,SYS_POWER_ON_RESET_CFG );if (cpu_is_xlpii ()) { num =1000000ULL * (400 *3 +100 * (rstval >>26 )); denom =3 ;
arch/mips/netlogic/xlp/setup.c +4 -1
@@ -56,7 +56,10 @@ static void nlm_linux_exit(void) {uint64_t sysbase =nlm_get_node (0 )->sysbase; -nlm_write_sys_reg (sysbase,SYS_CHIP_RESET ,1 ); +if (cpu_is_xlp9xx ()) +nlm_write_sys_reg (sysbase,SYS_9XX_CHIP_RESET ,1 ); +else +nlm_write_sys_reg (sysbase,SYS_CHIP_RESET ,1 );for ( ; ; )cpu_wait (); }
arch/mips/netlogic/xlp/wakeup.c +53 -25
113 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 11/18 MIPS: Netlogic: SYS block updates of XLP9XX
Add the SYS block registers for XLP9XX, most of them have changed. The wakeup sequence has been updated to set the coherent mode from the main thread rather than the woken up thread.
---
Updated to apply cleanly after change to 06/18 in this patchset
arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 ++++++- arch/mips/netlogic/common/reset.S | 8 +++ arch/mips/netlogic/xlp/nlm_hal.c | 5 +- arch/mips/netlogic/xlp/setup.c | 5 +- arch/mips/netlogic/xlp/wakeup.c | 74 ++++++++++++++++++-------- 5 files changed, 84 insertions(+), 26 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/sys.h +17 -1
@@ -147,13 +147,29 @@#define SYS_SYS_PLL_MEM_REQ 0x2a3#define SYS_PLL_MEM_STAT 0x2a4 +/* Registers changed on 9XX */ +#define SYS_9XX_POWER_ON_RESET_CFG 0x00 +#define SYS_9XX_CHIP_RESET 0x01 +#define SYS_9XX_CPU_RESET 0x02 +#define SYS_9XX_CPU_NONCOHERENT_MODE 0x03 + +/* XLP 9XX fuse block registers */ +#define FUSE_9XX_DEVCFG6 0xc6 +#ifndef __ASSEMBLY__#define nlm_read_sys_reg (b, r) nlm_read_reg(b, r)#define nlm_write_sys_reg (b, r, v) nlm_write_reg(b, r, v) -#define nlm_get_sys_pcibase (node) nlm_pcicfg_base(XLP_IO_SYS_OFFSET(node)) +#define nlm_get_sys_pcibase (node) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_SYS_OFFSET(node) : XLP_IO_SYS_OFFSET(node))#define nlm_get_sys_regbase (node) (nlm_get_sys_pcibase(node) + XLP_IO_PCI_HDRSZ) +/* XLP9XX fuse block */ +#define nlm_get_fuse_pcibase (node) \ + nlm_pcicfg_base(XLP9XX_IO_FUSE_OFFSET(node)) +#define nlm_get_fuse_regbase (node) \ + (nlm_get_fuse_pcibase(node) + XLP_IO_PCI_HDRSZ) +unsigned int nlm_get_pic_frequency (int node);#endif #endif
arch/mips/netlogic/common/reset.S +8 -0
@@ -159,6 +159,13 @@ FEXPORT(nlm_reset_entry) nop 1: /* Entry point on core wakeup */ + mfc0 t0, CP0_EBASE, 0 /* processor ID */ + andi t0, 0xff00 + li t1, 0x1500 /* XLP 9xx */ + beq t0, t1, 2f /* does not need to set coherent */ + nop + + /* set bit in SYS coherent register for the core */ mfc0 t0, CP0_EBASE, 1 mfc0 t1, CP0_EBASE, 1 srl t1, 5
@@ -180,6 +187,7 @@ FEXPORT(nlm_reset_entry) lw t1, 0(t2) sync +2: /* Configure LSU on Non-0 Cores. */ xlp_config_lsu /* FALL THROUGH */
arch/mips/netlogic/xlp/nlm_hal.c +4 -1
@@ -174,7 +174,10 @@ unsigned int nlm_get_core_frequency(int node, int core)uint64_t num, sysbase; sysbase =nlm_get_node (node)->sysbase; - rstval =nlm_read_sys_reg (sysbase,SYS_POWER_ON_RESET_CFG ); +if (cpu_is_xlp9xx ()) + rstval =nlm_read_sys_reg (sysbase,SYS_9XX_POWER_ON_RESET_CFG ); +else + rstval =nlm_read_sys_reg (sysbase,SYS_POWER_ON_RESET_CFG );if (cpu_is_xlpii ()) { num =1000000ULL * (400 *3 +100 * (rstval >>26 )); denom =3 ;
arch/mips/netlogic/xlp/setup.c +4 -1
@@ -56,7 +56,10 @@ static void nlm_linux_exit(void) {uint64_t sysbase =nlm_get_node (0 )->sysbase; -nlm_write_sys_reg (sysbase,SYS_CHIP_RESET ,1 ); +if (cpu_is_xlp9xx ()) +nlm_write_sys_reg (sysbase,SYS_9XX_CHIP_RESET ,1 ); +else +nlm_write_sys_reg (sysbase,SYS_CHIP_RESET ,1 );for ( ; ; )cpu_wait (); }
arch/mips/netlogic/xlp/wakeup.c +51 -23
109 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 12/18 MIPS: Netlogic: XLP9XX UART offset
In reply to Jayachandran CUpdate IO offset of the early console UART.
--- arch/mips/include/asm/netlogic/xlp-hal/uart.h | 3 ++- arch/mips/netlogic/common/earlycons.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
arch/mips/include/asm/netlogic/xlp-hal/uart.h +2 -1
@@ -94,7 +94,8 @@#define nlm_read_uart_reg (b, r) nlm_read_reg(b, r)#define nlm_write_uart_reg (b, r, v) nlm_write_reg(b, r, v)#define nlm_get_uart_pcibase (node, inst) \ - nlm_pcicfg_base(XLP_IO_UART_OFFSET(node, inst)) + nlm_pcicfg_base(cpu_is_xlp9xx() ? XLP9XX_IO_UART_OFFSET(node) : \ + XLP_IO_UART_OFFSET(node, inst))#define nlm_get_uart_regbase (node, inst) \ (nlm_get_uart_pcibase(node, inst) + XLP_IO_PCI_HDRSZ)
arch/mips/netlogic/common/earlycons.c +2 -0
@@ -37,9 +37,11 @@#include <asm/mipsregs.h> #include <asm/netlogic/haldefs.h> +#include <asm/netlogic/common.h> #if defined(CONFIG_CPU_XLP )#include <asm/netlogic/xlp-hal/iomap.h> +#include <asm/netlogic/xlp-hal/xlp.h> #include <asm/netlogic/xlp-hal/uart.h> #elif defined(CONFIG_CPU_XLR )#include <asm/netlogic/xlr/iomap.h>
Signature · 1 line
1.7.9.5
PATCH 13/18 MIPS: Netlogic: XLP9XX bridge and DRAM code
In reply to Jayachandran CUpdate bridge code. Add code to the XLP9XX registers for DRAM size, limit and node when running on XLPXX
--- arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 69 +++++++++++------------ arch/mips/netlogic/xlp/nlm_hal.c | 26 ++++++--- 2 files changed, 51 insertions(+), 44 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/bridge.h +32 -37
@@ -69,44 +69,9 @@#define BRIDGE_FLASH_LIMIT3 0x13#define BRIDGE_DRAM_BAR (i) (0x14 + (i)) -#define BRIDGE_DRAM_BAR0 0x14 -#define BRIDGE_DRAM_BAR1 0x15 -#define BRIDGE_DRAM_BAR2 0x16 -#define BRIDGE_DRAM_BAR3 0x17 -#define BRIDGE_DRAM_BAR4 0x18 -#define BRIDGE_DRAM_BAR5 0x19 -#define BRIDGE_DRAM_BAR6 0x1a -#define BRIDGE_DRAM_BAR7 0x1b -#define BRIDGE_DRAM_LIMIT (i) (0x1c + (i)) -#define BRIDGE_DRAM_LIMIT0 0x1c -#define BRIDGE_DRAM_LIMIT1 0x1d -#define BRIDGE_DRAM_LIMIT2 0x1e -#define BRIDGE_DRAM_LIMIT3 0x1f -#define BRIDGE_DRAM_LIMIT4 0x20 -#define BRIDGE_DRAM_LIMIT5 0x21 -#define BRIDGE_DRAM_LIMIT6 0x22 -#define BRIDGE_DRAM_LIMIT7 0x23 -#define BRIDGE_DRAM_NODE_TRANSLN (i) (0x24 + (i)) -#define BRIDGE_DRAM_NODE_TRANSLN0 0x24 -#define BRIDGE_DRAM_NODE_TRANSLN1 0x25 -#define BRIDGE_DRAM_NODE_TRANSLN2 0x26 -#define BRIDGE_DRAM_NODE_TRANSLN3 0x27 -#define BRIDGE_DRAM_NODE_TRANSLN4 0x28 -#define BRIDGE_DRAM_NODE_TRANSLN5 0x29 -#define BRIDGE_DRAM_NODE_TRANSLN6 0x2a -#define BRIDGE_DRAM_NODE_TRANSLN7 0x2b -#define BRIDGE_DRAM_CHNL_TRANSLN (i) (0x2c + (i)) -#define BRIDGE_DRAM_CHNL_TRANSLN0 0x2c -#define BRIDGE_DRAM_CHNL_TRANSLN1 0x2d -#define BRIDGE_DRAM_CHNL_TRANSLN2 0x2e -#define BRIDGE_DRAM_CHNL_TRANSLN3 0x2f -#define BRIDGE_DRAM_CHNL_TRANSLN4 0x30 -#define BRIDGE_DRAM_CHNL_TRANSLN5 0x31 -#define BRIDGE_DRAM_CHNL_TRANSLN6 0x32 -#define BRIDGE_DRAM_CHNL_TRANSLN7 0x33#define BRIDGE_PCIEMEM_BASE0 0x34#define BRIDGE_PCIEMEM_BASE1 0x35
@@ -178,12 +143,42 @@#define BRIDGE_GIO_WEIGHT 0x2cb#define BRIDGE_FLASH_WEIGHT 0x2cc +/* FIXME verify */ +#define BRIDGE_9XX_FLASH_BAR (i) (0x11 + (i)) +#define BRIDGE_9XX_FLASH_BAR_LIMIT (i) (0x15 + (i)) + +#define BRIDGE_9XX_DRAM_BAR (i) (0x19 + (i)) +#define BRIDGE_9XX_DRAM_LIMIT (i) (0x29 + (i)) +#define BRIDGE_9XX_DRAM_NODE_TRANSLN (i) (0x39 + (i)) +#define BRIDGE_9XX_DRAM_CHNL_TRANSLN (i) (0x49 + (i)) + +#define BRIDGE_9XX_ADDRESS_ERROR0 0x9d +#define BRIDGE_9XX_ADDRESS_ERROR1 0x9e +#define BRIDGE_9XX_ADDRESS_ERROR2 0x9f + +#define BRIDGE_9XX_PCIEMEM_BASE0 0x59 +#define BRIDGE_9XX_PCIEMEM_BASE1 0x5a +#define BRIDGE_9XX_PCIEMEM_BASE2 0x5b +#define BRIDGE_9XX_PCIEMEM_BASE3 0x5c +#define BRIDGE_9XX_PCIEMEM_LIMIT0 0x5d +#define BRIDGE_9XX_PCIEMEM_LIMIT1 0x5e +#define BRIDGE_9XX_PCIEMEM_LIMIT2 0x5f +#define BRIDGE_9XX_PCIEMEM_LIMIT3 0x60 +#define BRIDGE_9XX_PCIEIO_BASE0 0x61 +#define BRIDGE_9XX_PCIEIO_BASE1 0x62 +#define BRIDGE_9XX_PCIEIO_BASE2 0x63 +#define BRIDGE_9XX_PCIEIO_BASE3 0x64 +#define BRIDGE_9XX_PCIEIO_LIMIT0 0x65 +#define BRIDGE_9XX_PCIEIO_LIMIT1 0x66 +#define BRIDGE_9XX_PCIEIO_LIMIT2 0x67 +#define BRIDGE_9XX_PCIEIO_LIMIT3 0x68 +#ifndef __ASSEMBLY__#define nlm_read_bridge_reg (b, r) nlm_read_reg(b, r)#define nlm_write_bridge_reg (b, r, v) nlm_write_reg(b, r, v) -#define nlm_get_bridge_pcibase (node) \ - nlm_pcicfg_base(XLP_IO_BRIDGE_OFFSET(node)) +#define nlm_get_bridge_pcibase (node) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_BRIDGE_OFFSET(node) : XLP_IO_BRIDGE_OFFSET(node))#define nlm_get_bridge_regbase (node) \ (nlm_get_bridge_pcibase(node) + XLP_IO_PCI_HDRSZ)
arch/mips/netlogic/xlp/nlm_hal.c +19 -7
@@ -314,21 +314,33 @@ int xlp_get_dram_map(int n, uint64_t *dram_map) {uint64_t bridgebase, base, lim;uint32_t val; +unsigned int barreg, limreg, xlatreg;int i, node, rv;/* Look only at mapping on Node 0, we don't handle crazy configs */ bridgebase =nlm_get_bridge_regbase (0 ); rv =0 ;for (i =0 ; i <8 ; i++) { - val =nlm_read_bridge_reg (bridgebase, -BRIDGE_DRAM_NODE_TRANSLN (i)); - node = (val >>1 ) &0x3 ; -if (n >=0 && n != node) -continue ; - val =nlm_read_bridge_reg (bridgebase,BRIDGE_DRAM_BAR (i)); +if (cpu_is_xlp9xx ()) { + barreg =BRIDGE_9XX_DRAM_BAR (i); + limreg =BRIDGE_9XX_DRAM_LIMIT (i); + xlatreg =BRIDGE_9XX_DRAM_NODE_TRANSLN (i); + }else { + barreg =BRIDGE_DRAM_BAR (i); + limreg =BRIDGE_DRAM_LIMIT (i); + xlatreg =BRIDGE_DRAM_NODE_TRANSLN (i); + } +if (n >=0 ) { +/* node specified, get node mapping of BAR */ + val =nlm_read_bridge_reg (bridgebase, xlatreg); + node = (val >>1 ) &0x3 ; +if (n != node) +continue ; + } + val =nlm_read_bridge_reg (bridgebase, barreg); val = (val >>12 ) &0xfffff ; base = (uint64_t ) val <<20 ; - val =nlm_read_bridge_reg (bridgebase,BRIDGE_DRAM_LIMIT (i)); + val =nlm_read_bridge_reg (bridgebase, limreg); val = (val >>12 ) &0xfffff ;if (val ==0 )/* BAR not used */ continue ;
Signature · 1 line
1.7.9.5
PATCH 14/18 MIPS: Netlogic: Add cpu to node mapping for XLP9XX
In reply to Jayachandran CXLP9XX has 20 cores per node, opposed to 8 on earlier XLP8XX. Update code that calculates node id from cpu id to handle this.
--- arch/mips/include/asm/mach-netlogic/multi-node.h | 11 +++++++++-- arch/mips/include/asm/netlogic/mips-extns.h | 7 ++++++- arch/mips/netlogic/common/irq.c | 6 +++--- arch/mips/netlogic/common/smp.c | 8 +++++--- arch/mips/netlogic/xlp/setup.c | 5 +++++ arch/mips/netlogic/xlp/wakeup.c | 4 ++-- arch/mips/netlogic/xlr/wakeup.c | 2 +- arch/mips/pci/msi-xlp.c | 4 ++-- 8 files changed, 33 insertions(+), 14 deletions(-)
arch/mips/include/asm/mach-netlogic/multi-node.h +9 -2
@@ -47,9 +47,16 @@#endif #endif -#define NLM_CORES_PER_NODE 8#define NLM_THREADS_PER_CORE 4 -#define NLM_CPUS_PER_NODE (NLM_CORES_PER_NODE * NLM_THREADS_PER_CORE) +#ifdef CONFIG_CPU_XLR +#define nlm_cores_per_node () 8 +#else +extern unsigned int xlp_cores_per_node; +#define nlm_cores_per_node () xlp_cores_per_node +#endif + +#define nlm_threads_per_node () (nlm_cores_per_node() * NLM_THREADS_PER_CORE) +#define nlm_cpuid_to_node (c) ((c) / nlm_threads_per_node())struct nlm_soc_info {unsigned long coremask;/* cores enabled on the soc */
arch/mips/include/asm/netlogic/mips-extns.h +6 -1
@@ -146,7 +146,12 @@ static inline int hard_smp_processor_id(void)static inline int nlm_nodeid (void ) { -return (__read_32bit_c0_register ($15,1 ) >>5 ) &0x3 ; +uint32_t prid =read_c0_prid (); + +if ((prid &0xff00 ) ==PRID_IMP_NETLOGIC_XLP9XX ) +return (__read_32bit_c0_register ($15,1 ) >>7 ) &0x7 ; +else +return (__read_32bit_c0_register ($15,1 ) >>5 ) &0x3 ; }static inline unsigned int nlm_core_id (void )
arch/mips/netlogic/common/irq.c +3 -3
@@ -223,7 +223,7 @@ static void nlm_init_node_irqs(int node)continue ;nlm_pic_init_irt (nodep->picbase, irt, i, - node *NLM_CPUS_PER_NODE ,0 ); + node *nlm_threads_per_node (),0 );nlm_setup_pic_irq (node, i, i, irt); } }
@@ -232,8 +232,8 @@ void nlm_smp_irq_init(int hwcpuid) {int node, cpu; - node = hwcpuid /NLM_CPUS_PER_NODE ; - cpu = hwcpuid %NLM_CPUS_PER_NODE ; + node =nlm_cpuid_to_node (hwcpuid); + cpu = hwcpuid %nlm_threads_per_node ();if (cpu ==0 && node !=0 )nlm_init_node_irqs (node);
arch/mips/netlogic/common/smp.c +5 -3
@@ -63,7 +63,7 @@ void nlm_send_ipi_single(int logical_cpu, unsigned int action)uint64_t picbase; cpu =cpu_logical_map (logical_cpu); - node = cpu /NLM_CPUS_PER_NODE ; + node =nlm_cpuid_to_node (cpu); picbase =nlm_get_node (node)->picbase;if (action &SMP_CALL_FUNCTION )
@@ -152,7 +152,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)int cpu, node; cpu =cpu_logical_map (logical_cpu); - node = cpu /NLM_CPUS_PER_NODE ; + node =nlm_cpuid_to_node (logical_cpu); nlm_next_sp = (unsigned long )__KSTK_TOS (idle); nlm_next_gp = (unsigned long )task_thread_info (idle);
@@ -164,7 +164,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)void __init nlm_smp_setup (void ) {unsigned int boot_cpu; -int num_cpus, i, ncore; +int num_cpus, i, ncore, node;volatile u32 *cpu_ready =nlm_get_boot_data (BOOT_CPU_READY );char buf[64 ];
@@ -187,6 +187,8 @@ void __init nlm_smp_setup(void) __cpu_number_map[i] = num_cpus; __cpu_logical_map[num_cpus] = i;set_cpu_possible (num_cpus, true); + node =nlm_cpuid_to_node (i); +cpumask_set_cpu (num_cpus, &nlm_get_node (node)->cpumask); ++num_cpus; } }
arch/mips/netlogic/xlp/setup.c +5 -0
@@ -51,6 +51,7 @@ uint64_t nlm_io_base;struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];cpumask_t nlm_cpumask =CPU_MASK_CPU0 ;unsigned int nlm_threads_per_core; +unsigned int xlp_cores_per_node;static void nlm_linux_exit (void ) {
@@ -162,6 +163,10 @@ void __init prom_init(void)void *reset_vec; nlm_io_base =CKSEG1ADDR (XLP_DEFAULT_IO_BASE ); +if (cpu_is_xlp9xx ()) + xlp_cores_per_node =32 ; +else + xlp_cores_per_node =8 ;nlm_init_boot_cpu ();xlp_mmu_init ();nlm_node_init (0 );
arch/mips/netlogic/xlp/wakeup.c +2 -2
@@ -167,7 +167,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask) nodep->coremask =1 ;pr_info ("Node %d - SYS/FUSE coremask %x\n" , n, syscoremask); -for (core =0 ; core <NLM_CORES_PER_NODE ; core++) { +for (core =0 ; core <nlm_cores_per_node (); core++) {/* we will be on node 0 core 0 */ if (n ==0 && core ==0 )continue ;
@@ -177,7 +177,7 @@ static void xlp_enable_secondary_cores(const cpumask_t *wakeup_mask)continue ;/* see if at least the first hw thread is enabled */ - cpu = (n *NLM_CORES_PER_NODE + core) + cpu = (n *nlm_cores_per_node () + core) *NLM_THREADS_PER_CORE ;if (!cpumask_test_cpu (cpu, wakeup_mask))continue ;
arch/mips/netlogic/xlr/wakeup.c +1 -1
@@ -70,7 +70,7 @@ int xlr_wakeup_secondary_cpus(void)/* Fill up the coremask early */ nodep->coremask =1 ; -for (i =1 ; i <NLM_CORES_PER_NODE ; i++) { +for (i =1 ; i <nlm_cores_per_node (); i++) {for (j =1000000 ; j >0 ; j--) {if (cpu_ready[i *NLM_THREADS_PER_CORE ])break ;
arch/mips/pci/msi-xlp.c +2 -2
@@ -279,7 +279,7 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link, 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_CPUS_PER_NODE ,1 /*en */ ); + node *nlm_threads_per_node (),1 /*en */ ); }/* allocate a MSI vec, and tell the bridge about it */
@@ -442,7 +442,7 @@ void __init xlp_init_node_msi_irqs(int node, int 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_CPUS_PER_NODE ,1 /* enable */ ); + 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));
Signature · 1 line
1.7.9.5
PATCH 15/18 MIPS: PCI: Netlogic XLP9XX support
In reply to Jayachandran CAdd PCI support for Netlogic XLP9XX. The PCI registers and SoC bus numbers have changed in XLP9XX.
Also skip a few (bus,dev,fn) combinations which have issues when read.
--- arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 10 ++- arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 3 + arch/mips/netlogic/xlp/nlm_hal.c | 5 ++ arch/mips/pci/pci-xlp.c | 93 ++++++++++++++++++----- 4 files changed, 89 insertions(+), 22 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/pcibus.h +8 -2
@@ -63,6 +63,12 @@#define PCIE_INT_EN0 0x261#define PCIE_INT_EN1 0x262 +/* XLP9XX has basic changes */ +#define PCIE_9XX_BYTE_SWAP_MEM_BASE 0x25c +#define PCIE_9XX_BYTE_SWAP_MEM_LIM 0x25d +#define PCIE_9XX_BYTE_SWAP_IO_BASE 0x25e +#define PCIE_9XX_BYTE_SWAP_IO_LIM 0x25f +/* other */ #define PCIE_NLINKS 4
@@ -78,8 +84,8 @@#define nlm_read_pcie_reg (b, r) nlm_read_reg(b, r)#define nlm_write_pcie_reg (b, r, v) nlm_write_reg(b, r, v) -#define nlm_get_pcie_base (node, inst) \ - nlm_pcicfg_base(XLP_IO_PCIE_OFFSET(node, inst)) +#define nlm_get_pcie_base (node, inst) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_PCIE_OFFSET(node, inst) : XLP_IO_PCIE_OFFSET(node, inst))#ifdef CONFIG_PCI_MSI void xlp_init_node_msi_irqs (int node,int link);
arch/mips/include/asm/netlogic/xlp-hal/xlp.h +3 -0
@@ -84,6 +84,9 @@ void xlp_mmu_init(void);void nlm_hal_init (void );int xlp_get_dram_map (int n,uint64_t *dram_map); +struct pci_dev ; +int xlp_socdev_to_node (const struct pci_dev *dev); +/* Device tree related */ void *xlp_dt_init (void *fdtp);
arch/mips/netlogic/xlp/nlm_hal.c +5 -0
@@ -76,6 +76,11 @@ int nlm_irq_to_irt(int irq)return 133 ;case PIC_UART_1_IRQ :return 134 ; +case PIC_PCIE_LINK_LEGACY_IRQ (0 ): +case PIC_PCIE_LINK_LEGACY_IRQ (1 ): +case PIC_PCIE_LINK_LEGACY_IRQ (2 ): +case PIC_PCIE_LINK_LEGACY_IRQ (3 ): +return 191 + irq -PIC_PCIE_LINK_LEGACY_IRQ_BASE ; }return -1 ; }
arch/mips/pci/pci-xlp.c +73 -20
131 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 11/18 MIPS: Netlogic: SYS block updates of XLP9XX
Add the SYS block registers for XLP9XX, most of them have changed. The wakeup sequence has been updated to set the coherent mode from the main thread rather than the woken up thread.
---
Updated to apply cleanly after change to 06/18 in this patchset
arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 ++++++- arch/mips/netlogic/common/reset.S | 8 +++ arch/mips/netlogic/xlp/nlm_hal.c | 5 +- arch/mips/netlogic/xlp/setup.c | 5 +- arch/mips/netlogic/xlp/wakeup.c | 74 ++++++++++++++++++-------- 5 files changed, 84 insertions(+), 26 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/sys.h +17 -1
@@ -147,13 +147,29 @@#define SYS_SYS_PLL_MEM_REQ 0x2a3#define SYS_PLL_MEM_STAT 0x2a4 +/* Registers changed on 9XX */ +#define SYS_9XX_POWER_ON_RESET_CFG 0x00 +#define SYS_9XX_CHIP_RESET 0x01 +#define SYS_9XX_CPU_RESET 0x02 +#define SYS_9XX_CPU_NONCOHERENT_MODE 0x03 + +/* XLP 9XX fuse block registers */ +#define FUSE_9XX_DEVCFG6 0xc6 +#ifndef __ASSEMBLY__#define nlm_read_sys_reg (b, r) nlm_read_reg(b, r)#define nlm_write_sys_reg (b, r, v) nlm_write_reg(b, r, v) -#define nlm_get_sys_pcibase (node) nlm_pcicfg_base(XLP_IO_SYS_OFFSET(node)) +#define nlm_get_sys_pcibase (node) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_SYS_OFFSET(node) : XLP_IO_SYS_OFFSET(node))#define nlm_get_sys_regbase (node) (nlm_get_sys_pcibase(node) + XLP_IO_PCI_HDRSZ) +/* XLP9XX fuse block */ +#define nlm_get_fuse_pcibase (node) \ + nlm_pcicfg_base(XLP9XX_IO_FUSE_OFFSET(node)) +#define nlm_get_fuse_regbase (node) \ + (nlm_get_fuse_pcibase(node) + XLP_IO_PCI_HDRSZ) +unsigned int nlm_get_pic_frequency (int node);#endif #endif
arch/mips/netlogic/common/reset.S +8 -0
@@ -159,6 +159,13 @@ FEXPORT(nlm_reset_entry) nop 1: /* Entry point on core wakeup */ + mfc0 t0, CP0_EBASE, 0 /* processor ID */ + andi t0, 0xff00 + li t1, 0x1500 /* XLP 9xx */ + beq t0, t1, 2f /* does not need to set coherent */ + nop + + /* set bit in SYS coherent register for the core */ mfc0 t0, CP0_EBASE, 1 mfc0 t1, CP0_EBASE, 1 srl t1, 5
@@ -180,6 +187,7 @@ FEXPORT(nlm_reset_entry) lw t1, 0(t2) sync +2: /* Configure LSU on Non-0 Cores. */ xlp_config_lsu /* FALL THROUGH */
arch/mips/netlogic/xlp/nlm_hal.c +4 -1
@@ -174,7 +174,10 @@ unsigned int nlm_get_core_frequency(int node, int core)uint64_t num, sysbase; sysbase =nlm_get_node (node)->sysbase; - rstval =nlm_read_sys_reg (sysbase,SYS_POWER_ON_RESET_CFG ); +if (cpu_is_xlp9xx ()) + rstval =nlm_read_sys_reg (sysbase,SYS_9XX_POWER_ON_RESET_CFG ); +else + rstval =nlm_read_sys_reg (sysbase,SYS_POWER_ON_RESET_CFG );if (cpu_is_xlpii ()) { num =1000000ULL * (400 *3 +100 * (rstval >>26 )); denom =3 ;
arch/mips/netlogic/xlp/setup.c +4 -1
@@ -56,7 +56,10 @@ static void nlm_linux_exit(void) {uint64_t sysbase =nlm_get_node (0 )->sysbase; -nlm_write_sys_reg (sysbase,SYS_CHIP_RESET ,1 ); +if (cpu_is_xlp9xx ()) +nlm_write_sys_reg (sysbase,SYS_9XX_CHIP_RESET ,1 ); +else +nlm_write_sys_reg (sysbase,SYS_CHIP_RESET ,1 );for ( ; ; )cpu_wait (); }
arch/mips/netlogic/xlp/wakeup.c +51 -23
109 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 15/18 MIPS: PCI: Netlogic XLP9XX support
In reply to Jayachandran CAdd PCI support for Netlogic XLP9XX. The PCI registers and SoC bus numbers have changed in XLP9XX.
Also skip a few (bus,dev,fn) combinations which have issues when read.
---
Update for coding style compliance, braces on all the if blocks in a group
arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 10 ++- arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 3 + arch/mips/netlogic/xlp/nlm_hal.c | 5 ++ arch/mips/pci/pci-xlp.c | 95 ++++++++++++++++++----- 4 files changed, 90 insertions(+), 23 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/pcibus.h +8 -2
@@ -63,6 +63,12 @@#define PCIE_INT_EN0 0x261#define PCIE_INT_EN1 0x262 +/* XLP9XX has basic changes */ +#define PCIE_9XX_BYTE_SWAP_MEM_BASE 0x25c +#define PCIE_9XX_BYTE_SWAP_MEM_LIM 0x25d +#define PCIE_9XX_BYTE_SWAP_IO_BASE 0x25e +#define PCIE_9XX_BYTE_SWAP_IO_LIM 0x25f +/* other */ #define PCIE_NLINKS 4
@@ -78,8 +84,8 @@#define nlm_read_pcie_reg (b, r) nlm_read_reg(b, r)#define nlm_write_pcie_reg (b, r, v) nlm_write_reg(b, r, v) -#define nlm_get_pcie_base (node, inst) \ - nlm_pcicfg_base(XLP_IO_PCIE_OFFSET(node, inst)) +#define nlm_get_pcie_base (node, inst) nlm_pcicfg_base(cpu_is_xlp9xx() ? \ + XLP9XX_IO_PCIE_OFFSET(node, inst) : XLP_IO_PCIE_OFFSET(node, inst))#ifdef CONFIG_PCI_MSI void xlp_init_node_msi_irqs (int node,int link);
arch/mips/include/asm/netlogic/xlp-hal/xlp.h +3 -0
@@ -84,6 +84,9 @@ void xlp_mmu_init(void);void nlm_hal_init (void );int xlp_get_dram_map (int n,uint64_t *dram_map); +struct pci_dev ; +int xlp_socdev_to_node (const struct pci_dev *dev); +/* Device tree related */ void *xlp_dt_init (void *fdtp);
arch/mips/netlogic/xlp/nlm_hal.c +5 -0
@@ -76,6 +76,11 @@ int nlm_irq_to_irt(int irq)return 133 ;case PIC_UART_1_IRQ :return 134 ; +case PIC_PCIE_LINK_LEGACY_IRQ (0 ): +case PIC_PCIE_LINK_LEGACY_IRQ (1 ): +case PIC_PCIE_LINK_LEGACY_IRQ (2 ): +case PIC_PCIE_LINK_LEGACY_IRQ (3 ): +return 191 + irq -PIC_PCIE_LINK_LEGACY_IRQ_BASE ; }return -1 ; }
arch/mips/pci/pci-xlp.c +74 -21
134 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 16/18 MIPS: Netlogic: XLP9XX USB support
In reply to Jayachandran CFrom: Ganesan Ramalingam <[email protected]>
XLP9XX has a USB 3.0 controller on-chip with 2 xHCI ports. The USB block is similar to the one on XLP2XX, so update usb-init-xlp2.c to handle XLP9XX as well.
--- arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 3 + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 2 + arch/mips/netlogic/xlp/nlm_hal.c | 4 ++ arch/mips/netlogic/xlp/usb-init-xlp2.c | 88 ++++++++++++++++++++---- 4 files changed, 84 insertions(+), 13 deletions(-)
arch/mips/include/asm/netlogic/xlp-hal/iomap.h +3 -0
@@ -188,6 +188,9 @@#define PCI_DEVICE_ID_NLM_MMC 0x1018#define PCI_DEVICE_ID_NLM_XHCI 0x101d +#define PCI_DEVICE_ID_XLP9XX_SATA 0x901A +#define PCI_DEVICE_ID_XLP9XX_XHCI 0x901D +#ifndef __ASSEMBLY__#define nlm_read_pci_reg (b, r) nlm_read_reg(b, r)
arch/mips/include/asm/netlogic/xlp-hal/xlp.h +2 -0
@@ -50,6 +50,8 @@#define PIC_2XX_XHCI_0_IRQ 23#define PIC_2XX_XHCI_1_IRQ 24#define PIC_2XX_XHCI_2_IRQ 25 +#define PIC_9XX_XHCI_0_IRQ 23 +#define PIC_9XX_XHCI_1_IRQ 24#define PIC_MMC_IRQ 29#define PIC_I2C_0_IRQ 30
arch/mips/netlogic/xlp/nlm_hal.c +4 -0
@@ -72,6 +72,10 @@ int nlm_irq_to_irt(int irq)/* bypass for 9xx */ if (cpu_is_xlp9xx ()) {switch (irq) { +case PIC_9XX_XHCI_0_IRQ : +return 114 ; +case PIC_9XX_XHCI_1_IRQ : +return 115 ;case PIC_UART_0_IRQ :return 133 ;case PIC_UART_1_IRQ :
arch/mips/netlogic/xlp/usb-init-xlp2.c +75 -13
129 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 17/18 MIPS: Netlogic: XLP9XX PIC OF support
In reply to Jayachandran CSupport for adding legacy IRQ domain for XLP9XX. The node id of the PIC has to be calulated differently for XLP9XX.
--- arch/mips/netlogic/common/irq.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
arch/mips/netlogic/common/irq.c +24 -4
@@ -274,8 +274,6 @@ asmlinkage void plat_irq_dispatch(void) }#ifdef CONFIG_OF -static struct irq_domain *xlp_pic_domain; -static const struct irq_domain_ops xlp_pic_irq_domain_ops = { .xlate = irq_domain_xlate_onetwocell, };
@@ -284,8 +282,9 @@ static int __init xlp_of_pic_init(struct device_node *node, struct device_node *parent) {const int n_picirqs =PIC_IRT_LAST_IRQ -PIC_IRQ_BASE +1 ; +struct irq_domain *xlp_pic_domain;struct resource res; -int socid, ret; +int socid, ret, bus;/* we need a hack to get the PIC's SoC chip id */ ret =of_address_to_resource (node,0 , &res);
@@ -293,7 +292,28 @@ static int __init xlp_of_pic_init(struct device_node *node,pr_err ("PIC %s: reg property not found!\n" , node->name);return -EINVAL ; } - socid = (res.start >>18 ) &0x3 ; + +if (cpu_is_xlp9xx ()) { + bus = (res.start >>20 ) &0xf ; +for (socid =0 ; socid <NLM_NR_NODES ; socid++) { +if (!nlm_node_present (socid)) +continue ; +if (nlm_get_node (socid)->socbus == bus) +break ; + } +if (socid ==NLM_NR_NODES ) { +pr_err ("PIC %s: Node mapping for bus %d not found!n" , + node->name, bus); +return -EINVAL ; + } + }else + socid = (res.start >>18 ) &0x3 ; + +if (!nlm_node_present (socid)) { +pr_err ("PIC %s: node %d does not exist!\n" , node->name, socid); +return -EINVAL ; + } + xlp_pic_domain =irq_domain_add_legacy (node, n_picirqs,nlm_irq_to_xirq (socid,PIC_IRQ_BASE ),PIC_IRQ_BASE , &xlp_pic_irq_domain_ops,NULL );
Signature · 1 line
1.7.9.5
Re: [PATCH 17/18] MIPS: Netlogic: XLP9XX PIC OF support
Hello.
Quoted 12 lines · Jayachandran C
Support for adding legacy IRQ domain for XLP9XX. The node id of the PIC has to be calulated differently for XLP9XX.
Signed-off-by Jayachandran C <[email protected]>--- arch/mips/netlogic/common/irq.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)arch/mips/netlogic/common/irq.c +0
-0
[...]
Quoted 11 lines
arch/mips/netlogic/common/irq.c +6
-1@@ -293,7 +292,28 @@ static int __init xlp_of_pic_init(struct device_node *node,pr_err ("PIC %s: reg property not found!\n" , node->name);return -EINVAL ; } - socid = (res.start >>18 ) &0x3 ; + +if (cpu_is_xlp9xx ()) { + bus = (res.start >>20 ) &0xf ; +for (socid =0 ; socid <NLM_NR_NODES ; socid++) { +if (!nlm_node_present (socid)) +continue ;
arch/mips/netlogic/common/irq.c static int __init xlp_of_pic_init(struct device_node *node, · line 310
Quoted 10 lines
arch/mips/netlogic/common/irq.c +10
-0+if (nlm_get_node (socid)->socbus == bus) +break ; + } +if (socid ==NLM_NR_NODES ) { +pr_err ("PIC %s: Node mapping for bus %d not found!n" , + node->name, bus); +return -EINVAL ; + } + }else + socid = (res.start >>18 ) &0x3 ;
Both arms of the *if* statement should have {} if one arm has it,
according to Documentation/CodingStyle.
WBR, Sergei
PATCH 17/18 MIPS: Netlogic: XLP9XX PIC OF support
In reply to Jayachandran CSupport for adding legacy IRQ domain for XLP9XX. The node id of the PIC has to be calulated differently for XLP9XX.
---
Updates for CodingStyle compliance, suggested by
Sergei Shtylyov <[email protected]>. Also move the check for if (!nlm_node_present(socid)) to non XLP9XX case.
arch/mips/netlogic/common/irq.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)
arch/mips/netlogic/common/irq.c +26 -6
@@ -274,8 +274,6 @@ asmlinkage void plat_irq_dispatch(void) }#ifdef CONFIG_OF -static struct irq_domain *xlp_pic_domain; -static const struct irq_domain_ops xlp_pic_irq_domain_ops = { .xlate = irq_domain_xlate_onetwocell, };
@@ -284,8 +282,9 @@ static int __init xlp_of_pic_init(struct device_node *node, struct device_node *parent) {const int n_picirqs =PIC_IRT_LAST_IRQ -PIC_IRQ_BASE +1 ; +struct irq_domain *xlp_pic_domain;struct resource res; -int socid, ret; +int socid, ret, bus;/* we need a hack to get the PIC's SoC chip id */ ret =of_address_to_resource (node,0 , &res);
@@ -293,7 +292,29 @@ static int __init xlp_of_pic_init(struct device_node *node,pr_err ("PIC %s: reg property not found!\n" , node->name);return -EINVAL ; } - socid = (res.start >>18 ) &0x3 ; + +if (cpu_is_xlp9xx ()) { + bus = (res.start >>20 ) &0xf ; +for (socid =0 ; socid <NLM_NR_NODES ; socid++) { +if (!nlm_node_present (socid)) +continue ; +if (nlm_get_node (socid)->socbus == bus) +break ; + } +if (socid ==NLM_NR_NODES ) { +pr_err ("PIC %s: Node mapping for bus %d not found!n" , + node->name, bus); +return -EINVAL ; + } + }else { + socid = (res.start >>18 ) &0x3 ; +if (!nlm_node_present (socid)) { +pr_err ("PIC %s: node %d does not exist!\n" , + node->name, socid); +return -EINVAL ; + } + } + xlp_pic_domain =irq_domain_add_legacy (node, n_picirqs,nlm_irq_to_xirq (socid,PIC_IRQ_BASE ),PIC_IRQ_BASE , &xlp_pic_irq_domain_ops,NULL );
@@ -301,8 +322,7 @@ static int __init xlp_of_pic_init(struct device_node *node,pr_err ("PIC %s: Creating legacy domain failed!\n" , node->name);return -EINVAL ; } -pr_info ("Node %d: IRQ domain created for PIC@%pa\n" , socid, - &res.start); +pr_info ("Node %d: IRQ domain created for PIC@%pR\n" , socid, &res);return 0 ; }
Signature · 1 line
1.7.9.5
PATCH 18/18 MIPS: Netlogic: Add default DTB for XLP9XX SoC
In reply to Jayachandran CAdd a default device tree fie for XLP9XX boards, and add code to use this device tree if no DTB is passed to the kernel.
--- arch/mips/netlogic/Kconfig | 9 +++++ arch/mips/netlogic/dts/Makefile | 1 + arch/mips/netlogic/dts/xlp_gvp.dts | 76 ++++++++++++++++++++++++++++++++++++ arch/mips/netlogic/xlp/dt.c | 7 +++- 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts
arch/mips/netlogic/Kconfig +9 -0
@@ -28,6 +28,15 @@ config DT_XLP_FVP pointer to the kernel. The corresponding DTS file is at arch/mips/netlogic/dts/xlp_fvp.dts +config DT_XLP_GVP + bool "Built-in device tree for XLP GVP boards" + default y + help + Add an FDT blob for XLP GVP board into the kernel. + This DTB will be used if the firmware does not pass in a DTB + pointer to the kernel. The corresponding DTS file is at + arch/mips/netlogic/dts/xlp_gvp.dts + config NLM_MULTINODE bool "Support for multi-chip boards" depends on NLM_XLP_BOARD
arch/mips/netlogic/dts/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o obj-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb.o +obj-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb.o
arch/mips/netlogic/dts/xlp_gvp.dts new file +76 -0
76 lines not on this page · raw message
arch/mips/netlogic/xlp/dt.c +6 -1
@@ -40,12 +40,17 @@#include <linux/of_device.h> extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[], - __dtb_xlp_fvp_begin[], __dtb_start[]; + __dtb_xlp_fvp_begin[], __dtb_xlp_gvp_begin[], __dtb_start[];void __init *xlp_dt_init (void *fdtp) {if (!fdtp) {switch (current_cpu_data.processor_id &0xff00 ) { +#ifdef CONFIG_DT_XLP_GVP +case PRID_IMP_NETLOGIC_XLP9XX : + fdtp = __dtb_xlp_gvp_begin; +break ; +#endif #ifdef CONFIG_DT_XLP_FVP case PRID_IMP_NETLOGIC_XLP2XX : fdtp = __dtb_xlp_fvp_begin;
Signature · 1 line
1.7.9.5
PATCH 18/18 MIPS: Netlogic: Add default DTB for XLP9XX SoC
Add a default device tree fie for XLP9XX boards, and add code to use this device tree if no DTB is passed to the kernel.
---
Fixed a typo in the earlier .dts file
arch/mips/netlogic/Kconfig | 9 +++++ arch/mips/netlogic/dts/Makefile | 1 + arch/mips/netlogic/dts/xlp_gvp.dts | 76 ++++++++++++++++++++++++++++++++++++ arch/mips/netlogic/xlp/dt.c | 7 +++- 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts
arch/mips/netlogic/Kconfig +9 -0
@@ -28,6 +28,15 @@ config DT_XLP_FVP pointer to the kernel. The corresponding DTS file is at arch/mips/netlogic/dts/xlp_fvp.dts +config DT_XLP_GVP + bool "Built-in device tree for XLP GVP boards" + default y + help + Add an FDT blob for XLP GVP board into the kernel. + This DTB will be used if the firmware does not pass in a DTB + pointer to the kernel. The corresponding DTS file is at + arch/mips/netlogic/dts/xlp_gvp.dts + config NLM_MULTINODE bool "Support for multi-chip boards" depends on NLM_XLP_BOARD
arch/mips/netlogic/dts/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o obj-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb.o +obj-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb.o
arch/mips/netlogic/dts/xlp_gvp.dts new file +76 -0
76 lines not on this page · raw message
arch/mips/netlogic/xlp/dt.c +6 -1
@@ -40,12 +40,17 @@#include <linux/of_device.h> extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[], - __dtb_xlp_fvp_begin[], __dtb_start[]; + __dtb_xlp_fvp_begin[], __dtb_xlp_gvp_begin[], __dtb_start[];void __init *xlp_dt_init (void *fdtp) {if (!fdtp) {switch (current_cpu_data.processor_id &0xff00 ) { +#ifdef CONFIG_DT_XLP_GVP +case PRID_IMP_NETLOGIC_XLP9XX : + fdtp = __dtb_xlp_gvp_begin; +break ; +#endif #ifdef CONFIG_DT_XLP_FVP case PRID_IMP_NETLOGIC_XLP2XX : fdtp = __dtb_xlp_fvp_begin;
Signature · 1 line
1.7.9.5