February 2024 - U-Boot

[PATCH 0/4] Add New Devices for RGxx3
by Chris Morgan 14 Mar '24

14 Mar '24

From: Chris Morgan <macromorgan(a)hotmail.com> This patch series is to clean up a few issues found with the RGxx3, add support for a new device, and add a board specific ADC button check routine to the SPL stage. The ADC button routine was part of a previous patch series that was partially accepted, though making the ADC button routine board generic was rejected by the Rockchip maintainer. Chris Morgan (4): arm: dts: rockchip: rk3566: Remove unnecessary clks from rgxx3 board: rockchip: Add support for Powkiddy RGB10MAX3 configs: Remove unnecessary options from RGxx3 config board: rockchip: Add early ADC button detect for RGxx3 .../arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 31 -------- arch/arm/dts/rk3566-anbernic-rgxx3.dts | 16 ++++- board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 72 +++++++++++++++++++ configs/anbernic-rgxx3-rk3566_defconfig | 15 ++-- doc/board/anbernic/rgxx3.rst | 1 + 5 files changed, 97 insertions(+), 38 deletions(-) -- 2.34.1

3 12

[PATCH v2 0/5] rockchip: Read cpuid and generate MAC address from efuse for RK3328 and RK3399
by Chen-Yu Tsai 14 Mar '24

14 Mar '24

From: Chen-Yu Tsai <wens(a)csie.org> Hi folks, This is v2 of my "read cpuid and generate MAC address from efuse on RK3328 and RK3399 by default" series. Changes since v1: - Also imply "CONFIG_MISC" - Add back unintentionally removed CONFIG_OF_LIBFDT_OVERLAY=y - Remove ROCKCHIP_OTP from nanopi-r4s-rk3399_defconfig as requested by Jonas This series enables ROCKCHIP_EFUSE and MISC_INIT_R by default for RK3328 and RK3399 so that the cpuid is read from the efuse and used to generate a serial number and MAC addresses for all boards. This stacks on top of the recent defconfig update series [1] from Jonas. [1] https://lore.kernel.org/u-boot/20240207000301.3270722-1-jonas@kwiboo.se/ Chen-Yu Tsai (5): rockchip: rk3328: Read cpuid and generate MAC address from efuse rockchip: rk3399: Read cpuid and generate MAC address from efuse rockchip: rk3328: regenerate defconfigs rockchip: rk3399: regenerate defconfigs rockchip: nanopi-r4s: Drop ROCKCHIP_OTP arch/arm/mach-rockchip/Kconfig | 6 ++++++ configs/chromebook_bob_defconfig | 3 --- configs/chromebook_kevin_defconfig | 3 --- configs/eaidk-610-rk3399_defconfig | 1 - configs/evb-rk3328_defconfig | 3 --- configs/evb-rk3399_defconfig | 1 - configs/firefly-rk3399_defconfig | 3 --- configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/leez-rk3399_defconfig | 1 - configs/nanopc-t4-rk3399_defconfig | 1 - configs/nanopi-m4-2gb-rk3399_defconfig | 1 - configs/nanopi-m4-rk3399_defconfig | 1 - configs/nanopi-m4b-rk3399_defconfig | 1 - configs/nanopi-neo4-rk3399_defconfig | 1 - configs/nanopi-r2c-plus-rk3328_defconfig | 3 --- configs/nanopi-r2c-rk3328_defconfig | 3 --- configs/nanopi-r2s-rk3328_defconfig | 3 --- configs/nanopi-r4s-rk3399_defconfig | 4 ---- configs/orangepi-r1-plus-lts-rk3328_defconfig | 3 --- configs/orangepi-r1-plus-rk3328_defconfig | 3 --- configs/orangepi-rk3399_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 3 --- configs/pinephone-pro-rk3399_defconfig | 3 --- configs/puma-rk3399_defconfig | 3 --- configs/roc-cc-rk3328_defconfig | 3 --- configs/roc-pc-mezzanine-rk3399_defconfig | 3 --- configs/roc-pc-rk3399_defconfig | 3 --- configs/rock-4c-plus-rk3399_defconfig | 3 --- configs/rock-4se-rk3399_defconfig | 3 --- configs/rock-pi-4-rk3399_defconfig | 3 --- configs/rock-pi-4c-rk3399_defconfig | 3 --- configs/rock-pi-e-rk3328_defconfig | 3 --- configs/rock-pi-n10-rk3399pro_defconfig | 2 -- configs/rock64-rk3328_defconfig | 3 --- configs/rock960-rk3399_defconfig | 2 -- configs/rockpro64-rk3399_defconfig | 3 --- 38 files changed, 6 insertions(+), 86 deletions(-) -- 2.39.2

