From patchwork Sun Apr 26 15:40:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4571 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 017B73F36A for ; Sun, 26 Apr 2026 17:41:13 +0200 (CEST) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-48a55ecc32csf49750985e9.1 for ; Sun, 26 Apr 2026 08:41:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1777218072; cv=pass; d=google.com; s=arc-20240605; b=ipb5x6U+F0HOwvjnA515z+Qv0kOlBJI1WI1pCyYF3dCqTtdr30tegzqPPB1r/GYSxY SA7EycA/uh6w9yLJ/76O1dgU+XShKn8h+gL/majQCUAYJYMcMzutphnX5IxknM/evOUe IcY5sriPsYA6V14l1pM0ROM9QTN7dT+KXmqS7ptpD2erwbF+v5B664KzzT4Pqe4dD03s PNVSqyEAVNwHMQZafQNA9PClayOChynw/IxQhvgzCAzdsk3nfcLwGv4DOYe1lMyLtFyj 3KA98PeCNP9odJVQH9nlLI65l0uf2QqICw4JRdSDOUB/j5dxvB00lfhHkoSM2AfehOrS r2IA== 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=2MO9Jzl1sa5G1L8Vm63XcN+iBf4yY948VK7FKqF9Xd8=; fh=QJ4yJJy0r7ZoJGA0gavQjTVI6JxDCd+l6GYNoE1u24c=; b=NaptV8nbAH9Uv5bsDF9icPkVXLStuAdZo4lTM6z+riJ48ic8xQVaPFF5vC+T2RfHr3 rdLiWOC5PB2tu6HTwe79QP+kA2cVTR49hrecDu5sZF3hgaeEFSzuCEeo93i80qnsO/Xj 5XS9coh/uCBK8ERqWRm/IKQ225F5GCySBjsGbT31uUpoRqCDEfec98dOQ9p0fVz9saVp rf7nD8AaQJHvgmAa3hDo5v6xrwUYUf94BpDMaiHUDOZAqmdyoUuYhKt9wVvhgWoF+C7N l25fUlQ9NRviJgHOL77DLuy/qlNMCayfjYBnnwJgQTKLTV21uMYNGskClq+XJfuFPhK8 VNkg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lGV6Iuao; 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=1777218072; x=1777822872; 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=2MO9Jzl1sa5G1L8Vm63XcN+iBf4yY948VK7FKqF9Xd8=; b=rbgy405hm1LYneuAjomTVRtZKRost3ysdaNqWk7EKZttqlXCIyA4KvRNTz4/9SqNQj RCrnOWAynL+Z7H9Rf0MVehWqEIYtmiPW2BPbJoZ+rlsZSj4ChoKj4d3P1slkriK8Q1p6 JRRr4i7Uf9mUKSgG2/jWi/BPqKty1EOd2rhjM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777218072; x=1777822872; 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=2MO9Jzl1sa5G1L8Vm63XcN+iBf4yY948VK7FKqF9Xd8=; b=Q3XXKc/379fdoJ4/mCTglrPGq9NmiWox36xLzADgUMhTyjGFUxmRe6r3+NOUrCppLb zeRMk2gDzPxJ2GrNrDu9eaaEpiKvOJRUlyR8+lcjM3hlMhS5Q75rqpwbzM0JGIFi5hKT 4uJ4dshsegLemeF50e3t4H8J7R9tVUm+NKCHMNctCgw8+q6j6v8NelD75E/vQ8xLlhsY Ojfrf1Ugbj3fUzzQwwo4TAd/MlK18QX8C3POu9v3Iqe4aWYIAxqiAUkbxh49cWZlpouU 4l2WNvSgN/3BKLOZoX0b000X6c1DYE9Z2gOD93w3Gtjz2eC4cmyq8lDxIeygODY04D4u WobA== X-Forwarded-Encrypted: i=2; AFNElJ8D06e1yO2zS46d/3fA92ogPkf3F9m145DWXGRxNmFr8SRJTHBma7Gekn47hxSPJfVyKJzABgsAbvTXAC+f@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YxRAoddY/f92QCfZ/wC9/Qf2iHn2qPRtWlrJo3FzfFV4qauQiTu ZgzqjUdf8K8XMpbk6E8+aOqhd38GDvwJuc+wT35QW1ZNLgPVTpCUhdYfJfskPt9ILy4bYDsHHIo /ww== X-Received: by 2002:a05:600c:450a:b0:48a:72ab:f88c with SMTP id 5b1f17b1804b1-48a72abf8admr1555715e9.17.1777218072360; Sun, 26 Apr 2026 08:41:12 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h="AYAyTiIDdmHgpTDL98dG9cAlvRvroBc8T19xaVaXWw2uZs+/jg==" Received: by 2002:a05:600c:1549:b0:488:9946:181c with SMTP id 5b1f17b1804b1-48a5a517368ls37380105e9.2.-pod-prod-09-eu; Sun, 26 Apr 2026 08:41:11 -0700 (PDT) X-Received: by 2002:a05:600c:c177:b0:488:a82f:bba9 with SMTP id 5b1f17b1804b1-488fb7804f3mr519879465e9.22.1777218070903; Sun, 26 Apr 2026 08:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777218070; cv=none; d=google.com; s=arc-20240605; b=QDO94Jako6z2HL7J/JlpPSoaVZ/rAW+77DRC7XCz3xznU7i9CDdPE6g/IpONhHnMoY FD7t+457bT5D/CaF5i6yjHveQspJjn5dIst/1xVJw8+0LG/7umBleT8Lb31++3U+J91C 9+QpfQj+dYvVR5yMk/OTmJeoEdLauFZ3mfkiGe4NsmGP/H79iGF3r/uiqDoKiRAbEQzn SPDfaXcTI3Kb8nQ209TkbB/9jFseMectMxtlc+NumgrbYJOoIiburaXe+d+lyPUr5lzp n+xe1/+az9wzfHxPoE4ksrU0y2IIm1MkR3pi6BPFkntvFpmUXvxGAbhQLSvzS/CoRmll E96A== 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=pyCTNQQ5HSE9YWFE9QctEWIoRgXv/rGHYVY5OZpmknE=; fh=A7b4Lcg6d42EDiThJT5tK+BuJbQ+NoCE2BQ6B+bO/SE=; b=YeW3JZ7AsDfcrOWKadqcFM+5JD/Eup5F4+gm4JxOEhDQB2/fSO1U4Qd49Ci7GsSEGz 4rTHQwkGHruH0/vpaydf7cr5XD9qSX84MxKpe60YfHLL8BFCC9oh7TgkWCy9RB0jSbzt eBeS+7oME3m4jsnIcYiOG9fmIfi6SLL2uWaXOfoiG0yW6iVaFYukRwt2ji894+mt+7c3 0weHknOXqmTgpks6V1rbGQxwnUMDlUAPxx+p9RyZ9A/Z4exLy8mlpkH+pIFu91ddcA4a JraXOxfDVk9HXXJ3ZgXO2UmyBQfrdo6UjOPCrPOlKbusg72c6f9XLKVNyEsVVL9xXCsb qirQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=lGV6Iuao; 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-43fe4ca3d33sor4467729f8f.3.2026.04.26.08.41.10 for (Google Transport Security); Sun, 26 Apr 2026 08:41:10 -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: AeBDieuIvSnvBVGLhx6pFOVWknOOBZkdKnU+0r6gaZ5Hr1IreIKv5G/fDOKtYCL1Khr ppzZHBjWomiP8B4+0Sh/xgQPMuPdC75Kd+5GttJ6etKlDWCtaNFCqomVc/SgghoDVD9J6KN0uU2 vvYTIN6q05iUYEF43a6GEf4pHpxuzBzWeqKQXaxL22mKOCe22epC1f5NfsNlaAup3hoZLoUb9y+ 96UQPVYxG5Nf8RvvVddJURDynItt5skJnLNGa15RZ8aEi7Rg/2966XsESEluGc3GLSXPKPOfag0 oIqKABIlb88wswvpv1X8ARmgOIS2+V9fqxfRXvLqj2/8er8Svs3kuzSBIy/Ixn3ARQJhnjjHzoU 0MguTIH2GzP04rjvqTwBsrgH/6aogheRWnBSyBnedqMkm4Xja9y1GdW+pv/cOaPTUv+GaQj0rYj il+758P9tWWcjND4M60DwAsSPYH9BaakTtIQimZ3++2Q05cULpWEJ2Wf6wDzYBCvE/CcHQpOwvG yuzP6EIYxDYs84K9u4H3axjv2o0ldhwvkxnKkqaGDvkZQhU/mGzhUjiiGClCVfWls4B4DmOo+vn bcs41iPpubEL4avcAyQ1ABEUxtp4m6zRBVwz3QmK X-Received: by 2002:a05:600c:1f83:b0:488:8840:e5ae with SMTP id 5b1f17b1804b1-488fb787afemr556310845e9.24.1777218070416; Sun, 26 Apr 2026 08:41:10 -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-4891bb3d121sm802593765e9.14.2026.04.26.08.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 08:41:10 -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 v6 8/8] board: st: stm32mp25: support dynamic A/B bank bootup Date: Sun, 26 Apr 2026 17:40:40 +0200 Message-ID: <20260426154054.2040932-9-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260426154054.2040932-1-dario.binacchi@amarulasolutions.com> References: <20260426154054.2040932-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=lGV6Iuao; 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 --- (no changes since v5) 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"