[PATCH master 1/3] mci: sdhci: use host device, not card, for debug message

[PATCH master 1/3] mci: sdhci: use host device, not card, for debug message

[Ahmad Fatoum]

All other messages printed in sdhci.c use the host's device to prefix
the message, except this one debug message here that uses the card's
instead. Unify this by using the host device everywhere.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/mci/sdhci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index ba1e07e966ae..da6c2ddb5879 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -170,7 +170,7 @@ static int __sdhci_execute_tuning(struct sdhci *host, u32 opcode)
 
 	}
 
-	dev_dbg(&host->mci->mci->dev, "Tuning timeout, falling back to fixed sampling clock\n");
+	dev_dbg(host->mci->hw_dev, "Tuning timeout, falling back to fixed sampling clock\n");
 	sdhci_reset_tuning(host);
 	return -EAGAIN;
 }
-- 
2.39.2

[PATCH master 2/3] mci: sdhci: retrieve host device via common helper or NULL

[Ahmad Fatoum]

Since commit d20abb491654 ("common: console_common: handle NULL dev
gracefully in dev_printf"), it's permissible to pass NULL to the
dev_printf family of functions. Therefore define sdhci_dev, which either
return a device if mci was set or NULL otherwise.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/mci/sdhci.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index da6c2ddb5879..2e8f99fc462c 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -21,6 +21,11 @@ enum sdhci_reset_reason {
 	SDHCI_RESET_FOR_CQE_RECOVERY,
 };
 
+static inline struct device *sdhci_dev(struct sdhci *host)
+{
+	return host->mci ? host->mci->hw_dev : NULL;
+}
+
 static void sdhci_reset_for_reason(struct sdhci *host, enum sdhci_reset_reason reason)
 {
 	if (host->quirks2 & SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
@@ -170,7 +175,7 @@ static int __sdhci_execute_tuning(struct sdhci *host, u32 opcode)
 
 	}
 
-	dev_dbg(host->mci->hw_dev, "Tuning timeout, falling back to fixed sampling clock\n");
+	dev_dbg(sdhci_dev(host), "Tuning timeout, falling back to fixed sampling clock\n");
 	sdhci_reset_tuning(host);
 	return -EAGAIN;
 }
@@ -416,13 +421,13 @@ int sdhci_wait_for_done(struct sdhci *sdhci, u32 mask)
 			return -ETIMEDOUT;
 
 		if (stat & SDHCI_INT_ERROR) {
-			dev_err(sdhci->mci->hw_dev, "SDHCI_INT_ERROR: 0x%08x\n",
+			dev_err(sdhci_dev(sdhci), "SDHCI_INT_ERROR: 0x%08x\n",
 				stat);
 			return -EPERM;
 		}
 
 		if (is_timeout(start, 1000 * MSECOND)) {
-			dev_err(sdhci->mci->hw_dev,
+			dev_err(sdhci_dev(sdhci),
 				"SDHCI timeout while waiting for done\n");
 			return -ETIMEDOUT;
 		}
@@ -470,7 +475,7 @@ static void sdhci_config_dma(struct sdhci *host)
 void sdhci_setup_data_dma(struct sdhci *sdhci, struct mci_data *data,
 			  dma_addr_t *dma)
 {
-	struct device *dev = sdhci->mci->hw_dev;
+	struct device *dev = sdhci_dev(sdhci);
 	int nbytes;
 
 	if (!data)
@@ -502,7 +507,7 @@ void sdhci_setup_data_dma(struct sdhci *sdhci, struct mci_data *data,
 int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_data *data,
 			    dma_addr_t dma)
 {
-	struct device *dev = sdhci->mci->hw_dev;
+	struct device *dev = sdhci_dev(sdhci);
 	u64 start;
 	int nbytes;
 	u32 irqstat;
@@ -615,7 +620,7 @@ int sdhci_transfer_data_pio(struct sdhci *sdhci, struct mci_data *data)
 
 int sdhci_transfer_data(struct sdhci *sdhci, struct mci_data *data, dma_addr_t dma)
 {
-	struct device *dev = sdhci->mci->hw_dev;
+	struct device *dev = sdhci_dev(sdhci);
 
 	if (!data)
 		return 0;
@@ -665,7 +670,7 @@ static u16 sdhci_get_preset_value(struct sdhci *host)
 		preset = sdhci_read16(host, SDHCI_PRESET_FOR_HS400);
 		break;
 	default:
-		dev_warn(host->mci->hw_dev, "Invalid UHS-I mode selected\n");
+		dev_warn(sdhci_dev(host), "Invalid UHS-I mode selected\n");
 		preset = sdhci_read16(host, SDHCI_PRESET_FOR_SDR12);
 		break;
 	}
@@ -778,7 +783,7 @@ void sdhci_enable_clk(struct sdhci *host, u16 clk)
 	while (!(sdhci_read16(host, SDHCI_CLOCK_CONTROL) &
 		SDHCI_CLOCK_INT_STABLE)) {
 		if (is_timeout(start, 150 * MSECOND)) {
-			dev_err(host->mci->hw_dev,
+			dev_err(sdhci_dev(host),
 					"SDHCI clock stable timeout\n");
 			return;
 		}
@@ -805,7 +810,7 @@ int sdhci_wait_idle(struct sdhci *host, struct mci_cmd *cmd, struct mci_data *da
 			!(sdhci_read32(host, SDHCI_PRESENT_STATE) & mask));
 
 	if (ret) {
-		dev_err(host->mci->hw_dev,
+		dev_err(sdhci_dev(host),
 				"SDHCI timeout while waiting for idle\n");
 		return -EBUSY;
 	}
@@ -827,7 +832,7 @@ int sdhci_wait_idle_data(struct sdhci *host, struct mci_cmd *cmd)
 			!(sdhci_read32(host, SDHCI_PRESENT_STATE) & mask));
 
 	if (ret) {
-		dev_err(host->mci->hw_dev,
+		dev_err(sdhci_dev(host),
 				"SDHCI timeout while waiting for idle\n");
 		return -EBUSY;
 	}
@@ -880,7 +885,7 @@ void __sdhci_read_caps(struct sdhci *host, const u16 *ver,
 	u16 v;
 	u64 dt_caps_mask = 0;
 	u64 dt_caps = 0;
-	struct device_node *np = host->mci->hw_dev->of_node;
+	struct device_node *np = dev_of_node(sdhci_dev(host));
 
 	BUG_ON(!host->mci); /* Call sdhci_setup_host() before using this */
 
-- 
2.39.2

[PATCH master 3/3] mci: sdhci: populate struct sdhci::mci in drivers

[Ahmad Fatoum]

sdhci_wait_idle will make use of the mci's device to prefix error
messages, thus populate the field where it's still missing.

Reported-by: Jonas Richardsen <jonasrichardsen@emlix.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/mci/atmel-sdhci.c | 1 +
 drivers/mci/dove-sdhci.c  | 1 +
 drivers/mci/tegra-sdmmc.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/drivers/mci/atmel-sdhci.c b/drivers/mci/atmel-sdhci.c
index c124e736bb7d..4082d1769537 100644
--- a/drivers/mci/atmel-sdhci.c
+++ b/drivers/mci/atmel-sdhci.c
@@ -139,6 +139,7 @@ static int at91_sdhci_probe(struct device *dev)
 						    "microchip,sdcal-inverted");
 
 	at91_sdhci_mmio_init(&priv->host, IOMEM(iores->start));
+	priv->host.sdhci.mci = &priv->mci;
 
 	priv->gck_rate = at91_sdhci_conf_clks(priv);
 	if (priv->gck_rate < 0)
diff --git a/drivers/mci/dove-sdhci.c b/drivers/mci/dove-sdhci.c
index d37046ad31bf..c370ace9e8f8 100644
--- a/drivers/mci/dove-sdhci.c
+++ b/drivers/mci/dove-sdhci.c
@@ -271,6 +271,7 @@ static int dove_sdhci_probe(struct device *dev)
 
 	host = xzalloc(sizeof(*host));
 	host->sdhci.base = dev_request_mem_region(dev, 0);
+	host->sdhci.mci = &host->mci;
 	host->mci.max_req_size = 0x8000;
 	host->mci.hw_dev = dev;
 	host->mci.send_cmd = dove_sdhci_mci_send_cmd;
diff --git a/drivers/mci/tegra-sdmmc.c b/drivers/mci/tegra-sdmmc.c
index e940edf3227a..10017146417d 100644
--- a/drivers/mci/tegra-sdmmc.c
+++ b/drivers/mci/tegra-sdmmc.c
@@ -401,6 +401,7 @@ static int tegra_sdmmc_probe(struct device *dev)
 
 	host->sdhci.read32 = tegra_sdmmc_read32;
 	host->sdhci.write32 = tegra_sdmmc_write32;
+	host->sdhci.mci = mci;
 
 	mci->hw_dev = dev;
 	mci->f_max = 48000000;
-- 
2.39.2

Re: [PATCH master 1/3] mci: sdhci: use host device, not card, for debug message

[Sascha Hauer]

On Wed, 22 May 2024 10:07:32 +0200, Ahmad Fatoum wrote:
> All other messages printed in sdhci.c use the host's device to prefix
> the message, except this one debug message here that uses the card's
> instead. Unify this by using the host device everywhere.
> 
> 

Applied, thanks!

[1/3] mci: sdhci: use host device, not card, for debug message
      https://git.pengutronix.de/cgit/barebox/commit/?id=affdaa4a9df4 (link may not be stable)
[2/3] mci: sdhci: retrieve host device via common helper or NULL
      https://git.pengutronix.de/cgit/barebox/commit/?id=1ddaa6821b90 (link may not be stable)
[3/3] mci: sdhci: populate struct sdhci::mci in drivers
      https://git.pengutronix.de/cgit/barebox/commit/?id=532da9c40cdc (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>