Revert "ANDROID: scsi: ufs: allow overriding the blk_crypto_profile"
This reverts the changes from ANDROID-scsi-ufs-allow-overriding-the-blk_crypto_profile.patch. Equivalent functionality was upstreamed in v6.11. Bug: 162257402 Change-Id: I642e4c5bd01023c61f1177faaabcc57f474527f0 Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
committed by
William McVicker
parent
ac296de933
commit
d8ddb5c0c9
@@ -645,20 +645,6 @@ enum ufshcd_quirks {
|
||||
UFSHCD_QUIRK_MCQ_BROKEN_RTC = 1 << 21,
|
||||
};
|
||||
|
||||
enum ufshcd_android_quirks {
|
||||
|
||||
/*
|
||||
* IMPORTANT: set this in hba->android_quirks, not hba->quirks!
|
||||
*
|
||||
* This quirk needs to be enabled if the host controller supports inline
|
||||
* encryption, but it needs to initialize the crypto capabilities in a
|
||||
* nonstandard way and/or it needs to override blk_crypto_ll_ops. If
|
||||
* enabled, the standard code won't initialize the blk_crypto_profile;
|
||||
* ufs_hba_variant_ops::init() must do it instead.
|
||||
*/
|
||||
UFSHCD_ANDROID_QUIRK_CUSTOM_CRYPTO_PROFILE = 1 << 0,
|
||||
};
|
||||
|
||||
enum ufshcd_caps {
|
||||
/* Allow dynamic clk gating */
|
||||
UFSHCD_CAP_CLK_GATING = 1 << 0,
|
||||
@@ -987,8 +973,6 @@ struct ufs_hba {
|
||||
|
||||
unsigned int quirks; /* Deviations from standard UFSHCI spec. */
|
||||
|
||||
unsigned int android_quirks; /* for UFSHCD_ANDROID_QUIRK_* flags */
|
||||
|
||||
/* Device deviations from standard UFS device spec. */
|
||||
unsigned int dev_quirks;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user