4 10

[PATCH v2 00/15] rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI
by Jonas Karlman 14 Mar '24

14 Mar '24

This series contains miscellaneous updates to defconfigs, syncs latest device trees from linux, fixes an issue loading FIT from SD-card when running SPL from eMMC and enables building a bootable SPI image on RK3328 boards. I am also adding myself as a reviewer for the three RK3328 boards I own. Patch 1-7 updates boards to enable similar Kconfig options and use a common order for from where to try and load FIT. Patch 8 fix loading FIT from SD-card when booting from eMMC by using pinctrl for emmc and sdmmc in SPL. Patch 9-10 makes rockchip gpio and rng driver compatible with linux. Patch 11 sync latest rk3328 device tree files from linux v6.8-rc1. Patch 12 reverts an old commit that added duplicated code. Patch 13-15 enables building u-boot-rockchip-spi.bin for boards with SPI flash. Changes in v2: - Remove unused SPL drivers, I2C and PMIC - Add helpful CMD_GPIO and CMD_REGULATOR to boards - Add missing UART2 pinctrl nodes to soc u-boot.dtsi - Mark the pinctrl node to be included in U-Boot proper pre-reloc phase - Add SD-card IO-voltage related nodes to nanopi-r2 u-boot.dtsi - Fix an ethernet issue on orangepi-r1-plus-lts - Include SPI flash pinctrl nodes in SPL - Collect r-b tags This series depends on the "rockchip: Update stack and bss addresses on RK3328 and RK3399" series at [1] being applied _after_ this series. Some boards may go over the simple malloc limit without that series also applied. See [2] for a branch with the dependent series applied. [1] https://patchwork.ozlabs.org/cover/1887729/ [2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3328-update-v2 Jonas Karlman (15): rockchip: rk3328: Update default u-boot,spl-boot-order prop rockchip: rk3328-evb: Update defconfig rockchip: rk3328-rock64: Update defconfig rockchip: rk3328-roc-cc: Update defconfig rockchip: rk3328-rock-pi-e: Update defconfig rockchip: rk3328-nanopi-r2: Update defconfig rockchip: rk3328-orangepi-r1-plus: Update defconfig rockchip: rk3328: Fix loading FIT from SD-card when booting from eMMC gpio: rockchip: Use gpio alias id as gpio bank id rng: rockchip: Use same compatible as linux rockchip: rk3328: Sync device tree from linux v6.8-rc1 Revert "rockchip: Allow booting from SPI" rockchip: rk3328: Add support to build bootable SPI image rockchip: rk3328-rock64: Enable boot from SPI NOR flash rockchip: rk3328-orangepi-r1-plus: Enable boot from SPI NOR flash arch/arm/dts/rk3328-evb-u-boot.dtsi | 4 + arch/arm/dts/rk3328-evb.dts | 1 + .../dts/rk3328-nanopi-r2c-plus-u-boot.dtsi | 6 - arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 24 +--- arch/arm/dts/rk3328-nanopi-r2s.dts | 3 +- .../rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 32 ++---- arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 4 +- .../dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 32 ++---- arch/arm/dts/rk3328-orangepi-r1-plus.dts | 1 + arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 22 +--- arch/arm/dts/rk3328-roc-cc.dts | 3 +- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 17 --- arch/arm/dts/rk3328-rock-pi-e.dts | 55 +++++++++ arch/arm/dts/rk3328-rock64-u-boot.dtsi | 28 ++--- arch/arm/dts/rk3328-rock64.dts | 1 + arch/arm/dts/rk3328-u-boot.dtsi | 108 +++++++++++++++--- arch/arm/dts/rk3328.dtsi | 64 ++++++++--- arch/arm/dts/rk3399-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3328/rk3328.c | 1 + arch/arm/mach-rockchip/spl-boot-order.c | 3 - board/rockchip/evb_rk3328/MAINTAINERS | 11 ++ board/rockchip/evb_rk3328/README | 70 ------------ configs/evb-rk3328_defconfig | 22 +++- configs/nanopi-r2c-plus-rk3328_defconfig | 20 +++- configs/nanopi-r2c-rk3328_defconfig | 20 +++- configs/nanopi-r2s-rk3328_defconfig | 20 +++- configs/orangepi-r1-plus-lts-rk3328_defconfig | 29 ++++- configs/orangepi-r1-plus-rk3328_defconfig | 29 ++++- configs/roc-cc-rk3328_defconfig | 15 ++- configs/rock-pi-e-rk3328_defconfig | 17 +-- configs/rock64-rk3328_defconfig | 23 +++- doc/board/rockchip/rockchip.rst | 9 +- drivers/gpio/rk_gpio.c | 7 +- drivers/rng/rockchip_rng.c | 10 +- 34 files changed, 432 insertions(+), 281 deletions(-) delete mode 100644 board/rockchip/evb_rk3328/README -- 2.43.0

