July 2021 - U-Boot

[PATCH] dm: core: fix no null pointer detection in ofnode_get_addr_size_index()
by chenguanqiao 04 Jul '21

04 Jul '21

From: Chen Guanqiao <chenguanqiao(a)kuaishou.com> Fixed a defect of a null pointer being discovered by Coverity Scan: CID 331544: Null pointer dereferences (REVERSE_INULL) Null-checking "size" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Signed-off-by: Chen Guanqiao <chenguanqiao(a)kuaishou.com> --- drivers/core/ofnode.c | 13 +++++++------ include/dm/ofnode.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 6c771e364f..554af95114 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -299,11 +299,10 @@ ofnode ofnode_get_by_phandle(uint phandle) return node; } -fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size) +fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *psize) { int na, ns; - - *size = FDT_SIZE_T_NONE; + fdt_size_t size = FDT_SIZE_T_NONE; if (ofnode_is_np(node)) { const __be32 *prop_val; @@ -314,8 +313,7 @@ fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size) &flags); if (!prop_val) return FDT_ADDR_T_NONE; - if (size) - *size = size64; + size = size64; ns = of_n_size_cells(ofnode_to_np(node)); @@ -330,9 +328,12 @@ fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size) ns = ofnode_read_simple_size_cells(ofnode_get_parent(node)); return fdtdec_get_addr_size_fixed(gd->fdt_blob, ofnode_to_offset(node), "reg", - index, na, ns, size, true); + index, na, ns, psize, true); } + if (size) + *psize = size; + return FDT_ADDR_T_NONE; } diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 8a69fd87da..e38d39dcf3 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -487,7 +487,7 @@ int ofnode_read_size(ofnode node, const char *propname); * @return address, or FDT_ADDR_T_NONE if not present or invalid */ phys_addr_t ofnode_get_addr_size_index(ofnode node, int index, - fdt_size_t *size); + fdt_size_t *psize); /** * ofnode_get_addr_index() - get an address from a node -- 2.27.0

2 2

[PATCH 1/1] test: NULL dereference in test-uclass
by Heinrich Schuchardt 04 Jul '21

04 Jul '21

If a test-uclass device is probed outside a test, uts is not defined. Avoid a NULL dereference in this case. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/dm/test-uclass.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 067701734a..d2d1e0f190 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -32,6 +32,9 @@ static int test_post_bind(struct udevice *dev) struct unit_test_state *uts = test_get_state(); struct dm_test_perdev_uc_pdata *uc_pdata; + if (!uts) + return 0; + dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++; ut_assert(!device_active(dev)); @@ -57,6 +60,9 @@ static int test_pre_probe(struct udevice *dev) test-uclass.cstruct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev); struct unit_test_state *uts = test_get_state(); + if (!uts) + return 0; + dm_testdrv_op_count[DM_TEST_OP_PRE_PROBE]++; ut_assert(priv); ut_assert(device_active(dev)); @@ -70,6 +76,9 @@ static int test_post_probe(struct udevice *dev) struct udevice *prev = list_entry(dev->uclass_node.prev, struct udevice, uclass_node); + if (!uts) + return 0; + struct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev); struct uclass *uc = dev->uclass; @@ -103,6 +112,9 @@ static int test_init(struct uclass *uc) { struct unit_test_state *uts = test_get_state(); + if (!uts) + return 0; + dm_testdrv_op_count[DM_TEST_OP_INIT]++; ut_assert(uclass_get_priv(uc)); -- 2.30.2

2 1

[PATCH] fdtdec: fdtdec_get_aliases_highest_id: skip aliases to disabled nodes
by Tim Harvey 04 Jul '21

04 Jul '21

When looking for an alias with the highest id skip aliases for nodes that are disabled. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- lib/fdtdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 864589193b..d47195525a 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -546,6 +546,8 @@ int fdtdec_get_alias_highest_id(const void *blob, const char *base) if (*prop != '/' || prop[len - 1] || strncmp(name, base, base_len)) continue; + if (!fdtdec_get_is_enabled(blob, fdt_path_offset(blob, prop))) + continue; val = trailing_strtol(name); if (val > max) { -- 2.17.1

3 8

[PATCH v2 00/33] dm: Add dtoc implementation of device instantiation (part D)
by Simon Glass 04 Jul '21

04 Jul '21

By way of background, in May[1] and July[2] two 'tiny-dm' series were sent out, showing a possible way to reduce the overhead of driver model in SPL. The potential impact of that work was described in the cover letter[3]. While this was a successful demonstration, all but eliminating the overhead of driver model, it was not very practical, since it would have required substantial effort to adapt drivers used in SPL to what was effectively a parallel driver model. Instead, after much discussion [4], it was decided to try to use the tiny-dm methods to adapt the existing of-platdata infrastructure. This is considerably more work up front but should result in much less effort for maintainers, along with a single, more consistent driver model. Of the options mentioned in [3], the following are implemented (in dtoc only, not driver model) as part of this series (CS=reduces code size, DS=reduces data size): CS - drop driver_bind() and create devices (struct udevice) at build-time CS - allocate all device- and uclass-private data at build-time In addition the following was completed in an earlier series: CS / DS - Combine req_seq and seq and calculate the new value at build-time So this series updates dtoc to support generating devices and uclasses that are ready for use when SPL starts and don't need to be bound. This 'build-time' instantiation helps to reduce the code-size overhead of driver model in SPL. As part of this series, a new -i option is added to dtoc. This changes it to emit build-time-instantiated devices. Separate Kconfig options control instantiation and whether run-time binding is supported. Several corner cases have come up in making this work on sandbox_spl and chromebook_coral. It is possible that others will come up in the future, but it should be possible to adapt things to address these, based on the work here. This is part D of the overall effort. The final series includes the driver model implementation, as well as updating the documentation. To find out what the new generated files look like, see the last four patches of this series. It is available at u-boot-dm/prepd-working [1] http://patchwork.ozlabs.org/project/uboot/list/?series=179128&state=* [2] http://patchwork.ozlabs.org/project/uboot/list/?series=187295&state=* [3] https://lists.denx.de/pipermail/u-boot/2020-July/418433.html [4] http://patchwork.ozlabs.org/project/uboot/patch/20200525093539.1.Ibf2d19439… Changes in v2: - New patch - New patch - New patch - Drop patches previously applied - Update cover letter - Fix the naming for uclass_plat_name so it is different from uclass_priv - Tidy up tabbing to make the code output line up better - Add a summary to the top of the generated file Simon Glass (33): bootstage: Fix dependency for BOOTSTAGE_RECORD_COUNT dtoc: Scan drivers for available information dtoc: Save scan information across test runs dtoc: Ignore unwanted files when scanning for drivers dtoc: Collect priv/plat struct info from drivers dtoc: Support scanning of uclasses dtoc: Support scanning of structs in header files dtoc: Move test files into a test/ directory dtoc: Rename sandbox_i2c_test and sandbox_pmic_test dtoc: Add some extra properties to nodes dtoc: Make use of node properties dtoc: Process nodes to set up required properties dtoc: Track nodes which are actually used dtoc: Support tracking the phase of U-Boot Makefile: Pass the U-Boot phase to dtoc dtoc: Support headers needed for drivers dtoc: Process driver aliases along with drivers dtoc: Warn of duplicate drivers dtoc: Read aliases for uclasses dtoc: Detect drivers only at the start of start of line dtoc: Assign a sequence number to each node dtoc: Set up the uclasses that are used dtoc: Support processing the root node dtoc: Add an option for device instantiation dm: of-platadata: Add option for device instantiation dtoc: Add support for decl file dtoc: Don't generate platform data with instantiation sandbox: Make sandbox,emul more conventional sandbox: i2c: Rename driver names to work with of-platdata dtoc: Tidy up the list of supported phandle properties dtoc: Generate a summary in the dt-plat.c file dtoc: Generate uclass devices dtoc: Generate device instances arch/sandbox/dts/sandbox.dtsi | 6 +- arch/sandbox/dts/test.dts | 4 +- common/Kconfig.boot | 3 + common/bootstage.c | 2 +- doc/driver-model/of-plat.rst | 3 +- doc/driver-model/pci-info.rst | 1 + drivers/i2c/i2c-emul-uclass.c | 4 +- drivers/misc/test_drv.c | 11 +- drivers/rtc/i2c_rtc_emul.c | 2 +- dts/Kconfig | 23 +- include/dm/device.h | 34 + include/dm/test.h | 5 + scripts/Makefile.spl | 6 +- test/dm/test-fdt.c | 6 +- tools/dtoc/dtb_platdata.py | 620 +++++++++- tools/dtoc/dtoc_test_scan_drivers.cxx | 1 - tools/dtoc/main.py | 9 +- tools/dtoc/src_scan.py | 597 +++++++++- tools/dtoc/{ => test}/dtoc_test.dts | 0 tools/dtoc/{ => test}/dtoc_test_add_prop.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr32.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr32_64.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr64.dts | 0 tools/dtoc/{ => test}/dtoc_test_addr64_32.dts | 0 tools/dtoc/test/dtoc_test_alias_bad.dts | 58 + tools/dtoc/test/dtoc_test_alias_bad_path.dts | 58 + tools/dtoc/test/dtoc_test_alias_bad_uc.dts | 58 + tools/dtoc/{ => test}/dtoc_test_aliases.dts | 0 tools/dtoc/{ => test}/dtoc_test_bad_reg.dts | 0 tools/dtoc/{ => test}/dtoc_test_bad_reg2.dts | 0 .../{ => test}/dtoc_test_driver_alias.dts | 0 tools/dtoc/{ => test}/dtoc_test_empty.dts | 0 tools/dtoc/test/dtoc_test_inst.dts | 58 + .../{ => test}/dtoc_test_invalid_driver.dts | 0 tools/dtoc/{ => test}/dtoc_test_phandle.dts | 0 .../dtoc/{ => test}/dtoc_test_phandle_bad.dts | 0 .../{ => test}/dtoc_test_phandle_bad2.dts | 0 .../{ => test}/dtoc_test_phandle_cd_gpios.dts | 0 .../{ => test}/dtoc_test_phandle_reorder.dts | 0 .../{ => test}/dtoc_test_phandle_single.dts | 0 tools/dtoc/test/dtoc_test_scan_drivers.cxx | 5 + tools/dtoc/{ => test}/dtoc_test_simple.dts | 4 +- tools/dtoc/test_dtoc.py | 1023 ++++++++++++++++- tools/dtoc/test_fdt.py | 31 +- tools/dtoc/test_src_scan.py | 397 ++++++- 45 files changed, 2847 insertions(+), 182 deletions(-) delete mode 100644 tools/dtoc/dtoc_test_scan_drivers.cxx rename tools/dtoc/{ => test}/dtoc_test.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_add_prop.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr32.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr32_64.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr64.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_addr64_32.dts (100%) create mode 100644 tools/dtoc/test/dtoc_test_alias_bad.dts create mode 100644 tools/dtoc/test/dtoc_test_alias_bad_path.dts create mode 100644 tools/dtoc/test/dtoc_test_alias_bad_uc.dts rename tools/dtoc/{ => test}/dtoc_test_aliases.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_bad_reg.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_bad_reg2.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_driver_alias.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_empty.dts (100%) create mode 100644 tools/dtoc/test/dtoc_test_inst.dts rename tools/dtoc/{ => test}/dtoc_test_invalid_driver.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_bad.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_bad2.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_cd_gpios.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_reorder.dts (100%) rename tools/dtoc/{ => test}/dtoc_test_phandle_single.dts (100%) create mode 100644 tools/dtoc/test/dtoc_test_scan_drivers.cxx rename tools/dtoc/{ => test}/dtoc_test_simple.dts (93%) -- 2.30.0.365.g02bc693789-goog

2 69

[PATCH] rockchip: rk3399: adjust Nanopi R4S board power layout
by xiaobo 04 Jul '21

04 Jul '21

1. Modify the VCC VDD power layout 2. Modify Ethernet1 interface of PCIE0 Signed-off-by: xiaobo <peterwillcn(a)gmail.com> --- arch/arm/dts/rk3399-nanopi-r4s.dts | 85 ++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 22 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index 6f2cf17bf1..ae22363072 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -17,19 +17,65 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; - aliases { - ethernet1 = &r8169; + chosen { + stdout-path = "serial2:1500000n8"; + }; + + vcc1v8_s3: vcc1v8-s3 { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc1v8_s3"; + vin-supply = <&vcc_1v8>; + }; + + vcc3v0_sd: vcc3v0-sd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_pwr_h>; + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc3v0_sd"; + vin-supply = <&vcc3v3_sys>; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_sys"; + }; + + vcc5v0_sys: vcc5v0-sys { + compatible = "regulator-fixed"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_sys"; + vin-supply = <&vdd_5v>; }; vdd_5v: vdd-5v { compatible = "regulator-fixed"; - regulator-name = "vdd_5v"; regulator-always-on; regulator-boot-on; + regulator-name = "vdd_5v"; }; fan: pwm-fan { compatible = "pwm-fan"; + /* + * With 20KHz PWM and an EVERCOOL EC4007H12SA fan, these levels + * work out to 0, ~1200, ~3000, and 5000RPM respectively. + */ cooling-levels = <0 12 18 255>; #cooling-cells = <2>; fan-supply = <&vdd_5v>; @@ -73,40 +119,39 @@ status = "disabled"; }; +&i2c4 { + status = "disabled"; +}; + &leds { lan_led: led-1 { gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:lan"; + label = "green:lan"; + }; + + sys_led: led-sys { + default-state = "on"; + gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; + label = "red:sys"; }; wan_led: led-2 { gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; - label = "nanopi-r4s:green:wan"; + label = "green:wan"; }; }; &leds_gpio { rockchip,pins = - <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>, - <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; + <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; &pcie0 { max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>; - - pcie@0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - r8169: pcie@0,0 { - reg = <0x000000 0 0 0 0>; - local-mac-address = [ 00 00 00 00 00 00 ]; - }; - }; }; &sdhci { @@ -132,7 +177,3 @@ &usbdrd_dwc3_0 { dr_mode = "host"; }; - -&vcc3v3_sys { - vin-supply = <&vcc5v0_sys>; -}; -- 2.32.0

