Skip to contentSkip to conversation

ARM: tegra: Miscalleneous improvements

PATCH New Thierry Reding 2 participants 29 messages Apr 15, 2019

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

v5 cover ARM: tegra: Miscalleneous improvements

From: Thierry Reding <[email protected]>

Hi Tom, Stephen,

this in the fifth installment of this series of miscellaneous improvements for Tegra support. The main changes since the last version are:

- Add two patches from the "framebuffer carveout" series since Simon has already picked up the libfdt and fdtdec specific parts.
- Fix the MAC address regression found by Stephen's test system. This is done by writing the MAC address to U-Boot's control DTB rather than storing it in the environment and thereby confusing Ethernet drivers if more than one device are present in the system.
- I've also added the Jetson Nano patch to the series since it has changed slightly. The issue of the pinmux spreadsheet is still open, so this isn't quite ready to be merged, but I wanted to solicit more feedback, so that this is already reviewed by the time the pinmux spreadsheet issue is resolved.

Simon,

I've included another patch for a new fdtdec function in this series because the first user is introduced here. It'd be great if you could provide an Acked-by on the first patch so that Tom can pick it up and send out as part of the PR for the entire series once it's been reviewed and passed Stephen's test system.

The second patch is also required later in the series. There's no explicit maintainer for lib/string.c, but you show up in the output for scripts/get_maintainer.pl for the second patch, so perhaps you could also give an Acked-by on that?

Alternatively you could pick up patches 1 and 2 so that Tom can base his PR on your tree (or master, later on), if that's what you guys prefer. Actually, this might be better anyway, since there might be a tiny merge conflict between the fdtdec patch in this series and the other ones that I sent out earlier.

Thanks,
Thierry

Thierry Reding (27):
fdtdec: Add fdtdec_set_ethernet_mac_address()
lib: Implement strndup()
ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210
ARM: tegra: Remove disp1 clock initialization on Tegra210
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: Import cbootargs value from cboot DTB
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
p2371-2180: Add support for framebuffer carveouts
p2771-0000: Add support for framebuffer carveouts
ARM: tegra: Rename pcie-controller to pcie
ARM: tegra: Mark built-in Ethernet as default on Jetson TX2
ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/tegra124-apalis.dts              |   2 +-
 arch/arm/dts/tegra124-cei-tk1-som.dts         |   2 +-
 arch/arm/dts/tegra124-jetson-tk1.dts          |   2 +-
 arch/arm/dts/tegra124.dtsi                    |   2 +-
 arch/arm/dts/tegra186-p2771-0000-000.dts      |   2 +-
 arch/arm/dts/tegra186-p2771-0000-500.dts      |   2 +-
 arch/arm/dts/tegra186-p2771-0000.dtsi         |   2 +
 arch/arm/dts/tegra186.dtsi                    |   2 +-
 arch/arm/dts/tegra20-harmony.dts              |   2 +-
 arch/arm/dts/tegra20-trimslice.dts            |   2 +-
 arch/arm/dts/tegra20.dtsi                     |   2 +-
 arch/arm/dts/tegra210-p2371-2180.dts          |   2 +-
 arch/arm/dts/tegra210-p3450-0000.dts          | 135 ++++
 arch/arm/dts/tegra210.dtsi                    |   2 +-
 arch/arm/dts/tegra30-apalis.dts               |   2 +-
 arch/arm/dts/tegra30-beaver.dts               |   2 +-
 arch/arm/dts/tegra30-cardhu.dts               |   2 +-
 arch/arm/dts/tegra30.dtsi                     |   2 +-
 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                   | 620 ++++++++++++++++++
 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 -----
 arch/arm/mach-tegra/tegra210/Kconfig          |   7 +
 arch/arm/mach-tegra/tegra210/clock.c          |  11 +-
 board/nvidia/p2371-2180/p2371-2180.c          |  97 +++
 board/nvidia/p2771-0000/p2771-0000.c          | 111 +++-
 board/nvidia/p3450-0000/Kconfig               |  12 +
 board/nvidia/p3450-0000/MAINTAINERS           |   6 +
 board/nvidia/p3450-0000/Makefile              |   8 +
 board/nvidia/p3450-0000/p3450-0000.c          | 198 ++++++
 .../p3450-0000/pinmux-config-p3450-0000.h     | 265 ++++++++
 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 +-
 configs/p3450-0000_defconfig                  |  55 ++
 include/configs/p3450-0000.h                  |  34 +
 include/configs/tegra-common-post.h           |   2 +
 include/fdtdec.h                              |  24 +
 include/linux/string.h                        |   1 +
 lib/fdtdec.c                                  |  29 +
 lib/string.c                                  |  23 +
 67 files changed, 1964 insertions(+), 724 deletions(-)
 create mode 100644 arch/arm/dts/tegra210-p3450-0000.dts
 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.c
 create mode 100644 board/nvidia/p3450-0000/Kconfig
 create mode 100644 board/nvidia/p3450-0000/MAINTAINERS
 create mode 100644 board/nvidia/p3450-0000/Makefile
 create mode 100644 board/nvidia/p3450-0000/p3450-0000.c
 create mode 100644 board/nvidia/p3450-0000/pinmux-config-p3450-0000.h
 create mode 100644 configs/p3450-0000_defconfig
 create mode 100644 include/configs/p3450-0000.h
Signature · 1 line
2.21.0
#1 lore raw

PATCH v5 1/27 fdtdec: Add fdtdec_set_ethernet_mac_address()

From: Thierry Reding <[email protected]>

This function can be used to set the local MAC address for the default Ethernet interface in its device tree node. The default interface is identified by the "ethernet" alias.

One case where this is useful is for devices that store their MAC address in a custom location. Once extracted, board code can store the MAC address in U-Boot's control DTB so that it will automatically be used by the Ethernet uclass.

---
 include/fdtdec.h | 24 ++++++++++++++++++++++++
 lib/fdtdec.c     | 29 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
include/fdtdec.h +24 -0
index fa8e34f6f960..e6c22dd5cd5c 100644
@@ -996,6 +996,30 @@ int fdtdec_setup_memory_banksize_fdt(const void *blob);
  */
 int fdtdec_setup_memory_banksize(void);
 
