Commit f2d3630f authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.13-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.14.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 6ee5233a 8d90a86e

drivers/mmc/host/sdhci-msm.c

+8 −8
Original line number Diff line number Diff line
@@ -1867,20 +1867,20 @@ static int sdhci_msm_program_key(struct cqhci_host *cq_host, 
	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);

	union cqhci_crypto_cap_entry cap;



	if (!(cfg->config_enable & CQHCI_CRYPTO_CONFIGURATION_ENABLE))

		return qcom_ice_evict_key(msm_host->ice, slot);



	/* Only AES-256-XTS has been tested so far. */

	cap = cq_host->crypto_cap_array[cfg->crypto_cap_idx];

	if (cap.algorithm_id != CQHCI_CRYPTO_ALG_AES_XTS ||

		cap.key_size != CQHCI_CRYPTO_KEY_SIZE_256)

		return -EINVAL;



	if (cfg->config_enable & CQHCI_CRYPTO_CONFIGURATION_ENABLE)

	return qcom_ice_program_key(msm_host->ice,

				    QCOM_ICE_CRYPTO_ALG_AES_XTS,

				    QCOM_ICE_CRYPTO_KEY_SIZE_256,

				    cfg->crypto_key,

				    cfg->data_unit_size, slot);

	else

		return qcom_ice_evict_key(msm_host->ice, slot);

}



#else /* CONFIG_MMC_CRYPTO */