On 8/7/26 9:01 AM, Jorge Ramirez-Ortiz wrote:
> OP-TEE secure storage (CFG_RPMB_FS) requires RPMB, but on UFS-only
> platforms with no eMMC the OP-TEE RPMB supplicant has no way to reach the
> device's RPMB Well-Known LUN, which UFS exposes through SCSI SECURITY
> PROTOCOL IN/OUT commands rather than an eMMC-style RPMB partition; this
> transport provides that missing path so RPMB-backed secure storage works
> on UFS-based platforms.
>
...
> diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile
> index e7f3c1d30c4..d60440ca119 100644
> --- a/drivers/ufs/Makefile
> +++ b/drivers/ufs/Makefile
> @@ -13,3 +13,4 @@ obj-$(CONFIG_UFS_RENESAS) += ufs-renesas.o
> obj-$(CONFIG_UFS_RENESAS_GEN5) += ufs-renesas-rcar-gen5.o
> obj-$(CONFIG_UFS_ROCKCHIP) += ufs-rockchip.o
> obj-$(CONFIG_UFS_TI_J721E) += ti-j721e-ufs.o
> +obj-$(CONFIG_SUPPORT_UFS_RPMB) += ufs-rpmb.o
> diff --git a/drivers/ufs/ufs-rpmb.c b/drivers/ufs/ufs-rpmb.c
> new file mode 100644
> index 00000000000..2258dfaf69b
> --- /dev/null
> +++ b/drivers/ufs/ufs-rpmb.c
> @@ -0,0 +1,146 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +#include <dm.h>
> +#include <log.h>
> +#include <malloc.h>
> +#include <scsi.h>
> +#include <ufs.h>
> +#include <asm/cache.h>
> +#include <asm/unaligned.h>
> +#include <linux/errno.h>
> +#include <linux/string.h>
> +#include "ufs.h"
> +
> +#define RPMB_REQ_KEY 1
> +#define RPMB_REQ_WCOUNTER 2
> +#define RPMB_REQ_WRITE_DATA 3
> +#define RPMB_REQ_READ_DATA 4
> +#define RPMB_REQ_STATUS 5
> +
> +#define RPMB_FRAME_SIZE 512
> +#define RPMB_FRAME_REQ_OFFSET 510
> +
> +#define UFS_RPMB_UA_RETRIES 3
> +
> +#define SEC_PROTOCOL_UFS 0xEC
> +#define UFS_RPMB_SEC_PROTOCOL_ID 0x01
> +
> +#define GEOMETRY_DESC_RPMB_RW_SIZE 0x17
Should this go in patch 3 with ufs_rpmb_read_geometry()?
> +
> +static int ufs_rpmb_secprot(struct udevice *scsi_dev, unsigned int region,
> + u8 opcode, void *buf, unsigned int nframes,
> + enum dma_data_direction dir)
> +{
> + u16 spsp = (region << 8) | UFS_RPMB_SEC_PROTOCOL_ID;
> + u32 len = nframes * RPMB_FRAME_SIZE;
> + struct scsi_cmd pccb;
> + void *dma_buf = buf;
> + void *bounce = NULL;
> + int retries;
> + int ret = 0;
> +
> + if (!IS_ALIGNED((uintptr_t)buf, ARCH_DMA_MINALIGN)) {
> + bounce = memalign(ARCH_DMA_MINALIGN,
> + ALIGN(len, ARCH_DMA_MINALIGN));
> + if (!bounce)
> + return -ENOMEM;
> + dma_buf = bounce;
> + if (dir == DMA_TO_DEVICE)
> + memcpy(bounce, buf, len);
> + }
> +
> + memset(&pccb, 0, sizeof(pccb));
> + pccb.lun = UFS_UPIU_RPMB_WLUN;
> + pccb.cmd[0] = opcode;
> + pccb.cmd[1] = SEC_PROTOCOL_UFS;
> + put_unaligned_be16(spsp, &pccb.cmd[2]);
> + pccb.cmd[4] = 0;
> + pccb.cmd[5] = 0;
> + put_unaligned_be32(len, &pccb.cmd[6]);
> + pccb.cmd[10] = 0;
> + pccb.cmd[11] = 0;
> + pccb.cmdlen = 12;
> + pccb.pdata = dma_buf;
> + pccb.datalen = len;
> + pccb.dma_dir = dir;
> +
> + for (retries = UFS_RPMB_UA_RETRIES; retries > 0; retries--) {
> + ret = scsi_exec(scsi_dev, &pccb);
Should we check the error here any only retry on unit attenion error and
not other errors?
> + if (!ret)
> + break;
> + }
> +
> + if (bounce) {
> + if (!ret && dir == DMA_FROM_DEVICE)
> + memcpy(buf, bounce, len);
> +
> + free(bounce);
> + }
> +
> + return ret;
> +}
> +
...
> +int ufs_rpmb_route_frames(struct udevice *scsi_dev, unsigned int region,
> + void *req, unsigned long reqlen, void *rsp,
> + unsigned long rsplen)
> +{
> + unsigned int n_req = reqlen / RPMB_FRAME_SIZE;
> + unsigned int n_rsp = rsplen / RPMB_FRAME_SIZE;
> + u16 request;
> + int ret;
> +
> + if (!scsi_dev || reqlen % RPMB_FRAME_SIZE ||
> + rsplen % RPMB_FRAME_SIZE || !n_req)
> + return -EINVAL;
> +
> + request = get_unaligned_be16((u8 *)req + RPMB_FRAME_REQ_OFFSET);
> +
> + switch (request) {
> + case RPMB_REQ_KEY:
> + case RPMB_REQ_WRITE_DATA: {
> + u8 status_frame[RPMB_FRAME_SIZE];
> +
> + ret = ufs_rpmb_send(scsi_dev, region, req, n_req);
> + if (ret)
> + return ret;
> +
> + memset(status_frame, 0, sizeof(status_frame));
> + status_frame[RPMB_FRAME_REQ_OFFSET] = RPMB_REQ_STATUS >> 8;
> + status_frame[RPMB_FRAME_REQ_OFFSET + 1] = RPMB_REQ_STATUS &
> 0xff;
Looks like another place we can use put_unaligned_be16()
> + ret = ufs_rpmb_send(scsi_dev, region, status_frame, 1);
> + if (ret)
> + return ret;
> +
> + if (n_rsp < 1)
> + return -EINVAL;
> +
> + return ufs_rpmb_recv(scsi_dev, region, rsp, 1);
> + }
