mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Victor Shih <victorshihgli@gmail.com>
To: ulf.hansson@linaro.org, adrian.hunter@intel.com
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
	benchuanggli@gmail.com, HL.Liu@genesyslogic.com.tw,
	Greg.tu@genesyslogic.com.tw, takahiro.akashi@linaro.org,
	dlunev@chromium.org, Victor Shih <victorshihgli@gmail.com>
Subject: [PATCH V11 01/23] mmc: core: Cleanup printing of speed mode at card insertion
Date: Fri,  8 Sep 2023 17:53:08 +0800	[thread overview]
Message-ID: <20230908095330.12075-2-victorshihgli@gmail.com> (raw)
In-Reply-To: <20230908095330.12075-1-victorshihgli@gmail.com>

From: Ulf Hansson <ulf.hansson@linaro.org>

The current print of the bus speed mode in mmc_add_card() has grown over
the years and is now difficult to parse. Let's clean up the code and also
take the opportunity to properly announce "DDR" for eMMCs as
"high speed DDR", which is according to the eMMC spec.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/mmc/core/bus.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 0af96548e7da..bd761e2858f1 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -299,6 +299,7 @@ int mmc_add_card(struct mmc_card *card)
 {
 	int ret;
 	const char *type;
+	const char *speed_mode = "";
 	const char *uhs_bus_speed_mode = "";
 	static const char *const uhs_speeds[] = {
 		[UHS_SDR12_BUS_SPEED] = "SDR12 ",
@@ -340,27 +341,30 @@ int mmc_add_card(struct mmc_card *card)
 		break;
 	}
 
+	if (mmc_card_hs(card))
+		speed_mode = "high speed ";
+	else if (mmc_card_uhs(card))
+		speed_mode = "ultra high speed ";
+	else if	(mmc_card_ddr52(card))
+		speed_mode = "high speed DDR ";
+	else if (mmc_card_hs200(card))
+		speed_mode = "HS200 ";
+	else if (mmc_card_hs400es(card))
+		speed_mode = "HS400 Enhanced strobe ";
+	else if (mmc_card_hs400(card))
+		speed_mode = "HS400 ";
+
 	if (mmc_card_uhs(card) &&
 		(card->sd_bus_speed < ARRAY_SIZE(uhs_speeds)))
 		uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];
 
-	if (mmc_host_is_spi(card->host)) {
-		pr_info("%s: new %s%s%s card on SPI\n",
-			mmc_hostname(card->host),
-			mmc_card_hs(card) ? "high speed " : "",
-			mmc_card_ddr52(card) ? "DDR " : "",
-			type);
-	} else {
-		pr_info("%s: new %s%s%s%s%s%s card at address %04x\n",
-			mmc_hostname(card->host),
-			mmc_card_uhs(card) ? "ultra high speed " :
-			(mmc_card_hs(card) ? "high speed " : ""),
-			mmc_card_hs400(card) ? "HS400 " :
-			(mmc_card_hs200(card) ? "HS200 " : ""),
-			mmc_card_hs400es(card) ? "Enhanced strobe " : "",
-			mmc_card_ddr52(card) ? "DDR " : "",
+	if (mmc_host_is_spi(card->host))
+		pr_info("%s: new %s%s card on SPI\n",
+			mmc_hostname(card->host), speed_mode, type);
+	else
+		pr_info("%s: new %s%s%s card at address %04x\n",
+			mmc_hostname(card->host), speed_mode,
 			uhs_bus_speed_mode, type, card->rca);
-	}
 
 	mmc_add_card_debugfs(card);
 	card->dev.of_node = mmc_of_find_child_device(card->host, 0);
-- 
2.25.1


  reply	other threads:[~2023-09-08  9:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-08  9:53 [PATCH V11 00/23] Add support UHS-II for GL9755 Victor Shih
2023-09-08  9:53 ` Victor Shih [this message]
2023-09-08  9:53 ` [PATCH V11 02/23] mmc: core: Prepare to support SD UHS-II cards Victor Shih
2023-09-08  9:53 ` [PATCH V11 03/23] mmc: core: Announce successful insertion of an SD UHS-II card Victor Shih
2023-09-08  9:53 ` [PATCH V11 04/23] mmc: core: Extend support for mmc regulators with a vqmmc2 Victor Shih
2023-09-08  9:53 ` [PATCH V11 05/23] mmc: core: Add definitions for SD UHS-II cards Victor Shih
2023-09-14 15:06   ` Ulf Hansson
2023-09-15  9:40     ` Victor Shih
2023-09-08  9:53 ` [PATCH V11 06/23] mmc: core: Support UHS-II card control and access Victor Shih
2023-09-08  9:53 ` [PATCH V11 07/23] mmc: sdhci: add UHS-II related definitions in headers Victor Shih
2023-09-08  9:53 ` [PATCH V11 08/23] mmc: sdhci: add UHS-II module and add a kernel configuration Victor Shih
2023-09-08  9:53 ` [PATCH V11 09/23] mmc: sdhci-uhs2: dump UHS-II registers Victor Shih
2023-09-08  9:53 ` [PATCH V11 10/23] mmc: sdhci-uhs2: add reset function and uhs2_mode function Victor Shih
2023-09-08  9:53 ` [PATCH V11 11/23] mmc: sdhci-uhs2: add set_power() to support vdd2 Victor Shih
2023-09-08  9:53 ` [PATCH V11 12/23] mmc: sdhci-uhs2: skip signal_voltage_switch() Victor Shih
2023-09-08  9:53 ` [PATCH V11 13/23] mmc: sdhci-uhs2: add set_timeout() Victor Shih
2023-09-08  9:53 ` [PATCH V11 14/23] mmc: sdhci-uhs2: add set_ios() Victor Shih
2023-09-08  9:53 ` [PATCH V11 15/23] mmc: sdhci-uhs2: add detect_init() to detect the interface Victor Shih
2023-09-08  9:53 ` [PATCH V11 16/23] mmc: sdhci-uhs2: add clock operations Victor Shih
2023-09-08  9:53 ` [PATCH V11 17/23] mmc: sdhci-uhs2: add uhs2_control() to initialise the interface Victor Shih
2023-09-08  9:53 ` [PATCH V11 18/23] mmc: sdhci-uhs2: add request() and others Victor Shih
2023-09-08  9:53 ` [PATCH V11 19/23] mmc: sdhci-uhs2: add irq() " Victor Shih
2023-09-08  9:53 ` [PATCH V11 20/23] mmc: sdhci-uhs2: add add_host() and others to set up the driver Victor Shih
2023-09-12 11:26   ` Adrian Hunter
2023-09-08  9:53 ` [PATCH V11 21/23] mmc: sdhci-uhs2: add pre-detect_init hook Victor Shih
2023-09-08  9:53 ` [PATCH V11 22/23] mmc: sdhci-pci: add UHS-II support framework Victor Shih
2023-09-08  9:53 ` [PATCH V11 23/23] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755 Victor Shih

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230908095330.12075-2-victorshihgli@gmail.com \
    --to=victorshihgli@gmail.com \
    --cc=Greg.tu@genesyslogic.com.tw \
    --cc=HL.Liu@genesyslogic.com.tw \
    --cc=adrian.hunter@intel.com \
    --cc=benchuanggli@gmail.com \
    --cc=dlunev@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=takahiro.akashi@linaro.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®