mmc: msm_sdcc: print DML registers during SDCC errors
When SDCC driver encounters errors, it prints out the SDCC core
registers dump. But at times (say SPS BAM is stuck), SDCC core
register dump alone doesn't give much information.
So this patch also prints the DML (Data Mover Local HW which connects
SDCC controller to SPS-BAM HW) register dump if BAM is busy when
SDCC error is encountered.
Change-Id: If143e9225b40d49268600b50c83e7158f00cc79c
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index e1a6ffd..318c319 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -4082,21 +4082,22 @@
};
#endif
-void msmsdcc_print_regs(const char *name, void __iomem *base,
- unsigned int no_of_regs)
+static void msmsdcc_print_regs(const char *name, void __iomem *base,
+ u32 phys_base, unsigned int no_of_regs)
{
unsigned int i;
if (!base)
return;
- pr_info("===== %s: Register Dumps @base=0x%x =====\n",
- name, (u32)base);
+
+ pr_info("===== %s: Register Dumps @phys_base=0x%x, @virt_base=0x%x"
+ " =====\n", name, phys_base, (u32)base);
for (i = 0; i < no_of_regs; i = i + 4) {
- pr_info("Reg=0x%.2x: 0x%.8x, 0x%.8x, 0x%.8x, 0x%.8x.\n", i*4,
- (u32)readl_relaxed(base + i*4),
- (u32)readl_relaxed(base + ((i+1)*4)),
- (u32)readl_relaxed(base + ((i+2)*4)),
- (u32)readl_relaxed(base + ((i+3)*4)));
+ pr_info("Reg=0x%.2x: 0x%.8x, 0x%.8x, 0x%.8x, 0x%.8x\n", i*4,
+ (u32)readl_relaxed(base + i*4),
+ (u32)readl_relaxed(base + ((i+1)*4)),
+ (u32)readl_relaxed(base + ((i+2)*4)),
+ (u32)readl_relaxed(base + ((i+3)*4)));
}
}
@@ -4104,17 +4105,17 @@
{
/* Dump current state of SDCC clocks, power and irq */
pr_info("%s: SDCC PWR is %s\n", mmc_hostname(host->mmc),
- (host->pwr ? "ON" : "OFF"));
+ (host->pwr ? "ON" : "OFF"));
pr_info("%s: SDCC clks are %s, MCLK rate=%d\n",
- mmc_hostname(host->mmc),
- (host->clks_on ? "ON" : "OFF"),
- (u32)clk_get_rate(host->clk));
+ mmc_hostname(host->mmc), (host->clks_on ? "ON" : "OFF"),
+ (u32)clk_get_rate(host->clk));
pr_info("%s: SDCC irq is %s\n", mmc_hostname(host->mmc),
(host->sdcc_irq_disabled ? "disabled" : "enabled"));
/* Now dump SDCC registers. Don't print FIFO registers */
if (host->clks_on)
- msmsdcc_print_regs("SDCC-CORE", host->base, 28);
+ msmsdcc_print_regs("SDCC-CORE", host->base,
+ host->core_memres->start, 28);
if (host->curr.data) {
if (!msmsdcc_is_dma_possible(host, host->curr.data))
@@ -4123,22 +4124,27 @@
pr_info("%s: ADM mode: busy=%d, chnl=%d, crci=%d\n",
mmc_hostname(host->mmc), host->dma.busy,
host->dma.channel, host->dma.crci);
- else if (host->is_sps_mode)
+ else if (host->is_sps_mode) {
+ if (host->sps.busy)
+ msmsdcc_print_regs("SDCC-DML", host->dml_base,
+ host->dml_memres->start,
+ 16);
pr_info("%s: SPS mode: busy=%d\n",
mmc_hostname(host->mmc), host->sps.busy);
+ }
pr_info("%s: xfer_size=%d, data_xfered=%d, xfer_remain=%d\n",
mmc_hostname(host->mmc), host->curr.xfer_size,
host->curr.data_xfered, host->curr.xfer_remain);
- pr_info("%s: got_dataend=%d, prog_enable=%d,"
- " wait_for_auto_prog_done=%d,"
- " got_auto_prog_done=%d\n",
- mmc_hostname(host->mmc), host->curr.got_dataend,
- host->prog_enable, host->curr.wait_for_auto_prog_done,
- host->curr.got_auto_prog_done);
}
+ pr_info("%s: got_dataend=%d, prog_enable=%d,"
+ " wait_for_auto_prog_done=%d, got_auto_prog_done=%d\n",
+ mmc_hostname(host->mmc), host->curr.got_dataend,
+ host->prog_enable, host->curr.wait_for_auto_prog_done,
+ host->curr.got_auto_prog_done);
}
+
static void msmsdcc_req_tout_timer_hdlr(unsigned long data)
{
struct msmsdcc_host *host = (struct msmsdcc_host *)data;