@@ -470,6 +470,7 @@ static void dw_mci_dmac_complete_dma(void *arg)
{
struct dw_mci *host = arg;
struct mmc_data *data = host->data;
+ const struct dw_mci_drv_data *drv_data = host->drv_data;
dev_vdbg(host->dev, "DMA complete\n");
@@ -481,6 +482,9 @@ static void dw_mci_dmac_complete_dma(void *arg)
data->sg_len,
DMA_FROM_DEVICE);
+ if (drv_data && drv_data->crypto_engine_clear)
+ drv_data->crypto_engine_clear(host, host->sg_cpu, false);
+
host->dma_ops->cleanup(host);
/*
@@ -577,8 +581,10 @@ static inline int dw_mci_prepare_desc64(struct dw_mci
*host,
{
unsigned int desc_len;
struct idmac_desc_64addr *desc_first, *desc_last, *desc;
+ int i, ret;
+ const struct dw_mci_drv_data *drv_data = host->drv_data;
+ int sector_offset = 0;
u32 val;
- int i;
desc_first = desc_last = desc = host->sg_cpu;
@@ -618,6 +624,20 @@ static inline int dw_mci_prepare_desc64(struct dw_mci
*host,
desc->des4 = mem_addr & 0xffffffff;
desc->des5 = mem_addr >> 32;
+ if (drv_data && drv_data->crypto_engine_cfg) {
+ ret = drv_data->crypto_engine_cfg(host,
desc,
+ data, sg_page(&data->sg[i]),
i,
+ sector_offset, false);
+ if (ret) {
+ dev_err(host->dev,
+ "%s: fail to set
crypto(%d)\n",
+ __func__, ret);
+ return -EPERM;
+ }
+ /* mmc sector size */
+ sector_offset += desc_len / 512;
+ }
+
/* Update physical address for the next desc */
mem_addr += desc_len;
@@ -563,5 +563,11 @@ struct dw_mci_drv_data {
struct mmc_ios *ios);
int (*switch_voltage)(struct mmc_host *mmc,
struct mmc_ios *ios);
+ int (*crypto_engine_cfg)(struct dw_mci *host, void
*desc,
+ struct mmc_data *data, struct page *page,
+ int page_offset, int sector_offset,
+ bool cmdq_enabled);
+ int (*crypto_engine_clear)(struct dw_mci *host,
+ void *desc, bool cmdq_enabled);
};
This patch supports the crypto operation in mmc driver. Two vops are added to dw_mci_drv_data for it. The crypto_engine_cfg() is required to set crypto information such as key and algorithm modes before I/O. The crypto_engine_clear() is required to clear the crypto information set in the H/W after I/O. Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Boojin Kim <boojin.kim@samsung.com> --- drivers/mmc/host/dw_mmc.c | 22 +++++++++++++++++++++- drivers/mmc/host/dw_mmc.h | 6 ++++++ 2 files changed, 27 insertions(+), 1 deletion(-) #endif /* _DW_MMC_H_ */