1 0

[RFC] Load U-Boot without LK on DragonBoard 410c (+ DB820c?)
by Stephan Gerhold 04 Jul '21

04 Jul '21

Hi! at the moment the U-Boot ports for both DragonBoard 410c and 820c are designed to be loaded as an Android boot image after Qualcomm's LK bootloader. This is simple to set up but LK is redundant in this case, since everything done by LK can be also done directly by U-Boot. Dropping LK entirely would have at least the following advantages: - Easier installation/board code (no need for Android boot images) - (Slightly) faster boot - Boot directly in 64-bit without a round trip to 32-bit for LK This was not possible so far because of some unsolved problems. For clarity I try to describe them together with some background here, but I want to apologize for the long text. It's all quite complicated. :) 1. "Signing" 64-bit U-Boot ========================== Ramon already tried to eliminate LK for DB410c 3 years ago [1]. One of the open problems back then was to have a proper "signing" tool with 64-bit support. The firmware expects an ELF image with a few Qualcomm-specific ELF headers. Normally this is used for secure boot setups. This is not used on DragonBoards, but the firmware still insists on having a dummy (self-signed) certificate chain in the ELF images. Linaro uses signlk [2] to sign their builds of LK. It looks like Nicolas extended it with ELF64 support after Ramon's mail [3]. However, for some reason signlk literally works only for LK for me. I tried to "sign" U-Boot and some other firmware, but everything except LK is always rejected with the following message on boot: B - 1031113 - Error code 302e at boot_config.c Line 296 I tried to track down the issue in the source code for quite some time but did not manage to find the problem. Perhaps it's some subtle mistake with some of the ELF modifications, I'm not sure. (For some reason, signlk makes subtle changes to all of the existing ELF headers...) After reading about the image format myself I decided to try to make my own "signing" tool, qtestsign: https://github.com/msm8916-mainline/qtestsign It's based on a mixture of the specification [4] and some missing bits taken from signlk, put in a simple and clean Python tool. I still don't know what exactly qtestsign does different, but unlike signlk it can successfully "sign" U-Boot and all other firmware from DragonBoard 410c. [1]: https://lore.kernel.org/u-boot/CA+Kvs9kS=DbJKNAixk_3tz+3iWnRaSP0gJdZ8eKrzas… [2]: https://git.linaro.org/landing-teams/working/qualcomm/signlk.git/ [3]: https://git.linaro.org/landing-teams/working/qualcomm/signlk.git/commit/?id… [4]: https://www.qualcomm.com/media/documents/files/secure-boot-and-image-authen… My solution ----------- Now we have all we need to install U-Boot without LK. For DragonBoard 410c the following steps end up in the U-Boot prompt without going through LK: 1. Change dragonboard410c_defconfig as follows: -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_SYS_TEXT_BASE=0x8F600000 +CONFIG_OF_EMBED=y (I discuss this at the end of the mail) 2. $ make 3. Sign the ELF image: $ qtestsign.py aboot <out>/u-boot [5] 4. Flash "<out>/u-boot-test-signed.mbn" to the "aboot" partition [5]: https://github.com/msm8916-mainline/qtestsign 2. Linux gets stuck when loaded by 64-bit U-Boot without LK =========================================================== This should work well enough to get the U-Boot prompt on serial. However, once you load Linux you will likely notice a problem: [ 0.059043] smp: Bringing up secondary CPUs ... [ 5.120691] CPU1: failed to come online [ 10.246760] CPU2: failed to come online [ 15.372848] CPU3: failed to come online [ 15.406275] CPU: All CPU(s) started at EL1 ... [ 16.185527] genirq: irq_chip msmgpio did not update eff. affinity mask of irq 79 Board freezes forever. :( My investigations have shown this is a bug in the PSCI implementation on DB410c (part of the TrustZone/"tz" firmware). Shortly said, since we have never done the 32-bit -> 64-bit switch in LK, the PSCI implementation seems to believe we are still running in 32-bit mode and starts all further CPUs in 32-bit mode. The other CPU cores crash immediately when coming up and CPU 0 hangs once CPU idle suspends it for the first time. I have described this problem together with a workaround in detail here: https://github.com/msm8916-mainline/qhypstub#boot-flow The idea is to execute the TZ syscall to switch from 32-bit -> 64-bit even though we are already running in 64-bit mode. This will make the PSCI implementation aware that we want all further CPU cores booted in 64-bit mode as well. My solution ----------- The workaround is applied automatically when using my open-source "hyp" firmware replacement qhypstub: https://github.com/msm8916-mainline/qhypstub As a bonus, both U-Boot and Linux start in EL2, making it possible to use virtualization (e.g. KVM in Linux). $ git clone https://github.com/msm8916-mainline/qhypstub.git $ cd qhypstub $ make CROSS_COMPILE=aarch64-linux-gnu- $ qtestsign.py hyp qhypstub.elf # Flash "qhypstub-test-signed.mbn" to "hyp" partition and reboot. Now it works: [ 0.063411] CPU1: Booted secondary processor 0x0000000001 [0x410fd030] [ 0.064184] CPU2: Booted secondary processor 0x0000000002 [0x410fd030] [ 0.064906] CPU3: Booted secondary processor 0x0000000003 [0x410fd030] [ 0.123032] CPU: All CPU(s) started at EL2 [ 0.448743] kvm [1]: Hyp mode initialized successfully ... And with that U-Boot is fully working as far as I can tell. (I have only tested serial, SD card and USB so far. If something is broken, it's likely some missing register initialization that should be ported from LK/Linux...) 3. Remaining open questions =========================== I still see 3 questions that we need to discuss: 1. This is a quite fundamental change. Can we just make it to dragonboard410c_defconfig? Does it make sense to keep the old setup with LK? When would it be used? 2. Workaround for PSCI bug: I'm not sure if we want to make qhypstub [6] a requirement for U-Boot. On the one hand it's open-source, solves the problem nicely without changes in U-Boot and provides EL2 additionally. I'm also not aware of any problem/disadvantage when using it (if you find a problem, please let me know!). But I realize it's unofficial. If we want to support using Qualcomm's "hyp" firmware as well I could try porting the PSCI workaround from qhypstub to U-Boot. It should be ~10 lines of ARM64 assembly [7] placed e.g. in board/qualcomm/dragonboard410c/head.S. However, I will need to make sure to detect if U-Boot was started in EL2 by qhypstub because otherwise doing the workaround twice will conflict and U-Boot might demote itself back to EL1. 3. CONFIG_OF_EMBED: There is a big warning about this in the build log: "This option should only be used for debugging purposes. Please use CONFIG_OF_SEPARATE for boards in mainline." The important part here is that we need an ELF image with both U-Boot and the DTB. CONFIG_OF_EMBED is convenient for that because we can just use the ELF image built by the linker and it already contains the DTB. If CONFIG_OF_EMBED is really so bad it might be possible to build a new boot image based on "u-boot-dtb.bin" (which is U-Boot with DTB appended). I'm not sure if this is really much better though. Bonus question: Could something similar also work for DB820c? I don't have one myself but I think a similar setup short also work on it. If someone is interested in testing this I would be happy to help. :) Thanks for reading! Stephan [6]: https://github.com/msm8916-mainline/qhypstub [7]: https://github.com/msm8916-mainline/qhypstub/blob/c9c3fd0f66ea60032812b06b5…

