Skip to content

Commit 3e5a8e8

Browse files
Shaik Sajida BhanuUlf Hansson
authored andcommitted
mmc: sdhci-msm: Reset GCC_SDCC_BCR register for SDHC
Reset GCC_SDCC_BCR register before every fresh initilazation. This will reset whole SDHC-msm controller, clears the previous power control states and avoids, software reset timeout issues as below. [ 5.458061][ T262] mmc1: Reset 0x1 never completed. [ 5.462454][ T262] mmc1: sdhci: ============ SDHCI REGISTER DUMP =========== [ 5.469065][ T262] mmc1: sdhci: Sys addr: 0x00000000 | Version: 0x00007202 [ 5.475688][ T262] mmc1: sdhci: Blk size: 0x00000000 | Blk cnt: 0x00000000 [ 5.482315][ T262] mmc1: sdhci: Argument: 0x00000000 | Trn mode: 0x00000000 [ 5.488927][ T262] mmc1: sdhci: Present: 0x01f800f0 | Host ctl: 0x00000000 [ 5.495539][ T262] mmc1: sdhci: Power: 0x00000000 | Blk gap: 0x00000000 [ 5.502162][ T262] mmc1: sdhci: Wake-up: 0x00000000 | Clock: 0x00000003 [ 5.508768][ T262] mmc1: sdhci: Timeout: 0x00000000 | Int stat: 0x00000000 [ 5.515381][ T262] mmc1: sdhci: Int enab: 0x00000000 | Sig enab: 0x00000000 [ 5.521996][ T262] mmc1: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000000 [ 5.528607][ T262] mmc1: sdhci: Caps: 0x362dc8b2 | Caps_1: 0x0000808f [ 5.535227][ T262] mmc1: sdhci: Cmd: 0x00000000 | Max curr: 0x00000000 [ 5.541841][ T262] mmc1: sdhci: Resp[0]: 0x00000000 | Resp[1]: 0x00000000 [ 5.548454][ T262] mmc1: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000000 [ 5.555079][ T262] mmc1: sdhci: Host ctl2: 0x00000000 [ 5.559651][ T262] mmc1: sdhci_msm: ----------- VENDOR REGISTER DUMP----------- [ 5.566621][ T262] mmc1: sdhci_msm: DLL sts: 0x00000000 | DLL cfg: 0x6000642c | DLL cfg2: 0x0020a000 [ 5.575465][ T262] mmc1: sdhci_msm: DLL cfg3: 0x00000000 | DLL usr ctl: 0x00010800 | DDR cfg: 0x80040873 [ 5.584658][ T262] mmc1: sdhci_msm: Vndr func: 0x00018a9c | Vndr func2 : 0xf88218a8 Vndr func3: 0x02626040 Fixes: 0eb0d9f ("mmc: sdhci-msm: Initial support for Qualcomm chipsets") Signed-off-by: Shaik Sajida Bhanu <quic_c_sbhanu@quicinc.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Konrad Dybcio <konrad.dybcio@somainline.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/1650816153-23797-1-git-send-email-quic_c_sbhanu@quicinc.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent e9f3fb5 commit 3e5a8e8

1 file changed

Lines changed: 42 additions & 0 deletions

File tree

drivers/mmc/host/sdhci-msm.c

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/regulator/consumer.h>
1818
#include <linux/interconnect.h>
1919
#include <linux/pinctrl/consumer.h>
20+
#include <linux/reset.h>
2021

2122
#include "sdhci-pltfm.h"
2223
#include "cqhci.h"
@@ -2482,6 +2483,43 @@ static inline void sdhci_msm_get_of_property(struct platform_device *pdev,
24822483
of_property_read_u32(node, "qcom,dll-config", &msm_host->dll_config);
24832484
}
24842485

2486+
static int sdhci_msm_gcc_reset(struct device *dev, struct sdhci_host *host)
2487+
{
2488+
struct reset_control *reset;
2489+
int ret = 0;
2490+
2491+
reset = reset_control_get_optional_exclusive(dev, NULL);
2492+
if (IS_ERR(reset))
2493+
return dev_err_probe(dev, PTR_ERR(reset),
2494+
"unable to acquire core_reset\n");
2495+
2496+
if (!reset)
2497+
return ret;
2498+
2499+
ret = reset_control_assert(reset);
2500+
if (ret) {
2501+
reset_control_put(reset);
2502+
return dev_err_probe(dev, ret, "core_reset assert failed\n");
2503+
}
2504+
2505+
/*
2506+
* The hardware requirement for delay between assert/deassert
2507+
* is at least 3-4 sleep clock (32.7KHz) cycles, which comes to
2508+
* ~125us (4/32768). To be on the safe side add 200us delay.
2509+
*/
2510+
usleep_range(200, 210);
2511+
2512+
ret = reset_control_deassert(reset);
2513+
if (ret) {
2514+
reset_control_put(reset);
2515+
return dev_err_probe(dev, ret, "core_reset deassert failed\n");
2516+
}
2517+
2518+
usleep_range(200, 210);
2519+
reset_control_put(reset);
2520+
2521+
return ret;
2522+
}
24852523

24862524
static int sdhci_msm_probe(struct platform_device *pdev)
24872525
{
@@ -2529,6 +2567,10 @@ static int sdhci_msm_probe(struct platform_device *pdev)
25292567

25302568
msm_host->saved_tuning_phase = INVALID_TUNING_PHASE;
25312569

2570+
ret = sdhci_msm_gcc_reset(&pdev->dev, host);
2571+
if (ret)
2572+
goto pltfm_free;
2573+
25322574
/* Setup SDCC bus voter clock. */
25332575
msm_host->bus_clk = devm_clk_get(&pdev->dev, "bus");
25342576
if (!IS_ERR(msm_host->bus_clk)) {

0 commit comments

Comments
 (0)