[PATCH v6 12/17] ufs: core: add support for wrapped keys to UFS core

[Bartosz Golaszewski]

From: Gaurav Kashyap <quic_gaurk...@quicinc.com>

Add a new UFS capability flag indicating that the controller supports HW
wrapped keys and use it to determine which mechanism to use in UFS core.

Tested-by: Neil Armstrong <neil.armstr...@linaro.org>
Signed-off-by: Gaurav Kashyap <quic_gaurk...@quicinc.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszew...@linaro.org>
---
 drivers/ufs/core/ufshcd-crypto.c | 24 ++++++++++++++++--------
 include/ufs/ufshcd.h             |  5 +++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/drivers/ufs/core/ufshcd-crypto.c b/drivers/ufs/core/ufshcd-crypto.c
index 33083e0cad6e..64389e876910 100644
--- a/drivers/ufs/core/ufshcd-crypto.c
+++ b/drivers/ufs/core/ufshcd-crypto.c
@@ -81,13 +81,15 @@ static int ufshcd_crypto_keyslot_program(struct 
blk_crypto_profile *profile,
        cfg.crypto_cap_idx = cap_idx;
        cfg.config_enable = UFS_CRYPTO_CONFIGURATION_ENABLE;
 
-       if (ccap_array[cap_idx].algorithm_id == UFS_CRYPTO_ALG_AES_XTS) {
-               /* In XTS mode, the blk_crypto_key's size is already doubled */
-               memcpy(cfg.crypto_key, key->raw, key->size/2);
-               memcpy(cfg.crypto_key + UFS_CRYPTO_KEY_MAX_SIZE/2,
-                      key->raw + key->size/2, key->size/2);
-       } else {
-               memcpy(cfg.crypto_key, key->raw, key->size);
+       if (key->crypto_cfg.key_type != BLK_CRYPTO_KEY_TYPE_HW_WRAPPED) {
+               if (ccap_array[cap_idx].algorithm_id == UFS_CRYPTO_ALG_AES_XTS) 
{
+                       /* In XTS mode, the blk_crypto_key's size is already 
doubled */
+                       memcpy(cfg.crypto_key, key->raw, key->size / 2);
+                       memcpy(cfg.crypto_key + UFS_CRYPTO_KEY_MAX_SIZE / 2,
+                              key->raw + key->size / 2, key->size / 2);
+               } else {
+                       memcpy(cfg.crypto_key, key->raw, key->size);
+               }
        }
 
        err = ufshcd_program_key(hba, key, &cfg, slot);
@@ -196,7 +198,13 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba 
*hba)
        hba->crypto_profile.ll_ops = ufshcd_crypto_ops;
        /* UFS only supports 8 bytes for any DUN */
        hba->crypto_profile.max_dun_bytes_supported = 8;
-       hba->crypto_profile.key_types_supported = BLK_CRYPTO_KEY_TYPE_STANDARD;
+       if (hba->caps & UFSHCD_CAP_WRAPPED_CRYPTO_KEYS)
+               hba->crypto_profile.key_types_supported =
+                               BLK_CRYPTO_KEY_TYPE_HW_WRAPPED;
+       else
+               hba->crypto_profile.key_types_supported =
+                               BLK_CRYPTO_KEY_TYPE_STANDARD;
+
        hba->crypto_profile.dev = hba->dev;
 
        /*
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 0beb010bb8da..a2dad4f982c2 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -763,6 +763,11 @@ enum ufshcd_caps {
         * WriteBooster when scaling the clock down.
         */
        UFSHCD_CAP_WB_WITH_CLK_SCALING                  = 1 << 12,
+
+       /*
+        * UFS controller supports HW wrapped keys when using inline encryption.
+        */
+       UFSHCD_CAP_WRAPPED_CRYPTO_KEYS                  = 1 << 13,
 };
 
 struct ufs_hba_variant_params {

-- 
2.43.0