[PATCH v6 15/17] ufs: host: add support for wrapped keys in QCom UFS
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- To: Jens Axboe <axboe@xxxxxxxxx>, Jonathan Corbet <corbet@xxxxxxx>, Alasdair Kergon <agk@xxxxxxxxxx>, Mike Snitzer <snitzer@xxxxxxxxxx>, Mikulas Patocka <mpatocka@xxxxxxxxxx>, Adrian Hunter <adrian.hunter@xxxxxxxxx>, Asutosh Das <quic_asutoshd@xxxxxxxxxxx>, Ritesh Harjani <ritesh.list@xxxxxxxxx>, Ulf Hansson <ulf.hansson@xxxxxxxxxx>, Alim Akhtar <alim.akhtar@xxxxxxxxxxx>, Avri Altman <avri.altman@xxxxxxx>, Bart Van Assche <bvanassche@xxxxxxx>, "James E.J. Bottomley" <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>, "Martin K. Petersen" <martin.petersen@xxxxxxxxxx>, Eric Biggers <ebiggers@xxxxxxxxxx>, "Theodore Y. Ts'o" <tytso@xxxxxxx>, Jaegeuk Kim <jaegeuk@xxxxxxxxxx>, Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>, Christian Brauner <brauner@xxxxxxxxxx>, Jan Kara <jack@xxxxxxx>, Bjorn Andersson <andersson@xxxxxxxxxx>, Konrad Dybcio <konradybcio@xxxxxxxxxx>, Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>, Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>, Gaurav Kashyap <quic_gaurkash@xxxxxxxxxxx>, Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Subject: [PATCH v6 15/17] ufs: host: add support for wrapped keys in QCom UFS
- From: Bartosz Golaszewski <brgl@xxxxxxxx>
- Date: Fri, 06 Sep 2024 20:07:18 +0200
- In-reply-to: <20240906-wrapped-keys-v6-0-d59e61bc0cb4@linaro.org>
- References: <20240906-wrapped-keys-v6-0-d59e61bc0cb4@linaro.org>
From: Gaurav Kashyap <quic_gaurkash@xxxxxxxxxxx>
Use the wrapped keys capability when HWKM is supported. Whether to use
HWKM or not would be decided during an ICE probe, and based on this
information, UFS can decide to use wrapped or raw keys.
Also, propagate the appropriate key size to the ICE driver when wrapped
keys are used.
Tested-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Reviewed-by: Om Prakash Singh <quic_omprsing@xxxxxxxxxxx>
Signed-off-by: Gaurav Kashyap <quic_gaurkash@xxxxxxxxxxx>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
---
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 58018fc8999d..366fd62a951f 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->capabilities |= UFSHCD_CAP_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,
--
2.43.0
[Index of Archives]
[linux Cryptography]
[Asterisk App Development]
[PJ SIP]
[Gnu Gatekeeper]
[IETF Sipping]
[Info Cyrus]
[ALSA User]
[Fedora Linux Users]
[Linux SCTP]
[DCCP]
[Gimp]
[Yosemite News]
[Deep Creek Hot Springs]
[Yosemite Campsites]
[ISDN Cause Codes]