General tegra and board improvements
Subsystems (3)
cover General tegra and board improvements
This patchset follows Transformers, Grouper, LG X3 and Endeavoru bringup and contains changes from v9 of previous patchset and some new improvenets.
List of changes:
- separated tf600t and p1801-t device trees since they use different video path bindings
- enabled booting from usb devices (USB > SD > eMMC)
- fixed tf201 dock usb line binding
- removed transformer board pmic gpios setup
- refresh USB option converted into enter console for transformers
- updated device trees for future DM PMIC migration
- re-synced defconfigs
- added base voltages setup from board for t114 same as on t30
- added tap and trim values for t210
- adjusted ebtupdate to work with non-encrypted re-crypted devices
- attempt to move setup of some env values to arch
- convert TZ removes to defconfig option
- config fragments moved to board/vendor/device/configs/ dir (requires pending u-boot patch)
Svyatoslav Ryhel (19):
ARM: dts: p1801-t: separate from common transformers tree
ARM: dts: tf600t: separate from common transformers tree
configs: transformer_t30: support booting from USB
ARM: dts: tf201: configure dock USB phy
board: asus: transformer-t30: remove PMIC GPIOs configuration
configs: transformer_t30: convert bootmenu option
ARM: dts: transformer-t30: complete missing bindings
ARM: dts: endeavoru: complete missing bindings
ARM: dts: lg-x3: complete missing bindings
ARM: dts: grouper: complete missing bindings
configs: transformer_t30: grouper: lg-x3: endeavoru: sync defconfigs
ARM: tegra114: enable base voltages setup from board
ARM: tegra210: set default-tap and default-trim values in sdhci nodes
ARM: tegra20: tegra30: support EBTUPDATE on non-encrypted devices
ARM: tegra: board2: add generic late init
board: tegra30: remove nvidia_board_late_init calls
ARM: tegra: dt-setup: convert TrustZone remove into config
board: tegra30: switch to config version of TZ remove
board: asus: lg: move config fragments into device boards
arch/arm/dts/tegra210.dtsi | 8 +
arch/arm/dts/tegra30-asus-grouper-common.dtsi | 5 +-
.../dts/tegra30-asus-nexus7-grouper-E1565.dts | 5 +-
.../dts/tegra30-asus-nexus7-grouper-PM269.dts | 11 +-
.../dts/tegra30-asus-nexus7-tilapia-E1565.dts | 5 +-
arch/arm/dts/tegra30-asus-p1801-t.dts | 205 +++++++++++++++++-
arch/arm/dts/tegra30-asus-tf201.dts | 5 +
arch/arm/dts/tegra30-asus-tf600t.dts | 160 +++++++++++++-
arch/arm/dts/tegra30-asus-transformer.dtsi | 24 +-
arch/arm/dts/tegra30-htc-endeavoru.dts | 15 +-
arch/arm/dts/tegra30-lg-x3.dtsi | 11 +-
arch/arm/mach-tegra/Kconfig | 14 ++
arch/arm/mach-tegra/board2.c | 43 ++++
arch/arm/mach-tegra/dt-setup.c | 7 +
arch/arm/mach-tegra/tegra114/cpu.c | 5 +
arch/arm/mach-tegra/tegra20/bct.c | 30 ++-
arch/arm/mach-tegra/tegra30/bct.c | 30 ++-
board/asus/grouper/MAINTAINERS | 3 -
.../grouper/configs}/grouper_E1565.config | 0
.../grouper/configs}/grouper_PM269.config | 0
.../asus/grouper/configs}/tilapia.config | 0
board/asus/grouper/grouper.c | 24 --
board/asus/transformer-t30/MAINTAINERS | 7 -
.../transformer-t30/configs}/p1801-t.config | 0
.../transformer-t30/configs}/tf201.config | 0
.../transformer-t30/configs}/tf300t.config | 0
.../transformer-t30/configs}/tf300tg.config | 0
.../transformer-t30/configs}/tf300tl.config | 0
.../transformer-t30/configs}/tf600t.config | 3 +-
.../transformer-t30/configs}/tf700t.config | 0
board/asus/transformer-t30/transformer-t30.c | 49 -----
board/htc/endeavoru/endeavoru.c | 24 --
board/lg/x3-t30/MAINTAINERS | 2 -
.../lg/x3-t30/configs}/p880.config | 0
.../lg/x3-t30/configs}/p895.config | 0
board/lg/x3-t30/x3-t30.c | 15 --
configs/endeavoru_defconfig | 4 +-
configs/grouper_common_defconfig | 6 +-
configs/transformer_t30_defconfig | 6 +-
configs/x3_t30_defconfig | 3 +-
include/configs/transformer-common.h | 7 +-
41 files changed, 532 insertions(+), 204 deletions(-)
rename {configs => board/asus/grouper/configs}/grouper_E1565.config (100%)
rename {configs => board/asus/grouper/configs}/grouper_PM269.config (100%)
rename {configs => board/asus/grouper/configs}/tilapia.config (100%)
rename {configs => board/asus/transformer-t30/configs}/p1801-t.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf201.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf300t.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf300tg.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf300tl.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf600t.config (77%)
rename {configs => board/asus/transformer-t30/configs}/tf700t.config (100%)
rename {configs => board/lg/x3-t30/configs}/p880.config (100%)
rename {configs => board/lg/x3-t30/configs}/p895.config (100%)Signature · 1 line
2.39.2
PATCH 1/19 ARM: dts: p1801-t: separate from common transformers tree
P1801-T has significant differences (hdmi panel and backlight, own power supply system) which makes use of common transformer device tree complicated.
--- arch/arm/dts/tegra30-asus-p1801-t.dts | 205 +++++++++++++++++++++++++- 1 file changed, 198 insertions(+), 7 deletions(-)
arch/arm/dts/tegra30-asus-p1801-t.dts +198 -7
@@ -1,18 +1,209 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; -#include "tegra30-asus-transformer.dtsi" +#include <dt-bindings/input/input.h> +#include "tegra30.dtsi" / { model = "ASUS Portable AiO P1801-T"; compatible = "asus,p1801-t", "nvidia,tegra30"; - /delete-node/ host1x@50000000; - /delete-node/ pwm@7000a000; + chosen { + stdout-path = &uarta; + }; - /delete-node/ backlight; - /delete-node/ panel; + aliases { + i2c0 = &pwr_i2c; + i2c1 = &hdmi_ddc; - /delete-node/ regulator-pnl; - /delete-node/ regulator-bl; + mmc0 = &sdmmc4; /* eMMC */ + mmc1 = &sdmmc1; /* uSD slot */ + + rtc0 = &pmic; + rtc1 = "/rtc@7000e000"; + + usb0 = &usb1; + usb1 = &usb2; /* Mini USB */ + usb2 = &usb3; /* Dock USB */ + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; + + host1x@50000000 { + dc@54200000 { + clocks = <&tegra_car TEGRA30_CLK_DISP1>, + <&tegra_car TEGRA30_CLK_PLL_D_OUT0>; + + rgb { + status = "okay"; + + nvidia,panel = <&hdmi>; + }; + }; + + hdmi: hdmi@54280000 { + clocks = <&tegra_car TEGRA30_CLK_HDMI>, + <&tegra_car TEGRA30_CLK_PLL_D_OUT0>; + + status = "okay"; + + hdmi-supply = <&hdmi_5v0_sys>; + pll-supply = <&vdd_1v8_vio>; + vdd-supply = <&hdmi_3v3_vdd>; + + /* low: tablet, high: dock */ + nvidia,hpd-gpio = <&gpio TEGRA_GPIO(H, 4) GPIO_ACTIVE_LOW>; + nvidia,ddc-i2c-bus = <&hdmi_ddc>; + }; + }; + + uarta: serial@70006000 { + status = "okay"; + }; + + hdmi_ddc: i2c@7000c700 { + status = "okay"; + clock-frequency = <33000>; + }; + + pwr_i2c: i2c@7000d000 { + status = "okay"; + clock-frequency = <400000>; + + /* Texas Instruments TPS659110 PMIC */ + pmic: tps65911@2d { + compatible = "ti,tps65911"; + reg = <0x2d>; + + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; + #interrupt-cells = <2>; + interrupt-controller; + + ti,system-power-controller; + + #gpio-cells = <2>; + gpio-controller; + + regulators { + vdd_1v8_vio: vddio { + regulator-name = "vdd_1v8_gen"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; + + /* eMMC VDD */ + vcore_emmc: ldo1 { + regulator-name = "vdd_emmc_core"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + /* uSD slot VDD */ + vdd_usd: ldo2 { + regulator-name = "vdd_usd"; + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + }; + + /* uSD slot VDDIO */ + vddio_usd: ldo3 { + regulator-name = "vddio_usd"; + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + regulator-always-on; + regulator-boot-on; + }; + }; + }; + }; + + sdmmc1: sdhci@78000000 { + status = "okay"; + bus-width = <4>; + + cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; + power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>; + + vmmc-supply = <&vdd_usd>; + vqmmc-supply = <&vddio_usd>; + }; + + sdmmc4: sdhci@78000600 { + status = "okay"; + bus-width = <8>; + non-removable; + + vmmc-supply = <&vcore_emmc>; + vqmmc-supply = <&vdd_1v8_vio>; + }; + + /* USB via ASUS connector */ + usb1: usb@7d000000 { + status = "okay"; + dr_mode = "otg"; + }; + + /* Mini USB port */ + usb2: usb@7d004000 { + status = "okay"; + nvidia,vbus-gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>; + }; + + /* Dock's USB port */ + usb3: usb@7d008000 { + status = "okay"; + }; + + /* PMIC has a built-in 32KHz oscillator which is used by PMC */ + clk32k_in: clock-32k { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "pmic-oscillator"; + }; + + gpio-keys { + compatible = "gpio-keys"; + + key-power { + label = "Power"; + gpios = <&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>; + linux,code = <KEY_ENTER>; + }; + + key-volume-up { + label = "Volume Up"; + gpios = <&gpio TEGRA_GPIO(Q, 2) GPIO_ACTIVE_LOW>; + linux,code = <KEY_UP>; + }; + + key-volume-down { + label = "Volume Down"; + gpios = <&gpio TEGRA_GPIO(Q, 3) GPIO_ACTIVE_LOW>; + linux,code = <KEY_DOWN>; + }; + }; + + hdmi_3v3_vdd: regulator-vdd { + compatible = "regulator-fixed"; + regulator-name = "hdmi_3v3_vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + hdmi_5v0_sys: regulator-hdmi { + compatible = "regulator-fixed"; + regulator-name = "hdmi_5v0_sys"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; + enable-active-high; + }; };
Signature · 1 line
2.39.2
PATCH 2/19 ARM: dts: tf600t: separate from common transformers tree
In reply to Svyatoslav RyhelTF600T has significant differences (Tegra DSI and DSI panel, own power supply system) which makes use of common transformer device tree complicated.
--- arch/arm/dts/tegra30-asus-tf600t.dts | 160 +++++++++++++++++++++++++-- 1 file changed, 148 insertions(+), 12 deletions(-)
arch/arm/dts/tegra30-asus-tf600t.dts +148 -12
@@ -1,38 +1,116 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; -#include "tegra30-asus-transformer.dtsi" +#include <dt-bindings/input/input.h> +#include "tegra30.dtsi" / { model = "ASUS VivoTab RT TF600T"; compatible = "asus,tf600t", "nvidia,tegra30"; + chosen { + stdout-path = &uarta; + }; + aliases { + i2c0 = &pwr_i2c; + + mmc0 = &sdmmc4; /* eMMC */ + mmc1 = &sdmmc1; /* uSD slot */ + + rtc0 = &pmic; + rtc1 = "/rtc@7000e000"; + spi0 = &spi4; + + usb0 = &usb1; + usb1 = &usb3; /* Dock USB */ + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; + + host1x@50000000 { + dc@54200000 { + clocks = <&tegra_car TEGRA30_CLK_DISP1>, + <&tegra_car TEGRA30_CLK_PLL_D_OUT0>; + + rgb { + status = "okay"; + + nvidia,panel = <&dsia>; + }; + }; + + dsia: dsi@54300000 { + status = "okay"; + + avdd-dsi-csi-supply = <&avdd_dsi_csi>; + + panel = <&panel>; + }; + }; + + uarta: serial@70006000 { + status = "okay"; + }; + + pwm: pwm@7000a000 { + status = "okay"; }; - /delete-node/ host1x@50000000; + pwr_i2c: i2c@7000d000 { + status = "okay"; + clock-frequency = <400000>; - pmic_i2c: i2c@7000d000 { /* Texas Instruments TPS659110 PMIC */ pmic: tps65911@2d { + compatible = "ti,tps65911"; + reg = <0x2d>; + + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; + #interrupt-cells = <2>; + interrupt-controller; + + ti,system-power-controller; + + #gpio-cells = <2>; + gpio-controller; + regulators { vdd_1v2_bl: vdd1 { regulator-name = "vdd_1v2_backlight"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; + }; + + vcore_lcd: vdd2 { + regulator-name = "vcore_lcd"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + }; + + vdd_1v8_vio: vddio { + regulator-name = "vdd_1v8_gen"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; regulator-always-on; regulator-boot-on; - ti,regulator-ext-sleep-control = <8>; }; - /delete-node/ ldo2; - /delete-node/ ldo3; + /* eMMC VDD */ + vcore_emmc: ldo1 { + regulator-name = "vdd_emmc_core"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; /* uSD slot VDDIO */ vddio_usd: ldo5 { regulator-name = "vddio_sdmmc"; - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; };
@@ -57,11 +135,65 @@ }; }; - backlight { + sdmmc1: sdhci@78000000 { + status = "okay"; + bus-width = <4>; + + cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>; + power-gpios = <&gpio TEGRA_GPIO(D, 7) GPIO_ACTIVE_HIGH>; + + vmmc-supply = <&vdd_usd>; + vqmmc-supply = <&vddio_usd>; + }; + + sdmmc4: sdhci@78000600 { + status = "okay"; + bus-width = <8>; + non-removable; + + vmmc-supply = <&vcore_emmc>; + vqmmc-supply = <&vdd_1v8_vio>; + }; + + /* USB via ASUS connector */ + usb1: usb@7d000000 { + status = "okay"; + dr_mode = "otg"; + }; + + /* Dock's USB port */ + usb3: usb@7d008000 { + status = "okay"; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + + enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>; power-supply = <&vdd_1v2_bl>; + pwms = <&pwm 0 71428>; + + brightness-levels = <1 35 70 105 140 175 210 255>; + default-brightness-level = <5>; + }; + + /* PMIC has a built-in 32KHz oscillator which is used by PMC */ + clk32k_in: clock-32k { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "pmic-oscillator"; }; gpio-keys { + compatible = "gpio-keys"; + + key-power { + label = "Power"; + gpios = <&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>; + linux,code = <KEY_ENTER>; + }; + key-volume-up { label = "Volume Up"; gpios = <&gpio TEGRA_GPIO(Q, 3) GPIO_ACTIVE_LOW>;
@@ -75,7 +207,14 @@ }; }; - /delete-node/ panel; + panel: panel { + compatible = "hydis,hv101hd1"; + + vdd-supply = <&vcore_lcd>; + enable-gpios = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>; + + backlight = <&backlight>; + }; vdd_usd: regulator-usd { compatible = "regulator-fixed";
@@ -83,7 +222,4 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - - /delete-node/ regulator-pnl; - /delete-node/ regulator-bl; };
Signature · 1 line
2.39.2
PATCH 3/19 configs: transformer_t30: support booting from USB
In reply to Svyatoslav RyhelChange boot logic to primary try to boot from USB in dock, then from microSD and lastly from eMMC.
--- configs/tf600t.config | 2 +- configs/transformer_t30_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
configs/tf600t.config +1 -1
@@ -1,4 +1,4 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf600t" CONFIG_TRANSFORMER_SPI_BOOT=y -CONFIG_BOOTCOMMAND="setenv gpio_button 222; if run check_button; then poweroff; fi; setenv gpio_button 132; if run check_button; then echo Starting SPI flash update ...; run update_spi; fi; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" +CONFIG_BOOTCOMMAND="setenv gpio_button 222; if run check_button; then poweroff; fi; setenv gpio_button 132; if run check_button; then echo Starting SPI flash update ...; run update_spi; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00
configs/transformer_t30_defconfig +1 -1
@@ -22,7 +22,7 @@ CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" +CONFIG_BOOTCOMMAND="setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
Signature · 1 line
2.39.2
PATCH 4/19 ARM: dts: tf201: configure dock USB phy
In reply to Svyatoslav RyhelTF201 unlike other transformers uses non-fused xcvr value for its dock USB port. With out it dock USB and SD reader will not work.
--- arch/arm/dts/tegra30-asus-tf201.dts | 5 +++++ arch/arm/dts/tegra30-asus-transformer.dtsi | 4 ++++ 2 files changed, 9 insertions(+)
arch/arm/dts/tegra30-asus-tf201.dts +5 -0
@@ -6,4 +6,9 @@ / { model = "ASUS Transformer Prime TF201"; compatible = "asus,tf201", "nvidia,tegra30"; + + usb-phy@7d008000 { + /delete-property/ nvidia,xcvr-setup-use-fuses; + nvidia,xcvr-setup = <5>; /* Based on TF201 fuse value - 48 */ + }; };
arch/arm/dts/tegra30-asus-transformer.dtsi +4 -0
@@ -123,6 +123,10 @@ status = "okay"; }; + usb-phy@7d008000 { + status = "okay"; + }; + backlight: backlight { compatible = "pwm-backlight";
Signature · 1 line
2.39.2
PATCH 5/19 board: asus: transformer-t30: remove PMIC GPIOs configuration
In reply to Svyatoslav RyhelDefault configuration matches values which are set in the board so this configuration is not required.
--- board/asus/transformer-t30/transformer-t30.c | 25 -------------------- 1 file changed, 25 deletions(-)
board/asus/transformer-t30/transformer-t30.c +0 -25
@@ -33,11 +33,6 @@#define TPS65911_LDO5 0x32#define TPS65911_LDO6 0x35 -#define TPS65911_GPIO0 0x60 -#define TPS65911_GPIO6 0x66 -#define TPS65911_GPIO7 0x67 -#define TPS65911_GPIO8 0x68 -#define TPS65911_DEVCTRL 0x3F#define DEVCTRL_PWR_OFF_MASK BIT(7)#define DEVCTRL_DEV_ON_MASK BIT(2)
@@ -146,26 +141,6 @@ static void tps65911_voltage_init(void)if (ret)log_debug ("vddio_usd set failed: %d\n" , ret); } - -/* TPS659110: GPIO0_REG output high to VDD_5V0_SBY */ - ret =dm_i2c_reg_write (dev,TPS65911_GPIO0 ,0x07 ); -if (ret) -log_debug ("vdd_5v0_sby set failed: %d\n" , ret); - -/* TPS659110: GPIO6_REG output high to VDD_3V3_SYS */ - ret =dm_i2c_reg_write (dev,TPS65911_GPIO6 ,0x07 ); -if (ret) -log_debug ("vdd_3v3_sys set failed: %d\n" , ret); - -/* TPS659110: GPIO7_REG output high to VDD_1V5_DDR */ - ret =dm_i2c_reg_write (dev,TPS65911_GPIO7 ,0x07 ); -if (ret) -log_debug ("vdd_1v5_ddr set failed: %d\n" , ret); - -/* TPS659110: GPIO8_REG pull_down output high to VDD_5V0_SYS */ - ret =dm_i2c_reg_write (dev,TPS65911_GPIO8 ,0x0f ); -if (ret) -log_debug ("vdd_5v0_sys set failed: %d\n" , ret); }/*
Signature · 1 line
2.39.2
PATCH 6/19 configs: transformer_t30: convert bootmenu option
In reply to Svyatoslav RyhelConvert refresh USB to enter console. Transformers have full size USB and a dock keyboard so access to U-Boot console would be handy.
--- configs/transformer_t30_defconfig | 2 +- include/configs/transformer-common.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-)
configs/transformer_t30_defconfig +1 -1
@@ -22,7 +22,7 @@ CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" +CONFIG_BOOTCOMMAND="setenv skip_boot 0; setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; if test ${skip_boot} -eq 1; then; else run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff; fi" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
include/configs/transformer-common.h +1 -6
@@ -64,19 +64,14 @@"else echo SPI flash backup FAILED! Aborting ...;" \"poweroff; fi\0" -#define TRANSFORMER_REFRESH_USB \ - "refresh_usb=usb start; usb reset; usb tree; usb info;" \ - "pause 'Press ANY key to return to bootmenu...'; bootmenu\0" - #define TRANSFORMER_BOOTMENU \TRANSFORMER_FLASH_UBOOT \TRANSFORMER_FLASH_SPI \ - TRANSFORMER_REFRESH_USB \"bootmenu_0=mount internal storage=usb start && ums 0 mmc 0; bootmenu\0" \"bootmenu_1=mount external storage=usb start && ums 0 mmc 1; bootmenu\0" \"bootmenu_2=fastboot=echo Starting Fastboot protocol ...; fastboot usb 0; bootmenu\0" \"bootmenu_3=update bootloader=run flash_uboot\0" \ - "bootmenu_4=refresh USB=run refresh_usb\0" \ +"bootmenu_4=enter console=usb start; setenv skip_boot 1; exit\0" \"bootmenu_5=reboot RCM=enterrcm\0" \"bootmenu_6=reboot=reset\0" \"bootmenu_7=power off=poweroff\0" \
Signature · 1 line
2.39.2
PATCH 7/19 ARM: dts: transformer-t30: complete missing bindings
In reply to Svyatoslav RyhelClean up the tree and prepare for DM PMIC migration.
--- arch/arm/dts/tegra30-asus-transformer.dtsi | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
arch/arm/dts/tegra30-asus-transformer.dtsi +15 -5
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/input/input.h> - #include "tegra30.dtsi" / {
@@ -70,12 +69,19 @@ gpio-controller; regulators { + vdd_1v8_vio: vddio { + regulator-name = "vdd_1v8_gen"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; + /* eMMC VDD */ vcore_emmc: ldo1 { regulator-name = "vdd_emmc_core"; - regulator-min-microvolt = <1000000>; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; /* uSD slot VDD */
@@ -88,8 +94,10 @@ /* uSD slot VDDIO */ vddio_usd: ldo3 { regulator-name = "vddio_usd"; - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <3100000>; regulator-max-microvolt = <3100000>; + regulator-always-on; + regulator-boot-on; }; }; };
@@ -110,6 +118,9 @@ status = "okay"; bus-width = <8>; non-removable; + + vmmc-supply = <&vcore_emmc>; + vqmmc-supply = <&vdd_1v8_vio>; }; /* USB via ASUS connector */
@@ -208,7 +219,6 @@ regulator-name = "vdd_5v0_bl"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - regulator-boot-on; gpio = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>; enable-active-high; };
Signature · 1 line
2.39.2
PATCH 8/19 ARM: dts: endeavoru: complete missing bindings
In reply to Svyatoslav RyhelClean up the tree and prepare for DM PMIC migration.
--- arch/arm/dts/tegra30-htc-endeavoru.dts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
arch/arm/dts/tegra30-htc-endeavoru.dts +13 -2
@@ -5,7 +5,6 @@ /* CPU Speedo ID 4, Soc Speedo ID 1, CPU Process: 1, Core Process: 0 */ #include <dt-bindings/input/input.h> - #include "tegra30.dtsi" / {
@@ -66,13 +65,22 @@ compatible = "ti,tps80032"; reg = <0x48>; + ti,system-power-controller; + regulators { + vdd_1v8_vio: smps5 { + regulator-name = "vdd_1v8_gen"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; + /* DSI VDD */ avdd_dsi_csi: ldo1 { regulator-name = "avdd_dsi_csi"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; - regulator-always-on; }; }; };
@@ -82,6 +90,9 @@ status = "okay"; bus-width = <8>; non-removable; + + vmmc-supply = <&vcore_emmc>; + vqmmc-supply = <&vdd_1v8_vio>; }; micro_usb: usb@7d000000 {
Signature · 1 line
2.39.2
PATCH 9/19 ARM: dts: lg-x3: complete missing bindings
In reply to Svyatoslav RyhelClean up the tree and prepare for DM PMIC migration.
--- arch/arm/dts/tegra30-lg-x3.dtsi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/arm/dts/tegra30-lg-x3.dtsi +8 -3
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/input/input.h> - #include "tegra30.dtsi" / {
@@ -91,6 +90,14 @@ regulator-boot-on; }; + avdd_3v3_periph: ldo2 { + regulator-name = "avdd_usb"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-boot-on; + }; + vdd_usd: ldo3 { regulator-name = "vdd_sdmmc3"; regulator-min-microvolt = <3000000>;
@@ -103,8 +110,6 @@ regulator-name = "vdd_ddr_rx"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; - regulator-always-on; - regulator-boot-on; }; }; };
Signature · 1 line
2.39.2
PATCH 10/19 ARM: dts: grouper: complete missing bindings
In reply to Svyatoslav RyhelClean up the tree and prepare for DM PMIC migration.
--- arch/arm/dts/tegra30-asus-grouper-common.dtsi | 5 +++-- arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts | 5 ++--- arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts | 11 +++++++++-- arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts | 5 ++--- 4 files changed, 16 insertions(+), 10 deletions(-)
arch/arm/dts/tegra30-asus-grouper-common.dtsi +3 -2
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/input/input.h> - #include "tegra30.dtsi" / {
@@ -62,6 +61,9 @@ status = "okay"; bus-width = <8>; non-removable; + + vmmc-supply = <&vcore_emmc>; + vqmmc-supply = <&vdd_1v8_vio>; }; usb1: usb@7d000000 {
@@ -150,7 +152,6 @@ regulator-name = "vdd_5v0_bl"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - regulator-boot-on; gpio = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>; enable-active-high; };
arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts +2 -3
@@ -22,7 +22,7 @@ gpio-controller; regulators { - vdd_1v8: sd2 { + vdd_1v8_vio: sd2 { regulator-name = "vdd_1v8_gen"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -34,8 +34,7 @@ vcore_emmc: ldo3 { regulator-name = "vcore_emmc"; regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <3100000>; - regulator-always-on; + regulator-max-microvolt = <2850000>; }; }; };
arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts +9 -2
@@ -23,12 +23,19 @@ gpio-controller; regulators { + vdd_1v8_vio: vddio { + regulator-name = "vdd_1v8_gen"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + }; + /* eMMC VDD */ vcore_emmc: ldo1 { regulator-name = "vdd_emmc_core"; - regulator-min-microvolt = <1000000>; + regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; }; };
arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts +2 -3
@@ -22,7 +22,7 @@ gpio-controller; regulators { - vdd_1v8: sd2 { + vdd_1v8_vio: sd2 { regulator-name = "vdd_1v8_gen"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -34,8 +34,7 @@ vcore_emmc: ldo3 { regulator-name = "vcore_emmc"; regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <3100000>; - regulator-always-on; + regulator-max-microvolt = <2850000>; }; }; };
Signature · 1 line
2.39.2
PATCH 11/19 configs: transformer_t30: grouper: lg-x3: endeavoru: sync defconfigs
In reply to Svyatoslav Ryhel--- configs/endeavoru_defconfig | 2 -- configs/grouper_common_defconfig | 4 ---- configs/tf600t.config | 1 + configs/transformer_t30_defconfig | 2 -- configs/x3_t30_defconfig | 2 -- 5 files changed, 1 insertion(+), 10 deletions(-)
configs/endeavoru_defconfig +0 -2
@@ -21,7 +21,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run check_button; then bootmenu; fi; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000
@@ -44,7 +43,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set
configs/grouper_common_defconfig +0 -4
@@ -21,7 +21,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run check_button; then bootmenu; fi; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000
@@ -43,7 +42,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set
@@ -61,8 +59,6 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_GPIO_HOG=y CONFIG_SYS_I2C_TEGRA=y -CONFIG_I2C_MUX=y -CONFIG_I2C_MUX_GPIO=y CONFIG_BUTTON_KEYBOARD=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y
configs/tf600t.config +1 -0
@@ -2,3 +2,4 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf600t" CONFIG_TRANSFORMER_SPI_BOOT=y CONFIG_BOOTCOMMAND="setenv gpio_button 222; if run check_button; then poweroff; fi; setenv gpio_button 132; if run check_button; then echo Starting SPI flash update ...; run update_spi; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00 +CONFIG_VIDEO_DSI_TEGRA30=y
configs/transformer_t30_defconfig +0 -2
@@ -21,7 +21,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv skip_boot 0; setenv gpio_button 150; if run check_button; then poweroff; fi; setenv gpio_button 131; if run check_button; then bootmenu; fi; if test ${skip_boot} -eq 1; then; else run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff; fi" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000
@@ -45,7 +44,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set
configs/x3_t30_defconfig +0 -2
@@ -22,7 +22,6 @@ CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run check_button; then bootmenu; fi; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x8000
@@ -45,7 +44,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_UMS_ABORT_KEYED=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PAUSE=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set
Signature · 1 line
2.39.2
PATCH 12/19 ARM: tegra114: enable base voltages setup from board
In reply to Svyatoslav RyhelTegra 4, same as Tegra 3, requires configuration of CPU and CORE voltages in the SPL stage to boot properly. Expose function to be able perform this configuration in the SPL section of the device board.
--- arch/arm/mach-tegra/tegra114/cpu.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/mach-tegra/tegra114/cpu.c +5 -0
@@ -13,9 +13,13 @@#include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/tegra_i2c.h> #include <linux/delay.h> #include "../cpu.h" +/* In case this function is not defined */ +__weak void pmic_enable_cpu_vdd (void ) {} +/* Tegra114-specific CPU init code */ static void enable_cpu_power_rail (void ) {
@@ -254,6 +258,7 @@ void start_cpu(u32 reset_vector)/* Enable VDD_CPU */ enable_cpu_power_rail (); +pmic_enable_cpu_vdd ();/* Get the CPU(s) running */ enable_cpu_clocks ();
Signature · 1 line
2.39.2
PATCH 13/19 ARM: tegra210: set default-tap and default-trim values in sdhci nodes
In reply to Svyatoslav RyhelTegra MMC driver has hardcoded tap and trim values as for now. Set default-tap and default-trim values in sdhci nodes to avoid regressions in case Tegra MMC driver is upated to use dts values.
--- arch/arm/dts/tegra210.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/dts/tegra210.dtsi +8 -0
@@ -704,6 +704,8 @@ clock-names = "sdhci"; resets = <&tegra_car 14>; reset-names = "sdhci"; + nvidia,default-tap = <0x2>; + nvidia,default-trim = <0x4>; status = "disabled"; };
@@ -715,6 +717,8 @@ clock-names = "sdhci"; resets = <&tegra_car 9>; reset-names = "sdhci"; + nvidia,default-tap = <0x8>; + nvidia,default-trim = <0x0>; status = "disabled"; };
@@ -726,6 +730,8 @@ clock-names = "sdhci"; resets = <&tegra_car 69>; reset-names = "sdhci"; + nvidia,default-tap = <0x3>; + nvidia,default-trim = <0x3>; status = "disabled"; };
@@ -737,6 +743,8 @@ clock-names = "sdhci"; resets = <&tegra_car 15>; reset-names = "sdhci"; + nvidia,default-tap = <0x8>; + nvidia,default-trim = <0x0>; status = "disabled"; };
Signature · 1 line
2.39.2
PATCH 14/19 ARM: tegra20: tegra30: support EBTUPDATE on non-encrypted devices
In reply to Svyatoslav RyhelRe-crypt support was extended to devices without burnt SBK. In case SBK is not set, place from where it is read is filled with zeroes. This patch adds support for ebtupdate function to detect nosbk device and avoid crypto operations for it.
--- arch/arm/mach-tegra/tegra20/bct.c | 30 ++++++++++++++++++++---------- arch/arm/mach-tegra/tegra30/bct.c | 30 ++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 20 deletions(-)
arch/arm/mach-tegra/tegra20/bct.c +20 -10
@@ -11,6 +11,9 @@#include "bct.h" #include "uboot_aes.h" +/* Device with "sbk burned: false" will expose zero key */ +const u8 nosbk[AES128_KEY_LENGTH ] = {0 }; +/* * @param bct boot config table start in RAM * @param ect bootloader start in RAM
@@ -23,22 +26,27 @@ static int bct_patch(u8 *bct, u8 *ebt, u32 ebt_size)u8 ebt_hash[AES128_KEY_LENGTH ] = {0 };u8 sbk[AES128_KEY_LENGTH ] = {0 };u8 *bct_hash = bct; +bool encrypted;int ret; bct +=BCT_HASH ; + ebt_size =roundup (ebt_size,EBT_ALIGNMENT ); +memcpy (sbk, (u8 *)(bct +BCT_LENGTH ),NVBOOT_CMAC_AES_HASH_LENGTH *4 ); - ret =decrypt_data_block (bct,BCT_LENGTH , sbk); -if (ret) -return 1 ; + encrypted =memcmp (&sbk, &nosbk,AES128_KEY_LENGTH ); - ebt_size =roundup (ebt_size,EBT_ALIGNMENT ); +if (encrypted) { + ret =decrypt_data_block (bct,BCT_LENGTH , sbk); +if (ret) +return 1 ; - ret =encrypt_data_block (ebt, ebt_size, sbk); -if (ret) -return 1 ; + ret =encrypt_data_block (ebt, ebt_size, sbk); +if (ret) +return 1 ; + } ret =sign_enc_data_block (ebt, ebt_size, ebt_hash, sbk);if (ret)
@@ -52,9 +60,11 @@ static int bct_patch(u8 *bct, u8 *ebt, u32 ebt_size) bct_tbl->bootloader[0 ].load_addr =CONFIG_SPL_TEXT_BASE ; bct_tbl->bootloader[0 ].length = ebt_size; - ret =encrypt_data_block (bct,BCT_LENGTH , sbk); -if (ret) -return 1 ; +if (encrypted) { + ret =encrypt_data_block (bct,BCT_LENGTH , sbk); +if (ret) +return 1 ; + } ret =sign_enc_data_block (bct,BCT_LENGTH , bct_hash, sbk);if (ret)
arch/arm/mach-tegra/tegra30/bct.c +20 -10
@@ -11,6 +11,9 @@#include "bct.h" #include "uboot_aes.h" +/* Device with "sbk burned: false" will expose zero key */ +const u8 nosbk[AES128_KEY_LENGTH ] = {0 }; +/* * @param bct boot config table start in RAM * @param ect bootloader start in RAM
@@ -23,22 +26,27 @@ static int bct_patch(u8 *bct, u8 *ebt, u32 ebt_size)u8 ebt_hash[AES128_KEY_LENGTH ] = {0 };u8 sbk[AES128_KEY_LENGTH ] = {0 };u8 *bct_hash = bct; +bool encrypted;int ret; bct +=BCT_HASH ; + ebt_size =roundup (ebt_size,EBT_ALIGNMENT ); +memcpy (sbk, (u8 *)(bct +BCT_LENGTH ),NVBOOT_CMAC_AES_HASH_LENGTH *4 ); - ret =decrypt_data_block (bct,BCT_LENGTH , sbk); -if (ret) -return 1 ; + encrypted =memcmp (&sbk, &nosbk,AES128_KEY_LENGTH ); - ebt_size =roundup (ebt_size,EBT_ALIGNMENT ); +if (encrypted) { + ret =decrypt_data_block (bct,BCT_LENGTH , sbk); +if (ret) +return 1 ; - ret =encrypt_data_block (ebt, ebt_size, sbk); -if (ret) -return 1 ; + ret =encrypt_data_block (ebt, ebt_size, sbk); +if (ret) +return 1 ; + } ret =sign_enc_data_block (ebt, ebt_size, ebt_hash, sbk);if (ret)
@@ -52,9 +60,11 @@ static int bct_patch(u8 *bct, u8 *ebt, u32 ebt_size) bct_tbl->bootloader[0 ].load_addr =CONFIG_SPL_TEXT_BASE ; bct_tbl->bootloader[0 ].length = ebt_size; - ret =encrypt_data_block (bct,BCT_LENGTH , sbk); -if (ret) -return 1 ; +if (encrypted) { + ret =encrypt_data_block (bct,BCT_LENGTH , sbk); +if (ret) +return 1 ; + } ret =sign_enc_data_block (bct,BCT_LENGTH , bct_hash, sbk);if (ret)
Signature · 1 line
2.39.2
PATCH 15/19 ARM: tegra: board2: add generic late init
In reply to Svyatoslav RyhelBoard specific late init allows vendors to set up different device or board specific env variables (like serial number, platform name). In case this information is missing, u-boot will lack info regards serial or platform.
To avoid this prior nvidia_board_late_init internal generic function is called which fills required data. In this case platform name is obtained from get_chip and serialno is filled with SoC id.
Though SoC id is not dedicated to be devices serial but it fits well in case of restriction of data about device and since SoC is basically a main chip of the device.
--- arch/arm/mach-tegra/board2.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
arch/arm/mach-tegra/board2.c +43 -0
@@ -26,6 +26,10 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#ifndef CONFIG_TEGRA186 +#include <asm/arch-tegra/fuse.h> +#include <asm/arch/gp_padctrl.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif
@@ -256,6 +260,37 @@ int board_early_init_f(void) }#endif /* EARLY_INIT */ +#ifndef CONFIG_TEGRA186 +static void nvidia_board_late_init_generic (void ) +{ +char serialno_str[17 ]; + +/* Set chip id as serialno */ +sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); +env_set ("serial#" , serialno_str); + +switch (tegra_get_chip ()) { +case CHIPID_TEGRA20 : +env_set ("platform" ,"Tegra 2 T20" ); +break ; +case CHIPID_TEGRA30 : +env_set ("platform" ,"Tegra 3 T30" ); +break ; +case CHIPID_TEGRA114 : +env_set ("platform" ,"Tegra 4 T114" ); +break ; +case CHIPID_TEGRA124 : +env_set ("platform" ,"Tegra K1 T124" ); +break ; +case CHIPID_TEGRA210 : +env_set ("platform" ,"Tegra X1 T210" ); +break ; +default : +return ; + } +} +#endif +int board_late_init (void ) {#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE )
@@ -268,6 +303,14 @@ int board_late_init(void)#endif start_cpu_fan ();cboot_late_init (); + +/* +* Perform generic env setup in case +* vendor does not provide it. +*/ +#ifndef CONFIG_TEGRA186 +nvidia_board_late_init_generic (); +#endif nvidia_board_late_init ();return 0 ;
Signature · 1 line
2.39.2
Re: [PATCH v1 15/19] ARM: tegra: board2: add generic late init
Quoted 53 lines · Svyatoslav Ryhel
Board specific late init allows vendors to set up different device or board specific env variables (like serial number, platform name). In case this information is missing, u-boot will lack info regards serial or platform.
To avoid this prior
nvidia_board_late_initinternal generic function is called which fills required data. In this case platform name is obtained fromget_chipand serialno is filled with SoC id.Though SoC id is not dedicated to be devices serial but it fits well in case of restriction of data about device and since SoC is basically a main chip of the device.
Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/board2.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)arch/arm/mach-tegra/board2.c +18
-0@@ -26,6 +26,10 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#ifndef CONFIG_TEGRA186 +#include <asm/arch-tegra/fuse.h> +#include <asm/arch/gp_padctrl.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif @@ -256,6 +260,37 @@ int board_early_init_f(void) }#endif /* EARLY_INIT */ +#ifndef CONFIG_TEGRA186 +static void nvidia_board_late_init_generic (void ) +{ +char serialno_str[17 ]; + +/* Set chip id as serialno */ +sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); +env_set ("serial#" , serialno_str); + +switch (tegra_get_chip ()) { +case CHIPID_TEGRA20 : +env_set ("platform" ,"Tegra 2 T20" ); +break ; +case CHIPID_TEGRA30 :
arch/arm/mach-tegra/board2.c int board_early_init_f(void) · line 286
Quoted 10 lines
arch/arm/mach-tegra/board2.c +10
-0+env_set ("platform" ,"Tegra 3 T30" ); +break ; +case CHIPID_TEGRA114 : +env_set ("platform" ,"Tegra 4 T114" ); +break ; +case CHIPID_TEGRA124 : +env_set ("platform" ,"Tegra K1 T124" ); +break ; +case CHIPID_TEGRA210 : +env_set ("platform" ,"Tegra X1 T210" );
This variable is presumably something that you'd want to match on in a script, so perhaps we can settle on something a bit more canonical. In upstream Linux we use tegraXYZ quite consistently and you'll see that reflected in things like compatible strings, so I'd suggest reusing the same naming scheme here to simplify and avoid confusion.
Thierry
Re: [PATCH v1 15/19] ARM: tegra: board2: add generic late init
23 серпня 2023 р. 14:13:11 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 62 lines · Svyatoslav Ryhel
Quoted 61 lines
Board specific late init allows vendors to set up different device or board specific env variables (like serial number, platform name). In case this information is missing, u-boot will lack info regards serial or platform.
To avoid this prior
nvidia_board_late_initinternal generic function is called which fills required data. In this case platform name is obtained fromget_chipand serialno is filled with SoC id.Though SoC id is not dedicated to be devices serial but it fits well in case of restriction of data about device and since SoC is basically a main chip of the device.
Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/board2.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)arch/arm/mach-tegra/board2.c +26
-0@@ -26,6 +26,10 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#ifndef CONFIG_TEGRA186 +#include <asm/arch-tegra/fuse.h> +#include <asm/arch/gp_padctrl.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif @@ -256,6 +260,37 @@ int board_early_init_f(void) }#endif /* EARLY_INIT */ +#ifndef CONFIG_TEGRA186 +static void nvidia_board_late_init_generic (void ) +{ +char serialno_str[17 ]; + +/* Set chip id as serialno */ +sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); +env_set ("serial#" , serialno_str); + +switch (tegra_get_chip ()) { +case CHIPID_TEGRA20 : +env_set ("platform" ,"Tegra 2 T20" ); +break ; +case CHIPID_TEGRA30 : +env_set ("platform" ,"Tegra 3 T30" ); +break ; +case CHIPID_TEGRA114 : +env_set ("platform" ,"Tegra 4 T114" ); +break ; +case CHIPID_TEGRA124 : +env_set ("platform" ,"Tegra K1 T124" ); +break ;
Quoted 8 lines
arch/arm/mach-tegra/board2.c int board_early_init_f(void) · line 286
Quoted 2 lines
arch/arm/mach-tegra/board2.c +2
-0+case CHIPID_TEGRA210 : +env_set ("platform" ,"Tegra X1 T210" );This variable is presumably something that you'd want to match on in a script, so perhaps we can settle on something a bit more canonical. In upstream Linux we use tegraXYZ quite consistently and you'll see that reflected in things like compatible strings, so I'd suggest reusing the same naming scheme here to simplify and avoid confusion.
I chose this look because it looks nice if call fastboot getvar platform. You can choose anything you want, I do not care.
Quoted 1 line
Thierry
Re: [PATCH v1 15/19] ARM: tegra: board2: add generic late init
In reply to Svyatoslav RyhelHi Svyatoslav,
Quoted 90 lines · Svyatoslav Ryhel
Board specific late init allows vendors to set up different device or board specific env variables (like serial number, platform name). In case this information is missing, u-boot will lack info regards serial or platform.
To avoid this prior
nvidia_board_late_initinternal generic function is called which fills required data. In this case platform name is obtained fromget_chipand serialno is filled with SoC id.Though SoC id is not dedicated to be devices serial but it fits well in case of restriction of data about device and since SoC is basically a main chip of the device.
Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/board2.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)arch/arm/mach-tegra/board2.c +43
-1@@ -26,6 +26,10 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#ifndef CONFIG_TEGRA186 +#include <asm/arch-tegra/fuse.h> +#include <asm/arch/gp_padctrl.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif @@ -256,6 +260,37 @@ int board_early_init_f(void) }#endif /* EARLY_INIT */ +#ifndef CONFIG_TEGRA186 +static void nvidia_board_late_init_generic (void ) +{ +char serialno_str[17 ]; + +/* Set chip id as serialno */ +sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); +env_set ("serial#" , serialno_str); + +switch (tegra_get_chip ()) { +case CHIPID_TEGRA20 : +env_set ("platform" ,"Tegra 2 T20" ); +break ; +case CHIPID_TEGRA30 : +env_set ("platform" ,"Tegra 3 T30" ); +break ; +case CHIPID_TEGRA114 : +env_set ("platform" ,"Tegra 4 T114" ); +break ; +case CHIPID_TEGRA124 : +env_set ("platform" ,"Tegra K1 T124" ); +break ; +case CHIPID_TEGRA210 : +env_set ("platform" ,"Tegra X1 T210" ); +break ; +default : +return ; + } +} +#endif +int board_late_init (void ) {#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE )@@ -268,6 +303,14 @@ int board_late_init(void)#endif start_cpu_fan ();cboot_late_init (); + +/* +* Perform generic env setup in case +* vendor does not provide it. +*/ +#ifndef CONFIG_TEGRA186 +nvidia_board_late_init_generic (); +#endif nvidia_board_late_init ();return 0 ; --
Quoted 2 lines
2.39.2
This would be better done with events. I just sent a series that converts board_late_init() to use events [1] and with that you can add as many 'spy' functions as you like [2].
Regards,
Simon
[1] https://patchwork.ozlabs.org/project/uboot/list/?series=369742
[2] https://u-boot.readthedocs.io/en/latest/develop/event.html
Re: [PATCH v1 15/19] ARM: tegra: board2: add generic late init
24 серпня 2023 р. 02:57:34 GMT+03:00, Simon Glass <[email protected]> написав(-ла):
Quoted 91 lines
Hi Svyatoslav,
Quoted 88 lines · Svyatoslav Ryhel
Board specific late init allows vendors to set up different device or board specific env variables (like serial number, platform name). In case this information is missing, u-boot will lack info regards serial or platform.
To avoid this prior
nvidia_board_late_initinternal generic function is called which fills required data. In this case platform name is obtained fromget_chipand serialno is filled with SoC id.Though SoC id is not dedicated to be devices serial but it fits well in case of restriction of data about device and since SoC is basically a main chip of the device.
Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/board2.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)arch/arm/mach-tegra/board2.c +43
-0@@ -26,6 +26,10 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#ifndef CONFIG_TEGRA186 +#include <asm/arch-tegra/fuse.h> +#include <asm/arch/gp_padctrl.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif @@ -256,6 +260,37 @@ int board_early_init_f(void) }#endif /* EARLY_INIT */ +#ifndef CONFIG_TEGRA186 +static void nvidia_board_late_init_generic (void ) +{ +char serialno_str[17 ]; + +/* Set chip id as serialno */ +sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); +env_set ("serial#" , serialno_str); + +switch (tegra_get_chip ()) { +case CHIPID_TEGRA20 : +env_set ("platform" ,"Tegra 2 T20" ); +break ; +case CHIPID_TEGRA30 : +env_set ("platform" ,"Tegra 3 T30" ); +break ; +case CHIPID_TEGRA114 : +env_set ("platform" ,"Tegra 4 T114" ); +break ; +case CHIPID_TEGRA124 : +env_set ("platform" ,"Tegra K1 T124" ); +break ; +case CHIPID_TEGRA210 : +env_set ("platform" ,"Tegra X1 T210" ); +break ; +default : +return ; + } +} +#endif +int board_late_init (void ) {#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE )@@ -268,6 +303,14 @@ int board_late_init(void)#endif start_cpu_fan ();cboot_late_init (); + +/* +* Perform generic env setup in case +* vendor does not provide it. +*/ +#ifndef CONFIG_TEGRA186 +nvidia_board_late_init_generic (); +#endif nvidia_board_late_init ();
Quoted 8 lines
Quoted 4 lines
arch/arm/mach-tegra/board2.c +0
-1return 0 ; --2.39.2
This would be better done with events. I just sent a series that converts
board_late_init()to use events [1] and with that you can add as many 'spy' functions as you like [2].
This is definitely a nice suggestion, but I would rather dedicate this convertion a separate patchset since it will affect multiple files and functions across all mach-terga.
Best regards,
Svyatoslav R.
Quoted 5 lines
Regards,
Simon[1] https://patchwork.ozlabs.org/project/uboot/list/?series=369742
[2] https://u-boot.readthedocs.io/en/latest/develop/event.html
Simon Glass
Reviewed-byRe: [PATCH v1 15/19] ARM: tegra: board2: add generic late init
Quoted 104 lines · Svyatoslav Ryhel
24 серпня 2023 р. 02:57:34 GMT+03:00, Simon Glass <[email protected]> написав(-ла):
Quoted 91 lines
Hi Svyatoslav,
Quoted 88 lines · Svyatoslav Ryhel
Board specific late init allows vendors to set up different device or board specific env variables (like serial number, platform name). In case this information is missing, u-boot will lack info regards serial or platform.
To avoid this prior
nvidia_board_late_initinternal generic function is called which fills required data. In this case platform name is obtained fromget_chipand serialno is filled with SoC id.Though SoC id is not dedicated to be devices serial but it fits well in case of restriction of data about device and since SoC is basically a main chip of the device.
Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/board2.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)arch/arm/mach-tegra/board2.c +43
-0@@ -26,6 +26,10 @@#include <asm/arch-tegra/gpu.h> #include <asm/arch-tegra/usb.h> #include <asm/arch-tegra/xusb-padctl.h> +#ifndef CONFIG_TEGRA186 +#include <asm/arch-tegra/fuse.h> +#include <asm/arch/gp_padctrl.h> +#endif #if IS_ENABLED (CONFIG_TEGRA_CLKRST )#include <asm/arch/clock.h> #endif @@ -256,6 +260,37 @@ int board_early_init_f(void) }#endif /* EARLY_INIT */ +#ifndef CONFIG_TEGRA186 +static void nvidia_board_late_init_generic (void ) +{ +char serialno_str[17 ]; + +/* Set chip id as serialno */ +sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); +env_set ("serial#" , serialno_str); + +switch (tegra_get_chip ()) { +case CHIPID_TEGRA20 : +env_set ("platform" ,"Tegra 2 T20" ); +break ; +case CHIPID_TEGRA30 : +env_set ("platform" ,"Tegra 3 T30" ); +break ; +case CHIPID_TEGRA114 : +env_set ("platform" ,"Tegra 4 T114" ); +break ; +case CHIPID_TEGRA124 : +env_set ("platform" ,"Tegra K1 T124" ); +break ; +case CHIPID_TEGRA210 : +env_set ("platform" ,"Tegra X1 T210" ); +break ; +default : +return ; + } +} +#endif +int board_late_init (void ) {#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE )@@ -268,6 +303,14 @@ int board_late_init(void)#endif start_cpu_fan ();cboot_late_init (); + +/* +* Perform generic env setup in case +* vendor does not provide it. +*/ +#ifndef CONFIG_TEGRA186 +nvidia_board_late_init_generic (); +#endif nvidia_board_late_init ();Quoted 8 lines
Quoted 4 lines
arch/arm/mach-tegra/board2.c +0
-1return 0 ; --2.39.2
This would be better done with events. I just sent a series that converts
board_late_init()to use events [1] and with that you can add as many 'spy' functions as you like [2].
Quoted 1 line
This is definitely a nice suggestion, but I would rather dedicate this convertion a separate patchset since it will affect multiple files and functions across all mach-terga.
OK I look forward to it!
Quoted 9 lines
Best regards,
Svyatoslav R.Quoted 5 lines
Regards,
Simon[1] https://patchwork.ozlabs.org/project/uboot/list/?series=369742
[2] https://u-boot.readthedocs.io/en/latest/develop/event.html
PATCH 16/19 board: tegra30: remove nvidia_board_late_init calls
In reply to Svyatoslav RyhelRemove nvidia_board_late_init calls from board since this setup is performed in board2 of mach-tegra. Call of nvidia_board_late_init from within the board does not provide any additional data.
--- board/asus/grouper/grouper.c | 12 ------------ board/asus/transformer-t30/transformer-t30.c | 12 ------------ board/htc/endeavoru/endeavoru.c | 12 ------------ board/lg/x3-t30/x3-t30.c | 11 ----------- 4 files changed, 47 deletions(-)
board/asus/grouper/grouper.c +0 -12
@@ -9,14 +9,12 @@#include <common.h> #include <dm.h> -#include <env.h> #include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/gpio.h> -#include <asm/arch-tegra/fuse.h> #include <asm/gpio.h> #include <linux/delay.h> #include "pinmux-config-grouper.h"
@@ -190,13 +188,3 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; }#endif - -void nvidia_board_late_init (void ) -{ -char serialno_str[17 ]; - -/* Set chip id as serialno */ -sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); -env_set ("serial#" , serialno_str); -env_set ("platform" ,"Tegra 3 T30" ); -}
board/asus/transformer-t30/transformer-t30.c +0 -12
@@ -11,14 +11,12 @@#include <common.h> #include <dm.h> -#include <env.h> #include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/gpio.h> -#include <asm/arch-tegra/fuse.h> #include <asm/gpio.h> #include <linux/delay.h> #include "pinmux-config-transformer.h"
@@ -164,13 +162,3 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; }#endif - -void nvidia_board_late_init (void ) -{ -char serialno_str[17 ]; - -/* Set chip id as serialno */ -sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); -env_set ("serial#" , serialno_str); -env_set ("platform" ,"Tegra 3 T30" ); -}
board/htc/endeavoru/endeavoru.c +0 -12
@@ -9,14 +9,12 @@#include <common.h> #include <dm.h> -#include <env.h> #include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/gpio.h> -#include <asm/arch-tegra/fuse.h> #include <asm/gpio.h> #include <linux/delay.h> #include "pinmux-config-endeavoru.h"
@@ -104,13 +102,3 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; }#endif - -void nvidia_board_late_init (void ) -{ -char serialno_str[17 ]; - -/* Set chip id as serialno */ -sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); -env_set ("serial#" , serialno_str); -env_set ("platform" ,"Tegra 3 T30" ); -}
board/lg/x3-t30/x3-t30.c +0 -11
@@ -9,7 +9,6 @@#include <common.h> #include <dm.h> -#include <env.h> #include <fdt_support.h> #include <i2c.h> #include <log.h>
@@ -164,13 +163,3 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; }#endif - -void nvidia_board_late_init (void ) -{ -char serialno_str[17 ]; - -/* Set chip id as serialno */ -sprintf (serialno_str,"%016llx" ,tegra_chip_uid ()); -env_set ("serial#" , serialno_str); -env_set ("platform" ,"Tegra 3 T30" ); -}
Signature · 1 line
2.39.2
PATCH 17/19 ARM: tegra: dt-setup: convert TrustZone remove into config
In reply to Svyatoslav RyhelRemove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into Kconfig option.
--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)
arch/arm/mach-tegra/Kconfig +14 -0
@@ -172,6 +172,20 @@ config TEGRA_DISCONNECT_UDC_ON_BOOT USB controller when U-Boot boots to avoid leaving a stale USB device present. +config TEGRA_REMOVE_TZ_NODES + bool "Remove TrustZone node and alias from Linux DTS before boot" + depends on !SKIP_LOWLEVEL_INIT + select OF_LIBFDT + help + U-Boot cannot deploy TrustZone on its own on product devices since + vendors usually do not provide device specific TrustOS images. Same + time vendor bootloaders establish TrustZone and Linux device trees + take this into account and bind Trusted Foundation devices. If u-boot + tries to boot such tree it will stuck. This option automatically + removes TZ nodes from device tree used for booting Linux kernel to + avoid bootloop and preserve compatibility of Linux device trees with + vendor kernels. + config CI_UDC_HAS_HOSTPC def_bool y depends on CI_UDC && !TEGRA20
arch/arm/mach-tegra/dt-setup.c +7 -0
@@ -5,6 +5,7 @@#include <common.h> #include <fdtdec.h> +#include <fdt_support.h> #include <stdlib.h> #include <asm/arch-tegra/cboot.h> #include <asm/arch-tegra/gpu.h>
@@ -32,6 +33,12 @@ int ft_system_setup(void *blob, struct bd_info *bd)return ret; } +#ifdef CONFIG_TEGRA_REMOVE_TZ_NODES +/* Remove TrustZone nodes */ +fdt_del_node_and_alias (blob,"/firmware" ); +fdt_del_node_and_alias (blob,"/reserved-memory/trustzone@bfe00000" ); +#endif +return 0 ; }
Signature · 1 line
2.39.2
Re: [PATCH v1 17/19] ARM: tegra: dt-setup: convert TrustZone remove into config
Quoted 9 lines · Svyatoslav Ryhel
Remove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into
Kconfigoption.Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)
I kind of preferred the original because it's very explicit. There's also no big advantage in consolidating this because the code is unlikely to ever require changing (the libfdt API is quite stable and these nodes are all hard-coded anyway). This new variant put non-generic code (it requires a Kconfig option after all) into a generic place, so it seems a bit backwards.
Thierry
Re: [PATCH v1 17/19] ARM: tegra: dt-setup: convert TrustZone remove into config
23 серпня 2023 р. 14:17:37 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 11 lines · Svyatoslav Ryhel
Quoted 9 lines
Remove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into
Kconfigoption.Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)
Quoted 6 lines
I kind of preferred the original because it's very explicit. There's also no big advantage in consolidating this because the code is unlikely to ever require changing (the libfdt API is quite stable and these nodes are all hard-coded anyway). This new variant put non-generic code (it requires a
Kconfigoption after all) into a generic place, so it seems a bit backwards.
So you say that I have to add same function to boards over and over for all devices I plan to mainline? Unneeded code duplication in action.
List of devices which need this:
- transformers t30
- transformers t114
- grouper
- lg x3
- endeavoru
- tegratab
- wexler qc750 and basically ALL t30 and t114
Ok, fine. Dropping and moving on.
Quoted 1 line
Thierry
Re: [PATCH v1 17/19] ARM: tegra: dt-setup: convert TrustZone remove into config
Hi,
Quoted 33 lines · Svyatoslav Ryhel
23 серпня 2023 р. 14:17:37 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 11 lines · Svyatoslav Ryhel
Quoted 9 lines
Remove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into
Kconfigoption.Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)Quoted 6 lines
I kind of preferred the original because it's very explicit. There's also no big advantage in consolidating this because the code is unlikely to ever require changing (the libfdt API is quite stable and these nodes are all hard-coded anyway). This new variant put non-generic code (it requires a
Kconfigoption after all) into a generic place, so it seems a bit backwards.So you say that I have to add same function to boards over and over for all devices I plan to mainline? Unneeded code duplication in action.
List of devices which need this:
- transformers t30
- transformers t114
- grouper
- lg x3
- endeavoru
- tegratab
- wexler qc750 and basically ALL t30 and t114
Quoted 1 line
Ok, fine. Dropping and moving on.
Where is the binding for this node? I have never heard of it.
Regards,
Simon
Re: [PATCH v1 17/19] ARM: tegra: dt-setup: convert TrustZone remove into config
23 серпня 2023 р. 17:54:21 GMT+03:00, Simon Glass <[email protected]> написав(-ла):
Quoted 36 lines
Hi,
Quoted 33 lines · Svyatoslav Ryhel
23 серпня 2023 р. 14:17:37 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 11 lines · Svyatoslav Ryhel
Quoted 9 lines
Remove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into
Kconfigoption.Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)Quoted 6 lines
I kind of preferred the original because it's very explicit. There's also no big advantage in consolidating this because the code is unlikely to ever require changing (the libfdt API is quite stable and these nodes are all hard-coded anyway). This new variant put non-generic code (it requires a
Kconfigoption after all) into a generic place, so it seems a bit backwards.So you say that I have to add same function to boards over and over for all devices I plan to mainline? Unneeded code duplication in action.
List of devices which need this:
- transformers t30
- transformers t114
- grouper
- lg x3
- endeavoru
- tegratab
- wexler qc750 and basically ALL t30 and t114
Quoted 3 lines
Quoted 1 line
Ok, fine. Dropping and moving on.
Where is the binding for this node? I have never heard of it.
This is manipulation of linux kernel device tree. Vendor bootloader can establish trustzone while u-boot cannot since vendors do not provide trust OS image. To have a compromise linux trees have trustzone set which allows them to boot on vendor bootloaders, while u-boot removes it before linux kernel boot allowing the same tree to boot on u-boot as well. Without removing those nodes linux kernel will just stuck.
Quoted 2 lines
Regards,
Simon
Re: [PATCH v1 17/19] ARM: tegra: dt-setup: convert TrustZone remove into config
In reply to Svyatoslav RyhelQuoted 21 lines · Svyatoslav Ryhel
23 серпня 2023 р. 14:17:37 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 11 lines · Svyatoslav Ryhel
Quoted 9 lines
Remove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into
Kconfigoption.Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)Quoted 6 lines
I kind of preferred the original because it's very explicit. There's also no big advantage in consolidating this because the code is unlikely to ever require changing (the libfdt API is quite stable and these nodes are all hard-coded anyway). This new variant put non-generic code (it requires a
Kconfigoption after all) into a generic place, so it seems a bit backwards.
Quoted 3 lines
So you say that I have to add same function to boards over and over for all devices I plan to mainline? Unneeded code duplication in action.
There's a balance to be struck between duplication and readability. If you insert this board-specific code into a generic code path, that generic code path becomes difficult to read given the extra #ifdef guards etc. If you're really worried about duplicating code you can move the two libfdt calls into a separate function and call that function from each of the boards that need it.
Thierry
Re: [PATCH v1 17/19] ARM: tegra: dt-setup: convert TrustZone remove into config
24 серпня 2023 р. 16:33:48 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 26 lines · Svyatoslav Ryhel
Quoted 21 lines
23 серпня 2023 р. 14:17:37 GMT+03:00, Thierry Reding <[email protected]> написав(-ла):
Quoted 11 lines · Svyatoslav Ryhel
Quoted 9 lines
Remove of TrustZone nodes is required by many product devices which require repetable calls of same function from device board. To simplify this, TZ remove is converted into
Kconfigoption.Signed-off-by Svyatoslav Ryhel <[email protected]>--- arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++ arch/arm/mach-tegra/dt-setup.c | 7 +++++++ 2 files changed, 21 insertions(+)Quoted 6 lines
I kind of preferred the original because it's very explicit. There's also no big advantage in consolidating this because the code is unlikely to ever require changing (the libfdt API is quite stable and these nodes are all hard-coded anyway). This new variant put non-generic code (it requires a
Kconfigoption after all) into a generic place, so it seems a bit backwards.Quoted 3 lines
So you say that I have to add same function to boards over and over for all devices I plan to mainline? Unneeded code duplication in action.
Quoted 6 lines
There's a balance to be struck between duplication and readability. If you insert this board-specific code into a generic code path, that generic code path becomes difficult to read given the extra #ifdef guards etc. If you're really worried about duplicating code you can move the two libfdt calls into a separate function and call that function from each of the boards that need it.
I propose for now to drop this patches and when time comes to Simon Glass suggestion about events just create a call for this or handle it in some way.
Quoted 1 line
Thierry
PATCH 18/19 board: tegra30: switch to config version of TZ remove
In reply to Svyatoslav RyhelSwitch to defconfig version of TrustZone nodes remove.
--- board/asus/grouper/grouper.c | 12 ------------ board/asus/transformer-t30/transformer-t30.c | 12 ------------ board/htc/endeavoru/endeavoru.c | 12 ------------ board/lg/x3-t30/x3-t30.c | 4 ---- configs/endeavoru_defconfig | 2 +- configs/grouper_common_defconfig | 2 +- configs/transformer_t30_defconfig | 2 +- configs/x3_t30_defconfig | 1 + 8 files changed, 4 insertions(+), 43 deletions(-)
board/asus/grouper/grouper.c +0 -12
@@ -9,7 +9,6 @@#include <common.h> #include <dm.h> -#include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h>
@@ -177,14 +176,3 @@ void pin_mux_mmc(void) #endif }#endif /* MMC */ - -#if defined(CONFIG_OF_LIBFDT ) && defined(CONFIG_OF_BOARD_SETUP ) -int ft_board_setup (void *blob,struct bd_info *bd) -{ -/* Remove TrustZone nodes */ -fdt_del_node_and_alias (blob,"/firmware" ); -fdt_del_node_and_alias (blob,"/reserved-memory/trustzone@bfe00000" ); - -return 0 ; -} -#endif
board/asus/transformer-t30/transformer-t30.c +0 -12
@@ -11,7 +11,6 @@#include <common.h> #include <dm.h> -#include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h>
@@ -151,14 +150,3 @@ void pin_mux_mmc(void) tps65911_voltage_init(); }#endif /* MMC */ - -#if defined(CONFIG_OF_LIBFDT ) && defined(CONFIG_OF_BOARD_SETUP ) -int ft_board_setup (void *blob,struct bd_info *bd) -{ -/* Remove TrustZone nodes */ -fdt_del_node_and_alias (blob,"/firmware" ); -fdt_del_node_and_alias (blob,"/reserved-memory/trustzone@bfe00000" ); - -return 0 ; -} -#endif
board/htc/endeavoru/endeavoru.c +0 -12
@@ -9,7 +9,6 @@#include <common.h> #include <dm.h> -#include <fdt_support.h> #include <i2c.h> #include <log.h> #include <asm/arch/pinmux.h>
@@ -91,14 +90,3 @@ void pin_mux_mmc(void) tps80032_voltage_init(); }#endif /* MMC */ - -#if defined(CONFIG_OF_LIBFDT ) && defined(CONFIG_OF_BOARD_SETUP ) -int ft_board_setup (void *blob,struct bd_info *bd) -{ -/* Remove TrustZone nodes */ -fdt_del_node_and_alias (blob,"/firmware" ); -fdt_del_node_and_alias (blob,"/reserved-memory/trustzone@bfe00000" ); - -return 0 ; -} -#endif
board/lg/x3-t30/x3-t30.c +0 -4
@@ -156,10 +156,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)fdt_find_and_setprop (blob,"/serial@70006200/bluetooth" ,"local-bd-address" , btmacaddr,6 ,1 ); -/* Remove TrustZone nodes */ -fdt_del_node_and_alias (blob,"/firmware" ); -fdt_del_node_and_alias (blob,"/reserved-memory/trustzone@bfe00000" ); - return 0; }#endif
configs/endeavoru_defconfig +1 -1
@@ -13,10 +13,10 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (Endeavoru) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_ENDEAVORU=y CONFIG_CMD_EBTUPDATE=y CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y
configs/grouper_common_defconfig +1 -1
@@ -13,10 +13,10 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (Grouper) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_GROUPER=y CONFIG_CMD_EBTUPDATE=y CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y
configs/transformer_t30_defconfig +1 -1
@@ -13,10 +13,10 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (Transformer) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_TRANSFORMER_T30=y CONFIG_CMD_EBTUPDATE=y CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=0 CONFIG_AUTOBOOT_KEYED=y
configs/x3_t30_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_SYS_PROMPT="Tegra30 (x3) # " CONFIG_SPL_STACK=0x800ffffc CONFIG_TEGRA30=y +CONFIG_TEGRA_REMOVE_TZ_NODES=y CONFIG_TARGET_X3_T30=y CONFIG_TEGRA_ENABLE_UARTD=y CONFIG_CMD_EBTUPDATE=y
Signature · 1 line
2.39.2
PATCH 19/19 board: asus: lg: move config fragments into device boards
In reply to Svyatoslav RyhelMove ASUS Transformers, Grouper, P895 and P880 config fragments into their respective device directory in /board/../configs/
---
board/asus/grouper/MAINTAINERS | 3 ---
.../asus/grouper/configs}/grouper_E1565.config | 0
.../asus/grouper/configs}/grouper_PM269.config | 0
{configs => board/asus/grouper/configs}/tilapia.config | 0
board/asus/transformer-t30/MAINTAINERS | 7 -------
.../asus/transformer-t30/configs}/p1801-t.config | 0
.../asus/transformer-t30/configs}/tf201.config | 0
.../asus/transformer-t30/configs}/tf300t.config | 0
.../asus/transformer-t30/configs}/tf300tg.config | 0
.../asus/transformer-t30/configs}/tf300tl.config | 0
.../asus/transformer-t30/configs}/tf600t.config | 0
.../asus/transformer-t30/configs}/tf700t.config | 0
board/lg/x3-t30/MAINTAINERS | 2 --
{configs => board/lg/x3-t30/configs}/p880.config | 0
{configs => board/lg/x3-t30/configs}/p895.config | 0
15 files changed, 12 deletions(-)
rename {configs => board/asus/grouper/configs}/grouper_E1565.config (100%)
rename {configs => board/asus/grouper/configs}/grouper_PM269.config (100%)
rename {configs => board/asus/grouper/configs}/tilapia.config (100%)
rename {configs => board/asus/transformer-t30/configs}/p1801-t.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf201.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf300t.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf300tg.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf300tl.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf600t.config (100%)
rename {configs => board/asus/transformer-t30/configs}/tf700t.config (100%)
rename {configs => board/lg/x3-t30/configs}/p880.config (100%)
rename {configs => board/lg/x3-t30/configs}/p895.config (100%)board/asus/grouper/MAINTAINERS +0 -3
@@ -2,9 +2,6 @@ GROUPER BOARD M: Svyatoslav Ryhel <[email protected]> S: Maintained F: board/asus/grouper/ -F: configs/grouper_E1565.config -F: configs/grouper_PM269.config -F: configs/tilapia.config F: configs/grouper_common_defconfig F: doc/board/asus/grouper_common.rst F: include/configs/grouper.h
board/asus/grouper/configs/grouper_E1565.config renamed from configs/grouper_E1565.config +0 -0
board/asus/grouper/configs/grouper_PM269.config renamed from configs/grouper_PM269.config +0 -0
board/asus/grouper/configs/tilapia.config renamed from configs/tilapia.config +0 -0
board/asus/transformer-t30/MAINTAINERS +0 -7
@@ -2,13 +2,6 @@ TRANSFORMER BOARD M: Svyatoslav Ryhel <[email protected]> S: Maintained F: board/asus/transformer-t30/ -F: configs/p1801-t.config -F: configs/tf201.config -F: configs/tf300t.config -F: configs/tf300tg.config -F: configs/tf300tl.config -F: configs/tf600t.config -F: configs/tf700t.config F: configs/transformer_t30_defconfig F: doc/board/asus/transformer_t30.rst F: include/configs/transformer-common.h
board/asus/transformer-t30/configs/p1801-t.config renamed from configs/p1801-t.config +0 -0
board/asus/transformer-t30/configs/tf201.config renamed from configs/tf201.config +0 -0
board/asus/transformer-t30/configs/tf300t.config renamed from configs/tf300t.config +0 -0
board/asus/transformer-t30/configs/tf300tg.config renamed from configs/tf300tg.config +0 -0
board/asus/transformer-t30/configs/tf300tl.config renamed from configs/tf300tl.config +0 -0
board/asus/transformer-t30/configs/tf600t.config renamed from configs/tf600t.config +0 -0
board/asus/transformer-t30/configs/tf700t.config renamed from configs/tf700t.config +0 -0
board/lg/x3-t30/MAINTAINERS +0 -2
@@ -2,8 +2,6 @@ X3 BOARD M: Svyatoslav Ryhel <[email protected]> S: Maintained F: board/lg/x3-t30/ -F: configs/p880.config -F: configs/p895.config F: configs/x3_t30_defconfig F: doc/board/lg/x3_t30.rst F: include/configs/x3-t30.h
board/lg/x3-t30/configs/p880.config renamed from configs/p880.config +0 -0
board/lg/x3-t30/configs/p895.config renamed from configs/p895.config +0 -0
Signature · 1 line
2.39.2