4 36

[PATCH v6 1/3] dt-bindings: mtd: partitions: Add binman compatible
by Simon Glass 14 Mar '24

14 Mar '24

Add a compatible string for binman, so we can extend fixed-partitions in various ways. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- (no changes since v5) Changes in v5: - Add #address/size-cells and parternProperties - Drop $ref to fixed-partitions.yaml - Drop 'select: false' Changes in v4: - Change subject line Changes in v3: - Drop fixed-partition additional compatible string - Drop fixed-partitions from the example - Mention use of compatible instead of label Changes in v2: - Drop mention of 'enhanced features' in fixed-partitions.yaml - Mention Binman input and output properties - Use plain partition@xxx for the node name .../bindings/mtd/partitions/binman.yaml | 68 +++++++++++++++++++ .../bindings/mtd/partitions/partitions.yaml | 1 + MAINTAINERS | 5 ++ 3 files changed, 74 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml new file mode 100644 index 000000000000..329217550a98 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman firmware layout + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +description: | + The binman node provides a layout for firmware, used when packaging firmware + from multiple projects. It is based on fixed-partitions, with some + extensions, but uses 'compatible' to indicate the contents of the node, to + avoid perturbing or confusing existing installations which use 'label' for a + particular purpose. + + Binman supports properties used as inputs to the firmware-packaging process, + such as those which control alignment of partitions. This binding addresses + these 'input' properties. For example, it is common for the 'reg' property + (an 'output' property) to be set by Binman, based on the alignment requested + in the input. + + Once processing is complete, input properties have mostly served their + purpose, at least until the firmware is repacked later, e.g. due to a + firmware update. The 'fixed-partitions' binding should provide enough + information to read the firmware at runtime, including decompression if + needed. + + Documentation for Binman is available at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html + + with the current image-description format at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html#image-d… + +properties: + compatible: + const: binman + + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + +patternProperties: + "^partition(-.+|@[0-9a-f]+)$": + $ref: partition.yaml + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + label = "u-boot"; + reg = <0x100000 0xf00000>; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml index 1dda2c80747b..849fd15d085c 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -15,6 +15,7 @@ maintainers: oneOf: - $ref: arm,arm-firmware-suite.yaml + - $ref: binman.yaml - $ref: brcm,bcm4908-partitions.yaml - $ref: brcm,bcm947xx-cfe-partitions.yaml - $ref: fixed-partitions.yaml diff --git a/MAINTAINERS b/MAINTAINERS index b294edaf5698..8704eefe6e2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3550,6 +3550,11 @@ F: Documentation/filesystems/bfs.rst F: fs/bfs/ F: include/uapi/linux/bfs_fs.h +BINMAN +M: Simon Glass <sjg(a)chromium.org> +S: Supported +F: Documentation/devicetree/bindings/mtd/partitions/binman* + BITMAP API M: Yury Norov <yury.norov(a)gmail.com> R: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -- 2.43.0.rc0.421.g78406f8d94-goog

3 20

