[v5,10/15] ufs: host: wrapped keys support in ufs qcom

Message ID	20240617005825.1443206-11-quic_gaurkash@quicinc.com
State	New
Headers	show Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 DA7A2441F; Mon, 17 Jun 2024 00:59:42 +0000 (UTC) From: Gaurav Kashyap <quic_gaurkash@quicinc.com> To: <linux-arm-msm@vger.kernel.org>, <linux-scsi@vger.kernel.org>, <andersson@kernel.org>, <ebiggers@google.com>, <neil.armstrong@linaro.org>, <srinivas.kandagatla@linaro.org>, <krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>, <robh+dt@kernel.org> CC: <linux-kernel@vger.kernel.org>, <linux-mmc@vger.kernel.org>, <kernel@quicinc.com>, <linux-crypto@vger.kernel.org>, <devicetree@vger.kernel.org>, <quic_omprsing@quicinc.com>, <quic_nguyenb@quicinc.com>, <bartosz.golaszewski@linaro.org>, <konrad.dybcio@linaro.org>, <ulf.hansson@linaro.org>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <mani@kernel.org>, <davem@davemloft.net>, <herbert@gondor.apana.org.au>, <psodagud@quicinc.com>, <quic_apurupa@quicinc.com>, <sonalg@quicinc.com>, Gaurav Kashyap <quic_gaurkash@quicinc.com> Subject: [PATCH v5 10/15] ufs: host: wrapped keys support in ufs qcom Date: Sun, 16 Jun 2024 17:51:05 -0700 Message-ID: <20240617005825.1443206-11-quic_gaurkash@quicinc.com> In-Reply-To: <20240617005825.1443206-1-quic_gaurkash@quicinc.com> References: <20240617005825.1443206-1-quic_gaurkash@quicinc.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain
Series	Hardware wrapped key support for qcom ice and ufs \| expand [v5,00/15] Hardware wrapped key support for qcom ice and ufs [v5,01/15] ice, ufs, mmc: use blk_crypto_key for program_key [v5,02/15] qcom_scm: scm call for deriving a software secret [v5,03/15] qcom_scm: scm call for create, prepare and import keys [v5,04/15] soc: qcom: ice: add hwkm support in ice [v5,05/15] soc: qcom: ice: support for hardware wrapped keys [v5,06/15] soc: qcom: ice: support for generate, import and prepare key [v5,07/15] ufs: core: support wrapped keys in ufs core [v5,08/15] ufs: core: add support to derive software secret [v5,09/15] ufs: core: add support for generate, import and prepare keys [v5,10/15] ufs: host: wrapped keys support in ufs qcom [v5,11/15] ufs: host: implement derive sw secret vop in ufs qcom [v5,12/15] ufs: host: support for generate, import and prepare key [v5,13/15] dt-bindings: crypto: ice: document the hwkm property [v5,14/15] arm64: dts: qcom: sm8650: add hwkm support to ufs ice [v5,15/15] arm64: dts: qcom: sm8550: add hwkm support to ufs ice

Message ID

20240617005825.1443206-11-quic_gaurkash@quicinc.com

State

New

Headers

From: Gaurav Kashyap <quic_gaurkash@quicinc.com>
To: <linux-arm-msm@vger.kernel.org>, <linux-scsi@vger.kernel.org>,
        <andersson@kernel.org>, <ebiggers@google.com>,
        <neil.armstrong@linaro.org>, <srinivas.kandagatla@linaro.org>,
        <krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>,
        <robh+dt@kernel.org>
CC: <linux-kernel@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
        <kernel@quicinc.com>, <linux-crypto@vger.kernel.org>,
        <devicetree@vger.kernel.org>, <quic_omprsing@quicinc.com>,
        <quic_nguyenb@quicinc.com>, <bartosz.golaszewski@linaro.org>,
        <konrad.dybcio@linaro.org>, <ulf.hansson@linaro.org>,
        <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <mani@kernel.org>,
        <davem@davemloft.net>, <herbert@gondor.apana.org.au>,
        <psodagud@quicinc.com>, <quic_apurupa@quicinc.com>,
        <sonalg@quicinc.com>, Gaurav Kashyap
	<quic_gaurkash@quicinc.com>
Subject: [PATCH v5 10/15] ufs: host: wrapped keys support in ufs qcom
Date: Sun, 16 Jun 2024 17:51:05 -0700
Message-ID: <20240617005825.1443206-11-quic_gaurkash@quicinc.com>
In-Reply-To: <20240617005825.1443206-1-quic_gaurkash@quicinc.com>
References: <20240617005825.1443206-1-quic_gaurkash@quicinc.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

Series

Hardware wrapped key support for qcom ice and ufs | expand

Commit Message

Gaurav Kashyap (QUIC) June 17, 2024, 12:51 a.m. UTC

Use the wrapped keys quirk when hwkm is supported/used.
Whether to use HWKM or not would be decided during an ICE
probe, and based on this information, UFS can decide to use
wrapped keys or standard keys.

Also, propagate the appropriate key size to the ICE driver
when wrapped keys are used.

Tested-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Om Prakash Singh <quic_omprsing@quicinc.com>
Signed-off-by: Gaurav Kashyap <quic_gaurkash@quicinc.com>
---
 drivers/ufs/host/ufs-qcom.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 82584bb318fb..16f846f4a0c3 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -129,6 +129,8 @@  static int ufs_qcom_ice_init(struct ufs_qcom_host *host)
 
 	host->ice = ice;
 	hba->caps |= UFSHCD_CAP_CRYPTO;
+	if (qcom_ice_hwkm_supported(host->ice))
+		hba->quirks |= UFSHCD_QUIRK_USES_WRAPPED_CRYPTO_KEYS;
 
 	return 0;
 }
@@ -166,7 +168,11 @@  static int ufs_qcom_ice_program_key(struct ufs_hba *hba,
 	    cap.key_size != UFS_CRYPTO_KEY_SIZE_256)
 		return -EOPNOTSUPP;
 
-	ice_key_size = QCOM_ICE_CRYPTO_KEY_SIZE_256;
+	if (bkey->crypto_cfg.key_type == BLK_CRYPTO_KEY_TYPE_HW_WRAPPED)
+		ice_key_size = QCOM_ICE_CRYPTO_KEY_SIZE_WRAPPED;
+	else
+		ice_key_size = QCOM_ICE_CRYPTO_KEY_SIZE_256;
+
 	if (config_enable)
 		return qcom_ice_program_key(host->ice,
 					    QCOM_ICE_CRYPTO_ALG_AES_XTS,

[v5,10/15] ufs: host: wrapped keys support in ufs qcom

Commit Message

Patch