mmc: sdhci-msm: dump cmdq debug ram only for command queue host
Currently we are printing the cmdq debug ram contents during the
error handling but this code path shouldn't be executed for non cmdq
hosts.
Change-Id: Ic397e4378c290b604037e69b7df58200810e981c
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
[xiaonian@codeaurora.org: fixed trivial merge conflicts]
Signed-off-by: Xiaonian Wang <xiaonian@codeaurora.org>
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 899cc22..3fa3cd3 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2951,7 +2951,8 @@
u32 debug_reg[MAX_TEST_BUS] = {0};
pr_info("----------- VENDOR REGISTER DUMP -----------\n");
- sdhci_msm_cmdq_dump_debug_ram(msm_host);
+ if (host->cq_host)
+ sdhci_msm_cmdq_dump_debug_ram(msm_host);
pr_info("Data cnt: 0x%08x | Fifo cnt: 0x%08x | Int sts: 0x%08x\n",
readl_relaxed(msm_host->core_mem + CORE_MCI_DATA_CNT),
@@ -3664,11 +3665,13 @@
struct sdhci_msm_host *msm_host = pltfm_host->priv;
host->cq_host = cmdq_pltfm_init(pdev);
- if (IS_ERR(host->cq_host))
+ if (IS_ERR(host->cq_host)) {
dev_dbg(&pdev->dev, "cmdq-pltfm init: failed: %ld\n",
PTR_ERR(host->cq_host));
- else
+ host->cq_host = NULL;
+ } else {
msm_host->mmc->caps2 |= MMC_CAP2_CMD_QUEUE;
+ }
}
#else
static void sdhci_msm_cmdq_init(struct sdhci_host *host,