3 8

[PATCH 00/12] Random Fixes for the CHIP Pro
by Maxime Ripard 03 Jul '21

03 Jul '21

Hi, These patches fix the NextThingCo CHIP Pro support in upstream U-Boot. The three reverts are not supposed to be merged at this point: the first two will break the NAND support on newer Allwinner SoCs, and it's not clear what the fastboot one does exactly, so I'm a bit concerned about the side effects. The following patches fixes a couple of things around the GR8, CHIP Pro, and fastboot support in general. Let me know what you think, Maxime Maxime Ripard (12): Revert "sunxi: spl: remove DMA related settings of the NAND controller" Revert "spl: nand: sunxi: use PIO instead of DMA" Revert "usb: gadget: fastboot: use correct max packet size" Kconfig: Migrate SPL_PANIC_ON_RAW_IMAGE mtd: Allow for a longer mtdparts table fastboot: Add missing newlines configs: chip pro: Disable video output clk: sunxi: Add missing clock compatible fastboot: nand: Fix return error code configs: chip pro: Disable UMS configs: chip pro: fix the offsets configs: chip pro: Fix NAND Controller name README | 10 -- board/sunxi/board.c | 5 + common/spl/Kconfig | 14 +++ configs/CHIP_pro_defconfig | 8 +- drivers/clk/sunxi/clk_a10s.c | 2 + drivers/fastboot/fb_nand.c | 14 +-- drivers/mtd/mtd_uboot.c | 2 +- drivers/mtd/nand/raw/sunxi_nand_spl.c | 141 ++++++++++++++++---------- drivers/usb/gadget/f_fastboot.c | 2 +- scripts/config_whitelist.txt | 1 - 10 files changed, 120 insertions(+), 79 deletions(-) -- 2.31.1

