Re: [U-Boot] [PATCH 8/9] arm: exynos: add support for Exynos7420 SoC

Hi Simon,

On Wed, Apr 20, 2016 at 8:11 PM, Simon Glass sjg@chromium.org wrote:

Hi Thomas,

On 13 April 2016 at 04:43, Thomas Abraham ta.omasab@gmail.com wrote:

...

From: Thomas Abraham thomas.ab@samsung.com

Add support for Exynos7420 SoC. The Exynos7420 SoC has four Cortex-A57 and four Cortex-A53 CPUs and includes various peripheral controllers.

Signed-off-by: Thomas Abraham thomas.ab@samsung.com

arch/arm/dts/exynos7420.dtsi | 82 ++++++++++++++++++++++++ arch/arm/mach-exynos/Kconfig | 11 +++ arch/arm/mach-exynos/Makefile | 1 + arch/arm/mach-exynos/mmu-arm64.c | 35 ++++++++++ arch/arm/mach-exynos/soc.c | 8 +++ include/configs/espresso7420.h | 35 ++++++++++ include/configs/exynos7420-common.h | 117 +++++++++++++++++++++++++++++++++++ 7 files changed, 289 insertions(+), 0 deletions(-) create mode 100644 arch/arm/dts/exynos7420.dtsi create mode 100644 arch/arm/mach-exynos/mmu-arm64.c create mode 100644 include/configs/espresso7420.h create mode 100644 include/configs/exynos7420-common.h

Please see below:

Reviewed-by: Simon Glass sjg@chromium.org

Thanks.

...

diff --git a/arch/arm/dts/exynos7420.dtsi b/arch/arm/dts/exynos7420.dtsi new file mode 100644 index 0000000..990f8a1 --- /dev/null +++ b/arch/arm/dts/exynos7420.dtsi @@ -0,0 +1,82 @@ +/*

• • Samsung Exynos7420 SoC device tree source
• • Copyright (c) 2016 Samsung Electronics Co., Ltd.

• •         http://www.samsung.com
    

• • SPDX-License-Identifier: GPL-2.0+
• */

+/dts-v1/; +#include "skeleton.dtsi" +#include <dt-bindings/clock/exynos7420-clk.h> +/ {

•   compatible = "samsung,exynos7420";
  

•   fin_pll: xxti {
  

•           compatible = "fixed-clock";
  

•           clock-output-names = "fin_pll";
  

•           u-boot,dm-pre-reloc;
  

•           #clock-cells = <0>;
  

•   };
  

•   clock_topc: clock-controller@10570000 {
  

•           compatible = "samsung,exynos7-clock-topc";
  

•           reg = <0x10570000 0x10000>;
  

•           u-boot,dm-pre-reloc;
  

•           #clock-cells = <1>;
  

•           clocks = <&fin_pll>;
  

•           clock-names = "fin_pll";
  

•   };
  

•   clock_top0: clock-controller@105d0000 {
  

•           compatible = "samsung,exynos7-clock-top0";
  

•           reg = <0x105d0000 0xb000>;
  

•           u-boot,dm-pre-reloc;
  

•           #clock-cells = <1>;
  

•           clocks = <&fin_pll>, <&clock_topc DOUT_SCLK_BUS0_PLL>,
  

•                    <&clock_topc DOUT_SCLK_BUS1_PLL>,
  

•                    <&clock_topc DOUT_SCLK_CC_PLL>,
  

•                    <&clock_topc DOUT_SCLK_MFC_PLL>;
  

•           clock-names = "fin_pll", "dout_sclk_bus0_pll",
  

•                         "dout_sclk_bus1_pll", "dout_sclk_cc_pll",
  

•                         "dout_sclk_mfc_pll";
  

•   };
  

•   clock_peric1: clock-controller@14c80000 {
  

•           compatible = "samsung,exynos7-clock-peric1";
  

•           reg = <0x14c80000 0xd00>;
  

•           u-boot,dm-pre-reloc;
  

•           #clock-cells = <1>;
  

•           clocks = <&fin_pll>, <&clock_top0 DOUT_ACLK_PERIC1>,
  

•                    <&clock_top0 CLK_SCLK_UART1>,
  

•                    <&clock_top0 CLK_SCLK_UART2>,
  

•                    <&clock_top0 CLK_SCLK_UART3>;
  

•           clock-names = "fin_pll", "dout_aclk_peric1_66",
  

•                         "sclk_uart1", "sclk_uart2", "sclk_uart3";
  

•   };
  

