September 2023 - U-Boot

[PATCH v2] CI: allow jobs to be run in merge requests
by Andrejs Cainikovs 01 Oct '23

01 Oct '23

From: Andrejs Cainikovs <andrejs.cainikovs(a)toradex.com> Out-of-tree users could run an out-of-tree CI with limited coverage, however it is convenient to be able to run the upstream CI from time to time. To enable that we would need to change job rules to be able to run on any GitLab event. Excerpt from GitLab documentation: > Jobs with no rules default to except: merge_requests Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs(a)toradex.com> --- .gitlab-ci.yml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6efbd8021c8..981b95c00d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,8 @@ stages: .buildman_and_testpy_template: &buildman_and_testpy_dfn stage: test.py retry: 2 # QEMU may be too slow, etc. + rules: + - when: always before_script: # Clone uboot-test-hooks - git config --global --add safe.directory "${CI_PROJECT_DIR}" @@ -93,8 +95,13 @@ stages: - "*.css" expire_in: 1 week -build all 32bit ARM platforms: +.world_build: stage: world build + rules: + - when: always + +build all 32bit ARM platforms: + extends: .world_build script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; @@ -106,7 +113,7 @@ build all 32bit ARM platforms: fi; build all 64bit ARM platforms: - stage: world build + extends: .world_build script: - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate @@ -120,7 +127,7 @@ build all 64bit ARM platforms: fi; build all PowerPC platforms: - stage: world build + extends: .world_build script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; @@ -131,7 +138,7 @@ build all PowerPC platforms: fi; build all other platforms: - stage: world build + extends: .world_build script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; @@ -141,8 +148,13 @@ build all other platforms: exit $ret; fi; -check for new CONFIG symbols outside Kconfig: +.testsuites: stage: testsuites + rules: + - when: always + +check for new CONFIG symbols outside Kconfig: + extends: .testsuites script: - git config --global --add safe.directory "${CI_PROJECT_DIR}" # If grep succeeds and finds a match the test fails as we should @@ -153,7 +165,7 @@ check for new CONFIG symbols outside Kconfig: # build documentation docs: - stage: testsuites + extends: .testsuites script: - virtualenv -p /usr/bin/python3 /tmp/venvhtml - . /tmp/venvhtml/bin/activate @@ -163,20 +175,20 @@ docs: # ensure all configs have MAINTAINERS entries Check for configs without MAINTAINERS entry: - stage: testsuites + extends: .testsuites script: - ./tools/buildman/buildman --maintainer-check || exit 0 # Ensure host tools build Build tools-only and envtools: - stage: testsuites + extends: .testsuites script: - make tools-only_config tools-only -j$(nproc); make mrproper; make tools-only_config envtools -j$(nproc) Run binman, buildman, dtoc, Kconfig and patman testsuites: - stage: testsuites + extends: .testsuites script: - git config --global user.name "GitLab CI Runner"; git config --global user.email trini(a)konsulko.com; @@ -200,7 +212,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: make testconfig Run tests for Nokia RX-51 (aka N900): - stage: testsuites + extends: .testsuites script: - mkdir nokia_rx51_tmp; ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/; @@ -214,7 +226,7 @@ Run tests for Nokia RX-51 (aka N900): # Check for any pylint regressions Run pylint: - stage: testsuites + extends: .testsuites script: - git config --global --add safe.directory "${CI_PROJECT_DIR}" - pip install -r test/py/requirements.txt @@ -234,7 +246,7 @@ Run pylint: # Check for pre-schema driver model tags Check for pre-schema tags: - stage: testsuites + extends: .testsuites script: - git config --global --add safe.directory "${CI_PROJECT_DIR}"; # If grep succeeds and finds a match the test fails as we should @@ -243,7 +255,7 @@ Check for pre-schema tags: # Check we can package the Python tools Check packing of Python tools: - stage: testsuites + extends: .testsuites script: - make pip -- 2.34.1

2 2

[PATCH 1/1] test: build dependency for event unit tests
by Heinrich Schuchardt 01 Oct '23

01 Oct '23

