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_KEYS_IN_PRDT"

Browse Source 
This reverts the changes from
ANDROID-scsi-ufs-add-UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT.patch.

Equivalent functionality was upstreamed in v6.11.

Bug: 162257402
Change-Id: Ic513e80492333a69c38ee3906aee2bfcb0dd89b7
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers
2024-07-19 19:04:57 +00:00
committed by William McVicker
parent cf4978e5d2
commit 6dd3ea7e1f
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ufs/core/ufshcd-crypto.h
-16
View File
@@ -37,19 +37,6 @@ ufshcd_prepare_req_desc_hdr_crypto(struct ufshcd_lrb *lrbp,
h->dunu = cpu_to_le32(upper_32_bits(lrbp->data_unit_num));
}
static inline void ufshcd_crypto_clear_prdt(struct ufs_hba *hba,
struct ufshcd_lrb *lrbp)
{
if (!(hba->android_quirks & UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT))
return;
if (!(scsi_cmd_to_rq(lrbp->cmd)->crypt_ctx))
return;
memzero_explicit(lrbp->ucd_prdt_ptr,
ufshcd_sg_entry_size(hba) * scsi_sg_count(lrbp->cmd));
}
bool ufshcd_crypto_enable(struct ufs_hba *hba);
int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba);
@@ -67,9 +54,6 @@ static inline void
ufshcd_prepare_req_desc_hdr_crypto(struct ufshcd_lrb *lrbp,
struct request_desc_header *h) { }
static inline void ufshcd_crypto_clear_prdt(struct ufs_hba *hba,
struct ufshcd_lrb *lrbp) { }
static inline bool ufshcd_crypto_enable(struct ufs_hba *hba)
{
return false;
drivers/ufs/core/ufshcd.c
-1
View File
@@ -5501,7 +5501,6 @@ void ufshcd_release_scsi_cmd(struct ufs_hba *hba,
struct scsi_cmnd *cmd = lrbp->cmd;
scsi_dma_unmap(cmd);
ufshcd_crypto_clear_prdt(hba, lrbp);
ufshcd_release(hba);
ufshcd_clk_scaling_update_busy(hba);
}
include/ufs/ufshcd.h
-9
View File
@@ -666,15 +666,6 @@ enum ufshcd_android_quirks {
* breaks the HCE sequence if used.
*/
UFSHCD_ANDROID_QUIRK_BROKEN_CRYPTO_ENABLE = 1 << 1,
/*
* IMPORTANT: set this in hba->android_quirks, not hba->quirks!
*
* This quirk needs to be enabled if the host controller requires that
* the PRDT be cleared after each encrypted request because encryption
* keys were stored in it.
*/
UFSHCD_ANDROID_QUIRK_KEYS_IN_PRDT = 1 << 2,
};
enum ufshcd_caps {