Commit ab8a8ffd authored by Eric Biggers's avatar Eric Biggers
Browse files

ANDROID: scsi: ufs: revise and fix custom keyslot manager support



UFSHCD_QUIRK_BROKEN_CRYPTO_CAPS really means
"override the blk_keyslot_manager", which (at least for now) handles
both the crypto capabilities and the actual keyslot management.
So give it a better name: UFSHCD_QUIRK_CUSTOM_KEYSLOT_MANAGER.

Also, fix ufshcd_init_crypto() to call hba->ksm.ksm_ll_ops.keyslot_evict
instead of using the standard key eviction procedure.  This is needed
when the blk_keyslot_manager is overridden with one that has
num_slots > 0 and uses a nonstandard key eviction procedure.

This patch, ANDROID-scsi-ufs-add-UFSHCD_QUIRK_BROKEN_CRYPTO_CAPS.patch,
and ANDROID-scsi-ufs-allow-for-there-to-be-no-keyslots.patch should all
be folded into one patch.

Bug: 162257402
Bug: 166139333
Change-Id: I7081bdd111f638eb28366aacbd9f9c3a093495ee
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 9bdaa3fa
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment