arm: npcm: add basic support for Nuvoton BMCs
Subsystems (5)
v4 cover arm: npcm: add basic support for Nuvoton BMCs
Addressed comments from:
- Joel: https://www.spinics.net/lists/arm-kernel/msg605137.html
Changes since previous update:
- Added SMP and SMP_ON_UP
- Changed dts to use phandle
PATCH v4 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 | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 196 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 +50 -0
50 lines not on this page · raw message
arch/arm/mach-npcm/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.o
arch/arm/mach-npcm/headsmp.S new file +17 -0
@@ -0,0 +1,17 @@ +/* + * 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 version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <linux/init.h> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)
arch/arm/mach-npcm/npcm7xx.c new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation. +*/ + +#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 +89 -0
89 lines not on this page · raw message
Signature · 1 line
2.14.1.581.gf28d330327-goog
Avi Fishman
maintainer2017-09-06 11:07 GMT+03:00 Brendan Higgins <[email protected]>:
Quoted 121 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 | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++ ++++++++++++++ 7 files changed, 196 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 +0
-0@@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) +=mediatek
machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadikarch/arm/Makefile +1
-0+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 +50
-0@@ -0,0 +1,50 @@ +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 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + 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 GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +4
-0@@ -0,0 +1,17 @@ +/* + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify
arch/arm/mach-npcm/headsmp.S line 14
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> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0
I saw you answered to Florian Fainelli that the BootRom is not starting the secondary CPU in SVC mode. Are you sure? In our engineering npcm7xx revision, Z1, the BootRom indeed started to run it in IRQ mode but we fixed it in the production version, A1, (quite long time ago), I hope you didn't get an EB with Z1 you can check that in BootBlock console print:
Quoted 4 lines
ADC CLK is set to 25000000
Last reset was CORST
vgaioen=1 and mux gspi.
A1 <<====== this is what you should see, if you see Z1 we need to replace
your EB
+
Quoted 148 lines
arch/arm/mach-npcm/headsmp.S new file +2
-0+ b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation. +*/ + +#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 +35
-0@@ -0,0 +1,89 @@ +/* +* 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 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 + +extern void npcm7xx_secondary_startup (void ); + +static int npcm7xx_smp_boot_secondary (unsigned int cpu, +struct task_struct *idle) +{ +struct device_node *gcr_np; +void __iomem *gcr_base; +int ret =0 ; + + gcr_np = of_find_compatible_node(NULL, NULL,"nuvoton,npcm750-gcr");
arch/arm/mach-npcm/platsmp.c new file +54
-0+if (!gcr_np) { +pr_err ("no gcr device node\n" ); + ret = -EFAULT ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); + ret = -EFAULT ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (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 (); + +out: +iounmap (gcr_base); +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np; +void __iomem *scu_base; + + 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 scu at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +out: +iounmap (scu_base); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE(npcm7xx_smp, "nuvoton,npcm7xx-smp",
&npcm7xx_smp_ops);
--
2.14.1.581.gf28d330327-goog
Avi Fishman
maintainer2017-09-06 11:07 GMT+03:00 Brendan Higgins <[email protected]>:
Quoted 4 lines
Adds basic support for the Nuvoton NPCM750 BMC.
Signed-off-by Brendan Higgins <[email protected]>
Quoted 8 lines
--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89
++++++++++++++++++++++++++++++++++++++++++++
arch/arm/Makefile machine-$(CONFIG_ARCH_MEDIATEK) +=
Quoted 25 lines
7 files changed, 196 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 +0
-0@@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) +=
mediatek
Quoted 82 lines
arch/arm/Makefile +1
-0machine-$(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 +50
-0@@ -0,0 +1,50 @@ +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 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + 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 GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +4
-0@@ -0,0 +1,17 @@ +/* + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify
arch/arm/mach-npcm/headsmp.S line 14
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> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0
I saw you answered to Florian Fainelli that the BootRom is not starting the secondary CPU in SVC mode. Are you sure? In our engineering npcm7xx revision, Z1, the BootRom indeed started to run it in IRQ mode but we fixed it in the production version, A1, (quite long time ago), I hope you didn't get an EB with Z1 you can check that in BootBlock console print:
Quoted 4 lines
ADC CLK is set to 25000000
Last reset was CORST
vgaioen=1 and mux gspi.
A1 <<====== this is what you should see, if you see Z1 we need to replace
your EB
Quoted 16 lines
arch/arm/mach-npcm/headsmp.S new file +3
-0+ + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +7
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation.
arch/arm/mach-npcm/npcm7xx.c line 17
Quoted 10 lines
arch/arm/mach-npcm/npcm7xx.c new file +10
-0+*/ + +#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 |
\
arch/arm/mach-npcm/npcm7xx.c line 18
Quoted 1 line
arch/arm/mach-npcm/npcm7xx.c new file +1
-0+ L310_AUX_CTRL_DATA_PREFETCH |
\
arch/arm/mach-npcm/npcm7xx.c line 19
Quoted 1 line
arch/arm/mach-npcm/npcm7xx.c new file +1
-0+ L310_AUX_CTRL_NS_LOCKDOWN |
\
arch/arm/mach-npcm/npcm7xx.c line 20
Quoted 1 line
arch/arm/mach-npcm/npcm7xx.c new file +1
-0+ L310_AUX_CTRL_CACHE_REPLACE_RR |
\
arch/arm/mach-npcm/npcm7xx.c line 21
Quoted 1 line
arch/arm/mach-npcm/npcm7xx.c new file +1
-0+ L2C_AUX_CTRL_SHARED_OVERRIDE |
\
Quoted 44 lines
arch/arm/mach-npcm/npcm7xx.c new file +13
-0+ 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 +25
-0@@ -0,0 +1,89 @@ +/* +* 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 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 +
arch/arm/mach-npcm/platsmp.c line 35
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+extern void npcm7xx_secondary_startup (void ); + +static int npcm7xx_smp_boot_secondary (unsigned int cpu, +struct task_struct *idle) +{ +struct device_node *gcr_np; +void __iomem *gcr_base; +int ret =0 ; + + gcr_np = of_find_compatible_node(NULL, NULL,
"nuvoton,npcm750-gcr");
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+if (!gcr_np) { +pr_err ("no gcr device node\n" ); + ret = -EFAULT ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 );
arch/arm/mach-npcm/platsmp.c
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); + ret = -EFAULT ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (npcm7xx_secondary_startup), gcr_base + +NPCM7XX_SCRPAD_REG ); +/* make sure npcm7xx_secondary_startup is seen by all observers.
*/
Quoted 28 lines
arch/arm/mach-npcm/platsmp.c new file +28
-0+smp_wmb (); +dsb_sev (); +/* make sure write buffer is drained */ +mb (); + +out: +iounmap (gcr_base); +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np; +void __iomem *scu_base; + + 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 scu at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); +
arch/arm/mach-npcm/platsmp.c
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+out: +iounmap (scu_base); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE(npcm7xx_smp, "nuvoton,npcm7xx-smp",
&npcm7xx_smp_ops);
Quoted 3 lines
--
2.14.1.581.gf28d330327-goog
Avi Fishman
maintainerSorry for sending again some mailing list rejected it due to HTML involved (althoug I tried Plain Text), Trying again.
2017-09-06 11:07 GMT+03:00 Brendan Higgins <[email protected]>:
Quoted 118 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 | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 196 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 +50
-0@@ -0,0 +1,50 @@ +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 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + 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 GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +4
-0@@ -0,0 +1,17 @@ +/* + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify
arch/arm/mach-npcm/headsmp.S line 14
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> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0
I saw you answered to Florian Fainelli that the BootRom is not starting the secondary CPU in SVC mode. Are you sure? In our engineering npcm7xx revision, Z1, the BootRom indeed started to run it in IRQ mode but we fixed it in the production version, A1, (quite long time ago), I hope you didn't get an EB with Z1 you can check that in BootBlock console print:
Quoted 146 lines
ADC CLK is set to 25000000
Last reset was CORST
vgaioen=1 and mux gspi.
A1 <<====== this is what you should see, if you see Z1 we need to replace your EBarch/arm/mach-npcm/headsmp.S new file +3
-0+ + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation. +*/ + +#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 +89
-1@@ -0,0 +1,89 @@ +/* +* 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 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 + +extern void npcm7xx_secondary_startup (void ); + +static int npcm7xx_smp_boot_secondary (unsigned int cpu, +struct task_struct *idle) +{ +struct device_node *gcr_np; +void __iomem *gcr_base; +int ret =0 ; + + gcr_np =of_find_compatible_node (NULL ,NULL ,"nuvoton,npcm750-gcr" ); +if (!gcr_np) { +pr_err ("no gcr device node\n" ); + ret = -EFAULT ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); + ret = -EFAULT ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (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 (); + +out: +iounmap (gcr_base); +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np; +void __iomem *scu_base; + + 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 scu at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +out: +iounmap (scu_base); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE (npcm7xx_smp,"nuvoton,npcm7xx-smp" , &npcm7xx_smp_ops); --2.14.1.581.gf28d330327-goog
Quoted 131 lines · Avi Fishman
Sorry for sending again some mailing list rejected it due to HTML involved (althoug I tried Plain Text), Trying again.
2017-09-06 11:07 GMT+03:00 Brendan Higgins <[email protected]>:
Quoted 127 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 | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 196 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 +50
-0@@ -0,0 +1,50 @@ +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 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + 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 GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +13
-0@@ -0,0 +1,17 @@ +/* + * 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 version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <linux/init.h> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup)
Quoted 13 lines
arch/arm/mach-npcm/headsmp.S line 14
Quoted 1 line
arch/arm/mach-npcm/headsmp.S new file +1
-0+ safe_svcmode_maskall r0I saw you answered to Florian Fainelli that the BootRom is not starting the secondary CPU in SVC mode. Are you sure? In our engineering npcm7xx revision, Z1, the BootRom indeed started to run it in IRQ mode but we fixed it in the production version, A1, (quite long time ago), I hope you didn't get an EB with Z1 you can check that in BootBlock console print:
Quoted 4 lines
ADC CLK is set to 25000000
Last reset was CORST
vgaioen=1 and mux gspi.
A1 <<====== this is what you should see, if you see Z1 we need to replace your EB
Nope, on boot it prints:
Quoted 11 lines
EB
Board manufacturer: NuvotonCPU CLK is 800000000
MC CLK is 800000000ADC CLK is set to 25000000
Last reset was PORST
vgaioen=1 and mux gspi.
A1
Skip PCI config.
To reproduce, all you have to do is delete
Quoted 1 line
Quoted 1 line
+
safe_svcmode_maskallr0
and the kernel will warn that the core is not starting in SVC mode
Quoted 141 lines
Quoted 141 lines
arch/arm/mach-npcm/headsmp.S new file +3
-0+ + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation. +*/ + +#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 +89
-1@@ -0,0 +1,89 @@ +/* +* 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 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 + +extern void npcm7xx_secondary_startup (void ); + +static int npcm7xx_smp_boot_secondary (unsigned int cpu, +struct task_struct *idle) +{ +struct device_node *gcr_np; +void __iomem *gcr_base; +int ret =0 ; + + gcr_np =of_find_compatible_node (NULL ,NULL ,"nuvoton,npcm750-gcr" ); +if (!gcr_np) { +pr_err ("no gcr device node\n" ); + ret = -EFAULT ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); + ret = -EFAULT ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (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 (); + +out: +iounmap (gcr_base); +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np; +void __iomem *scu_base; + + 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 scu at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +out: +iounmap (scu_base); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE (npcm7xx_smp,"nuvoton,npcm7xx-smp" , &npcm7xx_smp_ops); --2.14.1.581.gf28d330327-goog
Avi Fishman
maintainerQuoted 160 lines · Brendan Higgins
Quoted 131 lines · Avi Fishman
Sorry for sending again some mailing list rejected it due to HTML involved (althoug I tried Plain Text), Trying again.
2017-09-06 11:07 GMT+03:00 Brendan Higgins <[email protected]>:
Quoted 127 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 | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 196 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 +50
-0@@ -0,0 +1,50 @@ +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 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + 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 GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +13
-0@@ -0,0 +1,17 @@ +/* + * 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 version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <linux/init.h> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup)Quoted 13 lines
arch/arm/mach-npcm/headsmp.S line 14
Quoted 1 line
arch/arm/mach-npcm/headsmp.S new file +1
-0+ safe_svcmode_maskall r0I saw you answered to Florian Fainelli that the BootRom is not starting the secondary CPU in SVC mode. Are you sure? In our engineering npcm7xx revision, Z1, the BootRom indeed started to run it in IRQ mode but we fixed it in the production version, A1, (quite long time ago), I hope you didn't get an EB with Z1 you can check that in BootBlock console print:
Quoted 4 lines
ADC CLK is set to 25000000
Last reset was CORST
vgaioen=1 and mux gspi.
A1 <<====== this is what you should see, if you see Z1 we need to replace your EBNope, on boot it prints:
Quoted 11 lines
EB
Board manufacturer: NuvotonCPU CLK is 800000000
MC CLK is 800000000ADC CLK is set to 25000000
Last reset was PORST
vgaioen=1 and mux gspi.
A1
Skip PCI config.
Quoted 6 lines
To reproduce, all you have to do is delete
Quoted 1 line
Quoted 1 line
+
safe_svcmode_maskallr0and the kernel will warn that the core is not starting in SVC mode
OK, Tomer also confirmed it, his kernel printed this:
CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary
CPU mode 0x13)
CPU: This may indicate a broken bootloader or firmware.
It appears that in kernel CPU0 starts at SVC mode (0x13) and CPU1 starts at SYS mode (0x1F) and the kernel doesn't like that, so leave it as is.
Quoted 141 lines
Quoted 141 lines
Quoted 141 lines
arch/arm/mach-npcm/headsmp.S new file +3
-0+ + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation. +*/ + +#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 +89
-1@@ -0,0 +1,89 @@ +/* +* 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 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 + +extern void npcm7xx_secondary_startup (void ); + +static int npcm7xx_smp_boot_secondary (unsigned int cpu, +struct task_struct *idle) +{ +struct device_node *gcr_np; +void __iomem *gcr_base; +int ret =0 ; + + gcr_np =of_find_compatible_node (NULL ,NULL ,"nuvoton,npcm750-gcr" ); +if (!gcr_np) { +pr_err ("no gcr device node\n" ); + ret = -EFAULT ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); + ret = -EFAULT ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (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 (); + +out: +iounmap (gcr_base); +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np; +void __iomem *scu_base; + + 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 scu at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +out: +iounmap (scu_base); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE (npcm7xx_smp,"nuvoton,npcm7xx-smp" , &npcm7xx_smp_ops); --2.14.1.581.gf28d330327-goog
Tomer Maimon
maintainer Reviewed-by Reviewed-by Avi Fishman Tested-by Tested-by Avi Fishman on v4 1/3Quoted 267 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 | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 196 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 +50
-0@@ -0,0 +1,50 @@ +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 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + 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 GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endifarch/arm/mach-npcm/Makefile new file +3
-0@@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +17
-0@@ -0,0 +1,17 @@ +/* + * 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 version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <linux/init.h> +#include <asm/assembler.h> + +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +34
-0@@ -0,0 +1,34 @@ +/* +* Copyright (c) 2017 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 version 2 as +* published by the Free Software Foundation. +*/ + +#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 +89
-1@@ -0,0 +1,89 @@ +/* +* 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 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 + +extern void npcm7xx_secondary_startup (void ); + +static int npcm7xx_smp_boot_secondary (unsigned int cpu, +struct task_struct *idle) +{ +struct device_node *gcr_np; +void __iomem *gcr_base; +int ret =0 ; + + gcr_np =of_find_compatible_node (NULL ,NULL ,"nuvoton,npcm750-gcr" ); +if (!gcr_np) { +pr_err ("no gcr device node\n" ); + ret = -EFAULT ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%llx\n" , gcr_base); + ret = -EFAULT ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (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 (); + +out: +iounmap (gcr_base); +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np; +void __iomem *scu_base; + + 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 scu at: 0x%llx\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +out: +iounmap (scu_base); +} + +static struct smp_operations npcm7xx_smp_ops__initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE (npcm7xx_smp,"nuvoton,npcm7xx-smp" , &npcm7xx_smp_ops); --
Quoted 2 lines
2.14.1.581.gf28d330327-goog
PATCH v4 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 | 57 +++++++ arch/arm/boot/dts/nuvoton-npcm750.dtsi | 177 +++++++++++++++++++++ include/dt-bindings/clock/nuvoton,npcm7xx-clks.h | 39 +++++ 5 files changed, 321 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 +57 -0
57 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
Re: [PATCH v4 2/3] arm: dts: add Nuvoton NPCM750 device tree
Quoted 8 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]>Reviewed-by Tomer Maimon <[email protected]>Reviewed-by Avi Fishman <[email protected]>Tested-by Tomer Maimon <[email protected]>Tested-by Avi Fishman <[email protected]>
PATCH v4 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