4 20

[PATCH 0/4] vpl: Introduce a verifying program loader
by Simon Glass 03 Jul '21

03 Jul '21

U-Boot provides a verified-boot feature based around FIT, but there is no standard way of implementing it for a board. At present the various required pieces must be built up separately, to produce a working implementation. In particular, there is no built-in support for selecting A/B boot or recovery mode. This series introduces VPL, a verified program loader. Its purpose is to run the verified-boot process and decide which SPL binary should be run. Adding VPL into the boot flow provides a standard way of implementing verified boot. So far, only the phase itself is added. More work is needed to add logic to the phase, based on continuing discussions about how best to standardise this feature. Simon Glass (4): doc: Convert SPL documentation to ReST doc: Expand SPL docs to explain the phase and config binman: Add VPL support Introduce Verifying Program Loader (VPL) common/Kconfig | 67 ++++++++ common/spl/Kconfig | 168 ++++++++++++++++++++- common/spl/spl.c | 25 ++- doc/develop/index.rst | 1 + doc/{README.SPL => develop/spl.rst} | 99 +++++++----- include/bootstage.h | 2 + include/linux/kconfig.h | 3 + include/spl.h | 20 ++- lib/Kconfig | 54 +++++++ scripts/Kbuild.include | 4 + scripts/Makefile.build | 4 + tools/binman/etype/u_boot_vpl.py | 42 ++++++ tools/binman/etype/u_boot_vpl_bss_pad.py | 44 ++++++ tools/binman/etype/u_boot_vpl_dtb.py | 28 ++++ tools/binman/etype/u_boot_vpl_expanded.py | 45 ++++++ tools/binman/etype/u_boot_vpl_nodtb.py | 42 ++++++ tools/binman/ftest.py | 110 +++++++++++--- tools/binman/state.py | 3 +- tools/binman/test/082_fdt_update_all.dts | 2 + tools/binman/test/201_u_boot_vpl.dts | 11 ++ tools/binman/test/202_u_boot_vpl_nodtb.dts | 13 ++ tools/binman/test/203_fdt_incl_vpl.dts | 13 ++ tools/binman/test/204_vpl_bss_pad.dts | 17 +++ 23 files changed, 748 insertions(+), 69 deletions(-) rename doc/{README.SPL => develop/spl.rst} (61%) create mode 100644 tools/binman/etype/u_boot_vpl.py create mode 100644 tools/binman/etype/u_boot_vpl_bss_pad.py create mode 100644 tools/binman/etype/u_boot_vpl_dtb.py create mode 100644 tools/binman/etype/u_boot_vpl_expanded.py create mode 100644 tools/binman/etype/u_boot_vpl_nodtb.py create mode 100644 tools/binman/test/201_u_boot_vpl.dts create mode 100644 tools/binman/test/202_u_boot_vpl_nodtb.dts create mode 100644 tools/binman/test/203_fdt_incl_vpl.dts create mode 100644 tools/binman/test/204_vpl_bss_pad.dts -- 2.31.1.607.g51e8a6a459-goog