[PATCH 0/4] rockchip: Migrate to use DM_USB_GADGET on RK3328
by Jonas Karlman 13 Mar '24

13 Mar '24

USB gadget is not working fully as expected on RK3328, it uses a board_usb_init() function to initialize the DWC2 OTG port, as a result the USB2PHY driver never gets invoked. An issue is that the USB_DWC2 driver is enabled and also gets loaded for the OTG port. A side effect of that is that the board will freeze if USB gadget is started after USB host have been stopped, the USB2PHY driver puts the OTG port in suspend mode on exit. To improve the situation this series changes to only enable one of USB_DWC2 (host) or DWC2_OTG (peripheral) depending on most likely usage of the port. It also migrates to use DM_USB_GADGET instead of board_usb_init(). First patch fixes and add Product ID for supported Rockchip SoCs. Second patch prepare board.c for use of DM_USB_GADGET with DWC2_OTG. Third patch add a g_dnl_bind_fixup() to configure a different Product ID when UMS is used. Final patch updates u-boot.dtsi and defconfigs to only use USB_DWC2 for host or migrate to use DM_USB_GADGET with DWC2_OTG for peripheral. UMS and ROCKUSB is enabled for all boards with otg port in peripheral mode. Hopefully current incompatibility between having USB_DWC2, DWC2_OTG and USB_DWC3_GADGET enabled together is something that could be improved on in a future series. Following have been tested on a Rock64, ROC-RK3328-CC, Rock Pi E and Orange Pi R1 Plus LTS: - USB host on all host ports: usb start && usb tree && usb stop - UMS on otg port: ums 0 mmc 1 - RockUSB on otg port: rockusb 0 mmc 1 This series depends on the following series and patches: - rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI [1] - rockchip: Read cpuid and generate MAC address from efuse for RK3328 and RK3399 [2] - usb: dwc3-generic: Fix build errors when USB_DWC3_GADGET is disabled [3] - phy: rockchip-inno-usb2: Write to correct GRF [4] The copy of the series and all its depends can also be found at [5]. [1] https://patchwork.ozlabs.org/cover/1900345/ [2] https://patchwork.ozlabs.org/cover/1897743/ [3] https://patchwork.ozlabs.org/patch/1903946/ [4] https://patchwork.ozlabs.org/cover/1903987/ [5] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3328-gadget-v1 Jonas Karlman (4): rockchip: Update the default USB Product ID Kconfig option rockchip: board: Prepare for use of DM_USB_GADGET with DWC2_OTG rockchip: board: Use a common USB Product ID for UMS rockchip: Migrate to use DM_USB_GADGET on RK3328 arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 4 ++ .../rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 4 ++ .../dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 4 ++ arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 4 ++ arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 9 ++++ arch/arm/dts/rk3328-rock64-u-boot.dtsi | 4 ++ arch/arm/dts/rk3328-u-boot.dtsi | 4 -- arch/arm/dts/rk3328.dtsi | 41 ++++++++----------- arch/arm/mach-rockchip/board.c | 19 ++++++++- configs/evb-rk3328_defconfig | 5 ++- configs/nanopi-r2c-plus-rk3328_defconfig | 5 ++- configs/nanopi-r2c-rk3328_defconfig | 5 ++- configs/nanopi-r2s-rk3328_defconfig | 5 ++- configs/orangepi-r1-plus-lts-rk3328_defconfig | 5 ++- configs/orangepi-r1-plus-rk3328_defconfig | 5 ++- configs/roc-cc-rk3328_defconfig | 7 ---- configs/rock-pi-e-rk3328_defconfig | 7 ---- configs/rock64-rk3328_defconfig | 6 --- drivers/usb/gadget/Kconfig | 15 +++++-- 19 files changed, 99 insertions(+), 59 deletions(-) -- 2.43.0

2 13

[PATCH 0/2] phy: rockchip-inno-usb2: Write to correct GRF
by Jonas Karlman 13 Mar '24

13 Mar '24

