Skip to content

Commit 49b14db

Browse files
Victor Shihstorulf
authored andcommitted
mmc: sdhci-uhs2: Adjust some error messages and register dump for SD UHS-II card
Adjust some error messages to debug mode and register dump to dynamic debug mode to avoid causing misunderstanding it is an error. Signed-off-by: Victor Shih <[email protected]> Acked-by: Adrian Hunter <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent 2881ba9 commit 49b14db

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/mmc/host/sdhci-uhs2.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask)
9999
/* hw clears the bit when it's done */
100100
if (read_poll_timeout_atomic(sdhci_readw, val, !(val & mask), 10,
101101
UHS2_RESET_TIMEOUT_100MS, true, host, SDHCI_UHS2_SW_RESET)) {
102-
pr_warn("%s: %s: Reset 0x%x never completed. %s: clean reset bit.\n", __func__,
103-
mmc_hostname(host->mmc), (int)mask, mmc_hostname(host->mmc));
102+
pr_debug("%s: %s: Reset 0x%x never completed. %s: clean reset bit.\n", __func__,
103+
mmc_hostname(host->mmc), (int)mask, mmc_hostname(host->mmc));
104104
sdhci_writeb(host, 0, SDHCI_UHS2_SW_RESET);
105105
return;
106106
}
@@ -335,8 +335,8 @@ static int sdhci_uhs2_interface_detect(struct sdhci_host *host)
335335
if (read_poll_timeout(sdhci_readl, val, (val & SDHCI_UHS2_IF_DETECT),
336336
100, UHS2_INTERFACE_DETECT_TIMEOUT_100MS, true,
337337
host, SDHCI_PRESENT_STATE)) {
338-
pr_warn("%s: not detect UHS2 interface in 100ms.\n", mmc_hostname(host->mmc));
339-
sdhci_dumpregs(host);
338+
pr_debug("%s: not detect UHS2 interface in 100ms.\n", mmc_hostname(host->mmc));
339+
sdhci_dbg_dumpregs(host, "UHS2 interface detect timeout in 100ms");
340340
return -EIO;
341341
}
342342

@@ -345,8 +345,8 @@ static int sdhci_uhs2_interface_detect(struct sdhci_host *host)
345345

346346
if (read_poll_timeout(sdhci_readl, val, (val & SDHCI_UHS2_LANE_SYNC),
347347
100, UHS2_LANE_SYNC_TIMEOUT_150MS, true, host, SDHCI_PRESENT_STATE)) {
348-
pr_warn("%s: UHS2 Lane sync fail in 150ms.\n", mmc_hostname(host->mmc));
349-
sdhci_dumpregs(host);
348+
pr_debug("%s: UHS2 Lane sync fail in 150ms.\n", mmc_hostname(host->mmc));
349+
sdhci_dbg_dumpregs(host, "UHS2 Lane sync fail in 150ms");
350350
return -EIO;
351351
}
352352

@@ -417,12 +417,12 @@ static int sdhci_uhs2_do_detect_init(struct mmc_host *mmc)
417417
host->ops->uhs2_pre_detect_init(host);
418418

419419
if (sdhci_uhs2_interface_detect(host)) {
420-
pr_warn("%s: cannot detect UHS2 interface.\n", mmc_hostname(host->mmc));
420+
pr_debug("%s: cannot detect UHS2 interface.\n", mmc_hostname(host->mmc));
421421
return -EIO;
422422
}
423423

424424
if (sdhci_uhs2_init(host)) {
425-
pr_warn("%s: UHS2 init fail.\n", mmc_hostname(host->mmc));
425+
pr_debug("%s: UHS2 init fail.\n", mmc_hostname(host->mmc));
426426
return -EIO;
427427
}
428428

@@ -504,8 +504,8 @@ static int sdhci_uhs2_check_dormant(struct sdhci_host *host)
504504
if (read_poll_timeout(sdhci_readl, val, (val & SDHCI_UHS2_IN_DORMANT_STATE),
505505
100, UHS2_CHECK_DORMANT_TIMEOUT_100MS, true, host,
506506
SDHCI_PRESENT_STATE)) {
507-
pr_warn("%s: UHS2 IN_DORMANT fail in 100ms.\n", mmc_hostname(host->mmc));
508-
sdhci_dumpregs(host);
507+
pr_debug("%s: UHS2 IN_DORMANT fail in 100ms.\n", mmc_hostname(host->mmc));
508+
sdhci_dbg_dumpregs(host, "UHS2 IN_DORMANT fail in 100ms");
509509
return -EIO;
510510
}
511511
return 0;

0 commit comments

Comments
 (0)