From patchwork Sun Apr 26 15:35:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4562 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C138E3F206 for ; Sun, 26 Apr 2026 17:36:35 +0200 (CEST) Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43d121c4271sf6437353f8f.3 for ; Sun, 26 Apr 2026 08:36:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1777217795; cv=pass; d=google.com; s=arc-20240605; b=KayKoi/AIbLWZtSnPrizx3q3T4e8HrJIKw1fobux79HtFPXLQ2u3Kx1J8a6tgL/UGZ BlSo0aiTGdtJ+Gp+356ZAh5FQ6lCW2biu55KmBliWqCy5+DhDYbwpIimFkiLzLyDSsj3 OEUAYQ6/vQf+KNmcUDF1NePQOaJNP69PNEHzNi4BXGo86ZLWR8WxCG/ved3OVl+Y++F8 yGXn8/gylH+KYrQJTXH0hiCFsf6ca/nUOl95LAj1RD6zPQDWxuVd+9n69CNUbChK6qdm 3G19vLTbdBVwNI21ba72iWXI0Nq8zX32L2nzy+UKY9EH1kihSlZs7xR95kFilUlNoc6r 0XOA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=o59OEOn2t4ehhCNQlftiItRTjhJ0LOzlCXk3u9o6w4c=; fh=42vZWFBFCUbTMvmYbMNQry8xpbAZpF8m+g9PJDN+V+k=; b=Uc9PKP9CeAbWFb3hv7p+ccj+6NdsKIpLZ+6tRiktvFkt3AaTda0h2h2iuRFj4aULTZ E32Q2MXiUnl3GZOhvwVk+n5cGDvii4v+1ILCvM/stJU/HWTL21MRZUbJAwjb9Rs6CQiN xeuUyKivs01mSvXOahvqVmgrQWeisbN+8URnGRyoi44GedE/ElfjlOnyhoBXpcP8BjO/ nU6r809w83q0klUO0QAPYK1aZZhpdXLu+mbp0DW16Rjchrf1g9nRa7Btml9YFAUMDtWx P9gP7KDIi/WFjSCIOAet0c5dTeqWQmomrGQLE6Bw7haBrA//WOFaKUP6TVh5lw0XtVkf Ff8A==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="m/81Gnps"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1777217795; x=1777822595; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=o59OEOn2t4ehhCNQlftiItRTjhJ0LOzlCXk3u9o6w4c=; b=gtyQ1jCJOidDUKnbBjMMu/mX9t8E1M7Qs9GAfvQIWMCJXz+ATgv0PbWUIcvwWgvni1 d6NFvDDFVKyihP05DkEP7FWBXJpo+LuIpA6v3YZ0kpsqd28O6jbFJYju9XTeqaR8uDa2 16KKcQQJ+WESemnSloibiHRDHugQ2eOtOUQlk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777217795; x=1777822595; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o59OEOn2t4ehhCNQlftiItRTjhJ0LOzlCXk3u9o6w4c=; b=C0v6Ee0sT9IaTc7i+At1nQpyfRpyD4rqy5QG9cDuTbV5uQFHZvEGSo2S9H0WnjP6Lm EfIfP4bqZm7Aq+fEyG5DLHblguC6+A+pXOOjMBNCwoaFgVecByGfaxJH4VZewqLFFobF XEs24xjjtCWi3XK+3m3J4heaOJ1V4shvGRCbFzoJKa1QBUkLKkjyBEH7YEyJjUUFMzGM mi9PULn0RkWKJJUeca+4QbmmAxlZ2xkfUG9XNqbZ8s7mnB9yzcXTdzYwFUn7LDpcJ1jn 1enC6DmZViPbPC/V4HWmZ7oImKO570SsBPcSRAdT8csDqnXjz7/qAC84jl4t5CYrGJ0C bSaA== X-Forwarded-Encrypted: i=2; AFNElJ9te8XzhLo9djFIJLjDomu+98X5Rs36cNDbR38aKnAwzgQWL6Kc6V9MsCgrhq3gKOuyvTaIbgVUrbHIV9Ct@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yzh3rDkIZh9OEHH2FEdhp4/VPsUNmftVXXJOtMkw351SgA8Kxkm obTjgKbv15BXkYfE3igtYjK6Gp1Voa7TqoFQ2bEThOAUuC1G73ufBDO4OmQAe2bVFABU5g== X-Received: by 2002:a05:600c:348d:b0:48a:674d:e756 with SMTP id 5b1f17b1804b1-48a677401c7mr126524905e9.20.1777217795356; Sun, 26 Apr 2026 08:36:35 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="AYAyTiLqACfwVa424zN2GLoPaLr1TXLh6h+nokO8QZUm7U92ZA==" Received: by 2002:a05:600c:8b30:b0:488:88d2:f55 with SMTP id 5b1f17b1804b1-488f4b0cc6bls74731185e9.1.-pod-prod-06-eu; Sun, 26 Apr 2026 08:36:33 -0700 (PDT) X-Received: by 2002:a05:600c:33a6:b0:489:1c1f:35f9 with SMTP id 5b1f17b1804b1-4891c1f38b6mr252483155e9.9.1777217793652; Sun, 26 Apr 2026 08:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777217793; cv=none; d=google.com; s=arc-20240605; b=ZoH2DPbhTKk+M+NqV7W+C5nUbS+LIcy/jAb5uMlese6y4FX5aASf00+PYE4BVCYFol 5kzCYVBz6QGA5XPnA0b5i6/lVmPkqtSED6tfDir6SbqQo7Yin18iIRrvWiQ37xBwEULy Vv75frMTUjycRR1RpYGveVvqA7i26As0PvIqlWoPXRPC7hgxCrRyTLPSLvpaXGVbiwMU 5x8D1DpkoDGrZEcp88CZBQTLEm52s3L1boRY5/ws3TojKLKxDtqa4GkJvgg5RHtBnkIH VvgwKpy8gWGrwndWrsEiT9IATxESBS4SizwChACCp2qQhdZTmDGqAWekWcr3E6AlJsP1 GR9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=VgDkinurEKkVfZgox9x4CaeLjLromr+fZYr6ImbNJmU=; fh=A7b4Lcg6d42EDiThJT5tK+BuJbQ+NoCE2BQ6B+bO/SE=; b=Jqwbscsb98zvFfBqokYvKEDGCn/RM02zFXZdLMqTmPRzaqPdLY9AoPkiEsOYMzFgrG clNgJ173RAHgVktbC1SukBZGBpp9fI3r+ri+oPtRwzS8UqivJ804glmPtUOCqJbYsvov g+iSk1ospCEp3DWyDtWcCM+MaFYgr6olWl4oLDJCrtGJHFJT5T/05IoM+zJjCoLd7UtR nJTBQikZfzWDw0r7lfW2XYLDyL39T7daPNJBNRiQ4/Zvsgax966t7qCWXHDKmBPvz5Yg kgTfEmbkE15mR0qygNn9kauVDIjFml2hMTHEAX2ak8tZqPCo/c9FyJH45nJ6PDN3PjtK A/cQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="m/81Gnps"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id ffacd0b85a97d-43fe4e1a81bsor3894590f8f.14.2026.04.26.08.36.33 for (Google Transport Security); Sun, 26 Apr 2026 08:36:33 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: AeBDietSdJikY/9AFegFJACgUwZv3MlImjCC7t6qLCYceFd3WYBBgOBCr3s7BciMXnJ IgdC4TbbCQ5yXC0c0SL9Gy/2/EYraeeblgjPVAADrdBFvKsHDr9uDepSIkj3wYrVIVWiUGdBgyE h0owxb4s2hl7YfHfnMl+catSdEgHSqpCEXdCaZ+Ca3C5h5G5/TZqBPyrusHCSUsyRczggyjWOvU WexICx2KUg3cwAH3sdW7nY9VANdM4H0JcqV1KOq5v0c4COdv0/ThJDC8DEmXDzrQlraGJhtshMs f+Ffvhw0MEZJ3rZ1d6kBQqQlXh404rMtAvNnsxUhrXvHtuFqgmWEJSyfGY0kE0R6LiIWVMN+Yyh z6GIXYe0sC4NfdsJYoyXnBopUfUG21rBGQyfJ0BCCPyWG0Nz9DG5PKPijUkDe0VGqz0itDUvxme XEQc6u1g7IKE8WIgxn56Kuj3c2FlnK1EIR62X5MvyDBmacxWJ6yKRyHNMCKXg1642bYxjDVH3I9 +/M81ikQBzoxegiRS5yeJn82htTzpaIbH0lIIFmvksoAjtJmMBtvViFs4z2KchVA/YoTNVmJvIk 5k0YmjUxkU/8Icl20vYHn3B6UVqT5ODkOpBPw2iz X-Received: by 2002:a05:600c:3ba0:b0:485:ae14:8191 with SMTP id 5b1f17b1804b1-488fb73a089mr611805405e9.5.1777217793195; Sun, 26 Apr 2026 08:36:33 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.amarulasolutions.com (host-82-56-22-134.retail.telecomitalia.it. [82.56.22.134]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a5499b0edsm388438845e9.14.2026.04.26.08.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 08:36:32 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Simon Glass , Marek Vasut , Patrice Chotard , Patrick Delaunay , Quentin Schulz , Tom Rini , uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH v5 8/8] board: st: stm32mp25: support dynamic A/B bank bootup Date: Sun, 26 Apr 2026 17:35:33 +0200 Message-ID: <20260426153617.2039651-9-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260426153617.2039651-1-dario.binacchi@amarulasolutions.com> References: <20260426153617.2039651-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="m/81Gnps"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Enable automatic detection of the active A/B bank by retrieving partition GUIDs from FWU metadata. This ensures the system correctly identifies the bootable partitions even in multi-bank scenarios, falling back to a standard bootable flag scan if the UUIDs are missing. To enable A/B bank bootup on stm32mp25 boards, add the following Kconfig options to the stm32mp25_defconfig: CONFIG_FWU_MULTI_BANK_UPDATE=y CONFIG_FWU_MDATA=y CONFIG_FWU_NUM_BANKS=2 CONFIG_FWU_NUM_IMAGES_PER_BANK=3 CONFIG_CMD_FWU_METADATA=y CONFIG_FWU_MDATA_V2=y Signed-off-by: Dario Binacchi Reviewed-by: Simon Glass --- Changes in v5: - Add Acked-by of Ilias Apalodimas to patch 6/8 "fwu: add helper to get image GUID by type and bank index" Changes in v4: - Add patch 7/8 test: dm: fwu_mdata: add test for fwu_mdata_get_image_guid Changes in v3: - Wrap lines exceeding 80 columns in test/cmd/part.c file. - Combine run_command() and ut_asserteq() -> ut_asserteq(1, run_command( - Add kerneldoc comment for fwu_mdata_get_image_guid() above its declaration in fwu.h. - Add log_warning() messages to fwu_platform_hook() to catch inconsistent FWU metadata (boot GUID found but root GUID missing or viceversa), as suggested by Simon Glass. - Add Reviewed-by tag of Simon Glass. Changes in v2: - Add links to the XBOOTLDR specification in the commit message of patch 1/7 lib: uuid: add partition type GUID for extended bootloader. - Update help for 'part start', 'part size' to mention UUID. - Add kerneldoc comment for fwu_mdata_get_image_guid(). - Pass efi_guid_t by pointer in fwu_mdata_get_image_guid(). - Add patches: 5/7 test: cmd: part: add UUID lookup tests 3/7 test: cmd: add unit tests for part command 2/7 test: dm: part: add test for part_get_info_by_uuid - Pass efi_guid_t by pointer in fwu_mdata_get_image_guid() calls. board/st/stm32mp2/stm32mp2.c | 32 +++++++++++++++++++++++++++ include/configs/stm32mp25_st_common.h | 15 +++++++++++++ 2 files changed, 47 insertions(+) diff --git a/board/st/stm32mp2/stm32mp2.c b/board/st/stm32mp2/stm32mp2.c index 43bc583378e6..5cbbbc322a3a 100644 --- a/board/st/stm32mp2/stm32mp2.c +++ b/board/st/stm32mp2/stm32mp2.c @@ -208,4 +208,36 @@ void fwu_plat_get_bootidx(uint *boot_idx) *boot_idx = (readl(TAMP_FWU_BOOT_INFO_REG) >> TAMP_FWU_BOOT_IDX_OFFSET) & TAMP_FWU_BOOT_IDX_MASK; } + +int fwu_platform_hook(struct udevice *dev, struct fwu_data *data) +{ + uint boot_idx; + efi_guid_t boot_uuid, root_uuid; + const efi_guid_t boot_type_guid = PARTITION_XBOOTLDR; + const efi_guid_t root_type_guid = + PARTITION_LINUX_FILE_SYSTEM_DATA_GUID; + char uuidbuf[UUID_STR_LEN + 1]; + int retb, retr; + + fwu_plat_get_bootidx(&boot_idx); + + retb = fwu_mdata_get_image_guid(&boot_uuid, &boot_type_guid, boot_idx); + retr = fwu_mdata_get_image_guid(&root_uuid, &root_type_guid, boot_idx); + + if (!retb && !retr) { + uuid_bin_to_str(boot_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID); + env_set("boot_partuuid", uuidbuf); + + uuid_bin_to_str(root_uuid.b, uuidbuf, UUID_STR_FORMAT_GUID); + env_set("root_partuuid", uuidbuf); + } else if (!retb && retr) { + log_warning("%s: found boot GUID but missing root GUID (%d)\n", + __func__, retr); + } else if (!retr && retb) { + log_warning("%s: found root GUID but missing boot GUID (%d)\n", + __func__, retb); + } + + return 0; +} #endif /* CONFIG_FWU_MULTI_BANK_UPDATE */ diff --git a/include/configs/stm32mp25_st_common.h b/include/configs/stm32mp25_st_common.h index cb679eb1be22..0b0267ae99b0 100644 --- a/include/configs/stm32mp25_st_common.h +++ b/include/configs/stm32mp25_st_common.h @@ -8,7 +8,22 @@ #ifndef __CONFIG_STM32MP25_ST_COMMON_H__ #define __CONFIG_STM32MP25_ST_COMMON_H__ +#ifdef CONFIG_FWU_MULTI_BANK_UPDATE +#define SCAN_DEV_FOR_BOOT_PARTS \ + "setenv devplist; " \ + "env exists boot_partuuid && " \ + "part number ${devtype} ${devnum} ${boot_partuuid} devplist; " \ + "env exists devplist || " \ + "part list ${devtype} ${devnum} -bootable devplist; " + +#define ST_STM32MP25_FWU_ENV \ + "altbootcmd=${bootcmd}\0" +#else +#define ST_STM32MP25_FWU_ENV +#endif + #define STM32MP_BOARD_EXTRA_ENV \ + ST_STM32MP25_FWU_ENV \ "usb_pgood_delay=2000\0" \ "console=ttySTM0\0"