The test_event_base and test_event_probe unit tests use function event_register() which depends on CONFIG_EVENT_DYNAMIC=y. Fixes: 7d02645fe4c0 ("event: Add a simple test") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/Makefile b/test/common/Makefile index a5ab10f6f6..12c65f8c95 100644 --- a/test/common/Makefile +++ b/test/common/Makefile @@ -2,5 +2,5 @@ obj-y += cmd_ut_common.o obj-$(CONFIG_AUTOBOOT) += test_autoboot.o obj-$(CONFIG_CYCLIC) += cyclic.o -obj-$(CONFIG_EVENT) += event.o +obj-$(CONFIG_EVENT_DYNAMIC) += event.o obj-y += cread.o -- 2.40.1

3 2

[PATCH] Adjust gitignore for /build
by Rong Tao 01 Oct '23

01 Oct '23

From: Rong Tao <rongtao(a)cestc.cn> /build-* can't ignore /build. Signed-off-by: Rong Tao <rongtao(a)cestc.cn> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 002f95de4feb..9697f0088f80 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ *.tab.[ch] # Build tree -/build-* +/build* # # Top-level generic files -- 2.41.0

4 4

[PATCH] test: fix comment indentation on tpm tests
by Ilias Apalodimas 01 Oct '23

01 Oct '23

