[U-Boot] [PATCH] drivers: optee: rpmb: fix returning CID to TEE

Jorge Ramirez-Ortiz jorge at foundries.io
Fri Nov 15 21:37:35 UTC 2019

The MMC CID value is one of the input parameters to unequivocally
provision the the RPMB key.

Before this patch, the value returned by the mmc driver in the Linux
kernel differs from the one returned by uboot to optee.

This means that if Linux provisions the RPMB key, uboot wont be able
to access it (and the other way around).

Fix it so both uboot and linux can access the RPMB partition
independently of who provisions the key.

Signed-off-by: Jorge Ramirez-Ortiz <jorge at foundries.io>
 drivers/tee/optee/rpmb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index 955155b3f8..5dbb1eae4a 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -98,6 +98,7 @@ static struct mmc *get_mmc(struct optee_private *priv, int dev_id)
 static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info)
 	struct mmc *mmc = find_mmc_device(dev_id);
+	int i;
 	if (!mmc)
@@ -105,7 +106,9 @@ static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info)
 	if (!mmc->ext_csd)
-	memcpy(info->cid, mmc->cid, sizeof(info->cid));
+	for (i = 0; i < ARRAY_SIZE(mmc->cid); i++)
+		((u32 *) info->cid)[i] = be32_to_cpu(mmc->cid[i]);
 	info->rel_wr_sec_c = mmc->ext_csd[222];
 	info->rpmb_size_mult = mmc->ext_csd[168];
 	info->ret_code = RPMB_CMD_GET_DEV_INFO_RET_OK;

More information about the U-Boot mailing list