•   pinctrl@13470000 {
  

•           compatible = "samsung,exynos7420-pinctrl";
  

•           reg = <0x13470000 0x1000>;
  

•           u-boot,dm-pre-reloc;
  

•           serial2_bus: serial2-bus {
  

•                   samsung,pins = "gpd1-4", "gpd1-5";
  

•                   samsung,pin-function = <2>;
  

•                   samsung,pin-pud = <3>;
  

•                   samsung,pin-drv = <0>;
  

•           };
  

•   };
  

•   serial@14C30000 {
  

•           compatible = "samsung,exynos4210-uart";
  

•           reg = <0x14C30000 0x100>;
  

•           u-boot,dm-pre-reloc;
  

•           clocks = <&clock_peric1 PCLK_UART2>,
  

•                    <&clock_peric1 SCLK_UART2>;
  

•           clock-names = "uart", "clk_uart_baud0";
  

•           pinctrl-names = "default";
  

•           pinctrl-0 = <&serial2_bus>;
  

•   };
  

+}; diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index acab947..52a5a30 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -81,6 +81,16 @@ config TARGET_PEACH_PIT select SUPPORT_SPL select OF_CONTROL

+config TARGET_ESPRESSO7420

•   bool "ESPRESSO7420 board"
  

•   select ARM64
  

•   select SUPPORT_SPL
  

•   select OF_CONTROL
  

•   select SPL_DISABLE_OF_CONTROL
  

•   select PINCTRL
  

•   select PINCTRL_EXYNOS7420
  

•   select CLK_EXYNOS
  

endchoice

config SYS_SOC @@ -95,5 +105,6 @@ source "board/samsung/odroid/Kconfig" source "board/samsung/arndale/Kconfig" source "board/samsung/smdk5250/Kconfig" source "board/samsung/smdk5420/Kconfig" +source "board/samsung/espresso7420/Kconfig"

endif diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index be5912e..a238a98 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -7,6 +7,7 @@

obj-y += soc.o obj-$(CONFIG_CPU_V7) += clock.o pinmux.o power.o soc.o system.o +obj-$(CONFIG_ARM64) += mmu-arm64.o

obj-$(CONFIG_EXYNOS5420) += sec_boot.o

diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c new file mode 100644 index 0000000..ba6d99d --- /dev/null +++ b/arch/arm/mach-exynos/mmu-arm64.c @@ -0,0 +1,35 @@ +/*

• • Copyright (C) 2016 Samsung Electronics
• • Thomas Abraham thomas.ab@samsung.com
• • SPDX-License-Identifier: GPL-2.0+
• */

+#include <common.h> +#include <asm/armv8/mmu.h>

+DECLARE_GLOBAL_DATA_PTR;

+#ifdef CONFIG_EXYNOS7420 +static struct mm_region exynos7420_mem_map[] = {

•   {
  

•           .base   = 0x10000000UL,
  

•           .size   = 0x10000000UL,
  

•           .attrs  = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
  

•                           PTE_BLOCK_NON_SHARE |
  

•                           PTE_BLOCK_PXN | PTE_BLOCK_UXN,
  

•   }, {
  

•           .base   = 0x40000000UL,
  

•           .size   = 0x80000000UL,
  

•           .attrs  = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
  

•                           PTE_BLOCK_INNER_SHARE,
  

•   }, {
  

•           /* List terminator */
  

•           .base   = 0,
  

•           .size   = 0,
  

•           .attrs  = 0,
  

•   },
  

+};

+struct mm_region *mem_map = exynos7420_mem_map; +#endif diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index 5cea5ed..0706f5d 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -23,3 +23,11 @@ void enable_caches(void) dcache_enable(); } #endif

+#ifdef CONFIG_ARM64 +void lowlevel_init(void) +{

•   armv8_switch_to_el2();
  

•   armv8_switch_to_el1();
  

+} +#endif diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h new file mode 100644 index 0000000..2af33e7 --- /dev/null +++ b/include/configs/espresso7420.h @@ -0,0 +1,35 @@ +/*

• • Configuration settings for the SAMSUNG ESPRESSO7420 board.
• • Copyright (C) 2016 Samsung Electronics
• • Thomas Abraham thomas.ab@samsung.com
• • SPDX-License-Identifier: GPL-2.0+
• */

+#ifndef __CONFIG_ESPRESSO7420_H +#define __CONFIG_ESPRESSO7420_H

+#include <configs/exynos7420-common.h>

+#define CONFIG_BOARD_COMMON

+#define CONFIG_ESPRESSO7420 +#define CONFIG_ENV_IS_NOWHERE

+#define CONFIG_SYS_SDRAM_BASE 0x40000000 +#define CONFIG_SYS_TEXT_BASE 0x43E00000 +#define CONFIG_SPL_STACK CONFIG_IRAM_END +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_END