This series fixes an issue where the rockchip-inno-usb2 driver is writing to wrong GRF reg for RK3328, RK356x and RK3588. The driver is currently always using the common GRF, something that is only correct for RK3399. Remaining SoCs have USB2PHY regs in a different or dedicated usb2phy GRF. First patch changes to use regmap functions and gets the regmap for correct GRF, from rockchip,usbgrf phandle or parent device. Second patch reduces to only configure utmi_suspend_n and utmi_sel bits, similar to how is done for RK3399. USB have continued to work in device and host mode on all supported SoCs with this series applied. Jonas Karlman (2): phy: rockchip-inno-usb2: Write to correct GRF phy: rockchip-inno-usb2: Limit changes made to regs drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 158 ++++-------------- 1 file changed, 36 insertions(+), 122 deletions(-) -- 2.43.0

2 6

[PATCH v2] cmd: mtd: OTP access support
by Arseniy Krasnov 13 Mar '24

13 Mar '24

Add access to OTP region. It supports info, dump, write and lock operations. Signed-off-by: Arseniy Krasnov <avkrasnov(a)salutedevices.com> --- Changelog: v1 -> v2: * Remove warning that OTP can't be erased after write. cmd/Kconfig | 1 + cmd/mtd.c | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 90e4ef93e0..c47523a03b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1354,6 +1354,7 @@ config CMD_MTD bool "mtd" depends on MTD select MTD_PARTITIONS + select HEXDUMP help MTD commands support. diff --git a/cmd/mtd.c b/cmd/mtd.c index eb6e2d6892..1ab69b108b 100644 --- a/cmd/mtd.c +++ b/cmd/mtd.c @@ -11,6 +11,7 @@ #include <command.h> #include <common.h> #include <console.h> +#include <hexdump.h> #include <malloc.h> #include <mapmem.h> #include <mtd.h> @@ -202,6 +203,219 @@ static bool mtd_oob_write_is_empty(struct mtd_oob_ops *op) return true; } +static int do_mtd_otp_read(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct mtd_info *mtd; + size_t retlen; + off_t from; + size_t len; + bool user; + int ret; + u8 *buf; + + if (argc != 5) + return CMD_RET_USAGE; + + if (!strcmp(argv[2], "u")) + user = true; + else if (!strcmp(argv[2], "f")) + user = false; + else + return CMD_RET_USAGE; + + mtd = get_mtd_by_name(argv[1]); + if (IS_ERR_OR_NULL(mtd)) + return CMD_RET_FAILURE; + + from = simple_strtoul(argv[3], NULL, 0); + len = simple_strtoul(argv[4], NULL, 0); + + ret = CMD_RET_FAILURE; + + buf = malloc(len); + if (!buf) + goto put_mtd; + + printf("Reading %s OTP from 0x%lx, %lu bytes\n", + user ? "user" : "factory", from, len); + + if (user) + ret = mtd_read_user_prot_reg(mtd, from, len, &retlen, buf); + else + ret = mtd_read_fact_prot_reg(mtd, from, len, &retlen, buf); + if (ret) { + free(buf); + pr_err("OTP read failed: %d\n", ret); + ret = CMD_RET_FAILURE; + goto put_mtd; + } + + if (retlen != len) + pr_err("OTP read returns %zu, but %zu expected\n", + retlen, len); + + print_hex_dump("", 0, 16, 1, buf, retlen, true); + + free(buf); + + ret = CMD_RET_SUCCESS; + +put_mtd: + put_mtd_device(mtd); + + return ret; +} + +static int do_mtd_otp_lock(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct mtd_info *mtd; + off_t from; + size_t len; + int ret; + + if (argc != 4) + return CMD_RET_USAGE; + + mtd = get_mtd_by_name(argv[1]); + if (IS_ERR_OR_NULL(mtd)) + return CMD_RET_FAILURE; + + from = simple_strtoul(argv[2], NULL, 0); + len = simple_strtoul(argv[3], NULL, 0); + + ret = mtd_lock_user_prot_reg(mtd, from, len); + if (ret) { + pr_err("OTP lock failed: %d\n", ret); + ret = CMD_RET_FAILURE; + goto put_mtd; + } + + ret = CMD_RET_SUCCESS; + +put_mtd: + put_mtd_device(mtd); + + return ret; +} + +static int do_mtd_otp_write(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct mtd_info *mtd; + size_t retlen; + size_t binlen; + u8 *binbuf; + off_t from; + int ret; + + if (argc != 4) + return CMD_RET_USAGE; + + mtd = get_mtd_by_name(argv[1]); + if (IS_ERR_OR_NULL(mtd)) + return CMD_RET_FAILURE; + + from = simple_strtoul(argv[2], NULL, 0); + binlen = strlen(argv[3]) / 2; + + ret = CMD_RET_FAILURE; + binbuf = malloc(binlen); + if (!binbuf) + goto put_mtd; + + hex2bin(binbuf, argv[3], binlen); + + printf("Will write:\n"); + + print_hex_dump("", 0, 16, 1, binbuf, binlen, true); + + printf("to 0x%zx\n", from); + + printf("Continue (y/n)?\n"); + + if (confirm_yesno() != 1) { + pr_err("OTP write canceled\n"); + ret = CMD_RET_SUCCESS; + goto put_mtd; + } + + ret = mtd_write_user_prot_reg(mtd, from, binlen, &retlen, binbuf); + if (ret) { + pr_err("OTP write failed: %d\n", ret); + ret = CMD_RET_FAILURE; + goto put_mtd; + } + + if (retlen != binlen) + pr_err("OTP write returns %zu, but %zu expected\n", + retlen, binlen); + + ret = CMD_RET_SUCCESS; + +put_mtd: + free(binbuf); + put_mtd_device(mtd); + + return ret; +} + +static int do_mtd_otp_info(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct otp_info otp_info; + struct mtd_info *mtd; + size_t retlen; + bool user; + int ret; + + if (argc != 3) + return CMD_RET_USAGE; + + if (!strcmp(argv[2], "u")) + user = true; + else if (!strcmp(argv[2], "f")) + user = false; + else + return CMD_RET_USAGE; + + mtd = get_mtd_by_name(argv[1]); + if (IS_ERR_OR_NULL(mtd)) + return CMD_RET_FAILURE; + + if (user) + ret = mtd_get_user_prot_info(mtd, sizeof(otp_info), &retlen, + &otp_info); + else + ret = mtd_get_fact_prot_info(mtd, sizeof(otp_info), &retlen, + &otp_info); + if (ret) { + pr_err("OTP info failed: %d\n", ret); + ret = CMD_RET_FAILURE; + goto put_mtd; + } + + if (retlen != sizeof(otp_info)) { + pr_err("OTP info returns %zu, but %zu expected\n", + retlen, sizeof(otp_info)); + ret = CMD_RET_FAILURE; + goto put_mtd; + } + + printf("%s OTP region info:\n", user ? "User" : "Factory"); + printf("\tstart: %u\n", otp_info.start); + printf("\tlength: %u\n", otp_info.length); + printf("\tlocked: %u\n", otp_info.locked); + + ret = CMD_RET_SUCCESS; + +put_mtd: + put_mtd_device(mtd); + + return ret; +} + static int do_mtd_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -552,6 +766,10 @@ static char mtd_help_text[] = "\n" "Specific functions:\n" "mtd bad <name>\n" + "mtd otpread <name> [u|f] <off> <size>\n" + "mtd otpwrite <name> <off> <hex string>\n" + "mtd otplock <name> <off> <size>\n" + "mtd otpinfo <name> [u|f]\n" "\n" "With:\n" "\t<name>: NAND partition/chip name (or corresponding DM device name or OF path)\n" @@ -562,11 +780,17 @@ static char mtd_help_text[] = "\t<size>: length of the operation in bytes (default: the entire device)\n" "\t\t* must be a multiple of a block for erase\n" "\t\t* must be a multiple of a page otherwise (special case: default is a page with dump)\n" + "\t<hex string>: hex string without '0x' and spaces. Example: ABCD1234\n" + "\t[u|f]: user or factory OTP region\n" "\n" "The .dontskipff option forces writing empty pages, don't use it if unsure.\n"; #endif U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils", mtd_help_text, + U_BOOT_SUBCMD_MKENT(otpread, 5, 1, do_mtd_otp_read), + U_BOOT_SUBCMD_MKENT(otpwrite, 4, 1, do_mtd_otp_write), + U_BOOT_SUBCMD_MKENT(otplock, 4, 1, do_mtd_otp_lock), + U_BOOT_SUBCMD_MKENT(otpinfo, 3, 1, do_mtd_otp_info), U_BOOT_SUBCMD_MKENT(list, 1, 1, do_mtd_list), U_BOOT_SUBCMD_MKENT_COMPLETE(read, 5, 0, do_mtd_io, mtd_name_complete), -- 2.35.0

