shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: mtk-sd: Fix error handle of probe function

Browse Source 
commit 291220451c775a054cedc4fab4578a1419eb6256 upstream.

In the probe function, it goes to 'release_mem' label and returns after
some procedure failure. But if the clocks (partial or all) have been
enabled previously, they would not be disabled in msdc_runtime_suspend,
since runtime PM is not yet enabled for this case.

That cause mmc related clocks always on during system suspend and block
suspend flow. Below log is from a SDCard issue of MT8196 chromebook, it
returns -ETIMEOUT while polling clock stable in the msdc_ungate_clock()
and probe failed, but the enabled clocks could not be disabled anyway.

[  129.059253] clk_chk_dev_pm_suspend()
[  129.350119] suspend warning: msdcpll is on
[  129.354494] [ck_msdc30_1_sel : enabled, 1, 1, 191999939,   ck_msdcpll_d2]
[  129.362787] [ck_msdcpll_d2   : enabled, 1, 1, 191999939,         msdcpll]
[  129.371041] [ck_msdc30_1_ck  : enabled, 1, 1, 191999939, ck_msdc30_1_sel]
[  129.379295] [msdcpll         : enabled, 1, 1, 383999878,          clk26m]

Add a new 'release_clk' label and reorder the error handle functions to
make sure the clocks be disabled after probe failure.

Fixes: ffaea6ebfe ("mmc: mtk-sd: Use readl_poll_timeout instead of open-coded polling")
Fixes: 7a2fa8eed936 ("mmc: mtk-sd: use devm_mmc_alloc_host")
Signed-off-by: Andy-ld Lu <andy-ld.lu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Cc: stable@vger.kernel.org
Message-ID: <20241107121215.5201-1-andy-ld.lu@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy-ld Lu
2024-11-07 20:11:21 +08:00
committed by Greg Kroah-Hartman
parent ca5c9cb647
commit 40aed32594
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/mtk-sd.c
View File

@@ -2755,7 +2755,7 @@ static int msdc_drv_probe(struct platform_device *pdev)
ret = msdc_ungate_clock(host); ret = msdc_ungate_clock(host);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Cannot ungate clocks!\n"); dev_err(&pdev->dev, "Cannot ungate clocks!\n");
goto release_mem; goto release_clk;
} }
msdc_init_hw(host); msdc_init_hw(host);
@@ -2765,14 +2765,14 @@ static int msdc_drv_probe(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
if (!host->cq_host) { if (!host->cq_host) {
ret = -ENOMEM; ret = -ENOMEM;
goto host_free; goto release;
} }
host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128; host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128;
host->cq_host->mmio = host->base + 0x800; host->cq_host->mmio = host->base + 0x800;
host->cq_host->ops = &msdc_cmdq_ops; host->cq_host->ops = &msdc_cmdq_ops;
ret = cqhci_init(host->cq_host, mmc, true); ret = cqhci_init(host->cq_host, mmc, true);
if (ret) if (ret)
goto host_free; goto release;
mmc->max_segs = 128; mmc->max_segs = 128;
/* cqhci 16bit length */ /* cqhci 16bit length */
/* 0 size, means 65536 so we don't have to -1 here */ /* 0 size, means 65536 so we don't have to -1 here */
@@ -2797,9 +2797,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
end: end:
pm_runtime_disable(host->dev); pm_runtime_disable(host->dev);
release: release:
platform_set_drvdata(pdev, NULL);
msdc_deinit_hw(host); msdc_deinit_hw(host);
release_clk:
msdc_gate_clock(host); msdc_gate_clock(host);
platform_set_drvdata(pdev, NULL);
release_mem: release_mem:
if (host->dma.gpd) if (host->dma.gpd)
dma_free_coherent(&pdev->dev, dma_free_coherent(&pdev->dev,