One out comments is off by one, adjust it Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- test/dm/tpm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/dm/tpm.c b/test/dm/tpm.c index 3defb3c3da1f..cde933ab2848 100644 --- a/test/dm/tpm.c +++ b/test/dm/tpm.c @@ -98,10 +98,11 @@ static int test_tpm_autostart(struct unit_test_state *uts, if (reinit) ut_assertok(tpm_init(dev)); - /* - * tpm_auto_start will rerun tpm_init() if reinit, but handles the - * -EBUSY return code internally. - */ + + /* + * tpm_auto_start will rerun tpm_init() if reinit, but handles the + * -EBUSY return code internally. + */ ut_assertok(tpm_auto_start(dev)); return 0; -- 2.39.2

3 3

[PATCH v3 0/4] Allwinner R528/T113s PSCI
by Sam Edwards 30 Sep '23

30 Sep '23

Hi list, This is the third version of my patchset for supporting PSCI on R528/T113-s3. It is meant to be applied atop Andre Przywara's T113s support series (v2). For convenience, the latter exists in a Git branch at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git t113s-v2 It's looking like we're very close to finished here. The only "controversy" that I expect is that patch 4/4 defines CFG_ARM_GIC_BASE_ADDRESS in sunxi-common.h. There has previously been discussion about moving this to Kconfig. I agree that this is a good change in principle, but I don't have the available cycles to look into adding another Kconfig symbol (and cleaning up Arndale, the other target which uses this) and so have opted to defer that cleanup for another day. For testing: I can confirm that patch 2/4 results in no change to machine code whatsoever on any supported target. Patch 1/4 results in a minor machine code change on R40 only. Patch 3/4 will likely require testing on each of the 4 "special case" sunxi targets (sun6i, sun7i, R40, H3) to ensure that register offsets are kept consistent. Patch 4/4 needs testing on R528 only. Changes v2->v3: - Fix missing `cpu=0;` for the sun7i power management case. - Make sunxi_cpu_power_off() a static function, per feedback on v2. - Kevin Amadiva of MEC electronics got in touch with me off-list, reported success bringing up CPU1 of a T113 with this patchset, and kindly provided me with a Tested-by tag for patch 4/4. - Remove a comment about R40/R528 being special, per feedback on v2. - Simplify an if statement, per feedback on v2. - Add missing 'select' directives to the R528 Kconfig, per feedback on v2. Changes v1->v2: - Power clamp is now adjusted ONLY on sun{6,7}i, H3, R40. The previous version was mistakenly doing this EXCEPT on those machines. - Flattened sunxi_power_switch() into sunxi_cpu_set_power() for simplicity's sake. - Moved the "power clamp is not NULL" conditional into sunxi_cpu_set_power(). - Removed unnecessary H6 special-case, since H6 is actually ARM64. - Renamed SUNXI_CPUX_BASE to SUNXI_CPUCFG_BASE, to mirror expected changes in Andre's v2 of the R528 series (we decided against using a new name for this block). - Removed sunxi_cpucfg_reg struct, and stopped using the PRCM struct in psci.c. Happy Saturday all, Sam Sam Edwards (4): sunxi: psci: clean away preprocessor macros sunxi: psci: refactor register access to separate functions sunxi: psci: stop modeling register layout with C structs sunxi: psci: implement PSCI on R528 arch/arm/cpu/armv7/sunxi/psci.c | 185 ++++++++++++++--------- arch/arm/include/asm/arch-sunxi/cpucfg.h | 67 -------- arch/arm/mach-sunxi/Kconfig | 4 + include/configs/sunxi-common.h | 8 + 4 files changed, 127 insertions(+), 137 deletions(-) delete mode 100644 arch/arm/include/asm/arch-sunxi/cpucfg.h -- 2.41.0

1 4

github dependabot alert on py / pytest
by Frank Wunderlich 30 Sep '23

30 Sep '23

Hi, dependabot reports a high security issue https://github.com/frank-w/u-boot/security/dependabot/1 it seems it is not yet fixed in master and next as there py is still in and pytest==6.2.5 I have not yet seen any topics for this...are you aware of this? I know tests are run in isolated environment through gitlab-pipeline, but maybe this can have still a risk. regards Frank

2 3

[PATCH] pinctrl: Check pinconfig nodes pre-reloc status recursively
by Jonas Karlman 30 Sep '23

30 Sep '23

Pinconfig nodes normally bind recursively with PINCTRL_FULL and PINCONF_RECURSIVE enabled. However, during U-Boot proper pre-relocation any node marked with e.g. bootph-all will not bind unless its parent is also marked for pre-reloc. group1 { pinconf1 { bootph-all; }; }; This cause the following warning message to be shown during U-Boot proper pre-reloc stage on Rockchip RK3568 devices. ns16550_serial serial@fe660000: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19 Check pinconfig nodes pre-reloc status recursively to fix this and to make pinconfig_post_bind work same at both U-Boot proper pre-reloc and at TPL/SPL stage. Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- drivers/pinctrl/pinctrl-uclass.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 73dd7b1038bb..fe2ba5021a78 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -100,6 +100,22 @@ static int pinctrl_select_state_full(struct udevice *dev, const char *statename) return 0; } +static bool ofnode_pre_reloc_recursive(ofnode parent) +{ + ofnode child; + + if (ofnode_pre_reloc(parent)) + return true; + + if (CONFIG_IS_ENABLED(PINCONF_RECURSIVE)) { + ofnode_for_each_subnode(child, parent) + if (ofnode_pre_reloc_recursive(child)) + return true; + } + + return false; +} + /** * pinconfig_post_bind() - post binding for PINCONFIG uclass * Recursively bind its children as pinconfig devices. @@ -119,7 +135,7 @@ static int pinconfig_post_bind(struct udevice *dev) dev_for_each_subnode(node, dev) { if (pre_reloc_only && - !ofnode_pre_reloc(node)) + !ofnode_pre_reloc_recursive(node)) continue; /* * If this node has "compatible" property, this is not -- 2.41.0

3 4

[PATCH] rockchip: rk3399: nanopc-t4: use 1600MHz sdram config
by Lu jicong 30 Sep '23

30 Sep '23

Current 1866MHz sdram config is too high for NanoPC-T4. On this frequency, its lpddr3 sdram becomes unstable, causing memtest failures and random kernel crashes. Signed-off-by: Lu jicong <jiconglu58(a)gmail.com> --- arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi index 17201bcf41..8b6c9059ab 100644 --- a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi @@ -4,4 +4,4 @@ */ #include "rk3399-nanopi4-u-boot.dtsi" -#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi" -- 2.39.2

2 3

[RFC PATCH v2 0/3] thermal: Integrate VTM and AVS driver
by Udit Kumar 30 Sep '23

30 Sep '23

