arm: npcm: add basic support for Nuvoton BMCs
Subsystems (5)
v8 cover arm: npcm: add basic support for Nuvoton BMCs
Addressed comments from:
- Rick (offline comments)
- Julien: https://www.spinics.net/lists/arm-kernel/msg613222.html
- Russell: https://www.spinics.net/lists/arm-kernel/msg613212.html
- Tomer: https://www.spinics.net/lists/arm-kernel/msg614059.html
- Rob: https://www.spinics.net/lists/arm-kernel/msg613355.html
- Tomer
Summary of changes since previous update:
- Arch support:
- Cleaned up L2C aux values
- Cleaned up memory barries
- Renamed CPU_NPCM750 to ARCH_NPCM750
- Other mostly cosmetic changes
- DTS:
- Added property to L2 cache
- More clean up
- No changes to MAINTAINERS since v5
Changes have been tested on the NPCM750 evaluation board.
PATCH v8 1/3 arm: npcm: add basic support for Nuvoton BMCs
Adds basic support for the Nuvoton NPCM750 BMC.
---
Changes since v7:
- Fixed useless parameter in print statement
- Added/cleaned up some comments
- Fixed typo in DT_MACHINE_START
- Got rid of L2C aux value
- Dropped unnecessary memory barriers
- Renamed CPU_NPCM750 to ARCH_NPCM750
- Fixed some other minor issues
--- 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 | 21 +++++++++++ arch/arm/mach-npcm/npcm7xx.c | 25 +++++++++++++ arch/arm/mach-npcm/platsmp.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 185 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_ARCH_NPCM750) += npcm7xx.o platsmp.o headsmp.o
arch/arm/mach-npcm/headsmp.S new file +21 -0
@@ -0,0 +1,21 @@ +/* + * 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> + +/* + * The boot ROM does not start secondary CPUs in SVC mode, so we need to do that + * here. + */ +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)
arch/arm/mach-npcm/npcm7xx.c new file +25 -0
@@ -0,0 +1,25 @@ +/* +* 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> + +static const char *const npcm7xx_dt_match[] = { +"nuvoton,npcm750" , +NULL +}; + +DT_MACHINE_START (NPCM7XX_DT ,"NPCM7XX Chip family" ) + .atag_offset = 0x100, + .dt_compat = npcm7xx_dt_match, +MACHINE_END
arch/arm/mach-npcm/platsmp.c new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
2.15.0.448.gf294e3d99a-goog
Any update on this?
Quoted 271 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]>---
Changes since v7:
- Fixed useless parameter in print statement
- Added/cleaned up some comments
- Fixed typo inDT_MACHINE_START
- Got rid of L2C aux value
- Dropped unnecessary memory barriers
- RenamedCPU_NPCM750toARCH_NPCM750
- Fixed some other minor issues--- 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 | 21 +++++++++++ arch/arm/mach-npcm/npcm7xx.c | 25 +++++++++++++ arch/arm/mach-npcm/platsmp.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 185 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 "NPCM7XX CPU type" + +config ARCH_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_ARCH_NPCM750) += npcm7xx.o platsmp.o headsmp.oarch/arm/mach-npcm/headsmp.S new file +21
-0@@ -0,0 +1,21 @@ +/* + * 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> + +/* + * The boot ROM does not start secondary CPUs in SVC mode, so we need to do that + * here. + */ +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup)arch/arm/mach-npcm/npcm7xx.c new file +25
-0@@ -0,0 +1,25 @@ +/* +* 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> + +static const char *const npcm7xx_dt_match[] = { +"nuvoton,npcm750" , +NULL +}; + +DT_MACHINE_START (NPCM7XX_DT ,"NPCM7XX Chip family" ) + .atag_offset = 0x100, + .dt_compat = npcm7xx_dt_match, +MACHINE_END arch/arm/mach-npcm/platsmp.c new file +85
-1@@ -0,0 +1,85 @@ +/* +* 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) "nuvoton,npcm7xx-smp: " 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 = -ENODEV ; + goto out; + } + gcr_base =of_iomap (gcr_np,0 ); +if (!gcr_base) { +pr_err ("could not iomap gcr" ); + ret = -ENOMEM ; + goto out; + } + +/* give boot ROM kernel start address. */ +iowrite32 (__pa_symbol (npcm7xx_secondary_startup), gcr_base + +NPCM7XX_SCRPAD_REG ); +/* make sure the previous write is seen by all observers. */ +dsb_sev (); + +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" ); +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); --2.15.0.448.gf294e3d99a-goog
Brendan,
Quoted 11 lines · Brendan Higgins
Any update on this?
Quoted 7 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]>
<snip>
Quoted 11 lines
arch/arm/mach-npcm/npcm7xx.c line 8
Quoted 11 lines
arch/arm/mach-npcm/npcm7xx.c new file +8
-0@@ -0,0 +1,25 @@ +/* +* 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. +*/
Have you considered using the new SPDX ids here instead of the traditional license boilerplate?
This could come out this way:
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2017 Nuvoton Technology corporation. // Copyright 2017 Google, Inc.
It is shorter and simpler, with a better code/comments ratio. And if you wonder about why using C++ style comment, please check Linus posts on the topic, as well as Thomas doc patches.
Thank you for your kind consideration!
Signature · 2 lines
Cordially Philippe Ombredanne
PATCH v8 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.
---
Changes since v7:
- Added arm,shared-override to l2 cache
- Cleaned up node names
- Cleaned up ranges properties
- Fixed address for nuvoton,npcm750-timer
- Dropped watchdog nodes for now since the properties in them are wrong
--- .../arm/cpu-enable-method/nuvoton,npcm7xx-smp | 42 +++++ .../devicetree/bindings/arm/npcm/npcm.txt | 6 + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 44 ++++++ arch/arm/boot/dts/nuvoton-npcm750.dtsi | 171 +++++++++++++++++++++ include/dt-bindings/clock/nuvoton,npcm7xx-clks.h | 39 +++++ 5 files changed, 302 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 +44 -0
44 lines not on this page · raw message
arch/arm/boot/dts/nuvoton-npcm750.dtsi new file +171 -0
171 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.448.gf294e3d99a-goog
Re: [PATCH v8 2/3] arm: dts: add Nuvoton NPCM750 device tree
Quoted 16 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]>---
Changes since v7:
- Added arm,shared-override to l2 cache
- Cleaned up node names
- Cleaned up ranges properties
- Fixed address for nuvoton,npcm750-timer
- Dropped watchdog nodes for now since the properties in them are wrong
Quoted 12 lines
--- .../arm/cpu-enable-method/nuvoton,npcm7xx-smp | 42 +++++ .../devicetree/bindings/arm/npcm/npcm.txt | 6 + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 44 ++++++ arch/arm/boot/dts/nuvoton-npcm750.dtsi | 171 +++++++++++++++++++++ include/dt-bindings/clock/nuvoton,npcm7xx-clks.h | 39 +++++ 5 files changed, 302 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
PATCH v8 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.448.gf294e3d99a-goog