From ac296de933af330c845b8e53d00e7f2094a548db Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 19 Jul 2024 19:04:59 +0000 Subject: [PATCH] Revert "ANDROID: scsi: ufs: add UFSHCD_ANDROID_QUIRK_BROKEN_CRYPTO_ENABLE" This reverts the changes from ANDROID-scsi-ufs-add-UFSHCD_ANDROID_QUIRK_BROKEN_CRYPTO_ENABLE.patch. Equivalent functionality was upstreamed in v6.11. Bug: 162257402 Change-Id: I56c174210ba9d16b460529fa81dc2c5a4fa8766d Signed-off-by: Eric Biggers --- drivers/ufs/core/ufshcd-crypto.c | 4 ---- include/ufs/ufshcd.h | 9 --------- 2 files changed, 13 deletions(-) diff --git a/drivers/ufs/core/ufshcd-crypto.c b/drivers/ufs/core/ufshcd-crypto.c index eaff45e64c63..14d06c381d3b 100644 --- a/drivers/ufs/core/ufshcd-crypto.c +++ b/drivers/ufs/core/ufshcd-crypto.c @@ -123,10 +123,6 @@ bool ufshcd_crypto_enable(struct ufs_hba *hba) /* Reset might clear all keys, so reprogram all the keys. */ blk_crypto_reprogram_all_keys(&hba->crypto_profile); - - if (hba->android_quirks & UFSHCD_ANDROID_QUIRK_BROKEN_CRYPTO_ENABLE) - return false; - return true; } diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 75a18674f051..6021f2cf5c25 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -657,15 +657,6 @@ enum ufshcd_android_quirks { * ufs_hba_variant_ops::init() must do it instead. */ UFSHCD_ANDROID_QUIRK_CUSTOM_CRYPTO_PROFILE = 1 << 0, - - /* - * IMPORTANT: set this in hba->android_quirks, not hba->quirks! - * - * This quirk needs to be enabled if the host controller supports inline - * encryption, but the CRYPTO_GENERAL_ENABLE bit is not implemented and - * breaks the HCE sequence if used. - */ - UFSHCD_ANDROID_QUIRK_BROKEN_CRYPTO_ENABLE = 1 << 1, }; enum ufshcd_caps {