+/**
+ * fdtdec_set_ethernet_mac_address() - set MAC address for default interface
+ *
+ * Looks up the default interface via the "ethernet" alias (in the /aliases
+ * node) and stores the given MAC in its "local-mac-address" property. This
+ * is useful on platforms that store the MAC address in a custom location.
+ * Board code can call this in the late init stage to make sure that the
+ * interface device tree node has the right MAC address configured for the
+ * Ethernet uclass to pick it up.
+ *
+ * Typically the FDT passed into this function will be U-Boot's control DTB.
+ * Given that a lot of code may be holding offsets to various nodes in that
+ * tree, this code will only set the "local-mac-address" property in-place,
+ * which means that it needs to exist and have space for the 6-byte address.
+ * This ensures that the operation is non-destructive and does not invalidate
+ * offsets that other drivers may be using.
+ *
+ * @param fdt FDT blob
+ * @param mac buffer containing the MAC address to set
+ * @param size size of MAC address
+ * @return 0 on success or a negative error code on failure
+ */
+int fdtdec_set_ethernet_mac_address(void *fdt, const u8 *mac, size_t size);
+
 /**
  * fdtdec_set_phandle() - sets the phandle of a given node
  *
lib/fdtdec.c +29 -0
index d0ba88897335..3ee786b57940 100644
@@ -1261,6 +1261,35 @@ __weak void *board_fdt_blob_setup(void)
 }
 #endif
 
+int fdtdec_set_ethernet_mac_address(void *fdt, const u8 *mac, size_t size)
+{
+	const char *path;
+	int offset, err;
+
+	if (!is_valid_ethaddr(mac))
+		return -EINVAL;
+
+	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) {
+		debug("ethernet alias points to absent node %s\n", path);
+		return -ENOENT;
+	}
+
+	err = fdt_setprop_inplace(fdt, offset, "local-mac-address", mac, size);
+	if (err < 0)
+		return err;
+
+	debug("MAC address: %pM\n", mac);
+
+	return 0;
+}
+
 static int fdtdec_init_reserved_memory(void *blob)
 {
 	int na, ns, node, err;
Signature · 1 line
2.21.0
#2 lore raw

PATCH v5 2/27 lib: Implement strndup()

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

---
 include/linux/string.h |  1 +
 lib/string.c           | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
include/linux/string.h +1 -0
index 36066207392e..5d63be4ce5b0 100644
@@ -94,6 +94,7 @@ size_t strcspn(const char *s, const char *reject);
 #ifndef __HAVE_ARCH_STRDUP
 extern char * strdup(const char *);
 #endif
+extern char * strndup(const char *, size_t);
 #ifndef __HAVE_ARCH_STRSWAB
 extern char * strswab(const char *);
 #endif
lib/string.c +23 -0
index af17c16f616d..9b779ddc3bbe 100644
@@ -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
#3 lore raw

PATCH v5 3/27 ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

On Tegra210 the parents for the disp1 and disp2 clocks are slightly different from earlier chips. Only pll_p, pll_d_out0, pll_d2_out0 and clk_m are valid parents (technically pll_d_out is as well, but U-Boot doesn't know anything about it). Fix up the type name and the mux definition.

---
 arch/arm/mach-tegra/tegra210/clock.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-tegra/tegra210/clock.c +5 -5
index 06068c4b7b8d..0d7cafea2017 100644
@@ -40,7 +40,7 @@ enum clock_type_id {
 	CLOCK_TYPE_PDCT,
 	CLOCK_TYPE_ACPT,
 	CLOCK_TYPE_ASPTE,
-	CLOCK_TYPE_PMDACD2T,
+	CLOCK_TYPE_PDD2T,
 	CLOCK_TYPE_PCST,
 	CLOCK_TYPE_DP,
 
@@ -97,8 +97,8 @@ static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX+1] = {
 	{ CLK(AUDIO),	CLK(SFROM32KHZ),	CLK(PERIPH),	CLK(OSC),
 		CLK(EPCI),	CLK(NONE),	CLK(NONE),	CLK(NONE),
 		MASK_BITS_31_29},
-	{ CLK(PERIPH),	CLK(MEMORY),	CLK(DISPLAY),	CLK(AUDIO),
-		CLK(CGENERAL),	CLK(DISPLAY2),	CLK(OSC),	CLK(NONE),
+	{ CLK(PERIPH),	CLK(NONE),	CLK(DISPLAY),	CLK(NONE),
+		CLK(NONE),	CLK(DISPLAY2),	CLK(OSC),	CLK(NONE),
 		MASK_BITS_31_29},
 	{ CLK(PERIPH),	CLK(CGENERAL),	CLK(SFROM32KHZ),	CLK(OSC),
 		CLK(NONE),	CLK(NONE),	CLK(NONE),	CLK(NONE),
@@ -174,8 +174,8 @@ static enum clock_type_id clock_periph_type[PERIPHC_COUNT] = {
 	TYPE(PERIPHC_0bh,	CLOCK_TYPE_NONE),
 	TYPE(PERIPHC_0ch,	CLOCK_TYPE_NONE),
 	TYPE(PERIPHC_SBC1,	CLOCK_TYPE_PC2CC3M_T),
-	TYPE(PERIPHC_DISP1,	CLOCK_TYPE_PMDACD2T),
-	TYPE(PERIPHC_DISP2,	CLOCK_TYPE_PMDACD2T),
+	TYPE(PERIPHC_DISP1,	CLOCK_TYPE_PDD2T),
+	TYPE(PERIPHC_DISP2,	CLOCK_TYPE_PDD2T),
 
 	/* 0x10 */
 	TYPE(PERIPHC_10h,	CLOCK_TYPE_NONE),
Signature · 1 line
2.21.0
#4 lore raw

PATCH v5 4/27 ARM: tegra: Remove disp1 clock initialization on Tegra210

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

pll_c is not a valid parent for the disp1 clock, so trying to set it will fail. Given that display is not used in U-Boot, remove the init table entry so that disp1 will keep its default parent (clk_m).

