arm: npcm: add basic support for Nuvoton BMCs
Subsystems (5)
v7 cover arm: npcm: add basic support for Nuvoton BMCs
Addressed comments from:
- Rob: http://www.spinics.net/lists/devicetree/msg196376.html
Changes since previous update:
- Moved all memory mapped nodes to busses.
- Map ranges starting at 0
- Moved external clocks to root
- No changes to mach-npcm since v5
- No changes to MAINTAINERS since v5
Changes have been tested on the NPCM750 evaluation board.
PATCH v7 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 | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +48 -0
48 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 +88 -0
88 lines not on this page · raw message
Signature · 1 line
2.15.0.rc0.271.g36b669edcc-goog
Hi Brendan,
Quoted 22 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 insertions(+)create mode 100644
arch/arm/mach-npcm/Kconfig
create mode 100644arch/arm/mach-npcm/Makefile
create mode 100644arch/arm/mach-npcm/headsmp.S
create mode 100644arch/arm/mach-npcm/npcm7xx.c
create mode 100644arch/arm/mach-npcm/platsmp.c
[...]
Quoted 39 lines
arch/arm/mach-npcm/platsmp.c new file +33
-0@@ -0,0 +1,88 @@ +/* +* 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 ;
arch/arm/mach-npcm/platsmp.c line 43
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-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%p\n" , gcr_base);
nit:
From the condition we know gcr_base is NULL here so we don't get much
info from it. Did you intend to print the value of gcr_np instead?
Quoted 21 lines
arch/arm/mach-npcm/platsmp.c new file +21
-0+ 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 (); + +iounmap (gcr_base); +out: +return ret; +} + +static void __init npcm7xx_smp_prepare_cpus (unsigned int max_cpus) +{ +struct device_node *scu_np;
arch/arm/mach-npcm/platsmp.c line 74
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+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%p\n" , scu_base);
Same comment about scu_base.
Cheers,
Signature · 1 line
Julien Thierry
Russell King - ARM Linux
maintainerQuoted 123 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +48
-0@@ -0,0 +1,48 @@ +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_720789 + 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 +7
-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. + */
arch/arm/mach-npcm/headsmp.S line 17
Quoted 10 lines
arch/arm/mach-npcm/headsmp.S new file +10
-0+ +#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)
Why do you need this? The switch to svc mode is already handled by secondary_startup.
Quoted 18 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-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>
arch/arm/mach-npcm/npcm7xx.c line 22
Quoted 10 lines
arch/arm/mach-npcm/npcm7xx.c new file +10
-0+#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)
Do you really need all these flags?
Quoted 18 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-0+ +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 +0
-0
arch/arm/mach-npcm/platsmp.c line 9
Quoted 9 lines
arch/arm/mach-npcm/platsmp.c new file +9
-0@@ -0,0 +1,88 @@ +/* +* 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
Maybe something more descriptive?
Quoted 19 lines
arch/arm/mach-npcm/platsmp.c new file +19
-0+ +#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,
arch/arm/mach-npcm/platsmp.c line 38
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ 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 ;
EFAULT is used for bad userspace addresses, it should not be used for other stuff - and a missing node is certainly not a "Bad address".
arch/arm/mach-npcm/platsmp.c line 44
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+ goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%p\n" , gcr_base); + ret = -EFAULT ;
This is more -ENOMEM.
arch/arm/mach-npcm/platsmp.c line 52
Quoted 8 lines
arch/arm/mach-npcm/platsmp.c new file +8
-0+ 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 ();
I think you mean "make sure the previous write is seen by all observers". However, doesn't "dsb_sev()" already do that?
arch/arm/mach-npcm/platsmp.c line 55
Quoted 3 lines
arch/arm/mach-npcm/platsmp.c new file +3
-0+dsb_sev (); +/* make sure write buffer is drained */ +mb ();
This looks over the top.
Quoted 36 lines
arch/arm/mach-npcm/platsmp.c new file +33
-0+ +iounmap (gcr_base); +out: +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%p\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +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);Signature · 1 line
2.15.0.rc0.271.g36b669edcc-goog
Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up
Quoted 129 lines · Russell King - ARM Linux
Quoted 128 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +48
-0@@ -0,0 +1,48 @@ +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_720789 + 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 +12
-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> +
Quoted 8 lines
arch/arm/mach-npcm/headsmp.S line 17
Quoted 5 lines
arch/arm/mach-npcm/headsmp.S new file +5
-0+ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)Why do you need this? The switch to svc mode is already handled by
secondary_startup.
Florian Fainelli already brought this up:
https://www.spinics.net/lists/arm-kernel/msg605126.html
Without this the kernel complains that the core is started in "wrong/inconsistent mode":
SMP: Total of 2 processors activated (398.13 BogoMIPS).
CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode 0x13)
CPU: This may indicate a broken bootloader or firmware.
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-npcm/npcm7xx.c new file +16
-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> +
Quoted 8 lines
arch/arm/mach-npcm/npcm7xx.c line 22
Quoted 6 lines
arch/arm/mach-npcm/npcm7xx.c new file +6
-0+#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)Do you really need all these flags?
Tomer, Avi, do we need these? I got this from the original version of the driver.
Quoted 132 lines
Quoted 19 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-0+ +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 +0
-0arch/arm/mach-npcm/platsmp.c line 9
Quoted 9 lines
arch/arm/mach-npcm/platsmp.c new file +9
-0@@ -0,0 +1,88 @@ +/* +* 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: " fmtMaybe something more descriptive?
Quoted 19 lines
arch/arm/mach-npcm/platsmp.c new file +19
-0+ +#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,arch/arm/mach-npcm/platsmp.c line 38
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ 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 ;EFAULT is used for bad userspace addresses, it should not be used for other stuff - and a missing node is certainly not a "Bad address".
arch/arm/mach-npcm/platsmp.c line 44
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+ goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%p\n" , gcr_base); + ret = -EFAULT ;This is more
-ENOMEM.arch/arm/mach-npcm/platsmp.c line 52
Quoted 8 lines
arch/arm/mach-npcm/platsmp.c new file +8
-0+ 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 ();I think you mean "make sure the previous write is seen by all observers". However, doesn't "
dsb_sev()" already do that?arch/arm/mach-npcm/platsmp.c line 55
Quoted 3 lines
arch/arm/mach-npcm/platsmp.c new file +3
-0+dsb_sev (); +/* make sure write buffer is drained */ +mb ();This looks over the top.
Quoted 34 lines
arch/arm/mach-npcm/platsmp.c new file +33
-1+ +iounmap (gcr_base); +out: +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%p\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +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.15.0.rc0.271.g36b669edcc-goog
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up
Russell King - ARM Linux
maintainerQuoted 140 lines · Brendan Higgins
Quoted 129 lines · Russell King - ARM Linux
Quoted 128 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +48
-0@@ -0,0 +1,48 @@ +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_720789 + 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 +12
-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> +Quoted 8 lines
arch/arm/mach-npcm/headsmp.S line 17
Quoted 5 lines
arch/arm/mach-npcm/headsmp.S new file +5
-0+ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)Why do you need this? The switch to svc mode is already handled by
secondary_startup.
Quoted 4 lines
Florian Fainelli already brought this up:
https://www.spinics.net/lists/arm-kernel/msg605126.html
Without this the kernel complains that the core is started in "wrong/inconsistent mode":
The solution would be a comment to indicate why it's necessary :)
Quoted 38 lines
SMP: Total of 2 processors activated (398.13 BogoMIPS).
CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode0x13)
CPU: This may indicate a broken bootloader or firmware.Quoted 23 lines
Quoted 23 lines
arch/arm/mach-npcm/npcm7xx.c new file +16
-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> +Quoted 8 lines
arch/arm/mach-npcm/npcm7xx.c line 22
Quoted 6 lines
arch/arm/mach-npcm/npcm7xx.c new file +6
-0+#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)Do you really need all these flags?
Quoted 2 lines
Tomer, Avi, do we need these? I got this from the original version of the driver.
The l2c driver manages L310_AUX_CTRL_FULL_LINE_ZERO itself, so you shouldn't specify that.
L2C_AUX_CTRL_SHARED_OVERRIDE is managed via the "arm,shared-override" DT property, so you should use that in DT instead.
Prefetching needs the prefetch control register configured to tune the prefetching - that's platform specific so the l2c driver doesn't touch it (it expects firmware to have configured it.) If firmware needs to configure that, it might as well configure the flags too as they're shared into that very same register. If not, I think the l2c prefetch register defaults to a very small prefetch, and is probably not worth setting the enable bits without configuring the depth of prefetch.
L310_AUX_CTRL_NS_LOCKDOWN is always enabled by the l2c driver, so shouldn't be necessary.
So that leaves only L310_AUX_CTRL_CACHE_REPLACE_RR.
Quoted 133 lines
Quoted 133 lines
Quoted 20 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-0+ +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 +0
-0arch/arm/mach-npcm/platsmp.c line 9
Quoted 9 lines
arch/arm/mach-npcm/platsmp.c new file +9
-0@@ -0,0 +1,88 @@ +/* +* 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: " fmtMaybe something more descriptive?
Quoted 19 lines
arch/arm/mach-npcm/platsmp.c new file +19
-0+ +#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,arch/arm/mach-npcm/platsmp.c line 38
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ 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 ;EFAULT is used for bad userspace addresses, it should not be used for other stuff - and a missing node is certainly not a "Bad address".
arch/arm/mach-npcm/platsmp.c line 44
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+ goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%p\n" , gcr_base); + ret = -EFAULT ;This is more
-ENOMEM.arch/arm/mach-npcm/platsmp.c line 52
Quoted 8 lines
arch/arm/mach-npcm/platsmp.c new file +8
-0+ 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 ();I think you mean "make sure the previous write is seen by all observers". However, doesn't "
dsb_sev()" already do that?arch/arm/mach-npcm/platsmp.c line 55
Quoted 3 lines
arch/arm/mach-npcm/platsmp.c new file +3
-0+dsb_sev (); +/* make sure write buffer is drained */ +mb ();This looks over the top.
Quoted 34 lines
arch/arm/mach-npcm/platsmp.c new file +33
-1+ +iounmap (gcr_base); +out: +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%p\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +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.15.0.rc0.271.g36b669edcc-goog
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up
Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up
Tomer Maimon
maintainerHi Brendan,
Sorry for the delay,
Quoted 61 lines · Russell King - ARM Linux
Quoted 60 lines · Brendan Higgins
Quoted 58 lines · Russell King - ARM Linux
Quoted 57 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +4
-0@@ -0,0 +1,48 @@ +menuconfig ARCH_NPCM + bool "Nuvoton NPCM Architecture" + select ARCH_REQUIRE_GPIOLIB + select USE_OF
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-npcm/Kconfig line 12
Quoted 8 lines
arch/arm/mach-npcm/Kconfig new file +8
-0+ select PINCTRL + select PINCTRL_NPCM7XX + +if ARCH_NPCM + +comment "NPCMX50 CPU type" + +config CPU_NPCM750
I started the upstream process of NPCM7xx clocksource driver, I got the following comment
https://www.spinics.net/lists/devicetree/msg197916.html
Is it possible to modify the the architecture configuration name to ARCH_NPCM7XX.
Quoted 126 lines
Quoted 72 lines
Quoted 63 lines
Quoted 63 lines
arch/arm/mach-npcm/Kconfig new file +36
-0+ 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_720789 + 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 +12
-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> +Quoted 8 lines
arch/arm/mach-npcm/headsmp.S line 17
Quoted 5 lines
arch/arm/mach-npcm/headsmp.S new file +5
-0+ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)Why do you need this? The switch to svc mode is already handled by
secondary_startup.Quoted 4 lines
Florian Fainelli already brought this up:
https://www.spinics.net/lists/arm-kernel/msg605126.html
Without this the kernel complains that the core is started in "wrong/inconsistent mode":The solution would be a comment to indicate why it's necessary :)
Quoted 38 lines
SMP: Total of 2 processors activated (398.13 BogoMIPS).
CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode0x13)
CPU: This may indicate a broken bootloader or firmware.Quoted 23 lines
Quoted 23 lines
arch/arm/mach-npcm/npcm7xx.c new file +16
-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> +Quoted 8 lines
arch/arm/mach-npcm/npcm7xx.c line 22
Quoted 6 lines
arch/arm/mach-npcm/npcm7xx.c new file +6
-0+#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)Do you really need all these flags?
Quoted 2 lines
Tomer, Avi, do we need these? I got this from the original version of the driver.
The l2c driver manages
L310_AUX_CTRL_FULL_LINE_ZEROitself, so you shouldn't specify that.
L2C_AUX_CTRL_SHARED_OVERRIDEis managed via the "arm,shared-override" DT property, so you should use that in DT instead.
Quoted 7 lines
Prefetching needs the prefetch control register configured to tune the prefetching - that's platform specific so the l2c driver doesn't touch it (it expects firmware to have configured it.) If firmware needs to configure that, it might as well configure the flags too as they're shared into that very same register. If not, I think the l2c prefetch register defaults to a very small prefetch, and is probably not worth setting the enable bits without configuring the depth of prefetch.
Yes, we do it in the firmware.
Quoted 6 lines
L310_AUX_CTRL_NS_LOCKDOWNis always enabled by the l2c driver, so shouldn't be necessary.So that leaves only
L310_AUX_CTRL_CACHE_REPLACE_RR.
You dont need to add L310_AUX_CTRL_CACHE_REPLACE_RR to the l2c aux value.
Quoted 134 lines
Quoted 125 lines
Quoted 125 lines
Quoted 20 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-0+ +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 +0
-0arch/arm/mach-npcm/platsmp.c line 9
Quoted 9 lines
arch/arm/mach-npcm/platsmp.c new file +9
-0@@ -0,0 +1,88 @@ +/* +* 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: " fmtMaybe something more descriptive?
Quoted 19 lines
arch/arm/mach-npcm/platsmp.c new file +19
-0+ +#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,arch/arm/mach-npcm/platsmp.c line 38
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ 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 ;EFAULT is used for bad userspace addresses, it should not be used for other stuff - and a missing node is certainly not a "Bad address".
arch/arm/mach-npcm/platsmp.c line 44
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+ goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%p\n" , gcr_base); + ret = -EFAULT ;This is more
-ENOMEM.arch/arm/mach-npcm/platsmp.c line 52
Quoted 8 lines
arch/arm/mach-npcm/platsmp.c new file +8
-0+ 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 ();I think you mean "make sure the previous write is seen by all observers". However, doesn't "
dsb_sev()" already do that?arch/arm/mach-npcm/platsmp.c line 55
Quoted 3 lines
arch/arm/mach-npcm/platsmp.c new file +3
-0+dsb_sev (); +/* make sure write buffer is drained */ +mb ();This looks over the top.
Quoted 33 lines
arch/arm/mach-npcm/platsmp.c new file +33
-0+ +iounmap (gcr_base); +out: +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%p\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +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 8 lines
Quoted 8 lines
Quoted 3 lines
--
2.15.0.rc0.271.g36b669edcc-goog--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up
Quoted 4 lines
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up
Thanks,
Tomer
Quoted 80 lines · Tomer Maimon
Hi Brendan,
Sorry for the delay,
Quoted 61 lines · Russell King - ARM Linux
Quoted 60 lines · Brendan Higgins
Quoted 58 lines · Russell King - ARM Linux
Quoted 57 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +4
-0@@ -0,0 +1,48 @@ +menuconfig ARCH_NPCM + bool "Nuvoton NPCM Architecture" + select ARCH_REQUIRE_GPIOLIB + select USE_OFQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-npcm/Kconfig line 12
Quoted 8 lines
arch/arm/mach-npcm/Kconfig new file +8
-0+ select PINCTRL + select PINCTRL_NPCM7XX + +if ARCH_NPCM + +comment "NPCMX50 CPU type" + +config CPU_NPCM750I started the upstream process of NPCM7xx clocksource driver, I got the following comment
https://www.spinics.net/lists/devicetree/msg197916.html
Quoted 2 lines
Is it possible to modify the the architecture configuration name to
ARCH_NPCM7XX.
You mean the CPU config: CPU_NPCM7XX?
I think the ARCH_NPCM is right, since that corresponds to this directory which is for all ARM Nuvoton BMCs.
Quoted 288 lines
Quoted 127 lines
Quoted 73 lines
Quoted 64 lines
Quoted 64 lines
arch/arm/mach-npcm/Kconfig new file +36
-0+ 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_720789 + 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 +12
-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> +Quoted 8 lines
arch/arm/mach-npcm/headsmp.S line 17
Quoted 5 lines
arch/arm/mach-npcm/headsmp.S new file +5
-0+ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)Why do you need this? The switch to svc mode is already handled by
secondary_startup.Quoted 4 lines
Florian Fainelli already brought this up:
https://www.spinics.net/lists/arm-kernel/msg605126.html
Without this the kernel complains that the core is started in "wrong/inconsistent mode":The solution would be a comment to indicate why it's necessary :)
Quoted 38 lines
SMP: Total of 2 processors activated (398.13 BogoMIPS).
CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode0x13)
CPU: This may indicate a broken bootloader or firmware.Quoted 23 lines
Quoted 23 lines
arch/arm/mach-npcm/npcm7xx.c new file +16
-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> +Quoted 8 lines
arch/arm/mach-npcm/npcm7xx.c line 22
Quoted 6 lines
arch/arm/mach-npcm/npcm7xx.c new file +6
-0+#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)Do you really need all these flags?
Quoted 2 lines
Tomer, Avi, do we need these? I got this from the original version of the driver.
The l2c driver manages
L310_AUX_CTRL_FULL_LINE_ZEROitself, so you shouldn't specify that.
L2C_AUX_CTRL_SHARED_OVERRIDEis managed via the "arm,shared-override" DT property, so you should use that in DT instead.Quoted 7 lines
Prefetching needs the prefetch control register configured to tune the prefetching - that's platform specific so the l2c driver doesn't touch it (it expects firmware to have configured it.) If firmware needs to configure that, it might as well configure the flags too as they're shared into that very same register. If not, I think the l2c prefetch register defaults to a very small prefetch, and is probably not worth setting the enable bits without configuring the depth of prefetch.
Yes, we do it in the firmware.
Quoted 6 lines
L310_AUX_CTRL_NS_LOCKDOWNis always enabled by the l2c driver, so shouldn't be necessary.So that leaves only
L310_AUX_CTRL_CACHE_REPLACE_RR.You dont need to add
L310_AUX_CTRL_CACHE_REPLACE_RRto the l2c aux value.Quoted 134 lines
Quoted 125 lines
Quoted 125 lines
Quoted 20 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-0+ +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 +0
-0arch/arm/mach-npcm/platsmp.c line 9
Quoted 9 lines
arch/arm/mach-npcm/platsmp.c new file +9
-0@@ -0,0 +1,88 @@ +/* +* 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: " fmtMaybe something more descriptive?
Quoted 19 lines
arch/arm/mach-npcm/platsmp.c new file +19
-0+ +#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,arch/arm/mach-npcm/platsmp.c line 38
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ 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 ;EFAULT is used for bad userspace addresses, it should not be used for other stuff - and a missing node is certainly not a "Bad address".
arch/arm/mach-npcm/platsmp.c line 44
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+ goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%p\n" , gcr_base); + ret = -EFAULT ;This is more
-ENOMEM.arch/arm/mach-npcm/platsmp.c line 52
Quoted 8 lines
arch/arm/mach-npcm/platsmp.c new file +8
-0+ 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 ();I think you mean "make sure the previous write is seen by all observers". However, doesn't "
dsb_sev()" already do that?arch/arm/mach-npcm/platsmp.c line 55
Quoted 3 lines
arch/arm/mach-npcm/platsmp.c new file +3
-0+dsb_sev (); +/* make sure write buffer is drained */ +mb ();This looks over the top.
Quoted 33 lines
arch/arm/mach-npcm/platsmp.c new file +33
-0+ +iounmap (gcr_base); +out: +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%p\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +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 8 lines
Quoted 8 lines
Quoted 3 lines
--
2.15.0.rc0.271.g36b669edcc-goog--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps upQuoted 4 lines
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps upThanks,
Tomer
Tomer Maimon
maintainerQuoted 81 lines · Brendan Higgins
Quoted 80 lines · Tomer Maimon
Hi Brendan,
Sorry for the delay,
Quoted 61 lines · Russell King - ARM Linux
Quoted 60 lines · Brendan Higgins
Quoted 58 lines · Russell King - ARM Linux
Quoted 57 lines · Brendan Higgins
Adds basic support for the Nuvoton NPCM750 BMC.
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]>--- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 48 ++++++++++++++++++++++++ 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 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 +4
-0@@ -0,0 +1,48 @@ +menuconfig ARCH_NPCM + bool "Nuvoton NPCM Architecture" + select ARCH_REQUIRE_GPIOLIB + select USE_OFQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-npcm/Kconfig line 12
Quoted 8 lines
arch/arm/mach-npcm/Kconfig new file +8
-0+ select PINCTRL + select PINCTRL_NPCM7XX + +if ARCH_NPCM + +comment "NPCMX50 CPU type" + +config CPU_NPCM750I started the upstream process of NPCM7xx clocksource driver, I got the following comment
https://www.spinics.net/lists/devicetree/msg197916.html
Quoted 4 lines
Quoted 2 lines
Is it possible to modify the the architecture configuration name to
ARCH_NPCM7XX.You mean the CPU config:
CPU_NPCM7XX?
Sorry about the confusion, I mean to modify the CPU_NPCM750 to ARCH_NPCM750.
Quoted 292 lines
I think the
ARCH_NPCMis right, since that corresponds to this directory which is for all ARM Nuvoton BMCs.Quoted 288 lines
Quoted 127 lines
Quoted 73 lines
Quoted 64 lines
Quoted 64 lines
arch/arm/mach-npcm/Kconfig new file +36
-0+ 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_720789 + 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 +12
-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> +Quoted 8 lines
arch/arm/mach-npcm/headsmp.S line 17
Quoted 5 lines
arch/arm/mach-npcm/headsmp.S new file +5
-0+ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)Why do you need this? The switch to svc mode is already handled by
secondary_startup.Quoted 4 lines
Florian Fainelli already brought this up:
https://www.spinics.net/lists/arm-kernel/msg605126.html
Without this the kernel complains that the core is started in "wrong/inconsistent mode":The solution would be a comment to indicate why it's necessary :)
Quoted 38 lines
SMP: Total of 2 processors activated (398.13 BogoMIPS).
CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode0x13)
CPU: This may indicate a broken bootloader or firmware.Quoted 23 lines
Quoted 23 lines
arch/arm/mach-npcm/npcm7xx.c new file +16
-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> +Quoted 8 lines
arch/arm/mach-npcm/npcm7xx.c line 22
Quoted 6 lines
arch/arm/mach-npcm/npcm7xx.c new file +6
-0+#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)Do you really need all these flags?
Quoted 2 lines
Tomer, Avi, do we need these? I got this from the original version of the driver.
The l2c driver manages
L310_AUX_CTRL_FULL_LINE_ZEROitself, so you shouldn't specify that.
L2C_AUX_CTRL_SHARED_OVERRIDEis managed via the "arm,shared-override" DT property, so you should use that in DT instead.Quoted 7 lines
Prefetching needs the prefetch control register configured to tune the prefetching - that's platform specific so the l2c driver doesn't touch it (it expects firmware to have configured it.) If firmware needs to configure that, it might as well configure the flags too as they're shared into that very same register. If not, I think the l2c prefetch register defaults to a very small prefetch, and is probably not worth setting the enable bits without configuring the depth of prefetch.
Yes, we do it in the firmware.
Quoted 6 lines
L310_AUX_CTRL_NS_LOCKDOWNis always enabled by the l2c driver, so shouldn't be necessary.So that leaves only
L310_AUX_CTRL_CACHE_REPLACE_RR.You dont need to add
L310_AUX_CTRL_CACHE_REPLACE_RRto the l2c aux value.Quoted 134 lines
Quoted 125 lines
Quoted 125 lines
Quoted 20 lines
arch/arm/mach-npcm/npcm7xx.c new file +12
-0+ +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 +0
-0arch/arm/mach-npcm/platsmp.c line 9
Quoted 9 lines
arch/arm/mach-npcm/platsmp.c new file +9
-0@@ -0,0 +1,88 @@ +/* +* 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: " fmtMaybe something more descriptive?
Quoted 19 lines
arch/arm/mach-npcm/platsmp.c new file +19
-0+ +#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,arch/arm/mach-npcm/platsmp.c line 38
Quoted 10 lines
arch/arm/mach-npcm/platsmp.c new file +10
-0+ 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 ;EFAULT is used for bad userspace addresses, it should not be used for other stuff - and a missing node is certainly not a "Bad address".
arch/arm/mach-npcm/platsmp.c line 44
Quoted 6 lines
arch/arm/mach-npcm/platsmp.c new file +6
-0+ goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr at: 0x%p\n" , gcr_base); + ret = -EFAULT ;This is more
-ENOMEM.arch/arm/mach-npcm/platsmp.c line 52
Quoted 8 lines
arch/arm/mach-npcm/platsmp.c new file +8
-0+ 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 ();I think you mean "make sure the previous write is seen by all observers". However, doesn't "
dsb_sev()" already do that?arch/arm/mach-npcm/platsmp.c line 55
Quoted 3 lines
arch/arm/mach-npcm/platsmp.c new file +3
-0+dsb_sev (); +/* make sure write buffer is drained */ +mb ();This looks over the top.
Quoted 33 lines
arch/arm/mach-npcm/platsmp.c new file +33
-0+ +iounmap (gcr_base); +out: +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%p\n" , scu_base); +return ; + } + +scu_enable (scu_base); + +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 8 lines
Quoted 8 lines
Quoted 3 lines
--
2.15.0.rc0.271.g36b669edcc-goog--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps upQuoted 4 lines
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps upThanks,
Tomer
Thanks
PATCH v7 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 | 48 +++++ arch/arm/boot/dts/nuvoton-npcm750.dtsi | 198 +++++++++++++++++++++ include/dt-bindings/clock/nuvoton,npcm7xx-clks.h | 39 ++++ 5 files changed, 333 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 +48 -0
48 lines not on this page · raw message
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +198 -0
198 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.15.0.rc0.271.g36b669edcc-goog
Re: [PATCH v7 2/3] arm: dts: add Nuvoton NPCM750 device tree
Quoted 10 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]>Reviewed-by Joel Stanley <[email protected]>Tested-by Tomer Maimon <[email protected]>Tested-by Avi Fishman <[email protected]>---
[...]
Quoted 69 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +63
-0@@ -0,0 +1,198 @@ +/* + * 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 <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>; + 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>; + }; + }; + +/* 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>;
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 73
Quoted 10 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +10
-0+}; + + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges = <0x0 0xf0000000 0x00900000>; + + gcr: gcr at f0800000 {
Should be gcr at 800000. Build the dtb with W=1 and it will give you warnings for this.
Quoted 35 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +35
-0+ compatible = "nuvoton,npcm750-gcr", "syscon", + "simple-mfd"; + reg = <0x800000 0x1000>; + }; + + scu: scu at f03fe000 { + compatible = "arm,cortex-a9-scu"; + reg = <0x3fe000 0x1000>; + }; + + l2: cache-controller at f03fc000 { + compatible = "arm,pl310-cache"; + reg = <0x3fc000 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 = <0x3ff000 0x1000>, + <0x3fe100 0x100>; + }; + + timer at f03fe600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0x3fe600 0x20>; + interrupts = <1 13 0x304>; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + }; +
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 118
Quoted 10 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +10
-0+ ahb { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges = <0x80000000 0x80000000 0x40010000 + 0xe0800000 0xe0800000 0x0f800000 + 0x00000000 0xf0000000 0x00900000 + 0xf8000000 0xf8000000 0x02000000 + 0xfb000000 0xfb000000 0x00002000>;
Just do "ranges;" here if all the translation is at the next level down.
Sorry, it's hard to say exactly what to do without knowing the whole memory map.
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 120
Quoted 2 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +2
-0+ + clk: clock-controller at f0801000 {
Seems like this belongs under /soc based on the address.
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 132
Quoted 12 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +12
-0+ compatible = "nuvoton,npcm750-clk"; + #clock-cells = <1>; + reg = <0x801000 0x1000>; + status = "okay"; + }; + + apb { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges = <0x0 0x0 0x00300000>;
And then this would be "<0x0 0xf0000000 0x300000>".
Quoted 114 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +66
-0+ + timer0: timer at f0000000 { + compatible = "nuvoton,npcm750-timer"; + interrupts = <0 32 4>; + reg = <0x0 0x1000>; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog0: watchdog at f0008000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 47 4>; + reg = <0x8000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog1: watchdog at f0009000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 48 4>; + reg = <0x9000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog2: watchdog at f000a000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 49 4>; + reg = <0xa000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + serial0: serial at f0001000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x1000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 2 4>; + status = "disabled"; + }; + + serial1: serial at f0002000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x2000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 3 4>; + status = "disabled"; + }; + + serial2: serial at f0003000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x3000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 4 4>; + status = "disabled"; + }; + + serial3: serial at f0004000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x4000 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 --2.15.0.rc0.271.g36b669edcc-goog
Re: [PATCH v7 2/3] arm: dts: add Nuvoton NPCM750 device tree
Sorry for the delay. I thought all of the comments were straightforward, but there are a couple which need some further discussion.
Quoted 137 lines · Rob Herring
Quoted 10 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]>Reviewed-by Joel Stanley <[email protected]>Tested-by Tomer Maimon <[email protected]>Tested-by Avi Fishman <[email protected]>---
[...]
Quoted 69 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +63
-0@@ -0,0 +1,198 @@ +/* + * 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 <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>; + 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>; + }; + }; + +/* 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>;arch/arm/boot/dts/nuvoton-npcm750.dtsi line 73
Quoted 10 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +10
-0+}; + + soc { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges = <0x0 0xf0000000 0x00900000>; + + gcr: gcr at f0800000 {Should be gcr at 800000. Build the dtb with W=1 and it will give you warnings for this.
Quoted 39 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +39
-0+ compatible = "nuvoton,npcm750-gcr", "syscon", + "simple-mfd"; + reg = <0x800000 0x1000>; + }; + + scu: scu at f03fe000 { + compatible = "arm,cortex-a9-scu"; + reg = <0x3fe000 0x1000>; + }; + + l2: cache-controller at f03fc000 { + compatible = "arm,pl310-cache"; + reg = <0x3fc000 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 = <0x3ff000 0x1000>, + <0x3fe100 0x100>; + }; + + timer at f03fe600 { + compatible = "arm,cortex-a9-twd-timer"; + reg = <0x3fe600 0x20>; + interrupts = <1 13 0x304>; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + }; + + ahb { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus";
Quoted 8 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 118
Quoted 6 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +6
-0+ interrupt-parent = <&gic>; + ranges = <0x80000000 0x80000000 0x40010000 + 0xe0800000 0xe0800000 0x0f800000 + 0x00000000 0xf0000000 0x00900000 + 0xf8000000 0xf8000000 0x02000000 + 0xfb000000 0xfb000000 0x00002000>;Just do "ranges;" here if all the translation is at the next level down.
Actually we do have some peripherals that sit directly on the AHB, they just have not had their DTS nodes written yet. I counted at least 6 devices which probably won't get a sub-memory space.
Quoted 2 lines
Sorry, it's hard to say exactly what to do without knowing the whole memory map.
No problem. Let me see if I can get it for you.
Quoted 5 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 120
Quoted 3 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +2
-0+ + clk: clock-controller at f0801000 {Seems like this belongs under /soc based on the address.
No, the AHB memory space is discontiguous. The "Cortex A9 Included" space (/soc here) sits in one of the discontinuities.
Quoted 130 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi line 132
Quoted 13 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +12
-0+ compatible = "nuvoton,npcm750-clk"; + #clock-cells = <1>; + reg = <0x801000 0x1000>; + status = "okay"; + }; + + apb { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + interrupt-parent = <&gic>; + ranges = <0x0 0x0 0x00300000>;And then this would be "<
0x00xf00000000x300000>".Quoted 114 lines
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +66
-0+ + timer0: timer at f0000000 { + compatible = "nuvoton,npcm750-timer"; + interrupts = <0 32 4>; + reg = <0x0 0x1000>; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog0: watchdog at f0008000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 47 4>; + reg = <0x8000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog1: watchdog at f0009000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 48 4>; + reg = <0x9000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + watchdog2: watchdog at f000a000 { + compatible = "nuvoton,npcm750-wdt"; + interrupts = <0 49 4>; + reg = <0xa000 0x1000>; + status = "disabled"; + clocks = <&clk NPCM7XX_CLK_TIMER>; + }; + + serial0: serial at f0001000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x1000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 2 4>; + status = "disabled"; + }; + + serial1: serial at f0002000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x2000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 3 4>; + status = "disabled"; + }; + + serial2: serial at f0003000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x3000 0x1000>; + clocks = <&clk NPCM7XX_CLK_UART_CORE>; + interrupts = <0 4 4>; + status = "disabled"; + }; + + serial3: serial at f0004000 { + compatible = "nuvoton,npcm750-uart"; + reg = <0x4000 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 --2.15.0.rc0.271.g36b669edcc-goog
PATCH v7 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: Supported +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.15.0.rc0.271.g36b669edcc-goog