From nobody Thu Oct 2 02:15:18 2025 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [81.169.146.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0B9A42AA9; Tue, 23 Sep 2025 15:45:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.170 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758642324; cv=pass; b=I5Aqk4BsHhMJgZ84pvC0d4dsUhG6+doRaG7a/Wxj8OH75gsUUgagusFAiu04wAZWOrAiyjRbNGaeKeae0DLll2baROFqkfbAwJwLhja1Qc8jrPwhDYco/8vXEp0tngmBzha+kUrPYJU57qopr3z3pHfWVuqqGzTLO5Qk5GmhSL4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758642324; c=relaxed/simple; bh=FLlDR2tziC5LTTUj1fqGz3p0kuBMiGN78op6NHzyngI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=AYQtXAUT0ZfqG9DAlR97Df+2IydanDzDsyJhTyTrmPQ5Y/pF6Y6axBb7ktkZllOK3lEi6QsN+8UWOZcDGkMQ1me09ockw3Uz36l5JRfRzMMrk2suLu8vUPfyncWqZATpfcEOnF7khk6mXWdQDj/sPJmbjn2BJ33vpqRkNLXV0CE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=tRrIZ3KR; arc=pass smtp.client-ip=81.169.146.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="tRrIZ3KR" ARC-Seal: i=1; a=rsa-sha256; t=1758641958; cv=none; d=strato.com; s=strato-dkim-0002; b=EnA2qV5Fe+WQXOdCUu1usyLbMD46OhfMVO/cJmnv05t4/piuF347OoGVFsdObirf2y npisyOF17X8sGWls7Xnhtnkkc6r+/KC1YwveLWkoKiktu2fi8DlkX7QAKogNNupKqlIf Csv7tvVvktFyaUATu/vYS5He3Ius8Sj7X9xl+AYS+gKHbF7uDpA9/CB6TUp0BfLiP33F CPpin4QddhWjga2wqdvcnANIKtzXt41tFM37Y47wc3qvYVFCbYTDXcz5O8GOlKDlyIm1 7QEISSBHtVi7ZhItIdufR6zT6EGWeSrnqq1fn9hQAkykIYQNXAdfYVGLCv3gRlIwIOTU ps1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1758641958; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=a+70373e+Lz+vAR2nKUbEkjl5RTJbQlaVGE7sifvdQI=; b=IBQjiN95Pzmy4TvXlx5dRJo1daANv2c5nfneLgP15ApzMcWMFagqnJmOBT5vvxoptk zRN6qg+OcWWE7cVUkxkEA3MfgZ8x6zQfEN5DJjV055aN6cayVKydsIVxRZRGWF9zalqr pY0NKl8dEnYWFXQ9MlRcKw2NpMPDwQg1LibsowU1uaTTtkHwS9bT2nsI685x25zwcPXu Zj49hpvDDTy22sDE0M0nCP1KxNaqHwNzRIVCZIJSSYe1Vi3r8y00YPCPU8fyY21Nz/vz K4KCTGDmkDR/5N9X8KvQdC+8nP3bPeFwa0CmAw3LeMpn0zV7QK7PBLCCG3eiGajbepgx IEnw== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1758641958; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=a+70373e+Lz+vAR2nKUbEkjl5RTJbQlaVGE7sifvdQI=; b=tRrIZ3KR9CrtNDEyjXImjIJv6r7YULGOnNva3CU6K245zsMn2DNNSjkklBgkH50mEc OEOwFafjU2gG/a5swGgt6OsHLpBx3aUvwg/x0KDRDro4spF+V2pW9dwObMOiNCp56jHO XK7zXj1cVbB9dg9g7BkApm//R1veQGizXkbsjJYQkrVL8N7RxFAPoeQ6uo/wXBMCiSmZ 92pMg3sw0LUth6YDrz+lXecY/kungr8zFCbfw17Ok7I62cuvEVMYJCx8F/4M3qfI3hjt NQZ+0EBHoW3d6N3xhyT9Hg6wkVkmkv6nqVxs09JcC0esoIXICUBoE+HvYVxE9Y91xVPY cqHw== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O2J2YOom0XQaPis+nU/5K" Received: from Munilab01-lab.micron.com by smtp.strato.de (RZmta 53.3.2 AUTH) with ESMTPSA id z9ebc618NFdI3eQ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 23 Sep 2025 17:39:18 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, bvanassche@acm.org, alim.akhtar@samsung.com, jejb@linux.ibm.com, martin.petersen@oracle.com, can.guo@oss.qualcomm.com, ulf.hansson@linaro.org, beanhuo@micron.com, jens.wiklander@linaro.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/3] rpmb: move rpmb_frame struct and constants to common header Date: Tue, 23 Sep 2025 17:39:04 +0200 Message-Id: <20250923153906.1751813-2-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250923153906.1751813-1-beanhuo@iokpp.de> References: <20250923153906.1751813-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Bean Huo Move struct rpmb_frame and RPMB operation constants from MMC block driver to include/linux/rpmb.h for reuse across different RPMB implementations (UFS, NVMe, etc.). Signed-off-by: Bean Huo --- drivers/mmc/core/block.c | 42 -------------------------------------- include/linux/rpmb.h | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index b32eefcca4b7..bd5f6fcb03af 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -79,48 +79,6 @@ MODULE_ALIAS("mmc:block"); #define MMC_EXTRACT_INDEX_FROM_ARG(x) ((x & 0x00FF0000) >> 16) #define MMC_EXTRACT_VALUE_FROM_ARG(x) ((x & 0x0000FF00) >> 8) =20 -/** - * struct rpmb_frame - rpmb frame as defined by eMMC 5.1 (JESD84-B51) - * - * @stuff : stuff bytes - * @key_mac : The authentication key or the message authentication - * code (MAC) depending on the request/response type. - * The MAC will be delivered in the last (or the only) - * block of data. - * @data : Data to be written or read by signed access. - * @nonce : Random number generated by the host for the requests - * and copied to the response by the RPMB engine. - * @write_counter: Counter value for the total amount of the successful - * authenticated data write requests made by the host. - * @addr : Address of the data to be programmed to or read - * from the RPMB. Address is the serial number of - * the accessed block (half sector 256B). - * @block_count : Number of blocks (half sectors, 256B) requested to be - * read/programmed. - * @result : Includes information about the status of the write coun= ter - * (valid, expired) and result of the access made to the R= PMB. - * @req_resp : Defines the type of request and response to/from the me= mory. - * - * The stuff bytes and big-endian properties are modeled to fit to the spe= c. - */ -struct rpmb_frame { - u8 stuff[196]; - u8 key_mac[32]; - u8 data[256]; - u8 nonce[16]; - __be32 write_counter; - __be16 addr; - __be16 block_count; - __be16 result; - __be16 req_resp; -} __packed; - -#define RPMB_PROGRAM_KEY 0x1 /* Program RPMB Authentication Key */ -#define RPMB_GET_WRITE_COUNTER 0x2 /* Read RPMB write counter */ -#define RPMB_WRITE_DATA 0x3 /* Write data to RPMB partition */ -#define RPMB_READ_DATA 0x4 /* Read data from RPMB partition */ -#define RPMB_RESULT_READ 0x5 /* Read result request (Internal) */ - #define RPMB_FRAME_SIZE sizeof(struct rpmb_frame) #define CHECK_SIZE_NEQ(val) ((val) !=3D sizeof(struct rpmb_frame)) #define CHECK_SIZE_ALIGNED(val) IS_ALIGNED((val), sizeof(struct rpmb_frame= )) diff --git a/include/linux/rpmb.h b/include/linux/rpmb.h index cccda73eea4d..1415ceb458fe 100644 --- a/include/linux/rpmb.h +++ b/include/linux/rpmb.h @@ -61,6 +61,50 @@ struct rpmb_dev { =20 #define to_rpmb_dev(x) container_of((x), struct rpmb_dev, dev) =20 +/** + * struct rpmb_frame - RPMB frame structure for authenticated access + * + * @stuff : stuff bytes, a padding/reserved area of 196 bytes at the + * beginning of the RPMB frame. They don=E2=80=99t carry m= eaningful + * data but are required to make the frame exactly 512 byt= es. + * @key_mac : The authentication key or the message authentication + * code (MAC) depending on the request/response type. + * The MAC will be delivered in the last (or the only) + * block of data. + * @data : Data to be written or read by signed access. + * @nonce : Random number generated by the host for the requests + * and copied to the response by the RPMB engine. + * @write_counter: Counter value for the total amount of the successful + * authenticated data write requests made by the host. + * @addr : Address of the data to be programmed to or read + * from the RPMB. Address is the serial number of + * the accessed block (half sector 256B). + * @block_count : Number of blocks (half sectors, 256B) requested to be + * read/programmed. + * @result : Includes information about the status of the write coun= ter + * (valid, expired) and result of the access made to the R= PMB. + * @req_resp : Defines the type of request and response to/from the me= mory. + * + * The stuff bytes and big-endian properties are modeled to fit to the spe= c. + */ +struct rpmb_frame { + u8 stuff[196]; + u8 key_mac[32]; + u8 data[256]; + u8 nonce[16]; + __be32 write_counter __packed; + __be16 addr __packed; + __be16 block_count __packed; + __be16 result __packed; + __be16 req_resp __packed; +}; + +#define RPMB_PROGRAM_KEY 0x1 /* Program RPMB Authentication Key */ +#define RPMB_GET_WRITE_COUNTER 0x2 /* Read RPMB write counter */ +#define RPMB_WRITE_DATA 0x3 /* Write data to RPMB partition */ +#define RPMB_READ_DATA 0x4 /* Read data from RPMB partition */ +#define RPMB_RESULT_READ 0x5 /* Read result request (Internal) */ + #if IS_ENABLED(CONFIG_RPMB) struct rpmb_dev *rpmb_dev_get(struct rpmb_dev *rdev); void rpmb_dev_put(struct rpmb_dev *rdev); --=20 2.34.1 From nobody Thu Oct 2 02:15:18 2025 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [81.169.146.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59F0F25CC74; Tue, 23 Sep 2025 15:51:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.171 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758642681; cv=pass; b=qNhtR67TwoliaTXVVD7KsfXNcl2McQ8ieH/2fUGYKXqZ41B9ueXQMOKPZ1LDAbuAA5/1nFjaOkdZSbUd4OA23lzdyPXc7P8YG3oPGkc449rOT/1ABrIpqw8ACu66M09LHWeEY5h+wkVDKCM/sOMaOpfkYiHWKIHF31n60P54A9M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758642681; c=relaxed/simple; bh=58ojsysFvPaNnj9sdPpwywdliL+WLSYvNAkP9FwIt58=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Md5Vcgq3nuorAVYxzX15/pHgt960CzVb0MI9QgYIIJpj1XO+COxfY7lwpqPX0aqSDju5uQ3U3CIGkjA/bHSqkriPCH8lvjRLTmjw2EogX3O6t0v6Fs1v6Ba9w+Tt2V6FRyGZ8J8GzW7LjLsr+kGxrtAJ/anFTVO887hjRahBW7Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=GUUEGTlm; arc=pass smtp.client-ip=81.169.146.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="GUUEGTlm" ARC-Seal: i=1; a=rsa-sha256; t=1758641959; cv=none; d=strato.com; s=strato-dkim-0002; b=mXmE2DEYzaPKrEImY96+pugrCqid+K5CAsCZWlySu/bucf/kNGmkI650SngzgQHn5Y Z+E7UcA+MC/lpUUgheZQZTYdQWH0P0ZlGGw+4Fr38TqFAkUTLYX4KdDN8R3QuH9q+eKd PQhMvrqA6I4WqyDp074NbFaDDEkd9cgtDNysdHZpzSoI8f2cctUkTBWkKpCNM7p6S33y 8jt+0XshhMJORkd76QLA3EZUxqEbFirc0ojikfs1QFLgfRaLQczx6vkl7afEpBlQNVcc kEEEGzCE0pAraj2+dqv8rn4cZlc2PwmvGM7c9gryymnetRbJ1LUKjN7DBx6yjKAwzsUI ntag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1758641959; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=WeENfocnqtAAgNP8w7OEafJmaxgWIsIDh4ZeyeasUqY=; b=XXde7krp64AgGN6c9sw4uIjwET0YrV8QbQHDW9XdHDRlk/VgBHOHD4j5lzPqaGh2R9 Y21zzCawARK9X0BYAHSMj2FPO6tvOFIZJesq6DKwKAX1IAPT3Dn0nAqMOporgnOPIqYP A7en+wZwCM59Mn1Jk9rZiT3eKr8YaNVrN+fQZTQNy7UM0dGN/ip5zuo+beH5DgPad16c fltyBoSWxDYTxt/bQ5nbjIee1h2bKb7mTZdTyvDPVyS9sSKOw7UHfuNW5B+rOKRAYcYC uQmIoFqcv32eHXSXBw1ObsETOgd2ySHupy8XRLG46l5bcybJVtx4EcsQKcIQ8VfDS8JD 2J6g== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1758641959; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=WeENfocnqtAAgNP8w7OEafJmaxgWIsIDh4ZeyeasUqY=; b=GUUEGTlml6tXQKR0DfmPXSKwRKHCXhKZX5rZpqknknwZA2+Q5epdaA0OY+pc8V0LNJ +gG1DIYj4ULjauEgaK4rogG9e9jAs5uGh+8r1vVfvW44hmH5DfklINYhSz3jRoeDISXx VxHKLemOk6Lsh9obu7gaEqlcjc86Sp9+xno1SJpTVX+/5JVwOYjbUnJI1FotUudLFxMl hfpDbS/pY5t1HVuO6GJNVILWRJWikLLAc7Mcqj6t8Ig9E09o8BF1wMIkv1PTmPjahJCv yQMKmBg8LVEDhpk7XkJpjbLAZwVIKNfQD6XkmqOt1E6NwJyieBr7MphUFVM1wojOuCHd Qt2g== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O2J2YOom0XQaPis+nU/5K" Received: from Munilab01-lab.micron.com by smtp.strato.de (RZmta 53.3.2 AUTH) with ESMTPSA id z9ebc618NFdI3eR (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 23 Sep 2025 17:39:18 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, bvanassche@acm.org, alim.akhtar@samsung.com, jejb@linux.ibm.com, martin.petersen@oracle.com, can.guo@oss.qualcomm.com, ulf.hansson@linaro.org, beanhuo@micron.com, jens.wiklander@linaro.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/3] scsi: ufs: core: fix incorrect buffer duplication in ufshcd_read_string_desc() Date: Tue, 23 Sep 2025 17:39:05 +0200 Message-Id: <20250923153906.1751813-3-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250923153906.1751813-1-beanhuo@iokpp.de> References: <20250923153906.1751813-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bean Huo The function ufshcd_read_string_desc() was duplicating memory starting from the beginning of struct uc_string_id, which included the length and type fields. As a result, the allocated buffer contained unwanted metadata in addition to the string itself. The correct behavior is to duplicate only the Unicode character array in the structure. Update the code so that only the actual string content is copied into the new buffer. Signed-off-by: Bean Huo --- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 2e1fa8cf83f5..79c7588be28a 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -3823,7 +3823,7 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 d= esc_index, str[ret++] =3D '\0'; =20 } else { - str =3D kmemdup(uc_str, uc_str->len, GFP_KERNEL); + str =3D kmemdup(uc_str->uc, uc_str->len, GFP_KERNEL); if (!str) { ret =3D -ENOMEM; goto out; --=20 2.34.1 From nobody Thu Oct 2 02:15:18 2025 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95B5F1A23B9; Tue, 23 Sep 2025 15:45:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758642325; cv=pass; b=s12n/cdbhjTJq2A/8hhc+qnl9iZPhRiZSKatghexa0Yjf64FsRj/ZyFndM87NinMFIFvcWKYP9z39Qg0/kTINxxzf+OOY57wN+vFtvQVC7wrepBI2lNWM+J/JYmsph1aVKe+Cqf2ZyCPu9mq+ipz62GCCDfS3lvAeUh8gLec+D8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758642325; c=relaxed/simple; bh=P0SChlX8HPL7xf0uVTtoWIlpLbtUhABvsC5fRPMAIbQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=IVY47ckTQkbjaPwlCgOwY8AR2g4cQJvLk/CoR41WFkIVi/0GH3pU0CtncLKHwRtvQenz8zF3yLGVZqtrgPkkRfGJ1DiMLgBXedPxmbQpeELf+qREXbhvNw6QxCOAf7CjkOuE0Vwy6mfOPDMFGkwOWXvQQ5NRW2BLDcIKL64Ndqo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iokpp.de; spf=none smtp.mailfrom=iokpp.de; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b=MLZ9ZKyz; arc=pass smtp.client-ip=85.215.255.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=iokpp.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=iokpp.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iokpp.de header.i=@iokpp.de header.b="MLZ9ZKyz" ARC-Seal: i=1; a=rsa-sha256; t=1758641960; cv=none; d=strato.com; s=strato-dkim-0002; b=Qs6s41HbDrP4n3fluB6dVjeVXC3eAt20UKnCjuSBMZDwbbl6nmz3FHdTMC+VYYExsO BzAQyqjQSW6833CYby/vo0jrv9X0dleK9YQD68rhu4pQezbqE1igpZnyQ/hqZg9oqw// jtri2/dhFZotMlIAHf3W9zmPs2DVdHwteSjsxL5aECrPEAMUkD7UYgv/gzM9LJS/fsBa OFPgO+I9PWqx9PzILsnekgBdC3gHMQJsuMmXjOL1n/eQghO0aW71bhlZYNxHD1WgtI5h mRDbZONJB53z+0kvUDgPFvWTmJXO6mQBDTdUt5bclNr266fUT/SelPgZv5N+PAD1xSsa wFpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1758641960; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=w2ZeRmMttULC9YoXD1HyEumTDOHxT/N5/vuJa3kQYYQ=; b=gXMpyhZMFxKaWDGsFXdP39U7BYQL5J1WHbp25bFTSg1BrmGsFs9xu69dv/rEK0CVp+ KKysA9BMqVxmZZOVEhfPHkctlAk0Cvi2OCsjDfn0/xzxzD9EG5k4nQ50PhQbJV9bABRe 3SYSMm7JTvcBu893Hh1/fvjUgccb+qJGiVgmOkJI6OsAjWOLf7YwEGTaMtzTP4Ux2W2x ftol9LkXkKMTF4zH+Jx5YbOl6+uDsvQZFmh78bnvs3RGiQY2mjvvgvGBDkU31rMFei3v zlpwxUpaTIJRDXwCO9PUOM87td1q9Odavv2Cu/1VUc2CuNxsRdeQ9/HNNVg2bP7wFetE fDfg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1758641960; s=strato-dkim-0002; d=iokpp.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=w2ZeRmMttULC9YoXD1HyEumTDOHxT/N5/vuJa3kQYYQ=; b=MLZ9ZKyzFxTxmLqsMPDobChxIxKc/++R01QEbOak7bU1g2/c7Yxo77Bpwr0dvJlgGj hhZu+a58d3HwrJr4SSz+lHcCzWECnjSr0XlQr74uY8tZgTkRAC69r/SS0cKXFrfNU3e0 3rrlR/eQRYCCztUV4KTxIUw5xqRvCsdLyZQOJ05lZmub51EvES+kd+8Nga+ukMeqb0WE mSsCDPtCplbzq4ndlkGkeTsx1y/2XuINJSeZpWiVfR6e1p1WHFxRnl1krF2UaWVL19du 5q3pW1/29ifZQcrDjw1a03IT2lY5kVnirdLYmoR7QYz1sGSAUJAWwyqFzetzk/hv/4g4 Yo3g== X-RZG-AUTH: ":LmkFe0i9dN8c2t4QQyGBB/NDXvjDB6pBSfNuhhDSDt3O2J2YOom0XQaPis+nU/5K" Received: from Munilab01-lab.micron.com by smtp.strato.de (RZmta 53.3.2 AUTH) with ESMTPSA id z9ebc618NFdJ3eT (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 23 Sep 2025 17:39:19 +0200 (CEST) From: Bean Huo To: avri.altman@wdc.com, bvanassche@acm.org, alim.akhtar@samsung.com, jejb@linux.ibm.com, martin.petersen@oracle.com, can.guo@oss.qualcomm.com, ulf.hansson@linaro.org, beanhuo@micron.com, jens.wiklander@linaro.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 3/3] scsi: ufs: core: Add OP-TEE based RPMB driver for UFS devices Date: Tue, 23 Sep 2025 17:39:06 +0200 Message-Id: <20250923153906.1751813-4-beanhuo@iokpp.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250923153906.1751813-1-beanhuo@iokpp.de> References: <20250923153906.1751813-1-beanhuo@iokpp.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bean Huo This patch adds OP-TEE based RPMB support for UFS devices, similar to the existing eMMC implementation. Benefits of OP-TEE based RPMB implementation: - Eliminates dependency on userspace supplicant for RPMB access - Enables early boot secure storage access (e.g., fTPM, secure UEFI variabl= es) - Provides kernel-level RPMB access as soon as UFS driver is initialized - Removes complex initramfs dependencies and boot ordering requirements - Ensures reliable and deterministic secure storage operations - Supports both built-in and modular fTPM configurations This enables secure RPMB operations on UFS devices through OP-TEE, providing the same functionality available for eMMC devices and extending kernel-based secure storage support to UFS-based systems. Co-developed-by: Can Guo Signed-off-by: Can Guo Signed-off-by: Bean Huo --- drivers/misc/Kconfig | 2 +- drivers/ufs/core/Makefile | 1 + drivers/ufs/core/ufs-rpmb.c | 259 +++++++++++++++++++++++++++++++++ drivers/ufs/core/ufshcd-priv.h | 13 ++ drivers/ufs/core/ufshcd.c | 30 +++- include/ufs/ufs.h | 7 + include/ufs/ufshcd.h | 3 + 7 files changed, 310 insertions(+), 5 deletions(-) create mode 100644 drivers/ufs/core/ufs-rpmb.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index b9ca56930003..46ffa62eac6e 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -106,7 +106,7 @@ config PHANTOM =20 config RPMB tristate "RPMB partition interface" - depends on MMC + depends on MMC || SCSI_UFSHCD help Unified RPMB unit interface for RPMB capable devices such as eMMC and UFS. Provides interface for in-kernel security controllers to access diff --git a/drivers/ufs/core/Makefile b/drivers/ufs/core/Makefile index cf820fa09a04..51e1867e524e 100644 --- a/drivers/ufs/core/Makefile +++ b/drivers/ufs/core/Makefile @@ -2,6 +2,7 @@ =20 obj-$(CONFIG_SCSI_UFSHCD) +=3D ufshcd-core.o ufshcd-core-y +=3D ufshcd.o ufs-sysfs.o ufs-mcq.o +ufshcd-core-$(CONFIG_RPMB) +=3D ufs-rpmb.o ufshcd-core-$(CONFIG_DEBUG_FS) +=3D ufs-debugfs.o ufshcd-core-$(CONFIG_SCSI_UFS_BSG) +=3D ufs_bsg.o ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO) +=3D ufshcd-crypto.o diff --git a/drivers/ufs/core/ufs-rpmb.c b/drivers/ufs/core/ufs-rpmb.c new file mode 100644 index 000000000000..c005314f0a89 --- /dev/null +++ b/drivers/ufs/core/ufs-rpmb.c @@ -0,0 +1,259 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * UFS OP-TEE based RPMB Driver + * + * Copyright (C) 2025 Micron Technology, Inc. + * Copyright (C) 2025 Qualcomm Technologies, Inc. + * + * Authors: + * Bean Huo + * Can Guo + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "ufshcd-priv.h" + +#define UFS_RPMB_SEC_PROTOCOL 0xEC /* JEDEC UFS application */ +#define UFS_RPMB_SEC_PROTOCOL_ID 0x01 /* JEDEC UFS RPMB protocol ID, CDB b= yte3 */ + +static const struct bus_type ufs_rpmb_bus_type =3D { + .name =3D "ufs_rpmb", +}; + +/* UFS RPMB device structure */ +struct ufs_rpmb_dev { + u8 region_id; + struct device dev; + struct rpmb_dev *rdev; + struct ufs_hba *hba; + struct list_head node; +}; + +static int ufs_sec_submit(struct ufs_hba *hba, u16 spsp, void *buffer, siz= e_t len, bool send) +{ + struct scsi_device *sdev =3D hba->ufs_rpmb_wlun; + u8 cdb[12] =3D { }; + int ret; + + cdb[0] =3D send ? SECURITY_PROTOCOL_OUT : SECURITY_PROTOCOL_IN; + cdb[1] =3D UFS_RPMB_SEC_PROTOCOL; + put_unaligned_be16(spsp, &cdb[2]); + put_unaligned_be32(len, &cdb[6]); + + ret =3D scsi_execute_cmd(sdev, cdb, send ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, + buffer, len, /*timeout=3D*/30 * HZ, 0, NULL); + return ret <=3D 0 ? ret : -EIO; +} + +/* UFS RPMB route frames implementation */ +static int ufs_rpmb_route_frames(struct device *dev, u8 *req, + unsigned int req_len, u8 *resp, unsigned int resp_len) +{ + struct ufs_rpmb_dev *ufs_rpmb =3D dev_get_drvdata(dev); + struct rpmb_frame *frm_out =3D (struct rpmb_frame *)req; + struct ufs_hba *hba =3D ufs_rpmb->hba; + bool need_result_read =3D true; + u16 req_type, protocol_id; + int ret; + + if (!req || !req_len || !resp || !resp_len) + return -EINVAL; + + req_type =3D be16_to_cpu(frm_out->req_resp); + switch (req_type) { + case RPMB_PROGRAM_KEY: + if (req_len !=3D sizeof(struct rpmb_frame) || + resp_len !=3D sizeof(struct rpmb_frame)) + return -EINVAL; + break; + case RPMB_GET_WRITE_COUNTER: + if (req_len !=3D sizeof(struct rpmb_frame) || + resp_len !=3D sizeof(struct rpmb_frame)) + return -EINVAL; + need_result_read =3D false; + break; + case RPMB_WRITE_DATA: + if (req_len % sizeof(struct rpmb_frame) || + resp_len !=3D sizeof(struct rpmb_frame)) + return -EINVAL; + break; + case RPMB_READ_DATA: + if (req_len !=3D sizeof(struct rpmb_frame) || + resp_len % sizeof(struct rpmb_frame)) + return -EINVAL; + need_result_read =3D false; + break; + default: + return -EINVAL; + } + + protocol_id =3D ufs_rpmb->region_id << 8 | UFS_RPMB_SEC_PROTOCOL_ID; + ret =3D ufs_sec_submit(hba, protocol_id, req, req_len, true); + if (ret) + return ret; + + if (need_result_read) { + struct rpmb_frame *frm_resp =3D (struct rpmb_frame *)resp; + memset(frm_resp, 0, sizeof(*frm_resp)); + frm_resp->req_resp =3D cpu_to_be16(RPMB_RESULT_READ); + ret =3D ufs_sec_submit(hba, protocol_id, resp, resp_len, true); + } + + if (!ret) + ret =3D ufs_sec_submit(hba, protocol_id, resp, resp_len, false); + + return ret; +} + +static void ufs_rpmb_device_release(struct device *dev) +{ + struct ufs_rpmb_dev *ufs_rpmb =3D dev_get_drvdata(dev); + + if (ufs_rpmb->rdev) + rpmb_dev_unregister(ufs_rpmb->rdev); +} + +/* UFS RPMB device registration */ +int ufs_rpmb_probe(struct ufs_hba *hba) +{ + struct ufs_rpmb_dev *ufs_rpmb; + struct rpmb_dev *rdev; + u8 cid[16] =3D { }; + int region; + u8 *sn; + u32 cap; + int ret; + + if (!hba->ufs_rpmb_wlun) { + dev_info(hba->dev, "No RPMB LUN, skip RPMB registration\n"); + return -ENODEV; + } + + /* Get the UNICODE serial number data */ + sn =3D hba->dev_info.serial_number; + if (!sn) { + dev_err(hba->dev, "Serial number not available\n"); + return -EINVAL; + } + + INIT_LIST_HEAD(&hba->rpmbs); + + /* Copy serial number into device ID (max 15 chars + NUL). */ + strscpy(cid, sn, sizeof(cid)); + + struct rpmb_descr descr =3D { + .type =3D RPMB_TYPE_UFS, + .route_frames =3D ufs_rpmb_route_frames, + .dev_id_len =3D sizeof(cid), + .reliable_wr_count =3D hba->dev_info.rpmb_io_size, + }; + + for (region =3D 0; region < 4; region++) { + switch (region) { + case 0: + cap =3D hba->dev_info.rpmb_region0_size; + break; + case 1: + cap =3D hba->dev_info.rpmb_region1_size; + break; + case 2: + cap =3D hba->dev_info.rpmb_region2_size; + break; + case 3: + cap =3D hba->dev_info.rpmb_region3_size; + break; + default: + cap =3D 0; + break; + } + + if (!cap) + continue; + + ufs_rpmb =3D devm_kzalloc(hba->dev, sizeof(*ufs_rpmb), GFP_KERNEL); + if (!ufs_rpmb) { + ret =3D -ENOMEM; + goto err_out; + } + + ufs_rpmb->dev.parent =3D &hba->ufs_rpmb_wlun->sdev_gendev; + ufs_rpmb->dev.bus =3D &ufs_rpmb_bus_type; + ufs_rpmb->dev.release =3D ufs_rpmb_device_release; + dev_set_name(&ufs_rpmb->dev, "ufs_rpmb%d", region); + + /* Set driver data BEFORE device_register */ + dev_set_drvdata(&ufs_rpmb->dev, ufs_rpmb); + + ret =3D device_register(&ufs_rpmb->dev); + if (ret) { + dev_err(hba->dev, "Failed to register UFS RPMB device %d\n", region); + put_device(&ufs_rpmb->dev); + goto err_out; + } + + /* Update unique CID and capacity for this region */ + cid[sizeof(cid) - 1] =3D region; + descr.dev_id =3D (void *)cid; + descr.capacity =3D cap; + + /* Register RPMB device */ + rdev =3D rpmb_dev_register(&ufs_rpmb->dev, &descr); + if (IS_ERR(rdev)) { + dev_err(hba->dev, "Failed to register UFS RPMB device.\n"); + device_unregister(&ufs_rpmb->dev); + ret =3D PTR_ERR(rdev); + goto err_out; + } + + ufs_rpmb->rdev =3D rdev; + ufs_rpmb->region_id =3D region; + + list_add_tail(&ufs_rpmb->node, &hba->rpmbs); + + dev_info(hba->dev, "UFS RPMB region %d registered (capacity=3D%u)\n", r= egion, cap); + } + + return 0; +err_out: + struct ufs_rpmb_dev *it, *tmp; + list_for_each_entry_safe(it, tmp, &hba->rpmbs, node) { + list_del(&it->node); + device_unregister(&it->dev); + } + + return ret; +} + +/* UFS RPMB remove handler */ +void ufs_rpmb_remove(struct ufs_hba *hba) +{ + struct ufs_rpmb_dev *ufs_rpmb, *tmp; + + if (list_empty(&hba->rpmbs)) { + dev_info(hba->dev, "No UFS RPMB devices to remove\n"); + return; + } + + /* Remove all registered RPMB devices */ + list_for_each_entry_safe(ufs_rpmb, tmp, &hba->rpmbs, node) { + dev_info(hba->dev, "Removing UFS RPMB region %d\n", ufs_rpmb->region_id); + /* Remove from list first */ + list_del(&ufs_rpmb->node); + /* Unregister device */ + device_unregister(&ufs_rpmb->dev); + } + + dev_info(hba->dev, "All UFS RPMB devices unregistered\n"); +} + + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("UFS RPMB integration into the RPMB framework using SCS= I Secure In/Out"); diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h index d0a2c963a27d..523828d6b1d5 100644 --- a/drivers/ufs/core/ufshcd-priv.h +++ b/drivers/ufs/core/ufshcd-priv.h @@ -411,4 +411,17 @@ static inline u32 ufshcd_mcq_get_sq_head_slot(struct u= fs_hw_queue *q) return val / sizeof(struct utp_transfer_req_desc); } =20 +#ifdef CONFIG_RPMB +int ufs_rpmb_probe(struct ufs_hba *hba); +void ufs_rpmb_remove(struct ufs_hba *hba); +#else +static inline int ufs_rpmb_probe(struct ufs_hba *hba) +{ + return 0; +} +static inline void ufs_rpmb_remove(struct ufs_hba *hba) +{ +} +#endif + #endif /* _UFSHCD_PRIV_H_ */ diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 79c7588be28a..f5c7d4aaf21d 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -5240,10 +5240,15 @@ static void ufshcd_lu_init(struct ufs_hba *hba, str= uct scsi_device *sdev) desc_buf[UNIT_DESC_PARAM_LU_WR_PROTECT] =3D=3D UFS_LU_POWER_ON_WP) hba->dev_info.is_lu_power_on_wp =3D true; =20 - /* In case of RPMB LU, check if advanced RPMB mode is enabled */ - if (desc_buf[UNIT_DESC_PARAM_UNIT_INDEX] =3D=3D UFS_UPIU_RPMB_WLUN && - desc_buf[RPMB_UNIT_DESC_PARAM_REGION_EN] & BIT(4)) - hba->dev_info.b_advanced_rpmb_en =3D true; + /* In case of RPMB LU, check if advanced RPMB mode is enabled, and get re= gion size */ + if (desc_buf[UNIT_DESC_PARAM_UNIT_INDEX] =3D=3D UFS_UPIU_RPMB_WLUN) { + if (desc_buf[RPMB_UNIT_DESC_PARAM_REGION_EN] & BIT(4)) + hba->dev_info.b_advanced_rpmb_en =3D true; + hba->dev_info.rpmb_region0_size =3D desc_buf[RPMB_UNIT_DESC_PARAM_REGION= 0_SIZE]; + hba->dev_info.rpmb_region1_size =3D desc_buf[RPMB_UNIT_DESC_PARAM_REGION= 1_SIZE]; + hba->dev_info.rpmb_region2_size =3D desc_buf[RPMB_UNIT_DESC_PARAM_REGION= 2_SIZE]; + hba->dev_info.rpmb_region3_size =3D desc_buf[RPMB_UNIT_DESC_PARAM_REGION= 3_SIZE]; + } =20 =20 kfree(desc_buf); @@ -8151,8 +8156,11 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_RPMB_WLUN), NULL); if (IS_ERR(sdev_rpmb)) { ret =3D PTR_ERR(sdev_rpmb); + hba->ufs_rpmb_wlun =3D NULL; + dev_err(hba->dev, "%s: RPMB WLUN not found\n", __func__); goto remove_ufs_device_wlun; } + hba->ufs_rpmb_wlun =3D sdev_rpmb; ufshcd_blk_pm_runtime_init(sdev_rpmb); scsi_device_put(sdev_rpmb); =20 @@ -8425,6 +8433,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba) int err; u8 model_index; u8 *desc_buf; + u8 serial_index; struct ufs_dev_info *dev_info =3D &hba->dev_info; =20 desc_buf =3D kzalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL); @@ -8460,6 +8469,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba) UFS_DEV_HID_SUPPORT; =20 model_index =3D desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME]; + serial_index =3D desc_buf[DEVICE_DESC_PARAM_SN]; =20 err =3D ufshcd_read_string_desc(hba, model_index, &dev_info->model, SD_ASCII_STD); @@ -8469,6 +8479,12 @@ static int ufs_get_device_desc(struct ufs_hba *hba) goto out; } =20 + err =3D ufshcd_read_string_desc(hba, serial_index, &dev_info->serial_numb= er, SD_RAW); + if (err < 0) { + dev_err(hba->dev, "%s: Failed reading Serial Number. err =3D %d\n", __fu= nc__, err); + goto out; + } + hba->luns_avail =3D desc_buf[DEVICE_DESC_PARAM_NUM_LU] + desc_buf[DEVICE_DESC_PARAM_NUM_WLU]; =20 @@ -8504,6 +8520,8 @@ static void ufs_put_device_desc(struct ufs_hba *hba) =20 kfree(dev_info->model); dev_info->model =3D NULL; + kfree(dev_info->serial_number); + dev_info->serial_number =3D NULL; } =20 /** @@ -8647,6 +8665,8 @@ static int ufshcd_device_geo_params_init(struct ufs_h= ba *hba) else if (desc_buf[GEOMETRY_DESC_PARAM_MAX_NUM_LUN] =3D=3D 0) hba->dev_info.max_lu_supported =3D 8; =20 + hba->dev_info.rpmb_io_size =3D desc_buf[GEOMETRY_DESC_PARAM_RPMB_RW_SIZE]; + out: kfree(desc_buf); return err; @@ -8832,6 +8852,7 @@ static int ufshcd_add_lus(struct ufs_hba *hba) =20 ufs_bsg_probe(hba); scsi_scan_host(hba->host); + ufs_rpmb_probe(hba); =20 out: return ret; @@ -10391,6 +10412,7 @@ void ufshcd_remove(struct ufs_hba *hba) ufshcd_rpm_get_sync(hba); ufs_hwmon_remove(hba); ufs_bsg_remove(hba); + ufs_rpmb_remove(hba); ufs_sysfs_remove_nodes(hba->dev); cancel_delayed_work_sync(&hba->ufs_rtc_update_work); blk_mq_destroy_queue(hba->tmf_queue); diff --git a/include/ufs/ufs.h b/include/ufs/ufs.h index 72fd385037a6..a74d23412b51 100644 --- a/include/ufs/ufs.h +++ b/include/ufs/ufs.h @@ -651,6 +651,13 @@ struct ufs_dev_info { u8 rtt_cap; /* bDeviceRTTCap */ =20 bool hid_sup; + + u8 *serial_number; + u8 rpmb_io_size; + u8 rpmb_region0_size; + u8 rpmb_region1_size; + u8 rpmb_region2_size; + u8 rpmb_region3_size; }; =20 /* diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 1d3943777584..17e97a45ef71 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -984,6 +984,7 @@ struct ufs_hba { struct Scsi_Host *host; struct device *dev; struct scsi_device *ufs_device_wlun; + struct scsi_device *ufs_rpmb_wlun; =20 #ifdef CONFIG_SCSI_UFS_HWMON struct device *hwmon_device; @@ -1140,6 +1141,8 @@ struct ufs_hba { int critical_health_count; atomic_t dev_lvl_exception_count; u64 dev_lvl_exception_id; + + struct list_head rpmbs; }; =20 /** --=20 2.34.1