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

ANDROID: scsi: ufs: add vendor hook to override key reprogramming

Browse Source 
Some hardware has a way to restore all keyslots at once that is
significantly faster than restoring each keyslot individually, as is
done by blk_ksm_reprogram_all_keys().  Add a hook
"android_rvh_ufs_reprogram_all_keys" that allows overriding the
restoration of all keyslots after UFS reset.  This may sleep, so this
must be a "restricted" Android vendor hook rather than a regular one.

Note that currently this functionality can't be upstreamed, as support
for the hardware that needs it would need to be upstreamed first.

(cherry picked from commit e2e063f5074e2e14a96875e5e5670314a41e1c34)

Bug: 160883801
Bug: 181905172
Bug: 241106918
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Kenny Root <kroot@google.com>
Change-Id: I0b25393a5131941f085892560e08a64e63cd1369
This commit is contained in:
Eric Biggers
2021-07-26 09:27:15 -07:00
committed by Konstantin Vyshetsky
parent 05c9b03f4c
commit 273b99c30a
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/android/vendor_hooks.c
+1
View File
@@ -130,6 +130,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_si_mem_available_adjust);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_si_meminfo_adjust); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_si_meminfo_adjust);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_si_meminfo_adjust_shmem); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_si_meminfo_adjust_shmem);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_fill_prdt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_fill_prdt);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_ufs_reprogram_all_keys);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_prepare_command); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_prepare_command);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_update_sysfs); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_update_sysfs);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_command); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_command);
drivers/ufs/core/ufshcd-crypto.c
+8 -1
View File
@@ -6,6 +6,9 @@
#include <ufs/ufshcd.h> #include <ufs/ufshcd.h>
#include "ufshcd-crypto.h" #include "ufshcd-crypto.h"
#undef CREATE_TRACE_POINTS
#include <trace/hooks/ufshcd.h>
/* Blk-crypto modes supported by UFS crypto */ /* Blk-crypto modes supported by UFS crypto */
static const struct ufs_crypto_alg_entry { static const struct ufs_crypto_alg_entry {
enum ufs_crypto_alg ufs_alg; enum ufs_crypto_alg ufs_alg;
@@ -116,11 +119,15 @@ static int ufshcd_crypto_keyslot_evict(struct blk_crypto_profile *profile,
*/ */
bool ufshcd_crypto_enable(struct ufs_hba *hba) bool ufshcd_crypto_enable(struct ufs_hba *hba)
{ {
int err = -EOPNOTSUPP;
if (!(hba->caps & UFSHCD_CAP_CRYPTO)) if (!(hba->caps & UFSHCD_CAP_CRYPTO))
return false; return false;
/* Reset might clear all keys, so reprogram all the keys. */ /* Reset might clear all keys, so reprogram all the keys. */
blk_crypto_reprogram_all_keys(&hba->crypto_profile); trace_android_rvh_ufs_reprogram_all_keys(hba, &err);
if (err == -EOPNOTSUPP)
blk_crypto_reprogram_all_keys(&hba->crypto_profile);
if (hba->quirks & UFSHCD_QUIRK_BROKEN_CRYPTO_ENABLE) if (hba->quirks & UFSHCD_QUIRK_BROKEN_CRYPTO_ENABLE)
return false; return false;
include/trace/hooks/ufshcd.h
+4
View File
@@ -22,6 +22,10 @@ DECLARE_HOOK(android_vh_ufs_fill_prdt,
unsigned int segments, int *err), unsigned int segments, int *err),
TP_ARGS(hba, lrbp, segments, err)); TP_ARGS(hba, lrbp, segments, err));
DECLARE_RESTRICTED_HOOK(android_rvh_ufs_reprogram_all_keys,
TP_PROTO(struct ufs_hba *hba, int *err),
TP_ARGS(hba, err), 1);
DECLARE_HOOK(android_vh_ufs_prepare_command, DECLARE_HOOK(android_vh_ufs_prepare_command,
TP_PROTO(struct ufs_hba *hba, struct request *rq, TP_PROTO(struct ufs_hba *hba, struct request *rq,
struct ufshcd_lrb *lrbp, int *err), struct ufshcd_lrb *lrbp, int *err),