[PATCH v1] toradex: tdx-cfg-block: fix switch to user partition

[PATCH v1] toradex: tdx-cfg-block: fix switch to user partition

[Stefan Eichenberger]

From: Stefan Eichenberger <stefan.eichenberger@toradex.com>

The Toradex configuration block is stored in the first boot partition of
the eMMC. After reading the configuration block, U-Boot switches back to
the user partition. Currently, this operation always targets mmc device
0, even when the configuration block is stored on mmc device 2.

This patch addresses the issue by switching the mmc device set in
CONFIG_TDX_CFG_BLOCK_DEV to the user partition, rather than using the
hardcoded device 0.

Fixes: a2777ecb9d11 ("toradex: config block handling")
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
 board/toradex/common/tdx-cfg-block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 3855e15b83b..b2149438b88 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -312,7 +312,7 @@ static int tdx_cfg_block_mmc_storage(u8 *config_block, int write)
 
 out:
 	/* Switch back to regular eMMC user partition */
-	blk_select_hwpart_devnum(UCLASS_MMC, 0, 0);
+	blk_select_hwpart_devnum(UCLASS_MMC, dev, 0);
 
 	return ret;
 }
-- 
2.45.2

Re: [PATCH v1] toradex: tdx-cfg-block: fix switch to user partition

[Francesco Dolcini]

On Fri, Jan 24, 2025 at 04:14:30PM +0100, Stefan Eichenberger wrote:
> From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
> 
> The Toradex configuration block is stored in the first boot partition of
> the eMMC. After reading the configuration block, U-Boot switches back to
> the user partition. Currently, this operation always targets mmc device
> 0, even when the configuration block is stored on mmc device 2.
> 
> This patch addresses the issue by switching the mmc device set in
> CONFIG_TDX_CFG_BLOCK_DEV to the user partition, rather than using the
> hardcoded device 0.
> 
> Fixes: a2777ecb9d11 ("toradex: config block handling")
> Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>

Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>

Francesco

Re: [PATCH v1] toradex: tdx-cfg-block: fix switch to user partition

[Tom Rini]

On Fri, 24 Jan 2025 16:14:30 +0100, Stefan Eichenberger wrote:

> The Toradex configuration block is stored in the first boot partition of
> the eMMC. After reading the configuration block, U-Boot switches back to
> the user partition. Currently, this operation always targets mmc device
> 0, even when the configuration block is stored on mmc device 2.
> 
> This patch addresses the issue by switching the mmc device set in
> CONFIG_TDX_CFG_BLOCK_DEV to the user partition, rather than using the
> hardcoded device 0.
> 
> [...]

Applied to u-boot/master, thanks!

-- 
Tom