VTM (Voltage and Thermal Manager) IP is used for following purpose 1) AVS class 0 2) Thermal management (setting thermal shutdown TSHUT) temperature. 3) SoC temperature reporting. In origin boot flow, R5/SPL sets the AVS voltage using by AVS driver, residing under UCLASS_MISC. In this series At top level, following changes are done - Moved avs driver to Thermal class - Ported kernel driver (drivers/thermal/k3_j72xx_bandgap.c) which supports TSHUT and temperature reporting - Merged these two driver as one under UCLASS_THERMAL. This series aims to - set avs and thermal shutdown at R5/SPL stage - At main u-boot stage, support thermal shutdown and temperature reporting Also, j72xx_bandgap does complex math to get ADC value to temperature conversion, This table is pretty static. So at R5 SPL stage, instead of calculation, fixed values is used for TSHUT values. and #ifdef is used skip non needed code for SPL/R5 to reduce code size. Change log Changes in v2: v1 : https://lore.kernel.org/all/20230901061500.2342452-1-u-kumar1@ti.com/ - Trying to merge AVS and kernel driver into 1 - Mark as RFC Udit Kumar (3): thermal: k3: Add support for thermal in vtm arm: mach-k3: update board file to use thermal device arm: dts: k3: update device tree for vtm node arch/arm/dts/k3-j7200-mcu-wakeup.dtsi | 9 + .../arm/dts/k3-j7200-r5-common-proc-board.dts | 6 - arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 10 + .../arm/dts/k3-j721e-r5-common-proc-board.dts | 7 - arch/arm/dts/k3-j721e-r5-sk.dts | 7 - arch/arm/mach-k3/am654_init.c | 2 +- arch/arm/mach-k3/j721e_init.c | 2 +- configs/am65x_evm_r5_defconfig | 3 + configs/am65x_evm_r5_usbdfu_defconfig | 3 + configs/am65x_evm_r5_usbmsc_defconfig | 3 + configs/am65x_hs_evm_r5_defconfig | 3 + configs/j7200_evm_a72_defconfig | 3 + configs/j7200_evm_r5_defconfig | 3 + configs/j721e_evm_a72_defconfig | 3 + configs/j721e_evm_r5_defconfig | 3 + drivers/misc/Makefile | 1 - drivers/misc/k3_avs.c | 394 -------- drivers/thermal/Kconfig | 7 + drivers/thermal/Makefile | 1 + drivers/thermal/k3_thermal.c | 928 ++++++++++++++++++ 20 files changed, 981 insertions(+), 417 deletions(-) delete mode 100644 drivers/misc/k3_avs.c create mode 100644 drivers/thermal/k3_thermal.c -- 2.34.1

2 4

[PULL] u-boot-at91-fixes-2023.10-b
by Eugen Hristev 29 Sep '23

29 Sep '23

Hello Tom, Please pull tag u-boot-at91-fixes-2023.10-b , the second set of fixes for 2023.10 cycle. This comes late, but I hope you can merge it before the release, it's only two small fixes , one for an array not initialized and the second one fixes an error case when a DT property is missing for the atmel NAND driver. Thanks, Eugen The following changes since commit 15155ab0a3d1f839509bcac620bfb38f950bead6: Merge tag 'u-boot-imx-20230923' of https://source.denx.de/u-boot/custodians/u-boot-imx (2023-09-24 17:15:31 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-at91.git tags/u-boot-at91-fixes-2023.10-b for you to fetch changes up to 7b4ffe8c32db284e25d3a2636904def8e093da9e: clk: at91: Fix initializing arrays (2023-09-29 16:45:40 +0300) ---------------------------------------------------------------- Second set of u-boot-atmel fixes for the 2023.10 cycle ---------------------------------------------------------------- Alexander Dahl (1): mtd: nand: raw: atmel: Add error handling when rb-gpios missing Francois Berder (1): clk: at91: Fix initializing arrays drivers/clk/at91/sam9x60.c | 4 ++-- drivers/clk/at91/sama7g5.c | 4 ++-- drivers/mtd/nand/raw/atmel/nand-controller.c | 11 +++++++---- 3 files changed, 11 insertions(+), 8 deletions(-)

2 1