2 5

[PATCH 0/4] Generate capsules from config files
by Sughosh Ganu 13 Mar '24

13 Mar '24

Add support for generating capsules through a config file. Multiple capsules can be generated through a single invocation of the mkeficapsule tool, where the capsule parameters are fetched from the config file. The format of the config file pretty similar to the one used by the capsule generation tool in EDKII. The functionality is enabled on the sandbox variant and the EFI capsule update test is now configured to generate the capsules through a config file. The sandbox_flattree variant generates capsules through binman, thus covering both the paths. Sughosh Ganu (4): tools: mkeficapsule: Add support for parsing capsule params from config file doc: Document capsule generation through a config file sandbox: capsule: Add a config file for generating capsules test: capsule: Generate capsules through config file configs/sandbox_defconfig | 2 + doc/develop/uefi/uefi.rst | 70 ++++ .../test_efi_capsule/capsule_gen_binman.dts | 2 + test/py/tests/test_efi_capsule/conftest.py | 7 + .../test_efi_capsule/sandbox_capsule_cfg.txt | 162 ++++++++ tools/Kconfig | 15 + tools/Makefile | 1 + tools/eficapsule.h | 114 ++++++ tools/mkeficapsule.c | 87 +++-- tools/mkeficapsule_parse.c | 352 ++++++++++++++++++ 10 files changed, 781 insertions(+), 31 deletions(-) create mode 100644 test/py/tests/test_efi_capsule/sandbox_capsule_cfg.txt create mode 100644 tools/mkeficapsule_parse.c -- 2.34.1