2 8

[PATCH v2 3/4] NSA310S : Use Ethernet PHY name from device tree
by Tony Dinh 03 Jul '21

03 Jul '21

In DM Ethernet, the old "egiga0" name is no longer valid, so replace it with Ethernet PHY name from device tree. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- Changes in v2: - Correct copyright board/zyxel/nsa310s/nsa310s.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c index cd4a7723b1..41479af8e6 100644 --- a/board/zyxel/nsa310s/nsa310s.c +++ b/board/zyxel/nsa310s/nsa310s.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2015 - * Gerald Kerma <dreagle(a)doukki.net> - * Tony Dinh <mibodhi(a)gmail.com> + * Copyright (C) 2015, 2021 Tony Dinh <mibodhi(a)gmail.com> + * Copyright (C) 2015 Gerald Kerma <dreagle(a)doukki.net> */ #include <common.h> @@ -81,22 +80,18 @@ int board_init(void) return 0; } +#define PHY_ADR 1 + #ifdef CONFIG_RESET_PHY_R void reset_phy(void) { u16 reg; - u16 phyaddr; - char *name = "egiga0"; + u16 phyaddr = PHY_ADR; + char *name = "ethernet-controller@72000"; if (miiphy_set_current_dev(name)) return; - /* read PHY dev address */ - if (miiphy_read(name, 0xee, 0xee, (u16 *) &phyaddr)) { - printf("could not read PHY dev address\n"); - return; - } - /* set RGMII delay */ miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, MV88E1318_MAC_CTRL_PG); miiphy_read(name, phyaddr, MV88E1318_MAC_CTRL_REG, &reg); @@ -131,5 +126,7 @@ void reset_phy(void) /* downshift */ miiphy_write(name, phyaddr, 0x10, 0x3860); miiphy_write(name, phyaddr, 0x0, 0x9140); + + printf("MV88E1318 PHY initialized on %s\n", name); } #endif /* CONFIG_RESET_PHY_R */ -- 2.20.1

