Commit 49b14db0 authored by Victor Shih's avatar Victor Shih Committed by Ulf Hansson
Browse files

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: default avatarVictor Shih <victor.shih@genesyslogic.com.tw>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250606110121.96314-4-victorshihgli@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2881ba9a

drivers/mmc/host/sdhci-uhs2.c

+10 −10
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask) 
	/* hw clears the bit when it's done */

	if (read_poll_timeout_atomic(sdhci_readw, val, !(val & mask), 10,

				     UHS2_RESET_TIMEOUT_100MS, true, host, SDHCI_UHS2_SW_RESET)) {

		pr_warn("%s: %s: Reset 0x%x never completed. %s: clean reset bit.\n", __func__,

		pr_debug("%s: %s: Reset 0x%x never completed. %s: clean reset bit.\n", __func__,

			 mmc_hostname(host->mmc), (int)mask, mmc_hostname(host->mmc));

		sdhci_writeb(host, 0, SDHCI_UHS2_SW_RESET);

		return;
@@ -335,8 +335,8 @@ static int sdhci_uhs2_interface_detect(struct sdhci_host *host) 
	if (read_poll_timeout(sdhci_readl, val, (val & SDHCI_UHS2_IF_DETECT),

			      100, UHS2_INTERFACE_DETECT_TIMEOUT_100MS, true,

			      host, SDHCI_PRESENT_STATE)) {

		pr_warn("%s: not detect UHS2 interface in 100ms.\n", mmc_hostname(host->mmc));

		sdhci_dumpregs(host);

		pr_debug("%s: not detect UHS2 interface in 100ms.\n", mmc_hostname(host->mmc));

		sdhci_dbg_dumpregs(host, "UHS2 interface detect timeout in 100ms");

		return -EIO;

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


	if (read_poll_timeout(sdhci_readl, val, (val & SDHCI_UHS2_LANE_SYNC),

			      100, UHS2_LANE_SYNC_TIMEOUT_150MS, true, host, SDHCI_PRESENT_STATE)) {

		pr_warn("%s: UHS2 Lane sync fail in 150ms.\n", mmc_hostname(host->mmc));

		sdhci_dumpregs(host);

		pr_debug("%s: UHS2 Lane sync fail in 150ms.\n", mmc_hostname(host->mmc));

		sdhci_dbg_dumpregs(host, "UHS2 Lane sync fail in 150ms");

		return -EIO;

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



	if (sdhci_uhs2_interface_detect(host)) {

		pr_warn("%s: cannot detect UHS2 interface.\n", mmc_hostname(host->mmc));

		pr_debug("%s: cannot detect UHS2 interface.\n", mmc_hostname(host->mmc));

		return -EIO;

	}



	if (sdhci_uhs2_init(host)) {

		pr_warn("%s: UHS2 init fail.\n", mmc_hostname(host->mmc));

		pr_debug("%s: UHS2 init fail.\n", mmc_hostname(host->mmc));

		return -EIO;

	}
@@ -504,8 +504,8 @@ static int sdhci_uhs2_check_dormant(struct sdhci_host *host) 
	if (read_poll_timeout(sdhci_readl, val, (val & SDHCI_UHS2_IN_DORMANT_STATE),

			      100, UHS2_CHECK_DORMANT_TIMEOUT_100MS, true, host,

			      SDHCI_PRESENT_STATE)) {

		pr_warn("%s: UHS2 IN_DORMANT fail in 100ms.\n", mmc_hostname(host->mmc));

		sdhci_dumpregs(host);

		pr_debug("%s: UHS2 IN_DORMANT fail in 100ms.\n", mmc_hostname(host->mmc));

		sdhci_dbg_dumpregs(host, "UHS2 IN_DORMANT fail in 100ms");

		return -EIO;

	}

	return 0;