5 22

[PATCH 00/11] rockchip: rk3399: Migrate to use IO-domain driver
by Jonas Karlman 12 Mar '24

12 Mar '24

This series remove old unused board_early_init_f() functions, adds support for RK3399 to the IO-domain driver and migrates all boards that used setup_iodomain() to now use the IO-domain driver instead. Also add device tree files and myself as reviewer to MAINTAINERS. This series depends on cleanup done in Quentin Schulz series "rockchip: add support for Theobroma JAGUAR SBC-RK3588-AMR" [1]. A copy of this series can also be found at [2] [1] https://patchwork.ozlabs.org/cover/1896901/ [2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3399-io-domain-v1 Jonas Karlman (11): board: rockchip: rk3399: Add device tree files to MAINTAINERS board: rockchip: rk3399: Add myself as reviewer to MAINTAINERS board: rockchip: rk3399: Remove unused board_early_init_f functions board: rockchip: Add a common ROCK Pi 4 target rockchip: io-domain: Add support for RK3399 rockchip: pine64: rockpro64: Migrate to use IO-domain driver rockchip: pine64: pinebook-pro: Migrate to use IO-domain driver rockchip: pine64: pinephone-pro: Migrate to use IO-domain driver rockchip: vamrs: rock960: Migrate to use IO-domain driver rockchip: theobroma-systems: puma: Migrate to use IO-domain driver rockchip: google: gru: Migrate to use IO-domain driver arch/arm/mach-rockchip/board.c | 10 +-- arch/arm/mach-rockchip/rk3399/Kconfig | 6 ++ board/firefly/roc-pc-rk3399/MAINTAINERS | 5 ++ board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 22 +----- board/google/gru/gru.c | 35 -------- board/pine64/pinebook-pro-rk3399/MAINTAINERS | 3 +- board/pine64/pinebook-pro-rk3399/Makefile | 1 - .../pinebook-pro-rk3399/pinebook-pro-rk3399.c | 61 -------------- board/pine64/pinephone-pro-rk3399/MAINTAINERS | 2 +- board/pine64/pinephone-pro-rk3399/Makefile | 1 - .../pinephone-pro-rk3399.c | 64 --------------- board/pine64/rockpro64_rk3399/MAINTAINERS | 3 + board/pine64/rockpro64_rk3399/Makefile | 7 -- .../rockpro64_rk3399/rockpro64-rk3399.c | 39 --------- board/radxa/rockpi4-rk3399/Kconfig | 15 ++++ board/radxa/rockpi4-rk3399/MAINTAINERS | 29 +++++++ .../rockpi4-rk3399}/Makefile | 2 +- .../rockpi4-rk3399/rockpi4-rk3399.c} | 33 +------- board/rockchip/evb_rk3399/MAINTAINERS | 38 ++++----- .../puma_rk3399/puma-rk3399.c | 21 ----- board/vamrs/rock960_rk3399/MAINTAINERS | 5 ++ board/vamrs/rock960_rk3399/Makefile | 6 -- board/vamrs/rock960_rk3399/rock960-rk3399.c | 27 ------- configs/chromebook_bob_defconfig | 1 + configs/chromebook_kevin_defconfig | 1 + configs/ficus-rk3399_defconfig | 1 + configs/pinebook-pro-rk3399_defconfig | 1 + configs/pinephone-pro-rk3399_defconfig | 1 + configs/puma-rk3399_defconfig | 1 + configs/rock-4c-plus-rk3399_defconfig | 2 +- configs/rock-4se-rk3399_defconfig | 2 +- configs/rock-pi-4-rk3399_defconfig | 2 +- configs/rock-pi-4c-rk3399_defconfig | 2 +- configs/rock960-rk3399_defconfig | 1 + configs/rockpro64-rk3399_defconfig | 1 + drivers/misc/rockchip-io-domain.c | 79 ++++++++++++++++++- include/configs/rk3399_common.h | 16 ---- include/configs/rockpi4-rk3399.h | 32 ++++++++ 38 files changed, 212 insertions(+), 366 deletions(-) delete mode 100644 board/pine64/pinebook-pro-rk3399/Makefile delete mode 100644 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c delete mode 100644 board/pine64/pinephone-pro-rk3399/Makefile delete mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c delete mode 100644 board/pine64/rockpro64_rk3399/Makefile delete mode 100644 board/pine64/rockpro64_rk3399/rockpro64-rk3399.c create mode 100644 board/radxa/rockpi4-rk3399/Kconfig create mode 100644 board/radxa/rockpi4-rk3399/MAINTAINERS rename board/{rockchip/evb_rk3399 => radxa/rockpi4-rk3399}/Makefile (79%) rename board/{rockchip/evb_rk3399/evb-rk3399.c => radxa/rockpi4-rk3399/rockpi4-rk3399.c} (65%) delete mode 100644 board/vamrs/rock960_rk3399/Makefile delete mode 100644 board/vamrs/rock960_rk3399/rock960-rk3399.c create mode 100644 include/configs/rockpi4-rk3399.h -- 2.43.0