---
 arch/arm/mach-tegra/tegra210/clock.c | 1 -
 1 file changed, 1 deletion(-)
arch/arm/mach-tegra/tegra210/clock.c +0 -1
index 0d7cafea2017..b240860f08cf 100644
@@ -1265,7 +1265,6 @@ struct periph_clk_init periph_clk_init_table[] = {
 	{ PERIPH_ID_SBC5, CLOCK_ID_PERIPH },
 	{ PERIPH_ID_SBC6, CLOCK_ID_PERIPH },
 	{ PERIPH_ID_HOST1X, CLOCK_ID_PERIPH },
-	{ PERIPH_ID_DISP1, CLOCK_ID_CGENERAL },
 	{ PERIPH_ID_SDMMC1, CLOCK_ID_PERIPH },
 	{ PERIPH_ID_SDMMC2, CLOCK_ID_PERIPH },
 	{ PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH },
Signature · 1 line
2.21.0
#5 lore raw

PATCH v5 5/27 ARM: tegra: Use common header for PMU declarations

In reply to Thierry Reding

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.h
arch/arm/include/asm/arch-tegra/pmu.h renamed from arch/arm/include/asm/arch-tegra20/pmu.h +3 -3
similarity index 73%
rename from arch/arm/include/asm/arch-tegra20/pmu.h
rename to arch/arm/include/asm/arch-tegra/pmu.h
index 18766dfed2bb..e850875d3166 100644
@@ -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
deleted file mode 100644
index 1e571ee7b317..000000000000
@@ -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
deleted file mode 100644
index c38393edefda..000000000000
@@ -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
deleted file mode 100644
index 6ea36aa41876..000000000000
@@ -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
deleted file mode 100644
index a823f0fbfc61..000000000000
@@ -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
index 12257a42b51b..b8d5ef0322cb 100644
@@ -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
index 6697909d9a3e..66628933b653 100644
@@ -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
#6 lore raw

PATCH v5 6/27 ARM: tegra: Guard clock code with a Kconfig symbol

In reply to Thierry Reding

From: 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
index 86b1cd11f752..ee078fec9adc 100644
@@ -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
index d4b4666fb1e2..0e812818d7a2 100644
@@ -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
index f8fc042a1dcc..ecd5001de4c5 100644
@@ -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
index b8d5ef0322cb..b94077221f77 100644
@@ -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
#7 lore raw

PATCH v5 7/27 ARM: tegra: Guard GP pad control code with a Kconfig symbol

In reply to Thierry Reding

From: 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
index ee078fec9adc..265051b18aaf 100644
@@ -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
index 0e812818d7a2..69f802c01b45 100644
@@ -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
index be414e4e4aca..d7063490e222 100644
@@ -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
#8 lore raw

PATCH v5 8/27 ARM: tegra: Guard memory controller code with a Kconfig symbol

In reply to Thierry Reding

From: 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
index 265051b18aaf..5763c4ae3cd1 100644
@@ -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
index ecd5001de4c5..7ef5a67edd1f 100644
@@ -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
#9 lore raw

PATCH v5 9/27 ARM: tegra: Guard pin controller code with a Kconfig symbol

In reply to Thierry Reding

From: 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
index 5763c4ae3cd1..be20ac2e804e 100644
@@ -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
index 69f802c01b45..395e0191a458 100644
@@ -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
index 7ef5a67edd1f..b65bdde5a78d 100644
@@ -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
index b94077221f77..ce1c9346959d 100644
@@ -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
#10 lore raw

PATCH v5 10/27 ARM: tegra: Guard powergate code with a Kconfig symbol

In reply to Thierry Reding

From: 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
index be20ac2e804e..db9198348d3f 100644
@@ -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
index 395e0191a458..517be21ee5f5 100644
@@ -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
#11 lore raw

PATCH v5 11/27 ARM: tegra: Fix save_boot_params() prototype

In reply to Thierry Reding

From: 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
index b65bdde5a78d..59d2f347485d 100644
@@ -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
#12 lore raw

PATCH v5 12/27 ARM: tegra: Allow boards to override boot target devices

In reply to Thierry Reding

From: 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
index e54428ba43e2..9685ee5059ab 100644
@@ -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
#13 lore raw

PATCH v5 13/27 ARM: tegra: Support TZ-only access to PMC

In reply to Thierry Reding

From: 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
index 34bbe75d5fdb..1524bf291164 100644
@@ -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
index 7ae0129e2db3..7a4e0972fb76 100644
@@ -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
index db9198348d3f..28914a34a1b5 100644
@@ -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
index 517be21ee5f5..f8bc65aa8b18 100644
@@ -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
index 096330748f2b..c9cd4e6aaeb7 100644
@@ -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
index 4e6beb3e5bb4..4a889f0e3422 100644
@@ -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
index 1b6ad074ed8f..3d140760e68f 100644
@@ -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
deleted file mode 100644
index 626f1b642745..000000000000
@@ -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
index e45f0961b242..761c9ef19e3b 100644
@@ -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
#14 lore raw

PATCH v5 14/27 ARM: tegra: Workaround UDC boot issues only if necessary

In reply to Thierry Reding

From: 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
index 28914a34a1b5..faa73559fd42 100644
@@ -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
#15 lore raw

PATCH v5 15/27 ARM: tegra: Restore DRAM bank count

In reply to Thierry Reding

From: 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
index ac85efa37b3b..ad0802067e73 100644
@@ -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
index df4d914d85cf..459b67fd195f 100644
@@ -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
#16 lore raw

PATCH v5 16/27 ARM: tegra: Unify Tegra186 builds

In reply to Thierry Reding

From: 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 v4:
- consistently use /chosen/nvidia,ether-mac property

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.c
arch/arm/include/asm/arch-tegra/cboot.h new file +39 -0
new file mode 100644
index 000000000000..b3441ec178b3
@@ -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
index f8bc65aa8b18..41ba674edff4 100644
@@ -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
index 59d2f347485d..c3ba00811e83 100644
@@ -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
deleted file mode 100644
index 80b55707e90f..000000000000
@@ -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
index ce1c9346959d..bbc487aa3bf6 100644
@@ -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
similarity index 57%
rename from arch/arm/mach-tegra/tegra186/nvtboot_ll.S
rename to arch/arm/mach-tegra/cboot_ll.S
index aa7a863d9702..4c9ddacc2b39 100644
@@ -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
index 56f3378ecea3..3a2405027704 100644
@@ -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
index 496e8a02111e..6f88010c18c3 100644
@@ -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
#17 lore raw

PATCH v5 17/27 ARM: tegra: Implement cboot_save_boot_params() in C

In reply to Thierry Reding

From: 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
index 41ba674edff4..7165d70a60da 100644
@@ -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
index 3ebf7b055553..a302ca45f39b 100644
@@ -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
deleted file mode 100644
index 4c9ddacc2b39..000000000000
@@ -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
#18 lore raw

PATCH v5 18/27 ARM: tegra: Implement cboot_get_ethaddr()

In reply to Thierry Reding

From: 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 default 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" or "nvidia,ether-mac" properties of the "/chosen" node.

The MAC address is then written to the default Ethernet device for the board (again identified by the "ethernet" alias) in U-Boot's control DTB. This allows the device driver for that device to read the MAC address from the standard location in device tree.

---
Changes in v5:
- write MAC to DT rather than an environment variable

Changes in v4:
- also check the /chosen/nvidia,ethernet-mac property for compatibility with Tegra210

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             | 97 ++++++++++++++++++++-----
 2 files changed, 86 insertions(+), 17 deletions(-)
arch/arm/include/asm/arch-tegra/cboot.h +6 -0
index b3441ec178b3..021c24617575 100644
@@ -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 +80 -17

132 lines not on this page · raw message

Signature · 1 line
2.21.0
#19 lore raw

PATCH v5 19/27 ARM: tegra: Import cbootargs value from cboot DTB

In reply to Thierry Reding

From: 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
index 628909f29137..a829ef794f2d 100644
@@ -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>
@@ -546,10 +548,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();
@@ -569,5 +610,11 @@ int cboot_late_init(void)
 			printf("failed to set MAC address %pM: %d\n", mac, err);
 	}
 
