tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: scsi: ufs: add UFSHCD_ANDROID_QUIRK_BROKEN_CRYPTO_ENABLE"

Browse Source 
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 <ebiggers@google.com>
This commit is contained in:
Eric Biggers
2024-07-19 19:04:59 +00:00
committed by William McVicker
parent 6dd3ea7e1f
commit ac296de933
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ufs/core/ufshcd-crypto.c
-4
View File
@@ -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;
}
include/ufs/ufshcd.h
-9
View File
@@ -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 {