From 14d98d667c81fe10f1aa780b67e6d40acfbf06b2 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 11 Dec 2020 10:18:05 -0800 Subject: [PATCH] ANDROID: mmc: cqhci: set blk_keyslot_manager::features This is needed due to "ANDROID: block: add hardware-wrapped key support", which isn't upstream yet. Bug: 160883801 Change-Id: I053a1de8d8c600f8eaba60cd338e07b778d017b3 Signed-off-by: Eric Biggers --- drivers/mmc/host/cqhci-crypto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/cqhci-crypto.c b/drivers/mmc/host/cqhci-crypto.c index 6419cfbb4ab7..5698bc48ac5b 100644 --- a/drivers/mmc/host/cqhci-crypto.c +++ b/drivers/mmc/host/cqhci-crypto.c @@ -209,6 +209,8 @@ int cqhci_crypto_init(struct cqhci_host *cq_host) /* Unfortunately, CQHCI crypto only supports 32 DUN bits. */ ksm->max_dun_bytes_supported = 4; + ksm->features = BLK_CRYPTO_FEATURE_STANDARD_KEYS; + /* * Cache all the crypto capabilities and advertise the supported crypto * modes and data unit sizes to the block layer.