+	bootargs = cboot_get_bootargs(fdt);
+	if (bootargs) {
+		env_set("cbootargs", bootargs);
+		free(bootargs);
+	}
+
 	return 0;
 }
Signature · 1 line
2.21.0
#20 lore raw

PATCH v5 20/27 ARM: tegra: Enable position independent build for 64-bit

In reply to Thierry Reding

From: 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
index faa73559fd42..97e22ead5985 100644
@@ -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
index af3f80edb117..baabb0ccf8cc 100644
@@ -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
index 6b564366a825..aa8b73a2ba08 100644
@@ -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
index a790cd83b82d..4923d330de6c 100644
@@ -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
index e48e0a1a14ec..8e9c45690dce 100644
@@ -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
#21 lore raw

PATCH v5 21/27 p2371-2180: Pass Ethernet MAC to the kernel

In reply to Thierry Reding

From: 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
index 212037da5ac0..a444d692d7ea 100644
@@ -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
index 4923d330de6c..0ee4913a0469 100644
@@ -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
#22 lore raw

PATCH v5 22/27 p2771-0000: Pass Ethernet MAC to the kernel

In reply to Thierry Reding

From: 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
index 6f88010c18c3..fe22067f6571 100644
@@ -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
index ad0802067e73..91896e39a10f 100644
@@ -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
index 459b67fd195f..20d4393838d6 100644
@@ -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
#23 lore raw

PATCH v5 23/27 p2371-2180: Add support for framebuffer carveouts

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

If early firmware initialized the display hardware and the display controllers are scanning out a framebuffer (e.g. a splash screen), make sure to pass information about the memory location of that framebuffer to the kernel before booting to avoid the kernel from using that memory for the buddy allocator.

This same mechanism can also be used in the kernel to set up early SMMU mappings and avoid SMMU faults caused by the display controller reading from memory for which it has no mapping.

---
Changes in v4:
- add reviewed-by from Simon

 board/nvidia/p2371-2180/p2371-2180.c | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
board/nvidia/p2371-2180/p2371-2180.c +47 -0
index a444d692d7ea..4985302d6bc2 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <environment.h>
+#include <fdtdec.h>
 #include <i2c.h>
 #include <linux/libfdt.h>
 #include <asm/arch/gpio.h>
@@ -138,9 +139,55 @@ static void ft_mac_address_setup(void *fdt)
 	}
 }
 
+static int ft_copy_carveout(void *dst, const void *src, const char *node)
+{
+	struct fdt_memory fb;
+	int err;
+
+	err = fdtdec_get_carveout(src, node, "memory-region", 0, &fb);
+	if (err < 0) {
+		if (err != -FDT_ERR_NOTFOUND)
+			printf("failed to get carveout for %s: %d\n", node,
+			       err);
+
+		return err;
+	}
+
+	err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer",
+				  &fb);
+	if (err < 0) {
+		printf("failed to set carveout for %s: %d\n", node, err);
+		return err;
+	}
+
+	return 0;
+}
+
+static void ft_carveout_setup(void *fdt)
+{
+	const void *cboot_fdt = (const void *)cboot_boot_x0;
+	static const char * const nodes[] = {
+		"/host1x at 50000000/dc at 54200000",
+		"/host1x at 50000000/dc@54240000",
+	};
+	unsigned int i;
+	int err;
+
+	for (i = 0; i < ARRAY_SIZE(nodes); i++) {
+		err = ft_copy_carveout(fdt, cboot_fdt, nodes[i]);
+		if (err < 0) {
+			if (err != -FDT_ERR_NOTFOUND)
+				printf("failed to copy carveout for %s: %d\n",
+				       nodes[i], err);
+			continue;
+		}
+	}
+}
+
 int ft_board_setup(void *fdt, bd_t *bd)
 {
 	ft_mac_address_setup(fdt);
+	ft_carveout_setup(fdt);
 
 	return 0;
 }
Signature · 1 line
2.21.0
#24 lore raw

PATCH v5 24/27 p2771-0000: Add support for framebuffer carveouts

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

If early firmware initialized the display hardware and the display controllers are scanning out a framebuffer (e.g. a splash screen), make sure to pass information about the memory location of that framebuffer to the kernel before booting to avoid the kernel from using that memory for the buddy allocator.

This same mechanism can also be used in the kernel to set up early SMMU mappings and avoid SMMU faults caused by the display controller reading from memory for which it has no mapping.

---
Changes in v4:
- add reviewed-by from Simon

 board/nvidia/p2771-0000/p2771-0000.c | 66 ++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 4 deletions(-)
board/nvidia/p2771-0000/p2771-0000.c +62 -4
index fe22067f6571..d294c7ae0136 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <environment.h>
+#include <fdtdec.h>
 #include <i2c.h>
 #include <linux/libfdt.h>
 #include <asm/arch-tegra/cboot.h>
@@ -56,7 +57,7 @@ int tegra_pcie_board_init(void)
 }
 #endif
 
-int ft_board_setup(void *fdt, bd_t *bd)
+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];
@@ -69,13 +70,15 @@ int ft_board_setup(void *fdt, bd_t *bd)
 
 	path = fdt_get_alias(fdt, "ethernet");
 	if (!path)
-		return 0;
+		return;
 
 	debug("ethernet alias found: %s\n", path);
 
 	offset = fdt_path_offset(fdt, path);
-	if (offset < 0)
-		return 0;
+	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,
@@ -92,6 +95,61 @@ int ft_board_setup(void *fdt, bd_t *bd)
 				debug("MAC address set: %pM\n", mac);
 		}
 	}
+}
+
+static int ft_copy_carveout(void *dst, const void *src, const char *node)
+{
+	struct fdt_memory fb;
+	int err;
+
+	err = fdtdec_get_carveout(src, node, "memory-region", 0, &fb);
+	if (err < 0) {
+		if (err != -FDT_ERR_NOTFOUND)
+			printf("failed to get carveout for %s: %d\n", node,
+			       err);
+
+		return err;
+	}
+
+	err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer",
+				  &fb);
+	if (err < 0) {
+		printf("failed to set carveout for %s: %d\n", node, err);
+		return err;
+	}
+
+	return 0;
+}
+
+static void ft_carveout_setup(void *fdt)
+{
+	const void *cboot_fdt = (const void *)cboot_boot_x0;
+	static const char * const nodes[] = {
+		"/host1x at 13e00000/display-hub at 15200000/display at 15200000",
+		"/host1x at 13e00000/display-hub at 15200000/display at 15210000",
+		"/host1x at 13e00000/display-hub at 15200000/display@15220000",
+	};
+	unsigned int i;
+	int err;
+
+	for (i = 0; i < ARRAY_SIZE(nodes); i++) {
+		printf("copying carveout for %s...\n", nodes[i]);
+
+		err = ft_copy_carveout(fdt, cboot_fdt, nodes[i]);
+		if (err < 0) {
+			if (err != -FDT_ERR_NOTFOUND)
+				printf("failed to copy carveout for %s: %d\n",
+				       nodes[i], err);
+
+			continue;
+		}
+	}
+}
+
+int ft_board_setup(void *fdt, bd_t *bd)
+{
+	ft_mac_address_setup(fdt);
+	ft_carveout_setup(fdt);
 
 	return 0;
 }
Signature · 1 line
2.21.0
#25 lore raw

PATCH v5 25/27 ARM: tegra: Rename pcie-controller to pcie

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Recent versions of DTC have checks for PCI host bridge device tree nodes that are named something other than "pci" or "pcie". Fix all occurrences of such nodes for Tegra boards to avoid potential warnings from DTC.

---
 arch/arm/dts/tegra124-apalis.dts         | 2 +-
 arch/arm/dts/tegra124-cei-tk1-som.dts    | 2 +-
 arch/arm/dts/tegra124-jetson-tk1.dts     | 2 +-
 arch/arm/dts/tegra124.dtsi               | 2 +-
 arch/arm/dts/tegra186-p2771-0000-000.dts | 2 +-
 arch/arm/dts/tegra186-p2771-0000-500.dts | 2 +-
 arch/arm/dts/tegra186.dtsi               | 2 +-
 arch/arm/dts/tegra20-harmony.dts         | 2 +-
 arch/arm/dts/tegra20-trimslice.dts       | 2 +-
 arch/arm/dts/tegra20.dtsi                | 2 +-
 arch/arm/dts/tegra210-p2371-2180.dts     | 2 +-
 arch/arm/dts/tegra210.dtsi               | 2 +-
 arch/arm/dts/tegra30-apalis.dts          | 2 +-
 arch/arm/dts/tegra30-beaver.dts          | 2 +-
 arch/arm/dts/tegra30-cardhu.dts          | 2 +-
 arch/arm/dts/tegra30.dtsi                | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/dts/tegra124-apalis.dts +1 -1
index fe08d3ea7304..a962c0a2f0ae 100644
@@ -77,7 +77,7 @@
 		reg = <0x0 0x80000000 0x0 0x80000000>;
 	};
 
