November 2023 - U-Boot

[PATCH] scsi: Have scsi_init_dev_desc_priv() use memset
by Tom Rini 10 Nov '23

10 Nov '23

When we do not have CONFIG_BOUNCE_BUFFER enabled, inside of scsi_init_dev_desc_priv we never set the 'bb' field to false, we only initialize it to true when CONFIG_BOUNCE_BUFFER is set. Given that we have a number of other fields here we had been explicitly setting to zero, change to first calling memset to clear the struct and then initialize only the fields that need non-zero default values. Addresses-Coverity-ID: 467407 ("Uninitialized variables (UNINIT)") Fixes: 81bd22e935dc ("rockchip: block: blk-uclass: add bounce buffer flag to blk_desc") Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Johan Jonker <jbx6244(a)gmail.com> --- drivers/scsi/scsi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 363047d0f72c..7dfe0c5e0562 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -368,15 +368,12 @@ static void scsi_setup_test_unit_ready(struct scsi_cmd *pccb) */ static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc) { + memset(dev_desc, 0, sizeof(struct blk_desc)); dev_desc->target = 0xff; dev_desc->lun = 0xff; dev_desc->log2blksz = LOG2_INVALID(typeof(dev_desc->log2blksz)); dev_desc->type = DEV_TYPE_UNKNOWN; - dev_desc->vendor[0] = 0; - dev_desc->product[0] = 0; - dev_desc->revision[0] = 0; - dev_desc->removable = false; #if IS_ENABLED(CONFIG_BOUNCE_BUFFER) dev_desc->bb = true; #endif /* CONFIG_BOUNCE_BUFFER */ -- 2.34.1

2 2

[PATCH] test: cmd: mbr: Remove unreachable code
by Alexander Gendin 10 Nov '23

10 Nov '23

Fix Coverity (CID 467404): Control flow issues (DEADCODE). Fix code indentation. Reported-by: Coverity (CID 467404) Signed-off-by: Alexander Gendin <agendin(a)matrox.com> --- test/cmd/mbr.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/cmd/mbr.c b/test/cmd/mbr.c index 5d7402154d..46b78e706c 100644 --- a/test/cmd/mbr.c +++ b/test/cmd/mbr.c @@ -205,16 +205,14 @@ static unsigned build_mbr_parts(char *buf, size_t buf_size, unsigned num_parts) bytes_remaining -= cur_str_size; } - else if (num_parts == 5) { - cur_str_size = sizeof(mbr_parts_p5); - if (cur_str_size + 1 > bytes_remaining) - return 1; - strcat(cur_buf, mbr_parts_p5); - bytes_remaining -= cur_str_size; + else if (num_parts == 5) { + cur_str_size = sizeof(mbr_parts_p5); + if (cur_str_size + 1 > bytes_remaining) + return 1; + strcat(cur_buf, mbr_parts_p5); + bytes_remaining -= cur_str_size; - } - else if (num_parts > 5) - return 1; + } } } } -- 2.41.0

2 1

[PATCH] firmware: scmi: correct a validity check against power domain id
by AKASHI Takahiro 10 Nov '23

10 Nov '23

