We must enable clock before cqhci init, because crypto needs read information from CQHCI registers, otherwise, it will hang in MediaTek mmc host controller.
Signed-off-by: Wenbin Mei wenbin.mei@mediatek.com Fixes: 88bd652b3c74 ("mmc: mediatek: command queue support") Cc: stable@vger.kernel.org --- drivers/mmc/host/mtk-sd.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index b124cfee05a1..943940b44e83 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2656,6 +2656,25 @@ static int msdc_drv_probe(struct platform_device *pdev) host->dma_mask = DMA_BIT_MASK(32); mmc_dev(mmc)->dma_mask = &host->dma_mask;
+ host->timeout_clks = 3 * 1048576; + host->dma.gpd = dma_alloc_coherent(&pdev->dev, + 2 * sizeof(struct mt_gpdma_desc), + &host->dma.gpd_addr, GFP_KERNEL); + host->dma.bd = dma_alloc_coherent(&pdev->dev, + MAX_BD_NUM * sizeof(struct mt_bdma_desc), + &host->dma.bd_addr, GFP_KERNEL); + if (!host->dma.gpd || !host->dma.bd) { + ret = -ENOMEM; + goto release_mem; + } + msdc_init_gpd_bd(host, &host->dma); + INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); + spin_lock_init(&host->lock); + + platform_set_drvdata(pdev, mmc); + msdc_ungate_clock(host); + msdc_init_hw(host); + if (mmc->caps2 & MMC_CAP2_CQE) { host->cq_host = devm_kzalloc(mmc->parent, sizeof(*host->cq_host), @@ -2676,25 +2695,6 @@ static int msdc_drv_probe(struct platform_device *pdev) mmc->max_seg_size = 64 * 1024; }
- host->timeout_clks = 3 * 1048576; - host->dma.gpd = dma_alloc_coherent(&pdev->dev, - 2 * sizeof(struct mt_gpdma_desc), - &host->dma.gpd_addr, GFP_KERNEL); - host->dma.bd = dma_alloc_coherent(&pdev->dev, - MAX_BD_NUM * sizeof(struct mt_bdma_desc), - &host->dma.bd_addr, GFP_KERNEL); - if (!host->dma.gpd || !host->dma.bd) { - ret = -ENOMEM; - goto release_mem; - } - msdc_init_gpd_bd(host, &host->dma); - INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); - 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, IRQF_TRIGGER_NONE, pdev->name, host); if (ret)
On Thu, 2021-10-28 at 10:20 +0800, Wenbin Mei wrote:
We must enable clock before cqhci init, because crypto needs read information from CQHCI registers, otherwise, it will hang in MediaTek mmc host controller.
Signed-off-by: Wenbin Mei wenbin.mei@mediatek.com
Acked-by: Chaotian Jing chaotian.jing@mediatek.com
Fixes: 88bd652b3c74 ("mmc: mediatek: command queue support") Cc: stable@vger.kernel.org
drivers/mmc/host/mtk-sd.c | 38 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index b124cfee05a1..943940b44e83 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2656,6 +2656,25 @@ static int msdc_drv_probe(struct platform_device *pdev) host->dma_mask = DMA_BIT_MASK(32); mmc_dev(mmc)->dma_mask = &host->dma_mask;
- host->timeout_clks = 3 * 1048576;
- host->dma.gpd = dma_alloc_coherent(&pdev->dev,
2 * sizeof(struct mt_gpdma_desc),&host->dma.gpd_addr, GFP_KERNEL);- host->dma.bd = dma_alloc_coherent(&pdev->dev,
MAX_BD_NUM * sizeof(structmt_bdma_desc),
&host->dma.bd_addr, GFP_KERNEL);- if (!host->dma.gpd || !host->dma.bd) {
ret = -ENOMEM;goto release_mem;- }
- msdc_init_gpd_bd(host, &host->dma);
- INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout);
- spin_lock_init(&host->lock);
- platform_set_drvdata(pdev, mmc);
- msdc_ungate_clock(host);
- msdc_init_hw(host);
- if (mmc->caps2 & MMC_CAP2_CQE) { host->cq_host = devm_kzalloc(mmc->parent, sizeof(*host->cq_host),
@@ -2676,25 +2695,6 @@ static int msdc_drv_probe(struct platform_device *pdev) mmc->max_seg_size = 64 * 1024; }
- host->timeout_clks = 3 * 1048576;
- host->dma.gpd = dma_alloc_coherent(&pdev->dev,
2 * sizeof(struct mt_gpdma_desc),&host->dma.gpd_addr, GFP_KERNEL);- host->dma.bd = dma_alloc_coherent(&pdev->dev,
MAX_BD_NUM * sizeof(structmt_bdma_desc),
&host->dma.bd_addr, GFP_KERNEL);- if (!host->dma.gpd || !host->dma.bd) {
ret = -ENOMEM;goto release_mem;- }
- msdc_init_gpd_bd(host, &host->dma);
- INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout);
- 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, IRQF_TRIGGER_NONE, pdev->name, host); if (ret)
On Thu, 28 Oct 2021 at 04:20, Wenbin Mei wenbin.mei@mediatek.com wrote:
We must enable clock before cqhci init, because crypto needs read information from CQHCI registers, otherwise, it will hang in MediaTek mmc host controller.
Signed-off-by: Wenbin Mei wenbin.mei@mediatek.com Fixes: 88bd652b3c74 ("mmc: mediatek: command queue support") Cc: stable@vger.kernel.org
Applied for fixes, thanks!
Kind regards Uffe
drivers/mmc/host/mtk-sd.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index b124cfee05a1..943940b44e83 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2656,6 +2656,25 @@ static int msdc_drv_probe(struct platform_device *pdev) host->dma_mask = DMA_BIT_MASK(32); mmc_dev(mmc)->dma_mask = &host->dma_mask;
host->timeout_clks = 3 * 1048576;host->dma.gpd = dma_alloc_coherent(&pdev->dev,2 * sizeof(struct mt_gpdma_desc),&host->dma.gpd_addr, GFP_KERNEL);host->dma.bd = dma_alloc_coherent(&pdev->dev,MAX_BD_NUM * sizeof(struct mt_bdma_desc),&host->dma.bd_addr, GFP_KERNEL);if (!host->dma.gpd || !host->dma.bd) {ret = -ENOMEM;goto release_mem;}msdc_init_gpd_bd(host, &host->dma);INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout);spin_lock_init(&host->lock);platform_set_drvdata(pdev, mmc);msdc_ungate_clock(host);msdc_init_hw(host);if (mmc->caps2 & MMC_CAP2_CQE) { host->cq_host = devm_kzalloc(mmc->parent, sizeof(*host->cq_host),@@ -2676,25 +2695,6 @@ static int msdc_drv_probe(struct platform_device *pdev) mmc->max_seg_size = 64 * 1024; }
host->timeout_clks = 3 * 1048576;host->dma.gpd = dma_alloc_coherent(&pdev->dev,2 * sizeof(struct mt_gpdma_desc),&host->dma.gpd_addr, GFP_KERNEL);host->dma.bd = dma_alloc_coherent(&pdev->dev,MAX_BD_NUM * sizeof(struct mt_bdma_desc),&host->dma.bd_addr, GFP_KERNEL);if (!host->dma.gpd || !host->dma.bd) {ret = -ENOMEM;goto release_mem;}msdc_init_gpd_bd(host, &host->dma);INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout);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, IRQF_TRIGGER_NONE, pdev->name, host); if (ret)-- 2.25.1
linux-stable-mirror@lists.linaro.org
-
Chaotian Jing -
Ulf Hansson -
Wenbin Mei