scsi: ufs: qcom: Fix crypto key eviction

Commit 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API")
introduced an incorrect check of the algorithm ID into the key eviction
path, and thus qcom_ice_evict_key() is no longer ever called.  Fix it.

Fixes: 56541c7c4468 ("scsi: ufs: ufs-qcom: Switch to the new ICE API")
Cc: stable@vger.kernel.org
Cc: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20241210030839.1118805-1-ebiggers@kernel.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 3b592492e15209f6ad715bed636d550a4a07de2a..65487839ed989ab6cd8382159d3726840180f358 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -155,8 +155,9 @@ static int ufs_qcom_ice_program_key(struct ufs_hba *hba,
 {
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
        union ufs_crypto_cap_entry cap;
-       bool config_enable =
-               cfg->config_enable & UFS_CRYPTO_CONFIGURATION_ENABLE;
+
+       if (!(cfg->config_enable & UFS_CRYPTO_CONFIGURATION_ENABLE))
+               return qcom_ice_evict_key(host->ice, slot);
 
        /* Only AES-256-XTS has been tested so far. */
        cap = hba->crypto_cap_array[cfg->crypto_cap_idx];
@@ -164,14 +165,11 @@ static int ufs_qcom_ice_program_key(struct ufs_hba *hba,
            cap.key_size != UFS_CRYPTO_KEY_SIZE_256)
                return -EOPNOTSUPP;
 
-       if (config_enable)
-               return qcom_ice_program_key(host->ice,
-                                           QCOM_ICE_CRYPTO_ALG_AES_XTS,
-                                           QCOM_ICE_CRYPTO_KEY_SIZE_256,
-                                           cfg->crypto_key,
-                                           cfg->data_unit_size, slot);
-       else
-               return qcom_ice_evict_key(host->ice, slot);
+       return qcom_ice_program_key(host->ice,
+                                   QCOM_ICE_CRYPTO_ALG_AES_XTS,
+                                   QCOM_ICE_CRYPTO_KEY_SIZE_256,
+                                   cfg->crypto_key,
+                                   cfg->data_unit_size, slot);
 }
 
 #else