A power domain id on sandbox should be in the range from zero to ARRAY_SIZE(scmi_pwdom) - 1. Correct the validity check logic. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Fixes: CID 467401 Fixes: CID 467405 --- drivers/firmware/scmi/sandbox-scmi_agent.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/scmi/sandbox-scmi_agent.c b/drivers/firmware/scmi/sandbox-scmi_agent.c index 9f5f497e0a6c..d13180962662 100644 --- a/drivers/firmware/scmi/sandbox-scmi_agent.c +++ b/drivers/firmware/scmi/sandbox-scmi_agent.c @@ -576,7 +576,7 @@ static int sandbox_scmi_pwd_attribs(struct udevice *dev, struct scmi_msg *msg) domain_id = *(u32 *)msg->in_msg; out = (struct scmi_pwd_attrs_out *)msg->out_msg; - if (domain_id > ARRAY_SIZE(scmi_pwdom)) { + if (domain_id >= ARRAY_SIZE(scmi_pwdom)) { out->status = SCMI_NOT_FOUND; return 0; @@ -613,7 +613,7 @@ static int sandbox_scmi_pwd_state_set(struct udevice *dev, struct scmi_msg *msg) in = (struct scmi_pwd_state_set_in *)msg->in_msg; status = (s32 *)msg->out_msg; - if (in->domain_id > ARRAY_SIZE(scmi_pwdom)) { + if (in->domain_id >= ARRAY_SIZE(scmi_pwdom)) { *status = SCMI_NOT_FOUND; return 0; @@ -653,7 +653,7 @@ static int sandbox_scmi_pwd_state_get(struct udevice *dev, struct scmi_msg *msg) domain_id = *(u32 *)msg->in_msg; out = (struct scmi_pwd_state_get_out *)msg->out_msg; - if (domain_id > ARRAY_SIZE(scmi_pwdom)) { + if (domain_id >= ARRAY_SIZE(scmi_pwdom)) { out->status = SCMI_NOT_FOUND; return 0; @@ -686,7 +686,7 @@ static int sandbox_scmi_pwd_name_get(struct udevice *dev, struct scmi_msg *msg) domain_id = *(u32 *)msg->in_msg; out = (struct scmi_pwd_name_get_out *)msg->out_msg; - if (domain_id > ARRAY_SIZE(scmi_pwdom)) { + if (domain_id >= ARRAY_SIZE(scmi_pwdom)) { out->status = SCMI_NOT_FOUND; return 0; -- 2.34.1

2 1

Pull request: u-boot-rockchip-20231110
by Kever Yang 10 Nov '23

10 Nov '23

Hi Tom, Please pull the fixex for rockchip platform: - Add Board: rk3588 Pine64 QuartzPro64; - fix rk3066 enter download mode; - fix for ringneck-px30 board; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/18047 Thanks, - Kever The following changes since commit e17d174773e9ba9447596708e702b7382e47a6cf: Merge tag 'xilinx-for-v2024.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze (2023-11-07 10:36:23 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20231110 for you to fetch changes up to 4df4aea88fb99f413a0e3a2a96e176c6108939e3: rockchip: include: asm: fix entering download mode rk3066 (2023-11-09 18:07:21 +0800) ---------------------------------------------------------------- Johan Jonker (1): rockchip: include: asm: fix entering download mode rk3066 Quentin Schulz (3): rockchip: ringneck-px30: enable i2c command rockchip: ringneck-px30: always reset STM32 companion controller on boot rockchip: ringneck-px30: enable SPL_BOARD_INIT Tim Lunn (3): rockchip: dts: fix bootph tags for rv1126 rockchip: otp: Add support for RV1126 rockchip: rv1126: Read cpuid from otp and set ethaddr Tom Fitzhenry (1): board: rockchip: add Pine64 QuartzPro64 RK3588 board arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi | 12 + arch/arm/dts/rk3588-quartzpro64.dts | 1137 ++++++++++++++++++++ arch/arm/dts/rv1126-u-boot.dtsi | 18 +- arch/arm/include/asm/arch-rk3066/boot0.h | 77 +- arch/arm/mach-rockchip/Kconfig | 4 +- arch/arm/mach-rockchip/rk3066/Kconfig | 8 + arch/arm/mach-rockchip/rk3588/Kconfig | 8 + board/pine64/quartzpro64-rk3588/Kconfig | 15 + board/pine64/quartzpro64-rk3588/MAINTAINERS | 8 + board/pine64/quartzpro64-rk3588/Makefile | 3 + .../pine64/quartzpro64-rk3588/quartzpro64-rk3588.c | 39 + .../ringneck_px30/ringneck-px30.c | 53 + configs/quartzpro64-rk3588_defconfig | 72 ++ configs/ringneck-px30_defconfig | 2 + doc/board/rockchip/rockchip.rst | 1 + drivers/misc/rockchip-otp.c | 76 ++ include/configs/quartzpro64-rk3588.h | 14 + 18 files changed, 1543 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-quartzpro64.dts create mode 100644 board/pine64/quartzpro64-rk3588/Kconfig create mode 100644 board/pine64/quartzpro64-rk3588/MAINTAINERS create mode 100644 board/pine64/quartzpro64-rk3588/Makefile create mode 100644 board/pine64/quartzpro64-rk3588/quartzpro64-rk3588.c create mode 100644 configs/quartzpro64-rk3588_defconfig create mode 100644 include/configs/quartzpro64-rk3588.h

2 1

Re: [PULL] Pull request for u-boot master / v2024.01 = u-boot-stm32-20231110
by Patrice CHOTARD 10 Nov '23

10 Nov '23

Add missing u-boot(a)lists.denx.de and patrick.delaunay(a)foss.st.com On 11/10/23 14:48, Patrice CHOTARD wrote: > Hi Tom > > Please pull the STM32 related patches for u-boot/master, v2024.01: u-boot-stm32-20231110 > > CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/18503 > > The following changes since commit e17d174773e9ba9447596708e702b7382e47a6cf: > > Merge tag 'xilinx-for-v2024.01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze (2023-11-07 10:36:23 -0500) > > are available in the Git repository at: > > https://source.denx.de/u-boot/custodians/u-boot-stm.git tags/u-boot-stm32-20231110 > > for you to fetch changes up to c205fe979ebc1961cf28555c00e24a9004761366: > > stm32mp1: read auth stats and boot_partition from tamp (2023-11-10 13:34:10 +0100) > > ---------------------------------------------------------------- > _ Fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled > _ Fix issue following DT sync with kernel 6.3 for stm32mp15xx-ev1 and DHSOM SoM > _ Enable TCP, IPv6, wget on DH STM32MP15 DHSOM > _ Limit u-boot.itb size to 0x160000 bytes on DH STM32MP15 DHSOM > _ Read auth stats and boot_partition from tamp > > ---------------------------------------------------------------- > Bhupesh Sharma (1): > arm: stm32mp: Really fix compilation issue when SYS_DCACHE_OFF and/or SYS_DCACHE_SYS are enabled > > Igor Opaniuk (1): > stm32mp1: read auth stats and boot_partition from tamp > > Marek Vasut (3): > ARM: dts: stm32mp: Repair damage from alignment with v6.3 > arm: stm32: Enable TCP, IPv6, wget on DH STM32MP15 DHSOM > arm: stm32: Limit u-boot.itb size to 0x160000 bytes on DH STM32MP15 DHSOM > > arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 16 ++++++++++++---- > arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 12 +++--------- > arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 ++++++-- > arch/arm/mach-stm32mp/cpu.c | 27 +++++++++++++++++++++++++-- > arch/arm/mach-stm32mp/include/mach/stm32.h | 4 ++++ > arch/arm/mach-stm32mp/include/mach/sys_proto.h | 3 +++ > configs/stm32mp15_dhcom_basic_defconfig | 7 +++++++ > configs/stm32mp15_dhcor_basic_defconfig | 7 +++++++ > 8 files changed, 67 insertions(+), 17 deletions(-)

1 0

[PATCH] common: usb-hub: Reset hub port before scanning
by Shantur Rathore 10 Nov '23

10 Nov '23

Currently when a hub is turned on, all the ports are powered on. This works well for hubs which have individual power control. For the hubs without individual power control this has no effect. Mostly in these scenarios the hub port is powered before the USB controller is enabled, this can lead to some devices in unexpected state. With this patch, we explicitly reset the port while powering up hub This resets the port for hubs without port power control and has no effect on hubs with port power control as the port is still off. Before this patch AMicro AM8180 based NVME to USB adapter won't be detected as a USB3.0 Mass Storage device but with this it works as expected. Tested working after this patch: 1. AMicro AM8180 based NVME to USB Adapter 2. Kingston DataTraveler 3.0 3. GenesysLogic USB3.0 Hub The drives were tested while connected directly and via the hub. --- common/usb_hub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/usb_hub.c b/common/usb_hub.c index 85c0822d8b..06fe436add 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -174,8 +174,10 @@ static void usb_hub_power_on(struct usb_hub_device *hub) debug("enabling power on all ports\n"); for (i = 0; i < dev->maxchild; i++) { + usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_RESET); + debug("Reset : port %d returns %lX\n", i + 1, dev->status); usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER); - debug("port %d returns %lX\n", i + 1, dev->status); + debug("PowerOn : port %d returns %lX\n", i + 1, dev->status); } #ifdef CONFIG_SANDBOX -- 2.40.1

1 0

[PATCH v1 0/9] Add STM32MP2 SoCs and STM32MP257F-EV board support
by Patrice Chotard 10 Nov '23

10 Nov '23

Add STM32MP257F Evaluation board support, it embeds a STM32MP257FAI SoC, with 4GB of DDR4, TSN switch (2+1 ports), 2*USB typeA, 1*USB2 typeC, SNOR OctoSPI, mini PCIe, STPMIC2 for power distribution ... Patrice Chotard (8): arm: caches: Make DCACHE_DEFAULT_OPTION accessible for ARM64 arch stm32mp: dram_init: Get RAM size from DT if no RAM driver found stm32mp: dram_init: Limit DDR usage under 4GB boundary for STM32MP stm32mp: bsec: Fix AARCH64 compilation warnings serial: stm32: Fix AARCH64 compilation warnings pinctrl: pinctrl_stm32: Add stm32mp2 support ARM: dts: stm32: Add STM32MP257F Evaluation board support stm32mp2: initial support Patrick Delaunay (1): stm32mp: dram_init: Fix AARCH64 compilation warnings arch/arm/Kconfig | 2 +- arch/arm/dts/Makefile | 3 + arch/arm/dts/stm32mp25-pinctrl.dtsi | 38 +++ arch/arm/dts/stm32mp25-u-boot.dtsi | 102 +++++++ arch/arm/dts/stm32mp251.dtsi | 285 ++++++++++++++++++ arch/arm/dts/stm32mp253.dtsi | 23 ++ arch/arm/dts/stm32mp255.dtsi | 9 + arch/arm/dts/stm32mp257.dtsi | 9 + arch/arm/dts/stm32mp257f-ev1-u-boot.dtsi | 20 ++ arch/arm/dts/stm32mp257f-ev1.dts | 55 ++++ arch/arm/dts/stm32mp25xc.dtsi | 8 + arch/arm/dts/stm32mp25xf.dtsi | 8 + arch/arm/dts/stm32mp25xxai-pinctrl.dtsi | 83 +++++ arch/arm/dts/stm32mp25xxak-pinctrl.dtsi | 71 +++++ arch/arm/dts/stm32mp25xxal-pinctrl.dtsi | 71 +++++ arch/arm/include/asm/system.h | 16 +- arch/arm/mach-stm32mp/Kconfig | 26 +- arch/arm/mach-stm32mp/Kconfig.25x | 43 +++ arch/arm/mach-stm32mp/Makefile | 15 +- arch/arm/mach-stm32mp/bsec.c | 29 +- arch/arm/mach-stm32mp/dram_init.c | 17 +- arch/arm/mach-stm32mp/include/mach/stm32.h | 141 +++++---- .../arm/mach-stm32mp/include/mach/sys_proto.h | 26 ++ arch/arm/mach-stm32mp/stm32mp1/Makefile | 20 ++ arch/arm/mach-stm32mp/{ => stm32mp1}/cpu.c | 0 arch/arm/mach-stm32mp/{ => stm32mp1}/fdt.c | 0 arch/arm/mach-stm32mp/{ => stm32mp1}/psci.c | 0 .../{ => stm32mp1}/pwr_regulator.c | 0 arch/arm/mach-stm32mp/{ => stm32mp1}/spl.c | 0 .../mach-stm32mp/{ => stm32mp1}/stm32mp13x.c | 0 .../mach-stm32mp/{ => stm32mp1}/stm32mp15x.c | 0 arch/arm/mach-stm32mp/{ => stm32mp1}/tzc400.c | 0 arch/arm/mach-stm32mp/stm32mp2/Makefile | 9 + arch/arm/mach-stm32mp/stm32mp2/arm64-mmu.c | 68 +++++ arch/arm/mach-stm32mp/stm32mp2/cpu.c | 108 +++++++ arch/arm/mach-stm32mp/stm32mp2/fdt.c | 16 + arch/arm/mach-stm32mp/stm32mp2/stm32mp25x.c | 194 ++++++++++++ arch/arm/mach-stm32mp/syscon.c | 4 +- board/st/stm32mp2/Kconfig | 13 + board/st/stm32mp2/MAINTAINERS | 9 + board/st/stm32mp2/Makefile | 6 + board/st/stm32mp2/stm32mp2.c | 52 ++++ configs/stm32mp25_defconfig | 52 ++++ drivers/pinctrl/pinctrl_stm32.c | 2 + drivers/serial/serial_stm32.c | 23 +- drivers/serial/serial_stm32.h | 2 +- include/configs/stm32mp25_common.h | 24 ++ include/dt-bindings/pinctrl/stm32-pinfunc.h | 3 + 48 files changed, 1597 insertions(+), 108 deletions(-) create mode 100644 arch/arm/dts/stm32mp25-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32mp25-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp251.dtsi create mode 100644 arch/arm/dts/stm32mp253.dtsi create mode 100644 arch/arm/dts/stm32mp255.dtsi create mode 100644 arch/arm/dts/stm32mp257.dtsi create mode 100644 arch/arm/dts/stm32mp257f-ev1-u-boot.dtsi create mode 100644 arch/arm/dts/stm32mp257f-ev1.dts create mode 100644 arch/arm/dts/stm32mp25xc.dtsi create mode 100644 arch/arm/dts/stm32mp25xf.dtsi create mode 100644 arch/arm/dts/stm32mp25xxai-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32mp25xxak-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32mp25xxal-pinctrl.dtsi create mode 100644 arch/arm/mach-stm32mp/Kconfig.25x create mode 100644 arch/arm/mach-stm32mp/stm32mp1/Makefile rename arch/arm/mach-stm32mp/{ => stm32mp1}/cpu.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/fdt.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/psci.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/pwr_regulator.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/spl.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/stm32mp13x.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/stm32mp15x.c (100%) rename arch/arm/mach-stm32mp/{ => stm32mp1}/tzc400.c (100%) create mode 100644 arch/arm/mach-stm32mp/stm32mp2/Makefile create mode 100644 arch/arm/mach-stm32mp/stm32mp2/arm64-mmu.c create mode 100644 arch/arm/mach-stm32mp/stm32mp2/cpu.c create mode 100644 arch/arm/mach-stm32mp/stm32mp2/fdt.c create mode 100644 arch/arm/mach-stm32mp/stm32mp2/stm32mp25x.c create mode 100644 board/st/stm32mp2/Kconfig create mode 100644 board/st/stm32mp2/MAINTAINERS create mode 100644 board/st/stm32mp2/Makefile create mode 100644 board/st/stm32mp2/stm32mp2.c create mode 100644 configs/stm32mp25_defconfig create mode 100644 include/configs/stm32mp25_common.h -- 2.25.1

3 28

[PATCH v1] stm32mp1: read auth stats and boot_partition from tamp
by Igor Opaniuk 10 Nov '23

10 Nov '23

Obtain from TAMP backup register information about image authorization status and partition id used for booting. Store this info in environmental variables ("boot_auth" and "boot_part" correspondingly). Image authorization supported values: 0x0 - No authentication done 0x1 - Authentication done and failed 0x2 - Authentication done and succeeded These values are stored to TAMP backup register by Trusted Firmware-A [1]. Testing: STM32MP> print boot_part boot_part=1 STM32MP> print boot_auth boot_auth=2 [1] https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?h=refs/… Signed-off-by: Igor Opaniuk <igor.opaniuk(a)foundries.io> Co-developed-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> --- arch/arm/mach-stm32mp/cpu.c | 23 +++++++++++++++++++ arch/arm/mach-stm32mp/include/mach/stm32.h | 4 ++++ .../arm/mach-stm32mp/include/mach/sys_proto.h | 3 +++ 3 files changed, 30 insertions(+) diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index e07abbe21c1..ba5942848bd 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -40,6 +40,13 @@ u32 get_bootmode(void) TAMP_BOOT_MODE_SHIFT; } +u32 get_bootauth(void) +{ + /* read boot auth status and partition from TAMP backup register */ + return (readl(TAMP_BOOT_CONTEXT) & TAMP_BOOT_AUTH_MASK) >> + TAMP_BOOT_AUTH_SHIFT; +} + /* * weak function overidde: set the DDR/SYSRAM executable before to enable the * MMU and configure DACR, for early early_enable_caches (SPL or pre-reloc) @@ -371,8 +378,24 @@ __weak void stm32mp_misc_init(void) { } +static int setup_boot_auth_info(void) +{ + char buf[10]; + u32 bootauth = get_bootauth(); + + snprintf(buf, sizeof(buf), "%d", bootauth >> 4); + env_set("boot_auth", buf); + + snprintf(buf, sizeof(buf), "%d", bootauth & + (u32)TAMP_BOOT_PARTITION_MASK); + env_set("boot_part", buf); + + return 0; +} + int arch_misc_init(void) { + setup_boot_auth_info(); setup_boot_mode(); setup_mac_address(); setup_serial_number(); diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h index 1cdc5e3b186..ac0deced67e 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h @@ -139,8 +139,12 @@ enum boot_device { #define TAMP_BOOT_MODE_MASK GENMASK(15, 8) #define TAMP_BOOT_MODE_SHIFT 8 +#define TAMP_BOOT_AUTH_MASK GENMASK(23, 16) +#define TAMP_BOOT_AUTH_SHIFT 16 #define TAMP_BOOT_DEVICE_MASK GENMASK(7, 4) #define TAMP_BOOT_INSTANCE_MASK GENMASK(3, 0) +#define TAMP_BOOT_AUTH_ST_MASK GENMASK(7, 4) +#define TAMP_BOOT_PARTITION_MASK GENMASK(3, 0) #define TAMP_BOOT_FORCED_MASK GENMASK(7, 0) enum forced_boot_mode { diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h index 83fb32a45fc..52aca1e23e1 100644 --- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h +++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h @@ -66,6 +66,9 @@ void get_soc_name(char name[SOC_NAME_SIZE]); /* return boot mode */ u32 get_bootmode(void); +/* return auth status and partition */ +u32 get_bootauth(void); + int get_eth_nb(void); int setup_mac_address(void); -- 2.34.1

2 2

[PATCH 1/2] arm: stm32: Enable TCP, IPv6, wget on DH STM32MP15 DHSOM
by Marek Vasut 10 Nov '23

10 Nov '23

Enable support for TCP protocol, wget, and IPv6 on this platform. The former two allow users download payload into the U-Boot from a web server, which may be more convenient or easier to set up than TFTP server. The later is enabled to future proof the IP stack on this platform. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andreas Geisreiter <ageisreiter(a)dh-electronics.de> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: u-boot(a)dh-electronics.com Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- configs/stm32mp15_dhcom_basic_defconfig | 5 +++++ configs/stm32mp15_dhcor_basic_defconfig | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index b6cd0a47fa7..08aac878f8e 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -76,7 +76,10 @@ CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP6=y +CONFIG_CMD_TFTPPUT=y CONFIG_SYS_DISABLE_AUTOLOAD=y +CONFIG_CMD_WGET=y CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y @@ -101,6 +104,8 @@ CONFIG_IP_DEFRAG=y CONFIG_TFTP_TSIZE=y CONFIG_USE_SERVERIP=y CONFIG_SERVERIP="192.168.1.1" +CONFIG_PROT_TCP_SACK=y +CONFIG_IPV6=y CONFIG_STM32_ADC=y CONFIG_SPL_BLOCK_CACHE=y CONFIG_BOOTCOUNT_LIMIT=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index d1acf9c657e..8cd6924b580 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -74,7 +74,10 @@ CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP6=y +CONFIG_CMD_TFTPPUT=y CONFIG_SYS_DISABLE_AUTOLOAD=y +CONFIG_CMD_WGET=y CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y @@ -99,6 +102,8 @@ CONFIG_IP_DEFRAG=y CONFIG_TFTP_TSIZE=y CONFIG_USE_SERVERIP=y CONFIG_SERVERIP="192.168.1.1" +CONFIG_PROT_TCP_SACK=y +CONFIG_IPV6=y CONFIG_STM32_ADC=y CONFIG_SPL_BLOCK_CACHE=y CONFIG_BOOTCOUNT_LIMIT=y -- 2.42.0

2 5

[PATCH] ARM: dts: stm32mp: Repair damage from alignment with v6.3
by Marek Vasut 10 Nov '23

10 Nov '23

The patch fixed by this commit renders ST STM32MP15xx EV1 board and all DHSOM SoM based boards unbootable from SPI NOR. Fix the damage by updating -u-boot.dtsi to match the stm32mp15-pinctrl.dtsi update. Fixes: 08002ffd083d ("ARM: dts: stm32mp: alignment with v6.3") Signed-off-by: Marek Vasut <marex(a)denx.de> --- NOTE: It is truly incomprehensible how 08002ffd083d was ever tested at ST, I can only speculate it never was tested at all, grumb. --- Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 16 ++++++++++++---- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 12 +++--------- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 8 ++++++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index 1f7fdbce530..eb283cacd27 100644 --- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi @@ -135,20 +135,28 @@ &qspi_bk1_pins_a { bootph-pre-ram; - pins1 { + pins { bootph-pre-ram; }; - pins2 { +}; + +&qspi_cs1_pins_a { + bootph-pre-ram; + pins { bootph-pre-ram; }; }; &qspi_bk2_pins_a { bootph-pre-ram; - pins1 { + pins { bootph-pre-ram; }; - pins2 { +}; + +&qspi_cs2_pins_a { + bootph-pre-ram; + pins { bootph-pre-ram; }; }; diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi index f12941b05f6..2f70b0690d2 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi @@ -134,20 +134,14 @@ &qspi_bk1_pins_a { bootph-pre-ram; - pins1 { - bootph-pre-ram; - }; - pins2 { + pins { bootph-pre-ram; }; }; -&qspi_bk2_pins_a { +&qspi_cs1_pins_a { bootph-pre-ram; - pins1 { - bootph-pre-ram; - }; - pins2 { + pins { bootph-pre-ram; }; }; diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi index eb905ad2820..552b35db3c7 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi @@ -98,10 +98,14 @@ &qspi_bk1_pins_a { bootph-pre-ram; - pins1 { + pins { bootph-pre-ram; }; - pins2 { +}; + +&qspi_cs1_pins_a { + bootph-pre-ram; + pins { bootph-pre-ram; }; }; -- 2.40.1

2 2