Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: Use logging instead of printf()

Browse source 
The code makes quite a few uses of __func__ which puts the function
name into the resulting SPL image. Use the log subsystem instead, to
reduce size.

The CONFIG_LOGF_FUNC option can be used to enable the function name.

Use lower-case hex for the status output in sdhci_transfer_data(), to
match sdhci_send_command()

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
This commit is contained in:
Simon Glass 2024-08-22 07:54:54 -06:00 • committed by Tom Rini
parent bf85af66c0
commit 3aa8c443b2
1 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
drivers/mmc/sdhci.c
View file

@ -32,8 +32,7 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)
sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET); sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET);
while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) { while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) {
if (timeout == 0) { if (timeout == 0) {
printf("%s: Reset 0x%x never completed.\n", log_warning("Reset %#x never completed\n", mask);
__func__, (int)mask);
return; return;
} }
timeout--; timeout--;
@ -139,8 +138,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data)
do { do {
stat = sdhci_readl(host, SDHCI_INT_STATUS); stat = sdhci_readl(host, SDHCI_INT_STATUS);
if (stat & SDHCI_INT_ERROR) { if (stat & SDHCI_INT_ERROR) {
pr_debug("%s: Error detected in status(0x%X)!\n", log_debug("Error detected in status(%#x)!\n", stat);
__func__, stat);
return -EIO; return -EIO;
} }
if (!transfer_done && (stat & rdy)) { if (!transfer_done && (stat & rdy)) {
@ -173,7 +171,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data)
if (timeout-- > 0) if (timeout-- > 0)
udelay(10); udelay(10);
else { else {
printf("%s: Transfer data timeout\n", __func__); log_err("Transfer data timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
} while (!(stat & SDHCI_INT_DATA_END)); } while (!(stat & SDHCI_INT_DATA_END));
@ -232,13 +230,13 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) { while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) {
if (time >= cmd_timeout) { if (time >= cmd_timeout) {
printf("%s: MMC: %d busy ", __func__, mmc_dev); log_warning("mmc%d busy ", mmc_dev);
if (2 * cmd_timeout <= SDHCI_CMD_MAX_TIMEOUT) { if (2 * cmd_timeout <= SDHCI_CMD_MAX_TIMEOUT) {
cmd_timeout += cmd_timeout; cmd_timeout += cmd_timeout;
printf("timeout increasing to: %u ms.\n", log_warning("timeout increasing to: %u ms\n",
cmd_timeout); cmd_timeout);
} else { } else {
puts("timeout.\n"); log_warning("timeout\n");
return -ECOMM; return -ECOMM;
} }
} }
@ -316,8 +314,8 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
} }
if (get_timer(start) >= SDHCI_READ_STATUS_TIMEOUT) { if (get_timer(start) >= SDHCI_READ_STATUS_TIMEOUT) {
printf("%s: Timeout for status update: %08x %08x\n", log_warning("Timeout for status update: %08x %08x\n",
__func__, stat, mask); stat, mask);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
} while ((stat & mask) != mask); } while ((stat & mask) != mask);
@ -358,7 +356,7 @@ static int sdhci_execute_tuning(struct udevice *dev, uint opcode)
struct mmc *mmc = mmc_get_mmc_dev(dev); struct mmc *mmc = mmc_get_mmc_dev(dev);
struct sdhci_host *host = mmc->priv; struct sdhci_host *host = mmc->priv;
debug("%s\n", __func__); log_debug("sdhci tuning\n");
if (host->ops && host->ops->platform_execute_tuning) { if (host->ops && host->ops->platform_execute_tuning) {
err = host->ops->platform_execute_tuning(mmc, opcode); err = host->ops->platform_execute_tuning(mmc, opcode);
@ -380,8 +378,7 @@ int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
while (sdhci_readl(host, SDHCI_PRESENT_STATE) & while (sdhci_readl(host, SDHCI_PRESENT_STATE) &
(SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT)) { (SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT)) {
if (timeout == 0) { if (timeout == 0) {
printf("%s: Timeout to wait cmd & data inhibit\n", log_err("Timeout waiting for cmd & data inhibit\n");
__func__);
return -EBUSY; return -EBUSY;
} }
@ -397,7 +394,7 @@ int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
if (host->ops && host->ops->set_delay) { if (host->ops && host->ops->set_delay) {
ret = host->ops->set_delay(host); ret = host->ops->set_delay(host);
if (ret) { if (ret) {
printf("%s: Error while setting tap delay\n", __func__); log_err("Error while setting tap delay\n");
return ret; return ret;
} }
} }
@ -405,7 +402,7 @@ int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
if (host->ops && host->ops->config_dll) { if (host->ops && host->ops->config_dll) {
ret = host->ops->config_dll(host, clock, false); ret = host->ops->config_dll(host, clock, false);
if (ret) { if (ret) {
printf("%s: Error while configuring dll\n", __func__); log_err("Error configuring dll\n");
return ret; return ret;
} }
} }
@ -456,7 +453,7 @@ int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
if (host->ops && host->ops->config_dll) { if (host->ops && host->ops->config_dll) {
ret = host->ops->config_dll(host, clock, true); ret = host->ops->config_dll(host, clock, true);
if (ret) { if (ret) {
printf("%s: Error while configuring dll\n", __func__); log_err("Error while configuring dll\n");
return ret; return ret;
} }
} }
@ -472,8 +469,7 @@ int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
& SDHCI_CLOCK_INT_STABLE)) { & SDHCI_CLOCK_INT_STABLE)) {
if (timeout == 0) { if (timeout == 0) {
printf("%s: Internal clock never stabilised.\n", log_err("Internal clock never stabilised.\n");
__func__);
return -EBUSY; return -EBUSY;
} }
timeout--; timeout--;
@ -738,8 +734,7 @@ static int sdhci_init(struct mmc *mmc)
if (host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) { if (host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) {
host->align_buffer = memalign(8, 512 * 1024); host->align_buffer = memalign(8, 512 * 1024);
if (!host->align_buffer) { if (!host->align_buffer) {
printf("%s: Aligned buffer alloc failed!!!\n", log_err("Aligned buffer alloc failed\n");
__func__);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -881,20 +876,18 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
#else #else
caps = sdhci_readl(host, SDHCI_CAPABILITIES); caps = sdhci_readl(host, SDHCI_CAPABILITIES);
#endif #endif
debug("%s, caps: 0x%x\n", __func__, caps); log_debug("caps: %#x\n", caps);
#if CONFIG_IS_ENABLED(MMC_SDHCI_SDMA) #if CONFIG_IS_ENABLED(MMC_SDHCI_SDMA)
if ((caps & SDHCI_CAN_DO_SDMA)) { if ((caps & SDHCI_CAN_DO_SDMA)) {
host->flags |= USE_SDMA; host->flags |= USE_SDMA;
} else { } else {
debug("%s: Your controller doesn't support SDMA!!\n", log_debug("Controller doesn't support SDMA\n");
__func__);
} }
#endif #endif
#if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA) #if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA)
if (!(caps & SDHCI_CAN_DO_ADMA2)) { if (!(caps & SDHCI_CAN_DO_ADMA2)) {
printf("%s: Your controller doesn't support ADMA!!\n", log_err("Controller doesn't support ADMA\n");
__func__);
return -EINVAL; return -EINVAL;
} }
if (!host->adma_desc_table) { if (!host->adma_desc_table) {
@ -927,7 +920,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
#else #else
caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
#endif #endif
debug("%s, caps_1: 0x%x\n", __func__, caps_1); log_debug("caps_1: %#x\n", caps_1);
host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >>
SDHCI_CLOCK_MUL_SHIFT; SDHCI_CLOCK_MUL_SHIFT;
@ -953,8 +946,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
host->max_clk *= host->clk_mul; host->max_clk *= host->clk_mul;
} }
if (host->max_clk == 0) { if (host->max_clk == 0) {
printf("%s: Hardware doesn't specify base clock frequency\n", log_err("Hardware doesn't specify base clock frequency\n");
__func__);
return -EINVAL; return -EINVAL;
} }
if (f_max && (f_max < host->max_clk)) if (f_max && (f_max < host->max_clk))
@ -1047,7 +1039,7 @@ int add_sdhci(struct sdhci_host *host, u32 f_max, u32 f_min)
host->mmc = mmc_create(&host->cfg, host); host->mmc = mmc_create(&host->cfg, host);
if (host->mmc == NULL) { if (host->mmc == NULL) {
printf("%s: mmc create fail!\n", __func__); log_err("mmc create fail\n");
return -ENOMEM; return -ENOMEM;
} }