-	pcie-controller at 01003000 {
+	pcie at 1003000 {
 		status = "okay";
 		avddio-pex-supply = <&vdd_1v05>;
 		avdd-pex-pll-supply = <&vdd_1v05>;
arch/arm/dts/tegra124-cei-tk1-som.dts +1 -1
index b1dd4181ac03..e5b41f3183cd 100644
@@ -29,7 +29,7 @@
 		reg = <0x80000000 0x80000000>;
 	};
 
-	pcie-controller at 01003000 {
+	pcie at 1003000 {
 		status = "okay";
 
 		avddio-pex-supply = <&vdd_1v05_run>;
arch/arm/dts/tegra124-jetson-tk1.dts +1 -1
index d6420436cde8..59e080a8af6f 100644
@@ -29,7 +29,7 @@
 		reg = <0x80000000 0x80000000>;
 	};
 
-	pcie-controller at 01003000 {
+	pcie at 1003000 {
 		status = "okay";
 
 		avddio-pex-supply = <&vdd_1v05_run>;
arch/arm/dts/tegra124.dtsi +1 -1
index 83d63480471b..f473ba28e4a6 100644
@@ -14,7 +14,7 @@
 	interrupt-parent = <&lic>;
 
 
-	pcie-controller at 01003000 {
+	pcie at 1003000 {
 		compatible = "nvidia,tegra124-pcie";
 		device_type = "pci";
 		reg = <0x01003000 0x00000800   /* PADS registers */
arch/arm/dts/tegra186-p2771-0000-000.dts +1 -1
index d97c6fd3d09a..84e850d6fca6 100644
@@ -11,7 +11,7 @@
 		power-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_HIGH>;
 	};
 
-	pcie-controller at 10003000 {
+	pcie at 10003000 {
 		status = "okay";
 
 		pci at 1,0 {
arch/arm/dts/tegra186-p2771-0000-500.dts +1 -1
index 393a8b246a0b..1ac8ab431e90 100644
@@ -11,7 +11,7 @@
 		power-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_HIGH>;
 	};
 
-	pcie-controller at 10003000 {
+	pcie at 10003000 {
 		status = "okay";
 
 		pci at 1,0 {
arch/arm/dts/tegra186.dtsi +1 -1
index dd9e3b869de7..0a9db9825b85 100644
@@ -217,7 +217,7 @@
 		#interrupt-cells = <2>;
 	};
 
-	pcie-controller at 10003000 {
+	pcie at 10003000 {
 		compatible = "nvidia,tegra186-pcie";
 		device_type = "pci";
 		reg = <0x0 0x10003000 0x0 0x00000800   /* PADS registers */
arch/arm/dts/tegra20-harmony.dts +1 -1
index 0c907054dbd4..7fe7d52096c4 100644
@@ -599,7 +599,7 @@
 		nvidia,sys-clock-req-active-high;
 	};
 
-	pcie-controller at 80003000 {
+	pcie@80003000 {
 		status = "okay";
 
 		avdd-pex-supply = <&pci_vdd_reg>;
arch/arm/dts/tegra20-trimslice.dts +1 -1
index 31f509ab12c8..e19001ee2bdf 100644
@@ -30,7 +30,7 @@
 		spi-max-frequency = <25000000>;
 	};
 
-	pcie-controller at 80003000 {
+	pcie at 80003000 {
 		status = "okay";
 
 		avdd-pex-supply = <&pci_vdd_reg>;
arch/arm/dts/tegra20.dtsi +1 -1
index e21ee258b378..275b3432bd88 100644
@@ -580,7 +580,7 @@
 		reset-names = "fuse";
 	};
 
-	pcie-controller at 80003000 {
+	pcie at 80003000 {
 		compatible = "nvidia,tegra20-pcie";
 		device_type = "pci";
 		reg = <0x80003000 0x00000800   /* PADS registers */
arch/arm/dts/tegra210-p2371-2180.dts +1 -1
index da4349bd039f..c2f497c524af 100644
@@ -21,7 +21,7 @@
 		reg = <0x0 0x80000000 0x0 0xc0000000>;
 	};
 
-	pcie-controller at 01003000 {
+	pcie at 1003000 {
 		status = "okay";
 
 		pci at 1,0 {
arch/arm/dts/tegra210.dtsi +1 -1
index 229fed04529a..3ec54b11c43f 100644
@@ -11,7 +11,7 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	pcie-controller at 01003000 {
+	pcie at 1003000 {
 		compatible = "nvidia,tegra210-pcie";
 		device_type = "pci";
 		reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */
arch/arm/dts/tegra30-apalis.dts +1 -1
index 1a9ce2720acd..77502dfdb478 100644
@@ -32,7 +32,7 @@
 		reg = <0x80000000 0x40000000>;
 	};
 
-	pcie-controller at 00003000 {
+	pcie at 3000 {
 		status = "okay";
 		avdd-pexa-supply = <&vdd2_reg>;
 		vdd-pexa-supply = <&vdd2_reg>;
arch/arm/dts/tegra30-beaver.dts +1 -1
index f5fbbe849e26..9bb097b08136 100644
@@ -28,7 +28,7 @@
 		reg = <0x80000000 0x7ff00000>;
 	};
 
-	pcie-controller at 00003000 {
+	pcie at 3000 {
 		status = "okay";
 
 		avdd-pexa-supply = <&ldo1_reg>;
arch/arm/dts/tegra30-cardhu.dts +1 -1
index 5b9798c5a874..7534861e40d9 100644
@@ -27,7 +27,7 @@
 		reg = <0x80000000 0x40000000>;
 	};
 
-	pcie-controller at 00003000 {
+	pcie at 3000 {
 		status = "okay";
 
 		/* AVDD_PEXA and VDD_PEXA inputs are grounded on Cardhu. */
arch/arm/dts/tegra30.dtsi +1 -1
index 5030065cbdfe..f198bc0edbe8 100644
@@ -10,7 +10,7 @@
 	compatible = "nvidia,tegra30";
 	interrupt-parent = <&lic>;
 
-	pcie-controller at 00003000 {
+	pcie at 3000 {
 		compatible = "nvidia,tegra30-pcie";
 		device_type = "pci";
 		reg = <0x00003000 0x00000800   /* PADS registers */
Signature · 1 line
2.21.0
#26 lore raw

PATCH v5 26/27 ARM: tegra: Mark built-in Ethernet as default on Jetson TX2

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Add an "ethernet" alias that points to the default network interface, which is the built-in EQoS on Jetson TX2.

---
 arch/arm/dts/tegra186-p2771-0000.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/dts/tegra186-p2771-0000.dtsi +2 -0
index a1319dc4936f..7cda0b41f74b 100644
@@ -9,6 +9,7 @@
 	};
 
 	aliases {
+		ethernet = "/ethernet at 2490000";
 		mmc0 = "/sdhci at 3460000";
 		mmc1 = "/sdhci at 3400000";
 		i2c0 = "/bpmp/i2c";
@@ -28,6 +29,7 @@
 	ethernet at 2490000 {
 		status = "okay";
 		phy-reset-gpios = <&gpio_main TEGRA_MAIN_GPIO(M, 4) GPIO_ACTIVE_LOW>;
+		local-mac-address = [ 00 00 00 00 00 00 ];
 	};
 
 	i2c at 3160000 {
Signature · 1 line
2.21.0
#27 lore raw

PATCH v5 27/27 ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The Jetson Nano Developer Kit is a Tegra X1 based development board. It is similar to Jetson TX1 but it is not pin compatible. It features 4 GB of LPDDR4, an SPI NOR flash for early boot firmware and an SD card slot used for storage.

HDMI 2.0 or DP 1.2 are available for display, four USB ports (3 USB 2.0 and 1 USB 3.0) can be used to attach a variety of peripherals and a PCI Ethernet controller provides onboard network connectivity.

A 40-pin header on the board can be used to extend the capabilities and exposed interfaces of the Jetson Nano.

---
Changes in v5:
- add "ethernet" alias and store an empty MAC address as placeholder

Changes in v3:
- rename "Development Kit" to "Developer Kit"
- drop alias for non-existent eMMC interface
- import pinmux from A02 spreadsheet
- drop preboot support for now
- fixup text base

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/tegra210-p3450-0000.dts          | 135 +++++++++
 arch/arm/mach-tegra/tegra210/Kconfig          |   7 +
 board/nvidia/p3450-0000/Kconfig               |  12 +
 board/nvidia/p3450-0000/MAINTAINERS           |   6 +
 board/nvidia/p3450-0000/Makefile              |   8 +
 board/nvidia/p3450-0000/p3450-0000.c          | 198 +++++++++++++
 .../p3450-0000/pinmux-config-p3450-0000.h     | 265 ++++++++++++++++++
 configs/p3450-0000_defconfig                  |  55 ++++
 include/configs/p3450-0000.h                  |  34 +++
 10 files changed, 722 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/tegra210-p3450-0000.dts
 create mode 100644 board/nvidia/p3450-0000/Kconfig
 create mode 100644 board/nvidia/p3450-0000/MAINTAINERS
 create mode 100644 board/nvidia/p3450-0000/Makefile
 create mode 100644 board/nvidia/p3450-0000/p3450-0000.c
 create mode 100644 board/nvidia/p3450-0000/pinmux-config-p3450-0000.h
 create mode 100644 configs/p3450-0000_defconfig
 create mode 100644 include/configs/p3450-0000.h
arch/arm/dts/Makefile +2 -1
index 8167cdb4e856..f8d3441663c0 100644
@@ -127,7 +127,8 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 	tegra210-e2220-1170.dtb \
 	tegra210-p2371-0000.dtb \
 	tegra210-p2371-2180.dtb \
-	tegra210-p2571.dtb
+	tegra210-p2571.dtb \
+	tegra210-p3450-0000.dtb
 
 dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	armada-3720-db.dtb			\
arch/arm/dts/tegra210-p3450-0000.dts new file +135 -0

135 lines not on this page · raw message

arch/arm/mach-tegra/tegra210/Kconfig +7 -0
index 250738aed312..ea28392c0f3a 100644
@@ -35,6 +35,12 @@ config TARGET_P2571
 	help
 	  P2571 is a P2530 married to a P1963 I/O board
 
+config TARGET_P3450_0000
+	bool "NVIDIA Jetson Nano Developer Kit"
+	select BOARD_LATE_INIT
+	help
+	  P3450-0000 is a P3448 CPU board married to a P3449 I/O board.
+
 endchoice
 
 config SYS_SOC
@@ -47,5 +53,6 @@ source "board/nvidia/e2220-1170/Kconfig"
 source "board/nvidia/p2371-0000/Kconfig"
 source "board/nvidia/p2371-2180/Kconfig"
 source "board/nvidia/p2571/Kconfig"
+source "board/nvidia/p3450-0000/Kconfig"
 
 endif
board/nvidia/p3450-0000/Kconfig new file +12 -0
new file mode 100644
index 000000000000..7a08cd88675f
@@ -0,0 +1,12 @@
+if TARGET_P3450_0000
+
+config SYS_BOARD
+	default "p3450-0000"
+
+config SYS_VENDOR
+	default "nvidia"
+
+config SYS_CONFIG_NAME
+	default "p3450-0000"
+
+endif
board/nvidia/p3450-0000/MAINTAINERS new file +6 -0
new file mode 100644
index 000000000000..40700066bf39
@@ -0,0 +1,6 @@
+P3450-0000 BOARD
+M:	Tom Warren <[email protected]>
+S:	Maintained
+F:	board/nvidia/p3450-0000/
+F:	include/configs/p3450-0000.h
+F:	configs/p3450-0000_defconfig
board/nvidia/p3450-0000/Makefile new file +8 -0
new file mode 100644
index 000000000000..993c506d8200
@@ -0,0 +1,8 @@
+#
+# (C) Copyright 2018
+# NVIDIA Corporation <www.nvidia.com>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y	+= p3450-0000.o
board/nvidia/p3450-0000/p3450-0000.c new file +198 -0

198 lines not on this page · raw message

board/nvidia/p3450-0000/pinmux-config-p3450-0000.h new file +265 -0

265 lines not on this page · raw message

configs/p3450-0000_defconfig new file +55 -0

55 lines not on this page · raw message

include/configs/p3450-0000.h new file +34 -0
new file mode 100644
index 000000000000..ee819b7573b0
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2018-2019 NVIDIA Corporation. All rights reserved.
+ */
+
+#ifndef _P3450_0000_H
+#define _P3450_0000_H
+
+#include <linux/sizes.h>
+
+#include "tegra210-common.h"
+
+/* High-level configuration options */
+#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
+
+/* Board-specific serial config */
+#define CONFIG_TEGRA_ENABLE_UARTA
+
+/* Only MMC1/PXE/DHCP for now, add USB back in later when supported */
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+
+/* SPI */
+#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+
+#include "tegra-common-usb-gadget.h"
+#include "tegra-common-post.h"
+
+/* Crystal is 38.4MHz. clk_m runs@half that rate */
+#define COUNTER_FREQUENCY	19200000
+
+#endif /* _P3450_0000_H */
Signature · 1 line
2.21.0
#28 lore raw

v5 cover ARM: tegra: Miscalleneous improvements

In reply to Thierry Reding

Thierry,

I tried applying your 27 v5 patchset series here to my local u-boot-tegra/master + uboot/master (on the assumption that Simon's FDT patches had made it to TomR's master), and it failed on the first patch w/git-am. Using 'patch' allowed it to be applied w/minor fixups/fuzz. The rest of the patches then applied w/git-am OK.

I'm building locally now (64-bit and 32-bit Tegra) and if all is well I'll send a new master to Denx (minus the Nano CL, since we're not yet ready to provide all the collateral docs) for Stephen's testframe to pick up, and if it all passes I can send it all to TomR in a PR later this week.

Tom

-----Original Message-----
From: Thierry Reding <[email protected]>
Sent: Monday, April 15, 2019 2:32 AM
To: Tom Warren <[email protected]>; Simon Glass <[email protected]>
Cc: Jonathan Hunter <[email protected]>; Stephen Warren <[email protected]>; u-boot at lists.denx.de
Subject: [PATCH v5 00/27] ARM: tegra: Miscalleneous improvements

From: Thierry Reding <[email protected]>

Hi Tom, Stephen,

this in the fifth installment of this series of miscellaneous improvements for Tegra support. The main changes since the last version are:

- Add two patches from the "framebuffer carveout" series since Simon has already picked up the libfdt and fdtdec specific parts.
- Fix the MAC address regression found by Stephen's test system. This is done by writing the MAC address to U-Boot's control DTB rather than storing it in the environment and thereby confusing Ethernet drivers if more than one device are present in the system.
- I've also added the Jetson Nano patch to the series since it has changed slightly. The issue of the pinmux spreadsheet is still open, so this isn't quite ready to be merged, but I wanted to solicit more feedback, so that this is already reviewed by the time the pinmux spreadsheet issue is resolved.

Simon,

I've included another patch for a new fdtdec function in this series because the first user is introduced here. It'd be great if you could provide an Acked-by on the first patch so that Tom can pick it up and send out as part of the PR for the entire series once it's been reviewed and passed Stephen's test system.

The second patch is also required later in the series. There's no explicit maintainer for lib/string.c, but you show up in the output for scripts/get_maintainer.pl for the second patch, so perhaps you could also give an Acked-by on that?

Alternatively you could pick up patches 1 and 2 so that Tom can base his PR on your tree (or master, later on), if that's what you guys prefer. Actually, this might be better anyway, since there might be a tiny merge conflict between the fdtdec patch in this series and the other ones that I sent out earlier.

Thanks,
Thierry

Thierry Reding (27):
fdtdec: Add fdtdec_set_ethernet_mac_address()
lib: Implement strndup()
ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210
ARM: tegra: Remove disp1 clock initialization on Tegra210
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: Import cbootargs value from cboot DTB
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
p2371-2180: Add support for framebuffer carveouts
p2771-0000: Add support for framebuffer carveouts
ARM: tegra: Rename pcie-controller to pcie
ARM: tegra: Mark built-in Ethernet as default on Jetson TX2
ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/tegra124-apalis.dts              |   2 +-
 arch/arm/dts/tegra124-cei-tk1-som.dts         |   2 +-
 arch/arm/dts/tegra124-jetson-tk1.dts          |   2 +-
 arch/arm/dts/tegra124.dtsi                    |   2 +-
 arch/arm/dts/tegra186-p2771-0000-000.dts      |   2 +-
 arch/arm/dts/tegra186-p2771-0000-500.dts      |   2 +-
 arch/arm/dts/tegra186-p2771-0000.dtsi         |   2 +
 arch/arm/dts/tegra186.dtsi                    |   2 +-
 arch/arm/dts/tegra20-harmony.dts              |   2 +-
 arch/arm/dts/tegra20-trimslice.dts            |   2 +-
 arch/arm/dts/tegra20.dtsi                     |   2 +-
 arch/arm/dts/tegra210-p2371-2180.dts          |   2 +-
 arch/arm/dts/tegra210-p3450-0000.dts          | 135 ++++
 arch/arm/dts/tegra210.dtsi                    |   2 +-
 arch/arm/dts/tegra30-apalis.dts               |   2 +-
 arch/arm/dts/tegra30-beaver.dts               |   2 +-
 arch/arm/dts/tegra30-cardhu.dts               |   2 +-
 arch/arm/dts/tegra30.dtsi                     |   2 +-
 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                   | 620 ++++++++++++++++++
 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 -----
 arch/arm/mach-tegra/tegra210/Kconfig          |   7 +
 arch/arm/mach-tegra/tegra210/clock.c          |  11 +-
 board/nvidia/p2371-2180/p2371-2180.c          |  97 +++
 board/nvidia/p2771-0000/p2771-0000.c          | 111 +++-
 board/nvidia/p3450-0000/Kconfig               |  12 +
 board/nvidia/p3450-0000/MAINTAINERS           |   6 +
 board/nvidia/p3450-0000/Makefile              |   8 +
 board/nvidia/p3450-0000/p3450-0000.c          | 198 ++++++
 .../p3450-0000/pinmux-config-p3450-0000.h     | 265 ++++++++
 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 +-
 configs/p3450-0000_defconfig                  |  55 ++
 include/configs/p3450-0000.h                  |  34 +
 include/configs/tegra-common-post.h           |   2 +
 include/fdtdec.h                              |  24 +
 include/linux/string.h                        |   1 +
 lib/fdtdec.c                                  |  29 +
 lib/string.c                                  |  23 +
 67 files changed, 1964 insertions(+), 724 deletions(-)  create mode 100644 arch/arm/dts/tegra210-p3450-0000.dts
 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.c
 create mode 100644 board/nvidia/p3450-0000/Kconfig  create mode 100644 board/nvidia/p3450-0000/MAINTAINERS
 create mode 100644 board/nvidia/p3450-0000/Makefile  create mode 100644 board/nvidia/p3450-0000/p3450-0000.c
 create mode 100644 board/nvidia/p3450-0000/pinmux-config-p3450-0000.h
 create mode 100644 configs/p3450-0000_defconfig  create mode 100644 include/configs/p3450-0000.h

--
2.21.0

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------