2 2

[PATCH 1/2] spl: mmc: Factor out eMMC boot partition selection code
by Marek Vasut 03 Jul '21

03 Jul '21

Factor out eMMC boot partition selection code into default_spl_mmc_emmc_boot_partition() function and implement weak spl_mmc_emmc_boot_partition(), so that architecture or board code can override the eMMC boot partition selection. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Faiz Abbas <faiz_abbas(a)ti.com> Cc: Harald Seiler <hws(a)denx.de> Cc: Lokesh Vutla <lokeshvutla(a)ti.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Ye Li <ye.li(a)nxp.com> --- common/spl/spl_mmc.c | 37 ++++++++++++++++++++++++------------- include/spl.h | 25 +++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index add2785b4e3..2377d0937d1 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -324,6 +324,29 @@ unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc, return raw_sect; } +int default_spl_mmc_emmc_boot_partition(struct mmc *mmc) +{ + int part; +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION + part = CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION; +#else + /* + * We need to check what the partition is configured to. + * 1 and 2 match up to boot0 / boot1 and 7 is user data + * which is the first physical partition (0). + */ + part = (mmc->part_config >> 3) & PART_ACCESS_MASK; + if (part == 7) + part = 0; +#endif + return part; +} + +int __weak spl_mmc_emmc_boot_partition(struct mmc *mmc) +{ + return default_spl_mmc_emmc_boot_partition(mmc); +} + int spl_mmc_load(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, const char *filename, @@ -355,19 +378,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION - part = CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION; -#else - /* - * We need to check what the partition is configured to. - * 1 and 2 match up to boot0 / boot1 and 7 is user data - * which is the first physical partition (0). - */ - part = (mmc->part_config >> 3) & PART_ACCESS_MASK; - - if (part == 7) - part = 0; -#endif + part = spl_mmc_emmc_boot_partition(mmc); if (CONFIG_IS_ENABLED(MMC_TINY)) err = mmc_switch_part(mmc, part); diff --git a/include/spl.h b/include/spl.h index cee9a42ddb5..b6698a686a7 100644 --- a/include/spl.h +++ b/include/spl.h @@ -357,6 +357,31 @@ u32 spl_mmc_boot_mode(const u32 boot_device); * If not overridden, it is weakly defined in common/spl/spl_mmc.c. */ int spl_mmc_boot_partition(const u32 boot_device); + +struct mmc; +/** + * default_spl_mmc_emmc_boot_partition() - eMMC boot partition to load U-Boot from. + * @boot_device: ID of the device which the MMC driver wants to load + * U-Boot from. + * + * This function should return the eMMC boot partition number which + * the SPL should load U-Boot from (on the given boot_device). + */ +int default_spl_mmc_emmc_boot_partition(struct mmc *mmc); + +/** + * spl_mmc_emmc_boot_partition() - eMMC boot partition to load U-Boot from. + * @boot_device: ID of the device which the MMC driver wants to load + * U-Boot from. + * + * This function should return the eMMC boot partition number which + * the SPL should load U-Boot from (on the given boot_device). + * + * If not overridden, it is weakly defined in common/spl/spl_mmc.c + * and calls default_spl_mmc_emmc_boot_partition(); + */ +int spl_mmc_emmc_boot_partition(struct mmc *mmc); + void spl_set_bd(void); /** -- 2.30.2

4 6