5 31

[PATCH] riscv: sifive: fu740: reduce DDR speed from 1866MT/s to 1600MT/s
by thomas.perrot＠bootlin.com 12 Mar '24

12 Mar '24

From: Thomas Perrot <thomas.perrot(a)bootlin.com> It appears that there is some timing marginality either in the board layout or the SoC that results in occasional data corruption on some boards. We observed this issue on some of the new HiFive Unmatched RevB boards during volume production as well as some of the original HiFive Unmatched boards from 2021 in our possession. This means that there are other boards out there that might have the issue too. We have done some limited testing with DDR4 at 1600MT/s and faulty boards (failing at 1866MT/s) passed. We plan further testing after we procure a temperature chamber. Signed-off-by: Thomas Perrot <thomas.perrot(a)bootlin.com> --- arch/riscv/dts/fu740-c000-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/dts/fu740-c000-u-boot.dtsi b/arch/riscv/dts/fu740-c000-u-boot.dtsi index 706224b384d2..956237c3218e 100644 --- a/arch/riscv/dts/fu740-c000-u-boot.dtsi +++ b/arch/riscv/dts/fu740-c000-u-boot.dtsi @@ -77,7 +77,7 @@ 0x0 0x100b2000 0x0 0x2000 0x0 0x100b8000 0x0 0x1000>; clocks = <&prci FU740_PRCI_CLK_DDRPLL>; - clock-frequency = <933333324>; + clock-frequency = <800000004>; bootph-pre-ram; }; }; -- 2.43.2

2 1