ARM: tegra: Miscellaneous improvements
Subsystems (6)
v3 cover ARM: tegra: Miscellaneous improvements
From: Thierry Reding <[email protected]>
The bulk of these changes are an effort to unify Tegra186 builds with builds of prior 64-bit Tegra generations. On top of that there are various improvements that allow data (such as the MAC address and boot arguments) to be passed through from early firmware to the kernel on boot.
The last two patches can be applied at a later time if the strndup() addition can't be merged along with the rest of the patches through the Tegra tree.
Thierry
Thierry Reding (19):
ARM: tegra: Use common header for PMU declarations
ARM: tegra: Guard clock code with a Kconfig symbol
ARM: tegra: Guard GP pad control code with a Kconfig symbol
ARM: tegra: Guard memory controller code with a Kconfig symbol
ARM: tegra: Guard pin controller code with a Kconfig symbol
ARM: tegra: Guard powergate code with a Kconfig symbol
ARM: tegra: Fix save_boot_params() prototype
ARM: tegra: Allow boards to override boot target devices
ARM: tegra: Support TZ-only access to PMC
ARM: tegra: Workaround UDC boot issues only if necessary
ARM: tegra: Restore DRAM bank count
ARM: tegra: Unify Tegra186 builds
ARM: tegra: Implement cboot_save_boot_params() in C
ARM: tegra: Implement cboot_get_ethaddr()
ARM: tegra: Enable position independent build for 64-bit
p2371-2180: Pass Ethernet MAC to the kernel
p2771-0000: Pass Ethernet MAC to the kernel
lib: Implement strndup()
ARM: tegra: Import cbootargs value from cboot DTB
arch/arm/include/asm/arch-tegra/cboot.h | 45 ++
arch/arm/include/asm/arch-tegra/pmc.h | 20 +-
.../asm/{arch-tegra20 => arch-tegra}/pmu.h | 6 +-
arch/arm/include/asm/arch-tegra/tegra.h | 6 +
arch/arm/include/asm/arch-tegra114/pmu.h | 12 -
arch/arm/include/asm/arch-tegra124/pmu.h | 13 -
arch/arm/include/asm/arch-tegra210/pmu.h | 13 -
arch/arm/include/asm/arch-tegra30/pmu.h | 12 -
arch/arm/mach-tegra/Kconfig | 32 +
arch/arm/mach-tegra/Makefile | 16 +-
arch/arm/mach-tegra/board.c | 41 +-
arch/arm/mach-tegra/board186.c | 32 -
arch/arm/mach-tegra/board2.c | 37 +-
arch/arm/mach-tegra/cache.c | 2 +
arch/arm/mach-tegra/cboot.c | 605 ++++++++++++++++++
arch/arm/mach-tegra/clock.c | 13 +-
arch/arm/mach-tegra/cmd_enterrcm.c | 6 +-
arch/arm/mach-tegra/cpu.c | 20 +-
arch/arm/mach-tegra/emc.c | 2 +-
arch/arm/mach-tegra/lowlevel_init.S | 39 --
arch/arm/mach-tegra/pmc.c | 92 +++
arch/arm/mach-tegra/powergate.c | 11 +-
arch/arm/mach-tegra/tegra186/Makefile | 4 -
arch/arm/mach-tegra/tegra186/nvtboot_board.c | 332 ----------
arch/arm/mach-tegra/tegra186/nvtboot_ll.S | 20 -
arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 172 -----
board/nvidia/p2371-2180/p2371-2180.c | 50 ++
board/nvidia/p2771-0000/p2771-0000.c | 53 +-
configs/e2220-1170_defconfig | 2 +-
configs/p2371-0000_defconfig | 2 +-
configs/p2371-2180_defconfig | 3 +-
configs/p2571_defconfig | 2 +-
configs/p2771-0000-000_defconfig | 3 +-
configs/p2771-0000-500_defconfig | 3 +-
include/configs/tegra-common-post.h | 2 +
include/linux/string.h | 1 +
lib/string.c | 23 +
37 files changed, 1046 insertions(+), 701 deletions(-)
create mode 100644 arch/arm/include/asm/arch-tegra/cboot.h
rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/pmu.h (73%)
delete mode 100644 arch/arm/include/asm/arch-tegra114/pmu.h
delete mode 100644 arch/arm/include/asm/arch-tegra124/pmu.h
delete mode 100644 arch/arm/include/asm/arch-tegra210/pmu.h
delete mode 100644 arch/arm/include/asm/arch-tegra30/pmu.h
delete mode 100644 arch/arm/mach-tegra/board186.c
create mode 100644 arch/arm/mach-tegra/cboot.c
delete mode 100644 arch/arm/mach-tegra/lowlevel_init.S
create mode 100644 arch/arm/mach-tegra/pmc.c
delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_board.c
delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_ll.S
delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_mem.cSignature · 1 line
2.21.0
PATCH v3 1/19 ARM: tegra: Use common header for PMU declarations
From: Thierry Reding <[email protected]>
There's no need to replicate the pmu.h header file for every Tegra SoC generation. Use a single header that is shared across generations.
---
.../include/asm/{arch-tegra20 => arch-tegra}/pmu.h | 6 +++---
arch/arm/include/asm/arch-tegra114/pmu.h | 12 ------------
arch/arm/include/asm/arch-tegra124/pmu.h | 13 -------------
arch/arm/include/asm/arch-tegra210/pmu.h | 13 -------------
arch/arm/include/asm/arch-tegra30/pmu.h | 12 ------------
arch/arm/mach-tegra/board2.c | 2 +-
arch/arm/mach-tegra/emc.c | 2 +-
7 files changed, 5 insertions(+), 55 deletions(-)
rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/pmu.h (73%)
delete mode 100644 arch/arm/include/asm/arch-tegra114/pmu.h
delete mode 100644 arch/arm/include/asm/arch-tegra124/pmu.h
delete mode 100644 arch/arm/include/asm/arch-tegra210/pmu.h
delete mode 100644 arch/arm/include/asm/arch-tegra30/pmu.harch/arm/include/asm/arch-tegra/pmu.h renamed from arch/arm/include/asm/arch-tegra20/pmu.h +3 -3
@@ -4,10 +4,10 @@* NVIDIA Corporation <www.nvidia.com> */ -#ifndef _ARCH_PMU_H_ -#define _ARCH_PMU_H_ +#ifndef _TEGRA_PMU_H_ +#define _TEGRA_PMU_H_/* Set core and CPU voltages to nominal levels */ int pmu_set_nominal (void ); -#endif /* _ARCH_PMU_H_ */ +#endif /* _TEGRA_PMU_H_ */
arch/arm/include/asm/arch-tegra114/pmu.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. -*/ - -#ifndef _TEGRA114_PMU_H_ -#define _TEGRA114_PMU_H_ - -/* Set core and CPU voltages to nominal levels */ -int pmu_set_nominal (void ); - -#endif /* _TEGRA114_PMU_H_ */
arch/arm/include/asm/arch-tegra124/pmu.h deleted +0 -13
@@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2010-2013 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef _TEGRA124_PMU_H_ -#define _TEGRA124_PMU_H_ - -/* Set core and CPU voltages to nominal levels */ -int pmu_set_nominal (void ); - -#endif /* _TEGRA124_PMU_H_ */
arch/arm/include/asm/arch-tegra210/pmu.h deleted +0 -13
@@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* (C) Copyright 2010-2015 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef _TEGRA210_PMU_H_ -#define _TEGRA210_PMU_H_ - -/* Set core and CPU voltages to nominal levels */ -int pmu_set_nominal (void ); - -#endif /* _TEGRA210_PMU_H_ */
arch/arm/include/asm/arch-tegra30/pmu.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. -*/ - -#ifndef _TEGRA30_PMU_H_ -#define _TEGRA30_PMU_H_ - -/* Set core and CPU voltages to nominal levels */ -int pmu_set_nominal (void ); - -#endif /* _TEGRA30_PMU_H_ */
arch/arm/mach-tegra/board2.c +1 -1
@@ -15,6 +15,7 @@#include <asm/arch-tegra/board.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/pmu.h> #include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/uart.h> #include <asm/arch-tegra/warmboot.h>
@@ -24,7 +25,6 @@#include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/pmu.h> #include <asm/arch/tegra.h> #ifdef CONFIG_TEGRA_CLOCK_SCALING #include <asm/arch/emc.h>
arch/arm/mach-tegra/emc.c +1 -1
@@ -8,10 +8,10 @@#include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> -#include <asm/arch/pmu.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/pmu.h> #include <asm/arch-tegra/sys_proto.h> DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
2.21.0
PATCH v3 2/19 ARM: tegra: Guard clock code with a Kconfig symbol
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Clock code is not relevant on all Tegra SoC generations, so guard it with a Kconfig symbol that can be selected by the generations that need it.
This is in preparation for unifying Tegra186 code with the code used on older generations.
--- arch/arm/mach-tegra/Kconfig | 5 +++++ arch/arm/mach-tegra/Makefile | 2 +- arch/arm/mach-tegra/board.c | 2 ++ arch/arm/mach-tegra/board2.c | 12 ++++++++++-- 4 files changed, 18 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/Kconfig +5 -0
@@ -12,6 +12,9 @@ config SPL_LIBGENERIC_SUPPORT config SPL_SERIAL_SUPPORT default y +config TEGRA_CLKRST + bool + config TEGRA_IVC bool "Tegra IVC protocol" help
@@ -55,6 +58,7 @@ config TEGRA_ARMV7_COMMON select SPL select SPL_BOARD_INIT if SPL select SUPPORT_SPL + select TEGRA_CLKRST select TEGRA_COMMON select TEGRA_GPIO select TEGRA_NO_BPMP
@@ -100,6 +104,7 @@ config TEGRA124 config TEGRA210 bool "Tegra210 family" select TEGRA_ARMV8_COMMON + select TEGRA_CLKRST select TEGRA_GPIO select TEGRA_NO_BPMP
arch/arm/mach-tegra/Makefile +1 -1
@@ -16,7 +16,7 @@ endif obj-y += ap.o obj-y += board.o board2.o obj-y += cache.o -obj-y += clock.o +obj-$(CONFIG_TEGRA_CLKRST) += clock.o obj-y += pinmux-common.o obj-y += powergate.o obj-y += xusb-padctl-dummy.o
arch/arm/mach-tegra/board.c +2 -0
@@ -9,7 +9,9 @@#include <ns16550.h> #include <spl.h> #include <asm/io.h> +#if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> +#endif #include <asm/arch/funcmux.h> #include <asm/arch/mc.h> #include <asm/arch/tegra.h>
arch/arm/mach-tegra/board2.c +10 -2
@@ -22,7 +22,9 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> +#endif #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> #include <asm/arch/tegra.h>
@@ -109,8 +111,10 @@ int board_init(void)__maybe_unused int board_id;/* Do clocks and UART first so that printf() works */ +#if IS_ENABLED (CONFIG_TEGRA_CLKRST )clock_init ();clock_verify (); +#endif tegra_gpu_config ();
@@ -181,8 +185,10 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init")));int board_early_init_f (void ) { +#if IS_ENABLED (CONFIG_TEGRA_CLKRST )if (!clock_early_init_done ())clock_early_init (); +#endif #if defined(CONFIG_TEGRA_DISCONNECT_UDC_ON_BOOT )#define USBCMD_FS2 (1 << 15)
@@ -193,10 +199,12 @@ int board_early_init_f(void)#endif /* Do any special system timer/TSC setup */ -#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE ) +#if IS_ENABLED (CONFIG_TEGRA_CLKRST ) +# if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE ) if (!tegra_cpu_is_non_secure()) -#endif +# endif arch_timer_init (); +#endif pinmux_init ();board_init_uart_f ();
Signature · 1 line
2.21.0
PATCH v3 3/19 ARM: tegra: Guard GP pad control code with a Kconfig symbol
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The GP pad control code is not relevant on all Tegra SoC generations, so guard it with a Kconfig symbol that can be selected by the generations that need it.
This is in preparation for unifying Tegra186 code with the code used on older generations.
--- arch/arm/mach-tegra/Kconfig | 5 +++++ arch/arm/mach-tegra/Makefile | 2 +- arch/arm/mach-tegra/cache.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-tegra/Kconfig +5 -0
@@ -15,6 +15,9 @@ config SPL_SERIAL_SUPPORT config TEGRA_CLKRST bool +config TEGRA_GP_PADCTRL + bool + config TEGRA_IVC bool "Tegra IVC protocol" help
@@ -61,6 +64,7 @@ config TEGRA_ARMV7_COMMON select TEGRA_CLKRST select TEGRA_COMMON select TEGRA_GPIO + select TEGRA_GP_PADCTRL select TEGRA_NO_BPMP config TEGRA_ARMV8_COMMON
@@ -106,6 +110,7 @@ config TEGRA210 select TEGRA_ARMV8_COMMON select TEGRA_CLKRST select TEGRA_GPIO + select TEGRA_GP_PADCTRL select TEGRA_NO_BPMP config TEGRA186
arch/arm/mach-tegra/Makefile +1 -1
@@ -13,7 +13,7 @@ else obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o endif -obj-y += ap.o +obj-$(CONFIG_TEGRA_GP_PADCTRL) += ap.o obj-y += board.o board2.o obj-y += cache.o obj-$(CONFIG_TEGRA_CLKRST) += clock.o
arch/arm/mach-tegra/cache.c +2 -0
@@ -8,7 +8,9 @@#include <common.h> #include <asm/io.h> #include <asm/arch-tegra/ap.h> +#if IS_ENABLED (CONFIG_TEGRA_GP_PADCTRL )#include <asm/arch/gp_padctrl.h> +#endif #ifndef CONFIG_ARM64 void config_cache (void )
Signature · 1 line
2.21.0
PATCH v3 4/19 ARM: tegra: Guard memory controller code with a Kconfig symbol
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Memory controller code is not relevant on all Tegra SoC generations, so guard it with a Kconfig symbol that can be selected by the generations that need it.
This is in preparation for unifying Tegra186 code with the code used on older generations.
--- arch/arm/mach-tegra/Kconfig | 5 +++++ arch/arm/mach-tegra/board.c | 7 +++++++ 2 files changed, 12 insertions(+)
arch/arm/mach-tegra/Kconfig +5 -0
@@ -26,6 +26,9 @@ config TEGRA_IVC U-Boot, it is typically used for communication between the main CPU and various auxiliary processors. +config TEGRA_MC + bool + config TEGRA_COMMON bool "Tegra common options" select BINMAN
@@ -65,6 +68,7 @@ config TEGRA_ARMV7_COMMON select TEGRA_COMMON select TEGRA_GPIO select TEGRA_GP_PADCTRL + select TEGRA_MC select TEGRA_NO_BPMP config TEGRA_ARMV8_COMMON
@@ -111,6 +115,7 @@ config TEGRA210 select TEGRA_CLKRST select TEGRA_GPIO select TEGRA_GP_PADCTRL + select TEGRA_MC select TEGRA_NO_BPMP config TEGRA186
arch/arm/mach-tegra/board.c +7 -0
@@ -13,7 +13,9 @@#include <asm/arch/clock.h> #endif #include <asm/arch/funcmux.h> +#if IS_ENABLED (CONFIG_TEGRA_MC )#include <asm/arch/mc.h> +#endif #include <asm/arch/tegra.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/board.h>
@@ -68,6 +70,7 @@ bool tegra_cpu_is_non_secure(void) }#endif +#if IS_ENABLED (CONFIG_TEGRA_MC )/* Read the RAM size directly from the memory controller */ static phys_size_t query_sdram_size (void ) {
@@ -117,11 +120,15 @@ static phys_size_t query_sdram_size(void) return size_bytes; } +#endif int dram_init (void ) { +#if IS_ENABLED (CONFIG_TEGRA_MC )/* We do not initialise DRAM here. We just query the size */ gd->ram_size =query_sdram_size (); +#endif +return 0 ; }
Signature · 1 line
2.21.0
PATCH v3 5/19 ARM: tegra: Guard pin controller code with a Kconfig symbol
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Pin controller code is not relevant on all Tegra SoC generations, so guard it with a Kconfig symbol that can be selected by the generations that need it.
This is in preparation for unifying Tegra186 code with the code used on older generations.
--- arch/arm/mach-tegra/Kconfig | 5 +++++ arch/arm/mach-tegra/Makefile | 2 +- arch/arm/mach-tegra/board.c | 6 ++++++ arch/arm/mach-tegra/board2.c | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-)
arch/arm/mach-tegra/Kconfig +5 -0
@@ -29,6 +29,9 @@ config TEGRA_IVC config TEGRA_MC bool +config TEGRA_PINCTRL + bool + config TEGRA_COMMON bool "Tegra common options" select BINMAN
@@ -70,6 +73,7 @@ config TEGRA_ARMV7_COMMON select TEGRA_GP_PADCTRL select TEGRA_MC select TEGRA_NO_BPMP + select TEGRA_PINCTRL config TEGRA_ARMV8_COMMON bool "Tegra 64-bit common options"
@@ -117,6 +121,7 @@ config TEGRA210 select TEGRA_GP_PADCTRL select TEGRA_MC select TEGRA_NO_BPMP + select TEGRA_PINCTRL config TEGRA186 bool "Tegra186 family"
arch/arm/mach-tegra/Makefile +1 -1
@@ -17,7 +17,7 @@ obj-$(CONFIG_TEGRA_GP_PADCTRL) += ap.o obj-y += board.o board2.o obj-y += cache.o obj-$(CONFIG_TEGRA_CLKRST) += clock.o -obj-y += pinmux-common.o +obj-$(CONFIG_TEGRA_PINCTRL) += pinmux-common.o obj-y += powergate.o obj-y += xusb-padctl-dummy.o endif
arch/arm/mach-tegra/board.c +6 -0
@@ -12,7 +12,9 @@#if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif +#if IS_ENABLED (CONFIG_TEGRA_PINCTRL )#include <asm/arch/funcmux.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_MC )#include <asm/arch/mc.h> #endif
@@ -132,6 +134,7 @@ int dram_init(void)return 0 ; } +#if IS_ENABLED (CONFIG_TEGRA_PINCTRL ) static int uart_configs[] = {#if defined(CONFIG_TEGRA20 )#if defined(CONFIG_TEGRA_UARTA_UAA_UAB )
@@ -199,9 +202,11 @@ static void setup_uarts(int uart_ids) } } } +#endif void board_init_uart_f (void ) { +#if IS_ENABLED (CONFIG_TEGRA_PINCTRL )int uart_ids =0 ;/* bit mask of which UART ids to enable */ #ifdef CONFIG_TEGRA_ENABLE_UARTA
@@ -220,6 +225,7 @@ void board_init_uart_f(void) uart_ids |=UARTE ;#endif setup_uarts (uart_ids); +#endif }#if !CONFIG_IS_ENABLED (OF_CONTROL )
arch/arm/mach-tegra/board2.c +2 -0
@@ -25,8 +25,10 @@#if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif +#if IS_ENABLED (CONFIG_TEGRA_PINCTRL )#include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> +#endif #include <asm/arch/tegra.h> #ifdef CONFIG_TEGRA_CLOCK_SCALING #include <asm/arch/emc.h>
Signature · 1 line
2.21.0
PATCH v3 6/19 ARM: tegra: Guard powergate code with a Kconfig symbol
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Powergate code is not relevant on all Tegra SoC generations, so guard it with a Kconfig symbol that can be selected by the generations that need it.
This is in preparation for unifying Tegra186 code with the code used on older generations.
--- arch/arm/mach-tegra/Kconfig | 5 +++++ arch/arm/mach-tegra/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-tegra/Kconfig +5 -0
@@ -32,6 +32,9 @@ config TEGRA_MC config TEGRA_PINCTRL bool +config TEGRA_PMC + bool + config TEGRA_COMMON bool "Tegra common options" select BINMAN
@@ -74,6 +77,7 @@ config TEGRA_ARMV7_COMMON select TEGRA_MC select TEGRA_NO_BPMP select TEGRA_PINCTRL + select TEGRA_PMC config TEGRA_ARMV8_COMMON bool "Tegra 64-bit common options"
@@ -122,6 +126,7 @@ config TEGRA210 select TEGRA_MC select TEGRA_NO_BPMP select TEGRA_PINCTRL + select TEGRA_PMC config TEGRA186 bool "Tegra186 family"
arch/arm/mach-tegra/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-y += board.o board2.o obj-y += cache.o obj-$(CONFIG_TEGRA_CLKRST) += clock.o obj-$(CONFIG_TEGRA_PINCTRL) += pinmux-common.o -obj-y += powergate.o +obj-$(CONFIG_TEGRA_PMC) += powergate.o obj-y += xusb-padctl-dummy.o endif
Signature · 1 line
2.21.0
PATCH v3 7/19 ARM: tegra: Fix save_boot_params() prototype
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The save_boot_params() function takes as its first four arguments the first four registers. On 32-bit ARM these are r0, r1, r2 and r3, all of which are 32 bits wide. However, on 64-bit ARM thene registers are x0, x1, x2 and x3, all of which are 64 bits wide. In order to allow reusing the save_boot_params() implementation on 64-bit ARM, change it to take unsigned long parameters rather than the fixed size 32-bit integers. This ensures that the correct values are passed.
--- arch/arm/mach-tegra/board.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-tegra/board.c +2 -1
@@ -42,7 +42,8 @@ enum { static bool from_spl __attribute__ ((section(".data")));#ifndef CONFIG_SPL_BUILD -void save_boot_params (u32 r0,u32 r1,u32 r2,u32 r3) +void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, +unsigned long r3) { from_spl = r0 !=UBOOT_NOT_LOADED_FROM_SPL ;save_boot_params_ret ();
Signature · 1 line
2.21.0
PATCH v3 8/19 ARM: tegra: Allow boards to override boot target devices
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Boards may not support all the boot target devices in the default list for Tegra devices. Allow a board to override the list and default to the standard list only if the board hasn't specified one itself.
--- include/configs/tegra-common-post.h | 2 ++ 1 file changed, 2 insertions(+)
include/configs/tegra-common-post.h +2 -0
@@ -21,12 +21,14 @@#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20)/* 1 MiB */ #ifndef CONFIG_SPL_BUILD +#ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) +#endif #include <config_distro_bootcmd.h> #else #define BOOTENV
Signature · 1 line
2.21.0
PATCH v3 9/19 ARM: tegra: Support TZ-only access to PMC
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Some devices may restrict access to the PMC to TrustZone software only. Non-TZ software can detect this and use SMC calls to the firmware that runs in the TrustZone to perform accesses to PMC registers.
Note that this also fixes reset_cpu() and the enterrcm command on Tegra186 where they were previously trying to access the PMC at a wrong physical address.
Based on work by Kalyani Chidambaram <[email protected]> and Tom Warren <[email protected]>.
--- arch/arm/include/asm/arch-tegra/pmc.h | 20 +++++- arch/arm/include/asm/arch-tegra/tegra.h | 6 ++ arch/arm/mach-tegra/Kconfig | 5 ++ arch/arm/mach-tegra/Makefile | 4 +- arch/arm/mach-tegra/clock.c | 13 ++-- arch/arm/mach-tegra/cmd_enterrcm.c | 6 +- arch/arm/mach-tegra/cpu.c | 20 +++--- arch/arm/mach-tegra/lowlevel_init.S | 39 ----------- arch/arm/mach-tegra/pmc.c | 92 +++++++++++++++++++++++++ arch/arm/mach-tegra/powergate.c | 11 +-- 10 files changed, 151 insertions(+), 65 deletions(-) delete mode 100644 arch/arm/mach-tegra/lowlevel_init.S create mode 100644 arch/arm/mach-tegra/pmc.c
arch/arm/include/asm/arch-tegra/pmc.h +19 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* (C) Copyright 2010-2015 +* (C) Copyright 2010-2019 * NVIDIA Corporation <www.nvidia.com> */
@@ -388,4 +388,22 @@ struct pmc_ctlr {/* APBDEV_PMC_CNTRL2_0 0x440 */ #define HOLD_CKE_LOW_EN (1 << 12) +/* PMC read/write functions */ +u32 tegra_pmc_readl (unsigned long offset); +void tegra_pmc_writel (u32 value,unsigned long offset); + +#define PMC_CNTRL 0x0 +#define PMC_CNTRL_MAIN_RST BIT(4) + +#if IS_ENABLED (CONFIG_TEGRA186 ) +# define PMC_SCRATCH0 0x32000 +#else +# define PMC_SCRATCH0 0x00050 +#endif + +/* for secure PMC */ +#define TEGRA_SMC_PMC 0xc2fffe00 +#define TEGRA_SMC_PMC_READ 0xaa +#define TEGRA_SMC_PMC_WRITE 0xbb +#endif /* PMC_H */
arch/arm/include/asm/arch-tegra/tegra.h +6 -0
@@ -30,7 +30,13 @@#define NV_PA_SLINK5_BASE (NV_PA_APB_MISC_BASE + 0xDC00)#define NV_PA_SLINK6_BASE (NV_PA_APB_MISC_BASE + 0xDE00)#define TEGRA_DVC_BASE (NV_PA_APB_MISC_BASE + 0xD000) +#if defined(CONFIG_TEGRA20 ) || defined(CONFIG_TEGRA30 ) || \ + defined(CONFIG_TEGRA114 ) || defined(CONFIG_TEGRA124 ) || \ + defined(CONFIG_TEGRA132 ) || defined(CONFIG_TEGRA210 )#define NV_PA_PMC_BASE (NV_PA_APB_MISC_BASE + 0xE400) +#else +#define NV_PA_PMC_BASE 0xc360000 +#endif #define NV_PA_EMC_BASE (NV_PA_APB_MISC_BASE + 0xF400)#define NV_PA_FUSE_BASE (NV_PA_APB_MISC_BASE + 0xF800) #if defined(CONFIG_TEGRA20) || defined(CONFIG_TEGRA30) || \
arch/arm/mach-tegra/Kconfig +5 -0
@@ -35,6 +35,10 @@ config TEGRA_PINCTRL config TEGRA_PMC bool +config TEGRA_PMC_SECURE + bool + depends on TEGRA_PMC + config TEGRA_COMMON bool "Tegra common options" select BINMAN
@@ -127,6 +131,7 @@ config TEGRA210 select TEGRA_NO_BPMP select TEGRA_PINCTRL select TEGRA_PMC + select TEGRA_PMC_SECURE config TEGRA186 bool "Tegra186 family"
arch/arm/mach-tegra/Makefile +2 -2
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -# (C) Copyright 2010-2015 Nvidia Corporation. +# (C) Copyright 2010-2019 Nvidia Corporation. # # (C) Copyright 2000-2008 # Wolfgang Denk, DENX Software Engineering, [email protected].
@@ -27,11 +27,11 @@ obj-y += dt-setup.o obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o obj-$(CONFIG_TEGRA_GPU) += gpu.o obj-$(CONFIG_TEGRA_IVC) += ivc.o -obj-y += lowlevel_init.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_ARMV7_PSCI) += psci.o endif obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o +obj-y += pmc.o obj-$(CONFIG_TEGRA20) += tegra20/ obj-$(CONFIG_TEGRA30) += tegra30/
arch/arm/mach-tegra/clock.c +9 -4
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2010-2015, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2010-2019, NVIDIA CORPORATION. All rights reserved. */ /* Tegra SoC common clock control functions */
@@ -814,11 +814,16 @@ void tegra30_set_up_pllp(void)int clock_external_output (int clk_id) { -struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE ; +u32 val;if (clk_id >=1 && clk_id <=3 ) { -setbits_le32 (&pmc->pmc_clk_out_cntrl, -1 << (2 + (clk_id -1 ) *8 )); + val =tegra_pmc_readl (offsetof(struct pmc_ctlr , + pmc_clk_out_cntrl)); + val |=1 << (2 + (clk_id -1 ) *8 ); +tegra_pmc_writel (val, + offsetof(struct pmc_ctlr , + pmc_clk_out_cntrl)); + }else {printf ("%s: Unknown output clock id %d\n" , __func__, clk_id);return -EINVAL ;
arch/arm/mach-tegra/cmd_enterrcm.c +2 -4
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2012-2019, NVIDIA CORPORATION. All rights reserved. * * Derived from code (arch/arm/lib/reset.c) that is: *
@@ -31,12 +31,10 @@static int do_enterrcm (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) { -struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE ; -puts ("Entering RCM...\n" );udelay (50000 ); - pmc->pmc_scratch0 =2 ; +tegra_pmc_writel (2 ,PMC_SCRATCH0 );disable_interrupts ();reset_cpu (0 );
arch/arm/mach-tegra/cpu.c +10 -10
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2010-2015, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2010-2019, NVIDIA CORPORATION. All rights reserved. */ #include <common.h>
@@ -299,21 +299,19 @@ void enable_cpu_clock(int enable)static int is_cpu_powered (void ) { -struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE ; - -return (readl (&pmc->pmc_pwrgate_status) &CPU_PWRED ) ?1 :0 ; +return (tegra_pmc_readl (offsetof(struct pmc_ctlr , + pmc_pwrgate_status)) &CPU_PWRED ) ?1 :0 ; }static void remove_cpu_io_clamps (void ) { -struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE ;u32 reg;debug ("%s entry\n" , __func__);/* Remove the clamps on the CPU I/O signals */ - reg =readl (&pmc->pmc_remove_clamping); + reg =tegra_pmc_readl (offsetof(struct pmc_ctlr , pmc_remove_clamping)); reg |=CPU_CLMP ; -writel (reg, &pmc->pmc_remove_clamping); +tegra_pmc_writel (reg, offsetof(struct pmc_ctlr , pmc_remove_clamping));/* Give I/O signals time to stabilize */ udelay (IO_STABILIZATION_DELAY );
@@ -321,17 +319,19 @@ static void remove_cpu_io_clamps(void)void powerup_cpu (void ) { -struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE ;u32 reg;int timeout =IO_STABILIZATION_DELAY ;debug ("%s entry\n" , __func__);if (!is_cpu_powered ()) {/* Toggle the CPU power state (OFF -> ON) */ - reg =readl (&pmc->pmc_pwrgate_toggle); + reg =tegra_pmc_readl (offsetof(struct pmc_ctlr , + pmc_pwrgate_toggle)); reg &=PARTID_CP ; reg |=START_CP ; -writel (reg, &pmc->pmc_pwrgate_toggle); +tegra_pmc_writel (reg, + offsetof(struct pmc_ctlr , + pmc_pwrgate_toggle));/* Wait for the power to come up */ while (!is_cpu_powered ()) {
arch/arm/mach-tegra/lowlevel_init.S deleted +0 -39
@@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * SoC-specific setup info - * - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - */ - -#include <config.h> -#include <linux/linkage.h> - -#ifdef CONFIG_ARM64 - .align 5 -ENTRY(reset_cpu) - /* get address for global reset register */ - ldr x1, =PRM_RSTCTRL - ldr w3, [x1] - /* force reset */ - orr w3, w3, #0x10 - str w3, [x1] - mov w0, w0 -1: - b 1b -ENDPROC(reset_cpu) -#else - .align 5 -ENTRY(reset_cpu) - ldr r1, rstctl @ get addr for global reset - @ reg - ldr r3, [r1] - orr r3, r3, #0x10 - str r3, [r1] @ force reset - mov r0, r0 -_loop_forever: - b _loop_forever -rstctl: - .word PRM_RSTCTRL -ENDPROC(reset_cpu) -#endif
arch/arm/mach-tegra/pmc.c new file +92 -0
92 lines not on this page · raw message
arch/arm/mach-tegra/powergate.c +6 -5
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved. */ #include <common.h>
@@ -11,6 +11,7 @@#include <asm/arch/powergate.h> #include <asm/arch/tegra.h> +#include <asm/arch-tegra/pmc.h> #define PWRGATE_TOGGLE 0x30#define PWRGATE_TOGGLE_START (1 << 8)
@@ -24,18 +25,18 @@ static int tegra_powergate_set(enum tegra_powergate id, bool state)u32 value, mask = state ? (1 << id) :0 , old_mask;unsigned long start, timeout =25 ; - value =readl (NV_PA_PMC_BASE +PWRGATE_STATUS ); + value =tegra_pmc_readl (PWRGATE_STATUS ); old_mask = value & (1 << id);if (mask == old_mask)return 0 ; -writel (PWRGATE_TOGGLE_START | id,NV_PA_PMC_BASE +PWRGATE_TOGGLE ); +tegra_pmc_writel (PWRGATE_TOGGLE_START | id,PWRGATE_TOGGLE ); start =get_timer (0 );while (get_timer (start) < timeout) { - value =readl (NV_PA_PMC_BASE +PWRGATE_STATUS ); + value =tegra_pmc_readl (PWRGATE_STATUS );if ((value & (1 << id)) == mask)return 0 ; }
@@ -69,7 +70,7 @@ static int tegra_powergate_remove_clamping(enum tegra_powergate id)else value =1 << id; -writel (value,NV_PA_PMC_BASE +REMOVE_CLAMPING ); +tegra_pmc_writel (value,REMOVE_CLAMPING );return 0 ; }
Signature · 1 line
2.21.0
PATCH v3 10/19 ARM: tegra: Workaround UDC boot issues only if necessary
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Resetting the USB device controller on boot is only necessary if the SoC actually has a UDC controller and U-Boot enables support for it. All the Tegra boards support UDC via the ChipIdea UDC driver, so make the UDC on boot workaround depend on the ChipIdea UDC driver.
This prevents a crash on Tegra186 which does not have the ChipIdea UDC.
--- arch/arm/mach-tegra/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-tegra/Kconfig +1 -0
@@ -148,6 +148,7 @@ endchoice config TEGRA_DISCONNECT_UDC_ON_BOOT bool "Disconnect USB device mode controller on boot" + depends on CI_UDC default y help When loading U-Boot into RAM over USB protocols using tools such as
Signature · 1 line
2.21.0
PATCH v3 11/19 ARM: tegra: Restore DRAM bank count
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Commit 86cf1c82850f ("configs: Migrate CONFIG_NR_DRAM_BANKS") reduced the number of DRAM banks supported by U-Boot from 1026 to 8 on P2771-000 boards.
However, as explained in commit a9819b9e33bd ("ARM: tegra: p2771-000:
increase max DRAM bank count"), the platform can have a large number of unusable chunks of memory (up to 1024), so a total of 1026 DRAM banks are needed to describe the worst-case situation.
In practice the number of DRAM banks needed will typically be much lower, but we should be prepared to properly deal with the worst case.
--- configs/p2771-0000-000_defconfig | 2 +- configs/p2771-0000-500_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
configs/p2771-0000-000_defconfig +1 -1
@@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_TEGRA=y CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA186=y -CONFIG_NR_DRAM_BANKS=8 +CONFIG_NR_DRAM_BANKS=1026 CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y
configs/p2771-0000-500_defconfig +1 -1
@@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_TEGRA=y CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA186=y -CONFIG_NR_DRAM_BANKS=8 +CONFIG_NR_DRAM_BANKS=1026 CONFIG_OF_SYSTEM_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y
Signature · 1 line
2.21.0
PATCH v3 12/19 ARM: tegra: Unify Tegra186 builds
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Tegra186 build are currently dealt with in very special ways, which is because Tegra186 is fundamentally different in many respects. It is no longer necessary to do many of the low-level programming because early boot firmware will already have taken care of it.
Unfortunately, separating Tegra186 builds from the rest in this way makes it difficult to share code with prior generations of Tegra. With all of the low-level programming code behind Kconfig guards, the build for Tegra186 can again be unified.
As a side-effect, and partial reason for this change, other Tegra SoC generations can now make use of the code that deals with taking over a boot from earlier bootloaders. This used to be nvtboot, but has been replaced by cboot nowadays. Rename the files and functions related to this to avoid confusion. The implemented protocols are unchanged.
---
Changes in v3:
- load cboot DTB address to fdt_addr instead of fdtaddr
arch/arm/include/asm/arch-tegra/cboot.h | 39 ++++
arch/arm/mach-tegra/Makefile | 4 +-
arch/arm/mach-tegra/board.c | 23 ++
arch/arm/mach-tegra/board186.c | 32 ---
arch/arm/mach-tegra/board2.c | 21 ++
.../{tegra186/nvtboot_board.c => cboot.c} | 200 ++++++++++++++++--
.../{tegra186/nvtboot_ll.S => cboot_ll.S} | 12 +-
arch/arm/mach-tegra/tegra186/Makefile | 4 -
arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 172 ---------------
board/nvidia/p2771-0000/p2771-0000.c | 10 +-
10 files changed, 278 insertions(+), 239 deletions(-)
create mode 100644 arch/arm/include/asm/arch-tegra/cboot.h
delete mode 100644 arch/arm/mach-tegra/board186.c
rename arch/arm/mach-tegra/{tegra186/nvtboot_board.c => cboot.c} (56%)
rename arch/arm/mach-tegra/{tegra186/nvtboot_ll.S => cboot_ll.S} (57%)
delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_mem.carch/arm/include/asm/arch-tegra/cboot.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) 2019 NVIDIA Corporation. All rights reserved. +*/ + +#ifndef _TEGRA_CBOOT_H_ +#define _TEGRA_CBOOT_H_ + +#ifdef CONFIG_ARM64 +extern unsigned long cboot_boot_x0; + +void cboot_save_boot_params (unsigned long x0,unsigned long x1, +unsigned long x2,unsigned long x3); +int cboot_dram_init (void ); +int cboot_dram_init_banksize (void ); +ulong cboot_get_usable_ram_top (ulong total_size); +#else +static inline void cboot_save_boot_params (unsigned long x0,unsigned long x1, +unsigned long x2,unsigned long x3) +{ +} + +static inline int cboot_dram_init (void ) +{ +return -ENOSYS ; +} + +static inline int cboot_dram_init_banksize (void ) +{ +return -ENOSYS ; +} + +static inline ulong cboot_get_usable_ram_top (ulong total_size) +{ +return 0 ; +} +#endif + +#endif
arch/arm/mach-tegra/Makefile +1 -3
@@ -5,7 +5,6 @@ # (C) Copyright 2000-2008 # Wolfgang Denk, DENX Software Engineering, wd at denx.de. -ifndef CONFIG_TEGRA186 ifdef CONFIG_SPL_BUILD obj-y += spl.o obj-y += cpu.o
@@ -20,9 +19,8 @@ obj-$(CONFIG_TEGRA_CLKRST) += clock.o obj-$(CONFIG_TEGRA_PINCTRL) += pinmux-common.o obj-$(CONFIG_TEGRA_PMC) += powergate.o obj-y += xusb-padctl-dummy.o -endif -obj-$(CONFIG_ARM64) += arm64-mmu.o +obj-$(CONFIG_ARM64) += arm64-mmu.o cboot_ll.o cboot.o obj-y += dt-setup.o obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o obj-$(CONFIG_TEGRA_GPU) += gpu.o
arch/arm/mach-tegra/board.c +23 -0
@@ -21,6 +21,7 @@#include <asm/arch/tegra.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/board.h> +#include <asm/arch-tegra/cboot.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/warmboot.h>
@@ -46,6 +47,21 @@ void save_boot_params(unsigned long r0, unsigned long r1, unsigned long r2, unsigned long r3) { from_spl = r0 !=UBOOT_NOT_LOADED_FROM_SPL ; + +/* +* The logic for this is somewhat indirect. The purpose of the marker +* (UBOOT_NOT_LOADED_FROM_SPL) is in fact used to determine if U-Boot +* was loaded from a read-only instance of itself, which is something +* that can happen in secure boot setups. So basically the presence +* of the marker is an indication that U-Boot was loaded by one such +* special variant of U-Boot. Conversely, the absence of the marker +* indicates that this instance of U-Boot was loaded by something +* other than a special U-Boot. This could be SPL, but it could just +* as well be one of any number of other first stage bootloaders. +*/ +if (from_spl) +cboot_save_boot_params (r0, r1, r2, r3); +save_boot_params_ret (); }#endif
@@ -127,6 +143,13 @@ static phys_size_t query_sdram_size(void)int dram_init (void ) { +int err; + +/* try to initialize DRAM from cboot DTB first */ + err =cboot_dram_init (); +if (err ==0 ) +return 0 ; +#if IS_ENABLED (CONFIG_TEGRA_MC )/* We do not initialise DRAM here. We just query the size */ gd->ram_size =query_sdram_size ();
arch/arm/mach-tegra/board186.c deleted +0 -32
@@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* Copyright (c) 2016, NVIDIA CORPORATION. -*/ - -#include <common.h> -#include <asm/arch/tegra.h> - -int board_early_init_f (void ) -{ -return 0 ; -} - -__weak int tegra_board_init (void ) -{ -return 0 ; -} - -int board_init (void ) -{ -return tegra_board_init (); -} - -__weak int tegra_soc_board_init_late (void ) -{ -return 0 ; -} - -int board_late_init (void ) -{ -return tegra_soc_board_init_late (); -}
arch/arm/mach-tegra/board2.c +21 -0
@@ -13,6 +13,7 @@#include <asm/io.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/board.h> +#include <asm/arch-tegra/cboot.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/pmu.h>
@@ -51,6 +52,7 @@ __weak void pin_mux_mmc(void) {}__weak void gpio_early_init_uart (void ) {}__weak void pin_mux_display (void ) {}__weak void start_cpu_fan (void ) {} +__weak void cboot_late_init (void ) {}#if defined(CONFIG_TEGRA_NAND )__weak void pin_mux_nand (void )
@@ -243,6 +245,7 @@ int board_late_init(void) }#endif start_cpu_fan (); +cboot_late_init ();return 0 ; }
@@ -337,6 +340,15 @@ static ulong usable_ram_size_below_4g(void)*/ int dram_init_banksize (void ) { +int err; + +/* try to compute DRAM bank size based on cboot DTB first */ + err =cboot_dram_init_banksize (); +if (err ==0 ) +return err; + +/* fall back to default DRAM bank size computation */ + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; gd->bd->bi_dram[0 ].size =usable_ram_size_below_4g ();
@@ -370,5 +382,14 @@ int dram_init_banksize(void)*/ ulong board_get_usable_ram_top (ulong total_size) { +ulong ram_top; + +/* try to get top of usable RAM based on cboot DTB first */ + ram_top =cboot_get_usable_ram_top (total_size); +if (ram_top >0 ) +return ram_top; + +/* fall back to default usable RAM computation */ +return CONFIG_SYS_SDRAM_BASE +usable_ram_size_below_4g (); }
arch/arm/mach-tegra/cboot.c renamed from arch/arm/mach-tegra/tegra186/nvtboot_board.c +183 -17
272 lines not on this page · raw message
arch/arm/mach-tegra/cboot_ll.S renamed from arch/arm/mach-tegra/tegra186/nvtboot_ll.S +6 -6
@@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Save nvtboot-related boot-time CPU state + * Save cboot-related boot-time CPU state * * (C) Copyright 2015-2016 NVIDIA Corporation <www.nvidia.com> */
@@ -9,12 +9,12 @@ #include <linux/linkage.h> .align 8 -.globl nvtboot_boot_x0 -nvtboot_boot_x0: +.globl cboot_boot_x0 +cboot_boot_x0: .dword 0 -ENTRY(save_boot_params) - adr x8, nvtboot_boot_x0 +ENTRY(cboot_save_boot_params) + adr x8, cboot_boot_x0 str x0, [x8] b save_boot_params_ret -ENDPROC(save_boot_params) +ENDPROC(cboot_save_boot_params)
arch/arm/mach-tegra/tegra186/Makefile +0 -4
@@ -2,8 +2,4 @@ # # SPDX-License-Identifier: GPL-2.0 -obj-y += ../board186.o obj-y += cache.o -obj-y += nvtboot_board.o -obj-y += nvtboot_ll.o -obj-y += nvtboot_mem.o
arch/arm/mach-tegra/tegra186/nvtboot_mem.c deleted +0 -172
172 lines not on this page · raw message
board/nvidia/p2771-0000/p2771-0000.c +5 -5
@@ -7,7 +7,7 @@#include <i2c.h> #include "../p2571/max77620_init.h" -int tegra_board_init (void ) +void pin_mux_mmc (void ) {struct udevice *dev;uchar val;
@@ -18,19 +18,18 @@ int tegra_board_init(void) ret =i2c_get_chip_for_busnum (0 ,MAX77620_I2C_ADDR_7BIT ,1 , &dev);if (ret) {printf ("%s: Cannot find MAX77620 I2C chip\n" , __func__); -return ret; +return ; }/* 0xF2 for 3.3v, enabled: bit7:6 = 11 = enable, bit5:0 = voltage */ val =0xF2 ; ret =dm_i2c_write (dev,MAX77620_CNFG1_L3_REG , &val,1 );if (ret) {printf ("i2c_write 0 0x3c 0x27 failed: %d\n" , ret); -return ret; +return ; } - -return 0 ; } +#ifdef CONFIG_PCI_TEGRA int tegra_pcie_board_init (void ) {struct udevice *dev;
@@ -52,3 +51,4 @@ int tegra_pcie_board_init(void) return 0; } +#endif
Signature · 1 line
2.21.0
PATCH v3 13/19 ARM: tegra: Implement cboot_save_boot_params() in C
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
This is easier to deal with and works just as well for this simple function.
--- arch/arm/mach-tegra/Makefile | 2 +- arch/arm/mach-tegra/cboot.c | 12 ++++++++++++ arch/arm/mach-tegra/cboot_ll.S | 20 -------------------- 3 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 arch/arm/mach-tegra/cboot_ll.S
arch/arm/mach-tegra/Makefile +1 -1
@@ -20,7 +20,7 @@ obj-$(CONFIG_TEGRA_PINCTRL) += pinmux-common.o obj-$(CONFIG_TEGRA_PMC) += powergate.o obj-y += xusb-padctl-dummy.o -obj-$(CONFIG_ARM64) += arm64-mmu.o cboot_ll.o cboot.o +obj-$(CONFIG_ARM64) += arm64-mmu.o cboot.o obj-y += dt-setup.o obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o obj-$(CONFIG_TEGRA_GPU) += gpu.o
arch/arm/mach-tegra/cboot.c +12 -0
@@ -52,6 +52,18 @@ static u64 ram_top __attribute__((section(".data")));/* The base address of the region of RAM that ends at ram_top */ static u64 region_base __attribute__((section(".data"))); +/* +* Explicitly put this in the .data section because it is written before the +* .bss section is zeroed out but it needs to persist. +*/ +unsigned long cboot_boot_x0 __attribute__((section(".data"))); + +void cboot_save_boot_params (unsigned long x0,unsigned long x1, +unsigned long x2,unsigned long x3) +{ + cboot_boot_x0 = x0; +} +int cboot_dram_init (void ) {unsigned int na, ns;
arch/arm/mach-tegra/cboot_ll.S deleted +0 -20
@@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Save cboot-related boot-time CPU state - * - * (C) Copyright 2015-2016 NVIDIA Corporation <www.nvidia.com> - */ - -#include <config.h> -#include <linux/linkage.h> - -.align 8 -.globl cboot_boot_x0 -cboot_boot_x0: - .dword 0 - -ENTRY(cboot_save_boot_params) - adr x8, cboot_boot_x0 - str x0, [x8] - b save_boot_params_ret -ENDPROC(cboot_save_boot_params)
Signature · 1 line
2.21.0
PATCH v3 14/19 ARM: tegra: Implement cboot_get_ethaddr()
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
This function will attempt to look up an ethernet address in the DTB that was passed in from cboot. It does so by first trying to locate the primary ethernet device for the board (identified by the "ethernet" alias) and if found, reads the "local-mac-address" property. If the "ethernet" alias does not exist, or if it points to a device tree node that doesn't exist, or if the device tree node that it points to does not have a "local-mac-address" property or if the value is invalid, it will fall back to the legacy mechanism of looking for the MAC address stored in the "nvidia,ethernet-mac" property of the "/chosen" node.
---
Changes in v2:
- make dummy static inline to avoid duplicate definitions
arch/arm/include/asm/arch-tegra/cboot.h | 6 ++ arch/arm/mach-tegra/cboot.c | 78 ++++++++++++++++++++----- 2 files changed, 69 insertions(+), 15 deletions(-)
arch/arm/include/asm/arch-tegra/cboot.h +6 -0
@@ -14,6 +14,7 @@ void cboot_save_boot_params(unsigned long x0, unsigned long x1,int cboot_dram_init (void );int cboot_dram_init_banksize (void );ulong cboot_get_usable_ram_top (ulong total_size); +int cboot_get_ethaddr (const void *fdt,uint8_t mac[ETH_ALEN ]);#else static inline void cboot_save_boot_params (unsigned long x0,unsigned long x1,unsigned long x2,unsigned long x3)
@@ -34,6 +35,11 @@ static inline ulong cboot_get_usable_ram_top(ulong total_size) {return 0 ; } + +static inline int cboot_get_ethaddr (const void *fdt,uint8_t mac[ETH_ALEN ]) +{ +return -ENOSYS ; +}#endif #endif
arch/arm/mach-tegra/cboot.c +63 -15
115 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v3 15/19 ARM: tegra: Enable position independent build for 64-bit
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Note that U-Boot is always chainloaded from cboot starting with L4T release 28. cboot always loads U-Boot to a fixed address, so making the builds position independent isn't strictly necessary. However, position independent builds can be convenient because if U-Boot is ever loaded to an address different from its link address, it will still be able to boot.
--- arch/arm/mach-tegra/Kconfig | 1 + configs/e2220-1170_defconfig | 2 +- configs/p2371-0000_defconfig | 2 +- configs/p2371-2180_defconfig | 2 +- configs/p2571_defconfig | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-)
arch/arm/mach-tegra/Kconfig +1 -0
@@ -87,6 +87,7 @@ config TEGRA_ARMV8_COMMON bool "Tegra 64-bit common options" select ARM64 select LINUX_KERNEL_IMAGE_HEADER + select POSITION_INDEPENDENT select TEGRA_COMMON if TEGRA_ARMV8_COMMON
configs/e2220-1170_defconfig +1 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA210=y CONFIG_NR_DRAM_BANKS=2 CONFIG_OF_SYSTEM_SETUP=y
configs/p2371-0000_defconfig +1 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA210=y CONFIG_TARGET_P2371_0000=y CONFIG_NR_DRAM_BANKS=2
configs/p2371-2180_defconfig +1 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA210=y CONFIG_TARGET_P2371_2180=y CONFIG_NR_DRAM_BANKS=2
configs/p2571_defconfig +1 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA210=y CONFIG_TARGET_P2571=y CONFIG_NR_DRAM_BANKS=2
Signature · 1 line
2.21.0
PATCH v3 16/19 p2371-2180: Pass Ethernet MAC to the kernel
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Pass the ethernet MAC address to the kernel upon boot. This passes both the local-mac-address property (as passed to U-Boot from cboot) and the currently set MAC address via the mac-address property. The latter will only be set if it is different from the address that was already passed via the local-mac-address property.
--- board/nvidia/p2371-2180/p2371-2180.c | 50 ++++++++++++++++++++++++++++ configs/p2371-2180_defconfig | 1 + 2 files changed, 51 insertions(+)
board/nvidia/p2371-2180/p2371-2180.c +50 -0
@@ -5,9 +5,12 @@*/ #include <common.h> +#include <environment.h> #include <i2c.h> +#include <linux/libfdt.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> +#include <asm/arch-tegra/cboot.h> #include "../p2571/max77620_init.h" #include "pinmux-config-p2371-2180.h"
@@ -94,3 +97,50 @@ int tegra_pcie_board_init(void)return 0 ; }#endif /* PCI */ + +static void ft_mac_address_setup (void *fdt) +{ +const void *cboot_fdt = (const void *)cboot_boot_x0; +uint8_t mac[ETH_ALEN ], local_mac[ETH_ALEN ]; +const char *path; +int offset, err; + + err =cboot_get_ethaddr (cboot_fdt, local_mac); +if (err <0 ) +memset (local_mac,0 ,ETH_ALEN ); + + path =fdt_get_alias (fdt,"ethernet" ); +if (!path) +return ; + +debug ("ethernet alias found: %s\n" , path); + + offset =fdt_path_offset (fdt, path); +if (offset <0 ) { +printf ("ethernet alias points to absent node %s\n" , path); +return ; + } + +if (is_valid_ethaddr (local_mac)) { + err =fdt_setprop (fdt, offset,"local-mac-address" , local_mac, +ETH_ALEN ); +if (!err) +debug ("Local MAC address set: %pM\n" , local_mac); + } + +if (eth_env_get_enetaddr ("ethaddr" , mac)) { +if (memcmp (local_mac, mac,ETH_ALEN ) !=0 ) { + err =fdt_setprop (fdt, offset,"mac-address" , mac, +ETH_ALEN ); +if (!err) +debug ("MAC address set: %pM\n" , mac); + } + } +} + +int ft_board_setup (void *fdt,bd_t *bd) +{ +ft_mac_address_setup (fdt); + +return 0 ; +}
configs/p2371-2180_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_TEGRA210=y CONFIG_TARGET_P2371_2180=y CONFIG_NR_DRAM_BANKS=2 CONFIG_OF_SYSTEM_SETUP=y +CONFIG_OF_BOARD_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
Signature · 1 line
2.21.0
PATCH v3 17/19 p2771-0000: Pass Ethernet MAC to the kernel
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Pass the ethernet MAC address to the kernel upon boot. This passes both the local-mac-address property (as passed to U-Boot from cboot) and the currently set MAC address via the mac-address property. The latter will only be set if it is different from the address that was already passed via the local-mac-address property.
--- board/nvidia/p2771-0000/p2771-0000.c | 43 ++++++++++++++++++++++++++++ configs/p2771-0000-000_defconfig | 1 + configs/p2771-0000-500_defconfig | 1 + 3 files changed, 45 insertions(+)
board/nvidia/p2771-0000/p2771-0000.c +43 -0
@@ -4,7 +4,10 @@*/ #include <common.h> +#include <environment.h> #include <i2c.h> +#include <linux/libfdt.h> +#include <asm/arch-tegra/cboot.h> #include "../p2571/max77620_init.h" void pin_mux_mmc (void )
@@ -52,3 +55,43 @@ int tegra_pcie_board_init(void)return 0 ; }#endif + +int ft_board_setup (void *fdt,bd_t *bd) +{ +const void *cboot_fdt = (const void *)cboot_boot_x0; +uint8_t mac[ETH_ALEN ], local_mac[ETH_ALEN ]; +const char *path; +int offset, err; + + err =cboot_get_ethaddr (cboot_fdt, local_mac); +if (err <0 ) +memset (local_mac,0 ,ETH_ALEN ); + + path =fdt_get_alias (fdt,"ethernet" ); +if (!path) +return 0 ; + +debug ("ethernet alias found: %s\n" , path); + + offset =fdt_path_offset (fdt, path); +if (offset <0 ) +return 0 ; + +if (is_valid_ethaddr (local_mac)) { + err =fdt_setprop (fdt, offset,"local-mac-address" , local_mac, +ETH_ALEN ); +if (!err) +debug ("Local MAC address set: %pM\n" , local_mac); + } + +if (eth_env_get_enetaddr ("ethaddr" , mac)) { +if (memcmp (local_mac, mac,ETH_ALEN ) !=0 ) { + err =fdt_setprop (fdt, offset,"mac-address" , mac, +ETH_ALEN ); +if (!err) +debug ("MAC address set: %pM\n" , mac); + } + } + +return 0 ; +}
configs/p2771-0000-000_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA186=y CONFIG_NR_DRAM_BANKS=1026 CONFIG_OF_SYSTEM_SETUP=y +CONFIG_OF_BOARD_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
configs/p2771-0000-500_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_TEGRA186=y CONFIG_NR_DRAM_BANKS=1026 CONFIG_OF_SYSTEM_SETUP=y +CONFIG_OF_BOARD_SETUP=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
Signature · 1 line
2.21.0
PATCH v3 18/19 lib: Implement strndup()
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
--- include/linux/string.h | 1 + lib/string.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)
include/linux/string.h +1 -0
@@ -94,6 +94,7 @@ size_t strcspn(const char *s, const char *reject);#ifndef __HAVE_ARCH_STRDUPextern char *strdup (const char *);#endif +extern char *strndup (const char *,size_t );#ifndef __HAVE_ARCH_STRSWABextern char *strswab (const char *);#endif
lib/string.c +23 -0
@@ -326,6 +326,29 @@ char * strdup(const char *s) }#endif +char *strndup (const char *s,size_t n) +{ +size_t len; +char *new; + +if (s ==NULL ) +return NULL ; + + len =strlen (s); + +if (n < len) + len = n; + + new =malloc (len +1 ); +if (new ==NULL ) +return NULL ; + +strncpy (new, s, len); + new[len] ='\0' ; + +return new; +} +#ifndef __HAVE_ARCH_STRSPN/** * strspn - Calculate the length of the initial substring of @s which only
Signature · 1 line
2.21.0
PATCH v3 19/19 ARM: tegra: Import cbootargs value from cboot DTB
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Read the boot arguments passed by cboot via the /chosen/bootargs property and store it in the cbootargs environment variable.
--- arch/arm/mach-tegra/cboot.c | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
arch/arm/mach-tegra/cboot.c +47 -0
@@ -8,7 +8,9 @@#include <fdt_support.h> #include <fdtdec.h> #include <stdlib.h> +#include <string.h> +#include <linux/ctype.h> #include <linux/sizes.h> #include <asm/arch/tegra.h>
@@ -536,10 +538,49 @@ out:return err; } +static char *strip (const char *ptr) +{ +const char *end; + +while (*ptr &&isblank (*ptr)) + ptr++; + +/* empty string */ +if (*ptr =='\0' ) +return strdup (ptr); + + end = ptr; + +while (end[1 ]) + end++; + +while (isblank (*end)) + end--; + +return strndup (ptr, end - ptr +1 ); +} + +static char *cboot_get_bootargs (const void *fdt) +{ +const char *args; +int offset, len; + + offset =fdt_path_offset (fdt,"/chosen" ); +if (offset <0 ) +return NULL ; + + args =fdt_getprop (fdt, offset,"bootargs" , &len); +if (!args) +return NULL ; + +return strip (args); +} +int cboot_late_init (void ) {const void *fdt = (const void *)cboot_boot_x0;uint8_t mac[ETH_ALEN ]; +char *bootargs;int err;set_calculated_env_vars ();
@@ -554,5 +595,11 @@ int cboot_late_init(void)if (!err)eth_env_set_enetaddr ("ethaddr" , mac); + bootargs =cboot_get_bootargs (fdt); +if (bootargs) { +env_set ("cbootargs" , bootargs); +free (bootargs); + } +return 0 ; }
Signature · 1 line
2.21.0