mmc: mediatek: add Inline Crypto Engine support
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 73 lines · Peng Zhou
- add crypto clock control and ungate it before CQHCI init
- setMMC_CAP2_CRYPTOproperty of eMMCSigned-off-by Peng Zhou <[email protected]>--- drivers/mmc/host/mtk-sd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/mmc/host/mtk-sd.c +15
-2@@ -442,6 +442,7 @@ struct msdc_host {struct clk *src_clk_cg;/* msdc source clock control gate */ struct clk *sys_clk_cg;/* msdc subsys clock control gate */ struct clk_bulk_data bulk_clks[MSDC_NR_CLOCKS ]; +struct clk *crypto_clk;/* msdc crypto clock */ u32 mclk;/* mmc subsystem clock frequency */ u32 src_clk_freq;/* source clock frequency */ unsigned char timing;@@ -802,6 +803,7 @@ static void msdc_set_busy_timeout(struct msdc_host *host, u64 ns, u64 clks)static void msdc_gate_clock (struct msdc_host *host) { +clk_disable_unprepare (host->crypto_clk);clk_bulk_disable_unprepare (MSDC_NR_CLOCKS , host->bulk_clks);clk_disable_unprepare (host->src_clk_cg);clk_disable_unprepare (host->src_clk);@@ -822,7 +824,7 @@ static void msdc_ungate_clock(struct msdc_host *host)dev_err (host->dev,"Cannot enable pclk/axi/ahb clock gates\n" );return ; } - +clk_prepare_enable (host->crypto_clk);while (!(readl (host->base +MSDC_CFG ) &MSDC_CFG_CKSTB ))cpu_relax (); }@@ -2510,6 +2512,16 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; } +/* only eMMC has crypto property */ +if ((mmc->caps2 &MMC_CAP2_NO_SD ) && + (mmc->caps2 &MMC_CAP2_NO_SDIO )) { + host->crypto_clk =devm_clk_get (&pdev->dev,"crypto" ); +if (IS_ERR (host->crypto_clk)) + host->crypto_clk =NULL ; +else + mmc->caps2 |=MMC_CAP2_CRYPTO ; + } + host->irq =platform_get_irq (pdev,0 );if (host->irq <0 ) { ret = -EINVAL ;@@ -2580,6 +2592,8 @@ static int msdc_drv_probe(struct platform_device *pdev) host->dma_mask =DMA_BIT_MASK (32 );mmc_dev (mmc)->dma_mask = &host->dma_mask; +/* here ungate due to cqhci init will access registers */ +msdc_ungate_clock (host);if (mmc->caps2 &MMC_CAP2_CQE ) { host->cq_host = devm_kzalloc(mmc->parent, sizeof(*host->cq_host),@@ -2616,7 +2630,6 @@ static int msdc_drv_probe(struct platform_device *pdev)spin_lock_init (&host->lock);platform_set_drvdata (pdev, mmc); -msdc_ungate_clock (host);msdc_init_hw (host); ret = devm_request_irq(&pdev->dev, host->irq, msdc_irq,Signature · 1 line
2.18.0
Somehow I can't apply this patch using git am. It looks like the mail isn't completely plain text (there's some html it seems), which may be why git am is complaining.
Quoted 72 lines · Satya Tangirala
Quoted 70 lines · Peng Zhou
- add crypto clock control and ungate it before CQHCI init
- setMMC_CAP2_CRYPTOproperty of eMMCSigned-off-by Peng Zhou <[email protected]>--- drivers/mmc/host/mtk-sd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/mmc/host/mtk-sd.c +15
-2@@ -442,6 +442,7 @@ struct msdc_host {struct clk *src_clk_cg;/* msdc source clock control gate */ struct clk *sys_clk_cg;/* msdc subsys clock control gate */ struct clk_bulk_data bulk_clks[MSDC_NR_CLOCKS ]; +struct clk *crypto_clk;/* msdc crypto clock */ u32 mclk;/* mmc subsystem clock frequency */ u32 src_clk_freq;/* source clock frequency */ unsigned char timing;@@ -802,6 +803,7 @@ static void msdc_set_busy_timeout(struct msdc_host *host, u64 ns, u64 clks)static void msdc_gate_clock (struct msdc_host *host) { +clk_disable_unprepare (host->crypto_clk);clk_bulk_disable_unprepare (MSDC_NR_CLOCKS , host->bulk_clks);clk_disable_unprepare (host->src_clk_cg);clk_disable_unprepare (host->src_clk);@@ -822,7 +824,7 @@ static void msdc_ungate_clock(struct msdc_host *host)dev_err (host->dev,"Cannot enable pclk/axi/ahb clock gates\n" );return ; } - +clk_prepare_enable (host->crypto_clk);while (!(readl (host->base +MSDC_CFG ) &MSDC_CFG_CKSTB ))cpu_relax (); }@@ -2510,6 +2512,16 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; } +/* only eMMC has crypto property */ +if ((mmc->caps2 &MMC_CAP2_NO_SD ) && + (mmc->caps2 &MMC_CAP2_NO_SDIO )) { + host->crypto_clk =devm_clk_get (&pdev->dev,"crypto" ); +if (IS_ERR (host->crypto_clk)) + host->crypto_clk =NULL ; +else + mmc->caps2 |=MMC_CAP2_CRYPTO ; + } + host->irq =platform_get_irq (pdev,0 );if (host->irq <0 ) { ret = -EINVAL ;@@ -2580,6 +2592,8 @@ static int msdc_drv_probe(struct platform_device *pdev) host->dma_mask =DMA_BIT_MASK (32 );mmc_dev (mmc)->dma_mask = &host->dma_mask; +/* here ungate due to cqhci init will access registers */ +msdc_ungate_clock (host);if (mmc->caps2 &MMC_CAP2_CQE ) { host->cq_host = devm_kzalloc(mmc->parent, sizeof(*host->cq_host),@@ -2616,7 +2630,6 @@ static int msdc_drv_probe(struct platform_device *pdev)spin_lock_init (&host->lock);platform_set_drvdata (pdev, mmc); -msdc_ungate_clock (host);msdc_init_hw (host);
Quoted 6 lines
Quoted 3 lines
drivers/mmc/host/mtk-sd.c +0
-1ret = devm_request_irq(&pdev->dev, host->irq, msdc_irq, --2.18.0
Somehow I can't apply this patch using git am. It looks like the mail isn't completely plain text (there's some html it seems), which may be why git am is complaining.
I assume this is why patchwork didn't accept them. Please re-post in plain/text and use "git send-email".
Kind regards
Uffe
A message that is not in the archive (sent off-list or not yet received): 1614947486.11643.4.camel@mbjsdccf07
Quoted 7 lines · Peng.Zhou
Quoted 7 lines
Quoted 3 lines
Somehow I can't apply this patch using git am. It looks like the mail isn't completely plain text (there's some html it seems), which may be why git am is complaining.
I assume this is why patchwork didn't accept them. Please re-post in plain/text and use "git send-email".
Quoted 7 lines
Quoted 2 lines
Kind regards
UffeI'm sorry about that, but I had used "git send-email" for above, and I had used checkpatch.pl to check but I don't find anything which will result in this error, I will check it much more...
Same problem with your v2 patches. Also I only received 2 of the 4 patches, and none of them were received by the mailing list
(https://lkml.kernel.org/linux-mmc/).
Are you using something like 'git format-patch --cover-letter @~4..@' and 'git send-email *.patch --to=... --cc=...'?
Otherwise, it might be a problem with the mail server you're using.
- Eric