@@ -128,6 +128,19 @@ static int cqhci_crypto_keyslot_evict(struct blk_crypto_profile *profile,
return cqhci_crypto_clear_keyslot(cq_host, slot);
}
+static int cqhci_crypto_derive_sw_secret(struct blk_crypto_profile *profile,
+ const u8 wkey[], size_t wkey_size,
+ u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE])
+{
+ struct cqhci_host *cq_host = cqhci_host_from_crypto_profile(profile);
+
+ if (cq_host->ops && cq_host->ops->derive_sw_secret)
+ return cq_host->ops->derive_sw_secret(cq_host, wkey, wkey_size,
+ sw_secret);
+
+ return -EOPNOTSUPP;
+}
+
/*
* The keyslot management operations for CQHCI crypto.
*
@@ -139,6 +152,7 @@ static int cqhci_crypto_keyslot_evict(struct blk_crypto_profile *profile,
static const struct blk_crypto_ll_ops cqhci_crypto_ops = {
.keyslot_program = cqhci_crypto_keyslot_program,
.keyslot_evict = cqhci_crypto_keyslot_evict,
+ .derive_sw_secret = cqhci_crypto_derive_sw_secret,
};
static enum blk_crypto_mode_num
@@ -286,6 +286,8 @@ struct cqhci_host {
#endif
};
+/* @derive_sw_secret: derive sw secret from a wrapped key
+ */
struct cqhci_host_ops {
void (*dumpregs)(struct mmc_host *mmc);
void (*write_l)(struct cqhci_host *host, u32 val, int reg);
@@ -300,6 +302,9 @@ struct cqhci_host_ops {
int (*program_key)(struct cqhci_host *cq_host,
const struct blk_crypto_key *bkey,
const union cqhci_crypto_cfg_entry *cfg, int slot);
+ int (*derive_sw_secret)(struct cqhci_host *cq_host, const u8 wkey[],
+ unsigned int wkey_size,
+ u8 sw_secret[BLK_CRYPTO_SW_SECRET_SIZE]);
#endif
void (*set_tran_desc)(struct cqhci_host *cq_host, u8 **desc,
dma_addr_t addr, int len, bool end, bool dma64);
Block crypto allows storage controllers like MMC to register an op derive a software secret from wrapped keys added to the kernel. Wrapped keys in most cases will have vendor specific implementations, which means this op would need to have a corresponding MMC variant op. This change adds hooks in MMC to support this variant ops and tie them to the blk crypto op. Signed-off-by: Seshu Madhavi Puppala <quic_spuppala@quicinc.com> --- drivers/mmc/host/cqhci-crypto.c | 14 ++++++++++++++ drivers/mmc/host/cqhci.h | 5 +++++ 2 files changed, 19 insertions(+)