+/* select serial console configuration */ +#define CONFIG_SERIAL2 /* use SERIAL 2 */

Is that needed?

No, that was not needed. This will be removed in the next version.

...

+#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"

+#define CONFIG_IDENT_STRING " for ESPRESSO7420" +#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"

+/* DRAM Memory Banks */ +#define CONFIG_NR_DRAM_BANKS 8 +#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */

+#endif /* __CONFIG_ESPRESSO7420_H */ diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h new file mode 100644 index 0000000..9a7e193 --- /dev/null +++ b/include/configs/exynos7420-common.h @@ -0,0 +1,117 @@ +/*

• • Configuration settings for the Espresso7420 board.
• • Copyright (C) 2016 Samsung Electronics
• • Thomas Abraham thomas.ab@samsung.com
• • SPDX-License-Identifier: GPL-2.0+
• */

+#ifndef __CONFIG_EXYNOS7420_COMMON_H +#define __CONFIG_EXYNOS7420_COMMON_H

+/* High Level Configuration Options */ +#define CONFIG_SAMSUNG /* in a SAMSUNG core */ +#define CONFIG_EXYNOS7420 /* Exynos7 Family */ +#define CONFIG_S5P

+#include <asm/arch/cpu.h> /* get chip and board defs */ +#include <linux/sizes.h>

+#define CONFIG_ARCH_CPU_INIT +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_BOARD_EARLY_INIT_F

+/* Size of malloc() pool before and after relocation */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))

+/* Miscellaneous configurable options */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */

+/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

+/* select serial console configuration */ +#define CONFIG_BAUDRATE 115200

+/* FLASH and environment organization */ +#define CONFIG_SYS_NO_FLASH

+/* Timer input clock frequency */ +#define COUNTER_FREQUENCY 24000000

+/* Generic Interrupt Controller Definitions */ +#define CONFIG_GICV2 +#define GICD_BASE 0x11001000 +#define GICC_BASE 0x11002000

Can these be in device tree? Or in arch/asm/include/... ?

These are not required for now. So will remove these as well.

Thanks, Thomas.

...

+#define CONFIG_DEVICE_TREE_LIST "exynos7420-espresso7420"

+/* IRAM Layout */ +#define CONFIG_IRAM_BASE 0x02100000

...

+#define CONFIG_IRAM_SIZE 0x58000 +#define CONFIG_IRAM_END (CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)

+/* Number of CPUs available */ +#define CONFIG_CORE_COUNT 0x8

+/* select serial console configuration */ +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SILENT_CONSOLE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_CONSOLE_MUX

+#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)

+#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE +#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_2 (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE) +#define PHYS_SDRAM_2_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_3 (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE)) +#define PHYS_SDRAM_3_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_4 (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE)) +#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_5 (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE)) +#define PHYS_SDRAM_5_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_6 (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE)) +#define PHYS_SDRAM_6_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_7 (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE)) +#define PHYS_SDRAM_7_SIZE SDRAM_BANK_SIZE +#define PHYS_SDRAM_8 (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE)) +#define PHYS_SDRAM_8_SIZE SDRAM_BANK_SIZE

I wish we could use device tree for this cruft. Any way?

...

+/* Configuration of ENV Blocks */ +#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */

+#define BOOT_TARGET_DEVICES(func) \

•   func(MMC, mmc, 1) \
  

•   func(MMC, mmc, 0) \
  

+#ifndef MEM_LAYOUT_ENV_SETTINGS +#define MEM_LAYOUT_ENV_SETTINGS \

•   "bootm_size=0x10000000\0" \
  

•   "kernel_addr_r=0x42000000\0" \
  

•   "fdt_addr_r=0x43000000\0" \
  

•   "ramdisk_addr_r=0x43300000\0" \
  

•   "scriptaddr=0x50000000\0" \
  

•   "pxefile_addr_r=0x51000000\0"
  

+#endif

+#ifndef EXYNOS_DEVICE_SETTINGS +#define EXYNOS_DEVICE_SETTINGS \

•   "stdin=serial\0" \
  

•   "stdout=serial\0" \
  

•   "stderr=serial\0"
  

+#endif

+#ifndef EXYNOS_FDTFILE_SETTING +#define EXYNOS_FDTFILE_SETTING +#endif

+#define CONFIG_EXTRA_ENV_SETTINGS \

•   EXYNOS_DEVICE_SETTINGS \
  

•   EXYNOS_FDTFILE_SETTING \
  

•   MEM_LAYOUT_ENV_SETTINGS
  

+#endif /* __CONFIG_EXYNOS7420_COMMON_H */

1.6.6.rc2

Regards, Simon