arm: npcm: add basic support for Nuvoton BMCs
Subsystems (5)
v2 cover arm: npcm: add basic support for Nuvoton BMCs
Addressed comments from:
- Rob: http://www.spinics.net/lists/devicetree/msg192130.html
- kbuild test robot: http://www.spinics.net/lists/devicetree/msg191902.html
- kbuild test robot: http://www.spinics.net/lists/devicetree/msg191902.html
Changes since previous update:
- Added dependency for !CPU_V6 and !CPU_V6K since headsmp.S depends on v7 instructions
- Dropped errata that depend on !ARCH_MULTIPLATFORM
- Removed custom smp_init_cpus from smp_operations
- Numerous changes to device tree support
Changes have been tested on the NPCM750 evaluation board.
PATCH v2 1/3 arm: npcm: add basic support for Nuvoton BMCs
Adds basic support for the Nuvoton NPCM750 BMC.
--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 58 +++++++++++++++ arch/arm/mach-npcm/Makefile | 3 + arch/arm/mach-npcm/headsmp.S | 120 +++++++++++++++++++++++++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++ arch/arm/mach-npcm/platsmp.c | 168 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 386 insertions(+) create mode 100644 arch/arm/mach-npcm/Kconfig create mode 100644 arch/arm/mach-npcm/Makefile create mode 100644 arch/arm/mach-npcm/headsmp.S create mode 100644 arch/arm/mach-npcm/npcm7xx.c create mode 100644 arch/arm/mach-npcm/platsmp.c
arch/arm/Kconfig +2 -0
@@ -782,6 +782,8 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/mach-npcm/Kconfig" + source "arch/arm/mach-nspire/Kconfig" source "arch/arm/plat-omap/Kconfig"
arch/arm/Makefile +1 -0
@@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik +machine-$(CONFIG_ARCH_NPCM) += npcm machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OXNAS) += oxnas machine-$(CONFIG_ARCH_OMAP1) += omap1
arch/arm/mach-npcm/Kconfig new file +58 -0
58 lines not on this page · raw message
arch/arm/mach-npcm/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +obj-$(CONFIG_CPU_NPCM750_SMP) += platsmp.o headsmp.o + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o
arch/arm/mach-npcm/headsmp.S new file +120 -0
120 lines not on this page · raw message
arch/arm/mach-npcm/npcm7xx.c new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2014 Nuvoton Technology corporation. +* Copyright 2017 Google, Inc. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation;version 2 of the License. +*/ + +#include <linux/kernel.h> +#include <linux/types.h> +#include <asm/mach/arch.h> +#include <asm/mach-types.h> +#include <asm/mach/map.h> +#include <asm/hardware/cache-l2x0.h> + +#define NPCM7XX_AUX_VAL (L310_AUX_CTRL_INSTR_PREFETCH | \ + L310_AUX_CTRL_DATA_PREFETCH | \ + L310_AUX_CTRL_NS_LOCKDOWN | \ + L310_AUX_CTRL_CACHE_REPLACE_RR | \ + L2C_AUX_CTRL_SHARED_OVERRIDE | \ + L310_AUX_CTRL_FULL_LINE_ZERO) + +static const char *const npcm7xx_dt_match[] = { +"nuvoton,npcm750" , +NULL +}; + +DT_MACHINE_START (NPCM7XX_DT ,"NPCMX50 Chip family" ) + .atag_offset = 0x100, + .dt_compat = npcm7xx_dt_match, + .l2c_aux_val = NPCM7XX_AUX_VAL, + .l2c_aux_mask = ~NPCM7XX_AUX_VAL , +MACHINE_END
arch/arm/mach-npcm/platsmp.c new file +168 -0
168 lines not on this page · raw message
Signature · 1 line
2.14.1.581.gf28d330327-goog
Tomer Maimon
maintainer Reviewed-by Tested-by Reviewed-by Avi Fishman Tested-by Avi Fishman on v2 1/3Quoted 457 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
Signed-off-by Brendan Higgins <[email protected]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 58 +++++++++++++++ arch/arm/mach-npcm/Makefile | 3 + arch/arm/mach-npcm/headsmp.S | 120 +++++++++++++++++++++++++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++ arch/arm/mach-npcm/platsmp.c | 168 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 386 insertions(+) create mode 100644 arch/arm/mach-npcm/Kconfig create mode 100644 arch/arm/mach-npcm/Makefile create mode 100644 arch/arm/mach-npcm/headsmp.S create mode 100644 arch/arm/mach-npcm/npcm7xx.c create mode 100644 arch/arm/mach-npcm/platsmp.carch/arm/Kconfig +2
-0@@ -782,6 +782,8 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/mach-npcm/Kconfig" + source "arch/arm/mach-nspire/Kconfig" source "arch/arm/plat-omap/Kconfig"arch/arm/Makefile +1
-0@@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik +machine-$(CONFIG_ARCH_NPCM) += npcm machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OXNAS) += oxnas machine-$(CONFIG_ARCH_OMAP1) += omap1arch/arm/mach-npcm/Kconfig new file +58
-0@@ -0,0 +1,58 @@ +menuconfig ARCH_NPCM + bool "Nuvoton NPCM Architecture" + select ARCH_REQUIRE_GPIOLIB + select USE_OF + select PINCTRL + select PINCTRL_NPCM7XX + +if ARCH_NPCM + +comment "NPCMX50 CPU type" + +config CPU_NPCM750 + depends on ARCH_NPCM && ARCH_MULTI_V7 && !CPU_V6 && !CPU_V6K + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select USB_EHCI_ROOT_HUB_TT + select USB_ARCH_HAS_HCD + select USB_ARCH_HAS_EHCI + select USB_EHCI_HCD + select USB_ARCH_HAS_OHCI + select USB_OHCI_HCD + select USB + select FIQ + select CPU_USE_DOMAINS + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for single core NPCM750 BMC CPU (Poleg). + + Single core variant of the Nuvoton NPCM750 BMC based on the Cortex A9. + +config CPU_NPCM750_SMP + depends on CPU_NPCM750 + bool "Support for NPCM750 BMC CPU SMP (Poleg)" + select HAVE_SMP + select HAVE_ARM_SCU + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + select ARM_ERRATA_720789 + select DEBUG_SPINLOCK + select GENERIC_CLOCKEVENTS + select SMP + select HAVE_ARM_TWD if SMP + select HAVE_ARM_SCU if SMP + select CLKDEV_LOOKUP + select COMMON_CLK if OF + help + Support for dual core NPCM750 BMC CPU (Poleg). + + Dual core variant of the Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +obj-$(CONFIG_CPU_NPCM750_SMP) += platsmp.o headsmp.o + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.oarch/arm/mach-npcm/headsmp.S new file +120
-0@@ -0,0 +1,120 @@ +/* + * linux/arch/arm/mach-realview/headsmp.S + * + * Copyright (c) 2003 ARM Limited + * Copyright 2017 Google, Inc. + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <linux/init.h> + +.equ SVC_MODE, 0x13 +.equ I_BIT, 0x80 +.equ F_BIT, 0x40 + +ENTRY(npcm7xx_wakeup_z1) + stmfd sp!, {r0-r12, lr} + ldr r0, =0x01 + ldr r1, =0x01 + ldr r2, =0x01 + + and r3, r0, #0x0F /* Mask off unused bits of ID, and move to r3 */ + and r1, r1, #0x0F /* Mask off unused bits of target_filter */ + and r2, r2, #0x0F /* Mask off unused bits of filter_list */ + + orr r3, r3, r1, LSL #16 /* Combine ID and target_filter */ + orr r3, r3, r2, LSL #24 /* and now the filter list */ + + /* Get the address of the GIC */ + mrc p15, 4, r0, c15, c0, 0 /* Read periph base address */ + add r0, r0, #0x1F00 /* Add offset of the sgi_trigger reg */ + + /* Write to the Software Generated Interrupt Register (ICDSGIR) */ + str r3, [r0] + + ldmfd sp!, {r0-r12, pc} +ENDPROC(npcm7xx_wakeup_z1) + +ENTRY(v7_invalidate_l1_npcmX50) + mov r0, #0 + mcr p15, 0, r0, c7, c5, 0 /* invalidate I cache */ + mcr p15, 2, r0, c0, c0, 0 + mrc p15, 1, r0, c0, c0, 0 + + ldr r1, =0x7fff + and r2, r1, r0, lsr #13 + + ldr r1, =0x3ff + + and r3, r1, r0, lsr #3 /* NumWays - 1 */ + add r2, r2, #1 /* NumSets */ + + and r0, r0, #0x7 + add r0, r0, #4 /* SetShift */ + + clz r1, r3 /* WayShift */ + add r4, r3, #1 /* NumWays */ +1: sub r2, r2, #1 /* NumSets-- */ + mov r3, r4 /* Temp = NumWays */ +2: subs r3, r3, #1 /* Temp-- */ + mov r5, r3, lsl r1 + mov r6, r2, lsl r0 + /* Reg = (Temp << WayShift) | (NumSets << SetShift) */ + orr r5, r5, r6 + mcr p15, 0, r5, c7, c6, 2 + bgt 2b + cmp r2, #0 + bgt 1b + dsb + isb + mov pc, lr +ENDPROC(v7_invalidate_l1_npcmX50) + +/* + * MSM specific entry point for secondary CPUs. This provides + * a "holding pen" into which all secondary cores are held until we're + * ready for them to initialise. + */ +ENTRY(npcm7xx_secondary_startup) + msr CPSR_c, #(SVC_MODE) + + bl v7_invalidate_l1_npcmX50 + /* disable vector table remapping */ + mrc p15, 0,r0, c1, c0, 0 + and r0, #0xffffdfff + mcr p15, 0,r0, c1, c0, 0 + +#ifdef CONFIG_CACHE_L2X0 + /* Enable L1 & L2 prefetch + Zero line */ + mrc p15, 0, r0, c1, c0, 1 + orr r0, r0, #(7 << 1) + mcr p15, 0, r0, c1, c0, 1 +#endif /* CONFIG_CACHE_L2X0 */ + + mrc p15, 0, r0, c0, c0, 5 + and r0, r0, #15 + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 + str r3,[r2] + +pen: ldr r7, [r6] + cmp r7, r0 + bne pen + + /* + * we've been released from the holding pen: secondary_stack + * should now contain the SVC stack for this core + */ + b secondary_startup +ENDPROC(npcm7xx_secondary_startup) + + .align +1: .long . + .long pen_releasearch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2014 Nuvoton Technology corporation. +* Copyright 2017 Google, Inc. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation;version 2 of the License. +*/ + +#include <linux/kernel.h> +#include <linux/types.h> +#include <asm/mach/arch.h> +#include <asm/mach-types.h> +#include <asm/mach/map.h> +#include <asm/hardware/cache-l2x0.h> + +#define NPCM7XX_AUX_VAL (L310_AUX_CTRL_INSTR_PREFETCH | \ + L310_AUX_CTRL_DATA_PREFETCH | \ + L310_AUX_CTRL_NS_LOCKDOWN | \ + L310_AUX_CTRL_CACHE_REPLACE_RR | \ + L2C_AUX_CTRL_SHARED_OVERRIDE | \ + L310_AUX_CTRL_FULL_LINE_ZERO) + +static const char *const npcm7xx_dt_match[] = { +"nuvoton,npcm750" , +NULL +}; + +DT_MACHINE_START (NPCM7XX_DT ,"NPCMX50 Chip family" ) + .atag_offset = 0x100, + .dt_compat = npcm7xx_dt_match, + .l2c_aux_val = NPCM7XX_AUX_VAL, + .l2c_aux_mask = ~NPCM7XX_AUX_VAL , +MACHINE_END arch/arm/mach-npcm/platsmp.c new file +168
-1@@ -0,0 +1,168 @@ +/* +* Copyright (C) 2002 ARM Ltd. +* Copyright (C) 2008 STMicroelctronics. +* Copyright (C) 2009 ST-Ericsson. +* Copyright 2017 Google, Inc. +* +* This file is based on arm realview platform +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#define pr_fmt (fmt) "PLATSMP: " fmt + +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/smp.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/of_address.h> +#include <asm/cacheflush.h> +#include <asm/smp.h> +#include <asm/smp_plat.h> +#include <asm/smp_scu.h> + +#define NPCM7XX_SCRPAD_REG 0x13c + +static void __iomem *gcr_base; +static void __iomem *scu_base; + +/* This is called from headsmp.S to wakeup the secondary core */ +extern void npcm7xx_secondary_startup (void ); +extern void npcm7xx_wakeup_z1 (void ); + +/* +* Write pen_release in a way that is guaranteed to be visible to all +* observers, irrespective of whether they're taking part in coherency +* or not. This is necessary for the hotplug code to work reliably. +*/ +static void npcm7xx_write_pen_release (int val) +{ + pen_release = val; +/* write to pen_release must be visible to all observers. */ +smp_wmb (); +__cpuc_flush_dcache_area ((void *) &pen_release,sizeof (pen_release)); +outer_clean_range (__pa (&pen_release),__pa (&pen_release +1 )); +} + +static DEFINE_SPINLOCK (boot_lock); + +static void npcm7xx_smp_secondary_init (unsigned int cpu) +{ +/* +* let the primary processor know we're out of the +* pen, then head off into the C entry point +*/ +npcm7xx_write_pen_release (-1 ); + +/* +* Synchronise with the boot thread. +*/ +spin_lock (&boot_lock); +spin_unlock (&boot_lock); +} + +static int npcm7xx_smp_boot_secondary (unsigned int cpu,struct task_struct *idle) +{ +unsigned long timeout; + +if (!gcr_base) +return -EIO ; + +/* +* set synchronisation state between this boot processor +* and the secondary one +*/ +spin_lock (&boot_lock); + +/* +* The secondary processor is waiting to be released from +* the holding pen - release it, then wait for it to flag +* that it has been released by resetting pen_release. +*/ +npcm7xx_write_pen_release (cpu_logical_map (cpu)); +iowrite32 (virt_to_phys (npcm7xx_secondary_startup), + gcr_base +NPCM7XX_SCRPAD_REG ); +/* make npcm7xx_secondary_startup visible to all observers. */ +smp_rmb (); + +arch_send_wakeup_ipi_mask (cpumask_of (cpu)); + timeout = jiffies + (HZ *1 ); +while (time_before (jiffies, timeout)) { +/* make sure we see any writes to pen_release. */ +smp_rmb (); +if (pen_release ==-1 ) +break ; + +udelay (10 ); + } + +/* +* now the secondary core is starting up let it run its +* calibrations, then wait for it to finish +*/ +spin_unlock (&boot_lock); + +return pen_release !=-1 ? -EIO :0 ; +} + + +static void __init npcm7xx_wakeup_secondary (void ) +{ +/* +* write the address of secondary startup into the backup ram register +* at offset 0x1FF4, then write the magic number 0xA1FEED01 to the +* backup ram register at offset 0x1FF0, which is what boot rom code +* is waiting for. This would wake up the secondary core from WFE +*/ +iowrite32 (virt_to_phys (npcm7xx_secondary_startup), gcr_base + +NPCM7XX_SCRPAD_REG ); +/* make sure npcm7xx_secondary_startup is seen by all observers. */ +smp_wmb (); +dsb_sev (); + +/* make sure write buffer is drained */ +mb (); +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *gcr_np, *scu_np; + + gcr_np =of_find_compatible_node (NULL ,NULL ,"nuvoton,npcm750-gcr" ); +if (!gcr_np) { +pr_err ("no gcr device node\n" ); +return ; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); +return ; + } + + scu_np =of_find_compatible_node (NULL ,NULL ,"arm,cortex-a9-scu" ); +if (!scu_np) { +pr_err ("no scu device node\n" ); +return ; + } + scu_base =of_iomap (scu_np,0 ); +if (!scu_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); +npcm7xx_wakeup_secondary (); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, + .smp_secondary_init = npcm7xx_smp_secondary_init, +}; + +CPU_METHOD_OF_DECLARE (npcm7xx_smp,"nuvoton,npcm7xx-smp" , &npcm7xx_smp_ops); --
Quoted 2 lines
2.14.1.581.gf28d330327-goog
Le 08/31/17 ? 15:53, Brendan Higgins a ?crit :
Quoted 52 lines
Adds basic support for the Nuvoton NPCM750 BMC.
Signed-off-by Brendan Higgins <[email protected]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 58 +++++++++++++++ arch/arm/mach-npcm/Makefile | 3 + arch/arm/mach-npcm/headsmp.S | 120 +++++++++++++++++++++++++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++ arch/arm/mach-npcm/platsmp.c | 168 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 386 insertions(+) create mode 100644 arch/arm/mach-npcm/Kconfig create mode 100644 arch/arm/mach-npcm/Makefile create mode 100644 arch/arm/mach-npcm/headsmp.S create mode 100644 arch/arm/mach-npcm/npcm7xx.c create mode 100644 arch/arm/mach-npcm/platsmp.carch/arm/Kconfig +2
-0@@ -782,6 +782,8 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/mach-npcm/Kconfig" + source "arch/arm/mach-nspire/Kconfig" source "arch/arm/plat-omap/Kconfig"arch/arm/Makefile +1
-0@@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik +machine-$(CONFIG_ARCH_NPCM) += npcm machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OXNAS) += oxnas machine-$(CONFIG_ARCH_OMAP1) += omap1arch/arm/mach-npcm/Kconfig new file +3
-0@@ -0,0 +1,58 @@ +menuconfig ARCH_NPCM + bool "Nuvoton NPCM Architecture" + select ARCH_REQUIRE_GPIOLIB
arch/arm/mach-npcm/Kconfig line 13
Quoted 10 lines
arch/arm/mach-npcm/Kconfig new file +10
-0+ select USE_OF + select PINCTRL + select PINCTRL_NPCM7XX + +if ARCH_NPCM + +comment "NPCMX50 CPU type" + +config CPU_NPCM750 + depends on ARCH_NPCM && ARCH_MULTI_V7 && !CPU_V6 && !CPU_V6K
Why the !CPU_V6 and !CPU_V6K, you indicate in your cover letter that this is because headsmp.S requires ARMv7 instructions, so just tell the assembler that with:
AFLAGS_headsmp.o += -march=armv7-a
Quoted 33 lines
arch/arm/mach-npcm/Kconfig new file +33
-0+ bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select USB_EHCI_ROOT_HUB_TT + select USB_ARCH_HAS_HCD + select USB_ARCH_HAS_EHCI + select USB_EHCI_HCD + select USB_ARCH_HAS_OHCI + select USB_OHCI_HCD + select USB + select FIQ + select CPU_USE_DOMAINS + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for single core NPCM750 BMC CPU (Poleg). + + Single core variant of the Nuvoton NPCM750 BMC based on the Cortex A9. + +config CPU_NPCM750_SMP + depends on CPU_NPCM750 + bool "Support for NPCM750 BMC CPU SMP (Poleg)" + select HAVE_SMP + select HAVE_ARM_SCU + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + select ARM_ERRATA_720789 + select DEBUG_SPINLOCK
arch/arm/mach-npcm/Kconfig line 56
Quoted 10 lines
arch/arm/mach-npcm/Kconfig new file +10
-0+ select GENERIC_CLOCKEVENTS + select SMP + select HAVE_ARM_TWD if SMP + select HAVE_ARM_SCU if SMP + select CLKDEV_LOOKUP + select COMMON_CLK if OF + help + Support for dual core NPCM750 BMC CPU (Poleg). + + Dual core variant of the Nuvoton NPCM750 BMC based on the Cortex A9.
This is something that you could determine entirely from Device Tree and just have this code unconditionally be built into the kernel and have your SMP operations do nothing if only one CPU is enabled/declared in DT. The runtime overhead of running SMP_ON_UP is largely negligible that it is worth having fewer configuration options to support.
arch/arm/mach-npcm/headsmp.S line 2
Quoted 8 lines
arch/arm/mach-npcm/headsmp.S new file +2
-0@@ -0,0 +1,120 @@ +/* + * linux/arch/arm/mach-realview/headsmp.S
The filename no longer matches but this also indicates that this was largely based on the realview board's SMP bring-up code which Russell King repeatedly tells people to move away from since it is made for a board with a ton of limitations.
Quoted 6 lines
arch/arm/mach-npcm/headsmp.S new file +6
-0+ * + * Copyright (c) 2003 ARM Limited + * Copyright 2017 Google, Inc. + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify
arch/arm/mach-npcm/headsmp.S line 18
Quoted 10 lines
arch/arm/mach-npcm/headsmp.S new file +10
-0+ * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <linux/init.h> + +.equ SVC_MODE, 0x13 +.equ I_BIT, 0x80 +.equ F_BIT, 0x40
You can use the C preprocessor to make this more readable and/or re-use existing defines from other header files.
Quoted 10 lines
arch/arm/mach-npcm/headsmp.S new file +10
-0+ +ENTRY(npcm7xx_wakeup_z1) + stmfd sp!, {r0-r12, lr} + ldr r0, =0x01 + ldr r1, =0x01 + ldr r2, =0x01 + + and r3, r0, #0x0F /* Mask off unused bits of ID, and move to r3 */ + and r1, r1, #0x0F /* Mask off unused bits of target_filter */ + and r2, r2, #0x0F /* Mask off unused bits of filter_list */
arch/arm/mach-npcm/headsmp.S line 38
Quoted 10 lines
arch/arm/mach-npcm/headsmp.S new file +10
-0+ + orr r3, r3, r1, LSL #16 /* Combine ID and target_filter */ + orr r3, r3, r2, LSL #24 /* and now the filter list */ + + /* Get the address of the GIC */ + mrc p15, 4, r0, c15, c0, 0 /* Read periph base address */ + add r0, r0, #0x1F00 /* Add offset of the sgi_trigger reg */ + + /* Write to the Software Generated Interrupt Register (ICDSGIR) */ + str r3, [r0]
Don't you need some kind of barrier here?
Quoted 28 lines
arch/arm/mach-npcm/headsmp.S new file +28
-0+ + ldmfd sp!, {r0-r12, pc} +ENDPROC(npcm7xx_wakeup_z1) + +ENTRY(v7_invalidate_l1_npcmX50) + mov r0, #0 + mcr p15, 0, r0, c7, c5, 0 /* invalidate I cache */ + mcr p15, 2, r0, c0, c0, 0 + mrc p15, 1, r0, c0, c0, 0 + + ldr r1, =0x7fff + and r2, r1, r0, lsr #13 + + ldr r1, =0x3ff + + and r3, r1, r0, lsr #3 /* NumWays - 1 */ + add r2, r2, #1 /* NumSets */ + + and r0, r0, #0x7 + add r0, r0, #4 /* SetShift */ + + clz r1, r3 /* WayShift */ + add r4, r3, #1 /* NumWays */ +1: sub r2, r2, #1 /* NumSets-- */ + mov r3, r4 /* Temp = NumWays */ +2: subs r3, r3, #1 /* Temp-- */ + mov r5, r3, lsl r1 + mov r6, r2, lsl r0
arch/arm/mach-npcm/headsmp.S line 76
Quoted 10 lines
arch/arm/mach-npcm/headsmp.S new file +10
-0+ /* Reg = (Temp << WayShift) | (NumSets << SetShift) */ + orr r5, r5, r6 + mcr p15, 0, r5, c7, c6, 2 + bgt 2b + cmp r2, #0 + bgt 1b + dsb + isb + mov pc, lr +ENDPROC(v7_invalidate_l1_npcmX50)
This looks a lot, if not nearly the same thing as v7_invalidate_l1 which is already called by secondary_startup, can you see if you can re-use it directly?
arch/arm/mach-npcm/headsmp.S line 82
Quoted 6 lines
arch/arm/mach-npcm/headsmp.S new file +6
-0+ +/* + * MSM specific entry point for secondary CPUs. This provides + * a "holding pen" into which all secondary cores are held until we're + * ready for them to initialise. + */
Assuming this was copied from a Qualcomm MSM routine, you may want to fix the comment, typo on "initialis.
arch/arm/mach-npcm/headsmp.S line 84
Quoted 2 lines
arch/arm/mach-npcm/headsmp.S new file +2
-0+ENTRY(npcm7xx_secondary_startup) + msr CPSR_c, #(SVC_MODE)
Is there a BootROM or something that would not make the secondary cores start in supervisor mode?
Quoted 108 lines
arch/arm/mach-npcm/headsmp.S new file +36
-0+ + bl v7_invalidate_l1_npcmX50 + /* disable vector table remapping */ + mrc p15, 0,r0, c1, c0, 0 + and r0, #0xffffdfff + mcr p15, 0,r0, c1, c0, 0 + +#ifdef CONFIG_CACHE_L2X0 + /* Enable L1 & L2 prefetch + Zero line */ + mrc p15, 0, r0, c1, c0, 1 + orr r0, r0, #(7 << 1) + mcr p15, 0, r0, c1, c0, 1 +#endif /* CONFIG_CACHE_L2X0 */ + + mrc p15, 0, r0, c0, c0, 5 + and r0, r0, #15 + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 + str r3,[r2] + +pen: ldr r7, [r6] + cmp r7, r0 + bne pen + + /* + * we've been released from the holding pen: secondary_stack + * should now contain the SVC stack for this core + */ + b secondary_startup +ENDPROC(npcm7xx_secondary_startup) + + .align +1: .long . + .long pen_releasearch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2014 Nuvoton Technology corporation. +* Copyright 2017 Google, Inc. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation;version 2 of the License. +*/ + +#include <linux/kernel.h> +#include <linux/types.h> +#include <asm/mach/arch.h> +#include <asm/mach-types.h> +#include <asm/mach/map.h> +#include <asm/hardware/cache-l2x0.h> + +#define NPCM7XX_AUX_VAL (L310_AUX_CTRL_INSTR_PREFETCH | \ + L310_AUX_CTRL_DATA_PREFETCH | \ + L310_AUX_CTRL_NS_LOCKDOWN | \ + L310_AUX_CTRL_CACHE_REPLACE_RR | \ + L2C_AUX_CTRL_SHARED_OVERRIDE | \ + L310_AUX_CTRL_FULL_LINE_ZERO) + +static const char *const npcm7xx_dt_match[] = { +"nuvoton,npcm750" , +NULL +}; + +DT_MACHINE_START (NPCM7XX_DT ,"NPCMX50 Chip family" ) + .atag_offset = 0x100, + .dt_compat = npcm7xx_dt_match, + .l2c_aux_val = NPCM7XX_AUX_VAL, + .l2c_aux_mask = ~NPCM7XX_AUX_VAL , +MACHINE_END arch/arm/mach-npcm/platsmp.c new file +26
-0@@ -0,0 +1,168 @@ +/* +* Copyright (C) 2002 ARM Ltd. +* Copyright (C) 2008 STMicroelctronics. +* Copyright (C) 2009 ST-Ericsson. +* Copyright 2017 Google, Inc. +* +* This file is based on arm realview platform +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#define pr_fmt (fmt) "PLATSMP: " fmt + +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/smp.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/of_address.h> +#include <asm/cacheflush.h> +#include <asm/smp.h> +#include <asm/smp_plat.h>
arch/arm/mach-npcm/platsmp.c line 36
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+#include <asm/smp_scu.h> + +#define NPCM7XX_SCRPAD_REG 0x13c + +static void __iomem *gcr_base; +static void __iomem *scu_base; + +/* This is called from headsmp.S to wakeup the secondary core */ +extern void npcm7xx_secondary_startup (void ); +extern void npcm7xx_wakeup_z1 (void );
This routine is not called, was it for an early revision of the silicon, or is it for CPU hotplugging maybe?
Quoted 43 lines
arch/arm/mach-npcm/platsmp.c new file +43
-0+ +/* +* Write pen_release in a way that is guaranteed to be visible to all +* observers, irrespective of whether they're taking part in coherency +* or not. This is necessary for the hotplug code to work reliably. +*/ +static void npcm7xx_write_pen_release (int val) +{ + pen_release = val; +/* write to pen_release must be visible to all observers. */ +smp_wmb (); +__cpuc_flush_dcache_area ((void *) &pen_release,sizeof (pen_release)); +outer_clean_range (__pa (&pen_release),__pa (&pen_release +1 )); +} + +static DEFINE_SPINLOCK (boot_lock); + +static void npcm7xx_smp_secondary_init (unsigned int cpu) +{ +/* +* let the primary processor know we're out of the +* pen, then head off into the C entry point +*/ +npcm7xx_write_pen_release (-1 ); + +/* +* Synchronise with the boot thread. +*/ +spin_lock (&boot_lock); +spin_unlock (&boot_lock); +} + +static int npcm7xx_smp_boot_secondary (unsigned int cpu,struct task_struct *idle) +{ +unsigned long timeout; + +if (!gcr_base) +return -EIO ; + +/* +* set synchronisation state between this boot processor +* and the secondary one +*/
arch/arm/mach-npcm/platsmp.c line 89
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+spin_lock (&boot_lock); + +/* +* The secondary processor is waiting to be released from +* the holding pen - release it, then wait for it to flag +* that it has been released by resetting pen_release. +*/ +npcm7xx_write_pen_release (cpu_logical_map (cpu)); +iowrite32 (virt_to_phys (npcm7xx_secondary_startup), + gcr_base +NPCM7XX_SCRPAD_REG );
Please use __pa_symbol here instead of virt_to_phys() since you are calling this against a kernel image symbol.
Quoted 22 lines
arch/arm/mach-npcm/platsmp.c new file +22
-0+/* make npcm7xx_secondary_startup visible to all observers. */ +smp_rmb (); + +arch_send_wakeup_ipi_mask (cpumask_of (cpu)); + timeout = jiffies + (HZ *1 ); +while (time_before (jiffies, timeout)) { +/* make sure we see any writes to pen_release. */ +smp_rmb (); +if (pen_release ==-1 ) +break ; + +udelay (10 ); + } + +/* +* now the secondary core is starting up let it run its +* calibrations, then wait for it to finish +*/ +spin_unlock (&boot_lock); + +return pen_release !=-1 ? -EIO :0 ; +}
arch/arm/mach-npcm/platsmp.c line 121
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ + +static void __init npcm7xx_wakeup_secondary (void ) +{ +/* +* write the address of secondary startup into the backup ram register +* at offset 0x1FF4, then write the magic number 0xA1FEED01f to the +* backup ram register at offset 0x1FF0, which is what boot rom code +* is waiting for. This would wake up the secondary core from WFE +*/
The comment does not seem to match what you are doing.
arch/arm/mach-npcm/platsmp.c line 123
Quoted 2 lines
arch/arm/mach-npcm/platsmp.c new file +2
-0+iowrite32 (virt_to_phys (npcm7xx_secondary_startup), gcr_base + +NPCM7XX_SCRPAD_REG );
Same here please use __pa_symbol().
Quoted 33 lines
arch/arm/mach-npcm/platsmp.c new file +33
-0+/* make sure npcm7xx_secondary_startup is seen by all observers. */ +smp_wmb (); +dsb_sev (); + +/* make sure write buffer is drained */ +mb (); +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *gcr_np, *scu_np; + + gcr_np =of_find_compatible_node (NULL ,NULL ,"nuvoton,npcm750-gcr" ); +if (!gcr_np) { +pr_err ("no gcr device node\n" ); +return ; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); +return ; + } + + scu_np =of_find_compatible_node (NULL ,NULL ,"arm,cortex-a9-scu" ); +if (!scu_np) { +pr_err ("no scu device node\n" ); +return ; + } + scu_base =of_iomap (scu_np,0 ); +if (!scu_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , scu_base); +return ; + }
arch/arm/mach-npcm/platsmp.c line 166
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ +scu_enable (scu_base); +npcm7xx_wakeup_secondary (); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, + .smp_secondary_init = npcm7xx_smp_secondary_init, +};
Overall you have copied the realview pen hold/release mechanism and this is really frowned upon especially if you have a better way to control the bring-up of secondary cores, e.g: via writing a special word to a specific register, or setting a special address bit (e.g: bit 31 of the physical address | secondary_startup) or anything that acts as a "GO" signal of some sort.
Signature · 1 line
Florian
With the exception of one comment, which I have responded to below, I have addressed your comments in my new version of this patch: https://patchwork.kernel.org/patch/9914153/
On Mon, Sep 4, 2017 at 7:47 PM, Florian Fainelli <[email protected]> wrote:
...
Quoted 50 lines
Quoted 25 lines
arch/arm/mach-npcm/headsmp.S new file +25
-0+ +ENTRY(v7_invalidate_l1_npcmX50) + mov r0, #0 + mcr p15, 0, r0, c7, c5, 0 /* invalidate I cache */ + mcr p15, 2, r0, c0, c0, 0 + mrc p15, 1, r0, c0, c0, 0 + + ldr r1, =0x7fff + and r2, r1, r0, lsr #13 + + ldr r1, =0x3ff + + and r3, r1, r0, lsr #3 /* NumWays - 1 */ + add r2, r2, #1 /* NumSets */ + + and r0, r0, #0x7 + add r0, r0, #4 /* SetShift */ + + clz r1, r3 /* WayShift */ + add r4, r3, #1 /* NumWays */ +1: sub r2, r2, #1 /* NumSets-- */ + mov r3, r4 /* Temp = NumWays */ +2: subs r3, r3, #1 /* Temp-- */ + mov r5, r3, lsl r1 + mov r6, r2, lsl r0arch/arm/mach-npcm/headsmp.S line 76
Quoted 10 lines
arch/arm/mach-npcm/headsmp.S new file +10
-0+ /* Reg = (Temp << WayShift) | (NumSets << SetShift) */ + orr r5, r5, r6 + mcr p15, 0, r5, c7, c6, 2 + bgt 2b + cmp r2, #0 + bgt 1b + dsb + isb + mov pc, lr +ENDPROC(v7_invalidate_l1_npcmX50)This looks a lot, if not nearly the same thing as
v7_invalidate_l1which is already called bysecondary_startup, can you see if you can re-use it directly?arch/arm/mach-npcm/headsmp.S line 82
Quoted 6 lines
arch/arm/mach-npcm/headsmp.S new file +6
-0+ +/* + * MSM specific entry point for secondary CPUs. This provides + * a "holding pen" into which all secondary cores are held until we're + * ready for them to initialise. + */Assuming this was copied from a Qualcomm MSM routine, you may want to fix the comment, typo on "initialis.
Quoted 5 lines
arch/arm/mach-npcm/headsmp.S line 84
Quoted 2 lines
arch/arm/mach-npcm/headsmp.S new file +2
-0+ENTRY(npcm7xx_secondary_startup) + msr CPSR_c, #(SVC_MODE)Is there a BootROM or something that would not make the secondary cores start in supervisor mode?
Unfortunately, yes; however, I was able to cut all of the other code out of npcm7xx_secondary_startup, so now it just puts the core in SVC mode and relies on secondary_startup to do all of the L1 cache invalidation.
Quoted 27 lines
Quoted 27 lines
arch/arm/mach-npcm/headsmp.S new file +26
-0+ + bl v7_invalidate_l1_npcmX50 + /* disable vector table remapping */ + mrc p15, 0,r0, c1, c0, 0 + and r0, #0xffffdfff + mcr p15, 0,r0, c1, c0, 0 + +#ifdef CONFIG_CACHE_L2X0 + /* Enable L1 & L2 prefetch + Zero line */ + mrc p15, 0, r0, c1, c0, 1 + orr r0, r0, #(7 << 1) + mcr p15, 0, r0, c1, c0, 1 +#endif /* CONFIG_CACHE_L2X0 */ + + mrc p15, 0, r0, c0, c0, 5 + and r0, r0, #15 + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 + str r3,[r2] + +pen: ldr r7, [r6] + cmp r7, r0 + bne pen +
...
PATCH v2 2/3 arm: dts: add Nuvoton NPCM750 device tree
In reply to Brendan HigginsAdd a common device tree for all Nuvoton NPCM750 BMCs and a board specific device tree for the NPCM750 (Poleg) evaluation board.
--- .../arm/cpu-enable-method/nuvoton,npcm7xx-smp | 42 +++++ .../devicetree/bindings/arm/npcm/npcm.txt | 6 + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 59 +++++++ arch/arm/boot/dts/nuvoton-npcm750.dtsi | 177 +++++++++++++++++++++ include/dt-bindings/clock/nuvoton,npcm7xx-clks.h | 39 +++++ 5 files changed, 323 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm7xx-smp create mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.txt create mode 100644 arch/arm/boot/dts/nuvoton-npcm750-evb.dts create mode 100644 arch/arm/boot/dts/nuvoton-npcm750.dtsi create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm7xx-smp new file +42 -0
@@ -0,0 +1,42 @@ +========================================================= +Secondary CPU enable-method "nuvoton,npcm7xx-smp" binding +========================================================= + +To apply to all CPUs, a single "nuvoton,npcm7xx-smp" enable method should be +defined in the "cpus" node. + +Enable method name: "nuvoton,npcm7xx-smp" +Compatible machines: "nuvoton,npcm750" +Compatible CPUs: "arm,cortex-a9" +Related properties: (none) + +Note: +This enable method needs valid nodes compatible with "arm,cortex-a9-scu" and +"nuvoton,npcm750-gcr". + +Example: + + cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "nuvoton,npcm7xx-smp"; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + clocks = <&clk NPCM7XX_CLK_CPU>; + clock-names = "clk_cpu"; + reg = <0>; + next-level-cache = <&L2>; + }; + + cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + clocks = <&clk NPCM7XX_CLK_CPU>; + clock-names = "clk_cpu"; + reg = <1>; + next-level-cache = <&L2>; + }; + }; +
Documentation/devicetree/bindings/arm/npcm/npcm.txt new file +6 -0
@@ -0,0 +1,6 @@ +NPCM Platforms Device Tree Bindings +----------------------------------- +NPCM750 SoC +Required root node properties: + - compatible = "nuvoton,npcm750"; +
arch/arm/boot/dts/nuvoton-npcm750-evb.dts new file +59 -0
59 lines not on this page · raw message
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +177 -0
177 lines not on this page · raw message
include/dt-bindings/clock/nuvoton,npcm7xx-clks.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2016 Nuvoton Technologies, tali.perry at nuvoton.com +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +*/ + +#ifndef _DT_BINDINGS_CLK_NPCM7XX_H +#define _DT_BINDINGS_CLK_NPCM7XX_H + +#define NPCM7XX_CLK_PLL0 0 +#define NPCM7XX_CLK_PLL1 1 +#define NPCM7XX_CLK_PLL2 2 +#define NPCM7XX_CLK_GFX 3 +#define NPCM7XX_CLK_APB1 4 +#define NPCM7XX_CLK_APB2 5 +#define NPCM7XX_CLK_APB3 6 +#define NPCM7XX_CLK_APB4 7 +#define NPCM7XX_CLK_APB5 8 +#define NPCM7XX_CLK_MC 9 +#define NPCM7XX_CLK_CPU 10 +#define NPCM7XX_CLK_SPI0 11 +#define NPCM7XX_CLK_SPI3 12 +#define NPCM7XX_CLK_SPIX 13 +#define NPCM7XX_CLK_UART_CORE 14 +#define NPCM7XX_CLK_TIMER 15 +#define NPCM7XX_CLK_HOST_UART 16 +#define NPCM7XX_CLK_MMC 17 +#define NPCM7XX_CLK_SDHC 18 +#define NPCM7XX_CLK_ADC 19 +#define NPCM7XX_CLK_GFX_MEM 20 +#define NPCM7XX_CLK_USB_BRIDGE 21 +#define NPCM7XX_CLK_AXI 22 +#define NPCM7XX_CLK_AHB 23 +#define NPCM7XX_CLK_EMC 24 +#define NPCM7XX_CLK_GMAC 25 + +#endif
Signature · 1 line
2.14.1.581.gf28d330327-goog
Tomer Maimon
maintainer Reviewed-by Tested-by Reviewed-by Avi Fishman Tested-by Avi Fishman on v2 2/3Re: [PATCH v2 2/3] arm: dts: add Nuvoton NPCM750 device tree
Quoted 371 lines · Brendan Higgins
Add a common device tree for all Nuvoton NPCM750 BMCs and a board specific device tree for the NPCM750 (Poleg) evaluation board.
Signed-off-by Brendan Higgins <[email protected]>--- .../arm/cpu-enable-method/nuvoton,npcm7xx-smp | 42 +++++ .../devicetree/bindings/arm/npcm/npcm.txt | 6 + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 59 +++++++ arch/arm/boot/dts/nuvoton-npcm750.dtsi | 177 +++++++++++++++++++++ include/dt-bindings/clock/nuvoton,npcm7xx-clks.h | 39 +++++ 5 files changed, 323 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm7xx-smp create mode 100644 Documentation/devicetree/bindings/arm/npcm/npcm.txt create mode 100644 arch/arm/boot/dts/nuvoton-npcm750-evb.dts create mode 100644 arch/arm/boot/dts/nuvoton-npcm750.dtsi create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clks.hDocumentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm7xx-smp new file +42
-0@@ -0,0 +1,42 @@ +========================================================= +Secondary CPU enable-method "nuvoton,npcm7xx-smp" binding +========================================================= + +To apply to all CPUs, a single "nuvoton,npcm7xx-smp" enable method should be +defined in the "cpus" node. + +Enable method name: "nuvoton,npcm7xx-smp" +Compatible machines: "nuvoton,npcm750" +Compatible CPUs: "arm,cortex-a9" +Related properties: (none) + +Note: +This enable method needs valid nodes compatible with "arm,cortex-a9-scu" and +"nuvoton,npcm750-gcr". + +Example: + + cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "nuvoton,npcm7xx-smp"; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + clocks = <&clk NPCM7XX_CLK_CPU>; + clock-names = "clk_cpu"; + reg = <0>; + next-level-cache = <&L2>; + }; + + cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + clocks = <&clk NPCM7XX_CLK_CPU>; + clock-names = "clk_cpu"; + reg = <1>; + next-level-cache = <&L2>; + }; + }; +Documentation/devicetree/bindings/arm/npcm/npcm.txt new file +6
-0@@ -0,0 +1,6 @@ +NPCM Platforms Device Tree Bindings +----------------------------------- +NPCM750 SoC +Required root node properties: + - compatible = "nuvoton,npcm750"; +arch/arm/boot/dts/nuvoton-npcm750-evb.dts new file +59
-0@@ -0,0 +1,59 @@ +/* + * DTS file for all NPCM750 SoCs + * + * Copyright 2012 Tomer Maimon <[email protected]> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "nuvoton-npcm750.dtsi" + +/ { + model = "Nuvoton npcm750 Development Board (Device Tree)"; + compatible = "nuvoton,npcm750"; + + chosen { + stdout-path = &serial3; + bootargs = "earlyprintk=serial,serial3,115200"; + }; + + memory { + reg = <0 0x40000000>; + }; + + cpus { + enable-method = "nuvoton,npcm7xx-smp"; + }; + + clk: clock-controller at f0801000 { + status = "okay"; + }; + + apb { + watchdog1: watchdog at f0009000 { + status = "okay"; + }; + + serial0: serial0 at f0001000 { + status = "okay"; + }; + + serial1: serial1 at f0002000 { + status = "okay"; + }; + + serial2: serial2 at f0003000 { + status = "okay"; + }; + + serial3: serial3 at f0004000 { + status = "okay"; + }; + }; +};arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +177
-0@@ -0,0 +1,177 @@ +/* + * DTSi file for the NPCM750 SoC + * + * Copyright 2012 Tomer Maimon <[email protected]> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include "skeleton.dtsi" +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/clock/nuvoton,npcm7xx-clks.h> + +/ { + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&gic>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + clocks = <&clk NPCM7XX_CLK_CPU>; + clock-names = "clk_cpu"; + reg = <0>; + next-level-cache = <&l2>; + }; + + cpu at 1 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + clocks = <&clk NPCM7XX_CLK_CPU>; + clock-names = "clk_cpu"; + reg = <1>; + next-level-cache = <&l2>; + }; + }; + + gcr: gcr at f0800000 { + compatible = "nuvoton,npcm750-gcr", "syscon", + "simple-mfd"; + reg = <0xf0800000 0x1000>; + }; + + scu: scu at f03fe000 { + compatible = "arm,cortex-a9-scu"; + reg = <0xf03fe000 0x1000>; + }; + + l2: l2-cache at f03fc000 { + compatible = "arm,pl310-cache"; + reg = <0xf03fc000 0x1000>; + interrupts = <0 21 4>; + cache-unified; + cache-level = <2>; + clocks = <&clk NPCM7XX_CLK_AXI>; + }; + + gic: interrupt-controller at f03ff000 { + compatible = "arm,cortex-a9-gic"; + interrupt-controller; + #interrupt-cells = <3>; + reg = <0xf03ff000 0x1000>, + <0xf03fe100 0x100>; + }; + + clk: clock-controller at f0801000 { + compatible = "nuvoton,npcm750-clk"; + #clock-cells = <1>; + reg = <0xf0801000 0x1000>; + }; + + /* external clock signal rg1refck, supplied by the phy */ + clk-rg1refck { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <125000000>; + }; + + /* external clock signal rg2refck, supplied by the phy */ + clk-rg2refck { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <125000000>; + }; + + clk-xin { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <50000000>; + }; + + timer at f03fe600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0xf03fe600 0x20>; + interrupts = <1 13 0x304>; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + apb { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges; + + timer0: timer at f0000000 { + compatible = "nuvoton,npcm750-timer"; + interrupts = <0 32 4>; + reg = <0xf0000000 0x1000>; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog0: watchdog at f0008000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 47 4>; + reg = <0xf0008000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog1: watchdog at f0009000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 48 4>; + reg = <0xf0009000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog2: watchdog at f000a000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 49 4>; + reg = <0xf000a000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + serial0: serial0 at f0001000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0xf0001000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 2 4>; + status = "disabled"; + }; + + serial1: serial1 at f0002000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0xf0002000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 3 4>; + status = "disabled"; + }; + + serial2: serial2 at f0003000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0xf0003000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 4 4>; + status = "disabled"; + }; + + serial3: serial3 at f0004000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0xf0004000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 5 4>; + status = "disabled"; + }; + }; +};include/dt-bindings/clock/nuvoton,npcm7xx-clks.h new file +39
-1@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2016 Nuvoton Technologies, tali.perry at nuvoton.com +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +*/ + +#ifndef _DT_BINDINGS_CLK_NPCM7XX_H +#define _DT_BINDINGS_CLK_NPCM7XX_H + +#define NPCM7XX_CLK_PLL0 0 +#define NPCM7XX_CLK_PLL1 1 +#define NPCM7XX_CLK_PLL2 2 +#define NPCM7XX_CLK_GFX 3 +#define NPCM7XX_CLK_APB1 4 +#define NPCM7XX_CLK_APB2 5 +#define NPCM7XX_CLK_APB3 6 +#define NPCM7XX_CLK_APB4 7 +#define NPCM7XX_CLK_APB5 8 +#define NPCM7XX_CLK_MC 9 +#define NPCM7XX_CLK_CPU 10 +#define NPCM7XX_CLK_SPI0 11 +#define NPCM7XX_CLK_SPI3 12 +#define NPCM7XX_CLK_SPIX 13 +#define NPCM7XX_CLK_UART_CORE 14 +#define NPCM7XX_CLK_TIMER 15 +#define NPCM7XX_CLK_HOST_UART 16 +#define NPCM7XX_CLK_MMC 17 +#define NPCM7XX_CLK_SDHC 18 +#define NPCM7XX_CLK_ADC 19 +#define NPCM7XX_CLK_GFX_MEM 20 +#define NPCM7XX_CLK_USB_BRIDGE 21 +#define NPCM7XX_CLK_AXI 22 +#define NPCM7XX_CLK_AHB 23 +#define NPCM7XX_CLK_EMC 24 +#define NPCM7XX_CLK_GMAC 25 + +#endif --
Quoted 2 lines
2.14.1.581.gf28d330327-goog
PATCH v2 3/3 MAINTAINERS: Add entry for the Nuvoton NPCM architecture
In reply to Brendan HigginsAdd maintainers and reviewers for the Nuvoton NPCM architecture.
--- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+)
MAINTAINERS +13 -0
@@ -1598,6 +1598,19 @@ F: drivers/pinctrl/nomadik/ F: drivers/i2c/busses/i2c-nomadik.c T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git +ARM/NUVOTON NPCM ARCHITECTURE +M: Avi Fishman <[email protected]> +M: Tomer Maimon <[email protected]> +R: Brendan Higgins <[email protected]> +R: Rick Altherr <[email protected]> +L: openbmc at lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-npcm/ +F: arch/arm/boot/dts/nuvoton-npcm* +F: include/dt-bindings/clock/nuvoton,npcm7xx-clks.h +F: drivers/*/*npcm* +F: Documentation/*/*npcm* + ARM/NUVOTON W90X900 ARM ARCHITECTURE M: Wan ZongShun <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
Signature · 1 line
2.14.1.581.gf28d330327-goog
Tomer Maimon
maintainer Reviewed-by Tested-by Reviewed-by Avi Fishman Tested-by Avi Fishman on v2 3/3Re: [PATCH v2 3/3] MAINTAINERS: Add entry for the Nuvoton NPCM architecture
Quoted 32 lines · Brendan Higgins
Add maintainers and reviewers for the Nuvoton NPCM architecture.
Signed-off-by Brendan Higgins <[email protected]>--- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+)MAINTAINERS +13
-1@@ -1598,6 +1598,19 @@ F: drivers/pinctrl/nomadik/ F: drivers/i2c/busses/i2c-nomadik.c T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git +ARM/NUVOTON NPCM ARCHITECTURE +M: Avi Fishman <[email protected]> +M: Tomer Maimon <[email protected]> +R: Brendan Higgins <[email protected]> +R: Rick Altherr <[email protected]> +L: openbmc at lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-npcm/ +F: arch/arm/boot/dts/nuvoton-npcm* +F: include/dt-bindings/clock/nuvoton,npcm7xx-clks.h +F: drivers/*/*npcm* +F: Documentation/*/*npcm* + ARM/NUVOTON W90X900 ARM ARCHITECTURE M: Wan ZongShun <[email protected]> L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) --
Quoted 2 lines
2.14.1.581.gf28d330327-goog