mmc: bus: print bus speed mode of UHS-I card

PATCH In review Subhash Jadavani 4 participants 4 messages Mar 30, 2012 – Apr 1, 2012

Subsystems (2)

Arm Qualcomm mailing list MMC, SD and SDIO

lore

Share & tools

lore

Subhash Jadavani

author

2012-03-30 06:40 UTC #0 lore raw

PATCH v2 1/1 mmc: bus: print bus speed mode of UHS-I card

When UHS-I card is detected also print the bus speed mode in which UHS-I card will be running.

Signed-off-by Subhash Jadavani <[email protected]>

---
 drivers/mmc/core/bus.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

drivers/mmc/core/bus.c +15 -2

index 5d011a3..3f60606 100644
@@ -267,6 +267,15 @@ int mmc_add_card(struct mmc_card *card)
 {
 	int ret;
 	const char *type;
+	const char *uhs_bus_speed_mode = "";
+	static const char *const uhs_speeds[] = {
+		[UHS_SDR12_BUS_SPEED] = "SDR12 ",
+		[UHS_SDR25_BUS_SPEED] = "SDR25 ",
+		[UHS_SDR50_BUS_SPEED] = "SDR50 ",
+		[UHS_SDR104_BUS_SPEED] = "SDR104 ",
+		[UHS_DDR50_BUS_SPEED] = "DDR50 ",
+	};
+
 
 	dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);

@@ -296,6 +305,10 @@ int mmc_add_card(struct mmc_card *card)
 		break;
 	}
 
+	if (mmc_sd_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),

@@ -303,13 +316,13 @@ int mmc_add_card(struct mmc_card *card)
 			mmc_card_ddr_mode(card) ? "DDR " : "",
 			type);
 	} else {
-		pr_info("%s: new %s%s%s%s card at address %04x\n",
+		pr_info("%s: new %s%s%s%s%s card at address %04x\n",
 			mmc_hostname(card->host),
 			mmc_card_uhs(card) ? "ultra high speed " :
 			(mmc_card_highspeed(card) ? "high speed " : ""),
 			(mmc_card_hs200(card) ? "HS200 " : ""),
 			mmc_card_ddr_mode(card) ? "DDR " : "",
-			type, card->rca);
+			uhs_bus_speed_mode, type, card->rca);
 	}
 
 #ifdef CONFIG_DEBUG_FS

Signature · 5 lines

1.7.1.1

--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Aaron Lu

Acked-by on v2 1/1

2012-03-30 08:51 UTC #1 lore raw

Hi,

Quoted 4 lines · Subhash Jadavani

When UHS-I card is detected also print the bus speed mode in which UHS-I card will be running.
Signed-off-by Subhash Jadavani <[email protected]>

Acked-by Aaron Lu <[email protected]>

-Aaron

Quoted 58 lines

---
 drivers/mmc/core/bus.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

drivers/mmc/core/bus.c +15 -2

index 5d011a3..3f60606 100644
@@ -267,6 +267,15 @@ int mmc_add_card(struct mmc_card *card)
 {
 	int ret;
 	const char *type;
+	const char *uhs_bus_speed_mode = "";
+	static const char *const uhs_speeds[] = {
+		[UHS_SDR12_BUS_SPEED] = "SDR12 ",
+		[UHS_SDR25_BUS_SPEED] = "SDR25 ",
+		[UHS_SDR50_BUS_SPEED] = "SDR50 ",
+		[UHS_SDR104_BUS_SPEED] = "SDR104 ",
+		[UHS_DDR50_BUS_SPEED] = "DDR50 ",
+	};
+
 
 	dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);

@@ -296,6 +305,10 @@ int mmc_add_card(struct mmc_card *card)
 		break;
 	}
 
+	if (mmc_sd_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),

@@ -303,13 +316,13 @@ int mmc_add_card(struct mmc_card *card)
 			mmc_card_ddr_mode(card) ? "DDR " : "",
 			type);
 	} else {
-		pr_info("%s: new %s%s%s%s card at address %04x\n",
+		pr_info("%s: new %s%s%s%s%s card at address %04x\n",
 			mmc_hostname(card->host),
 			mmc_card_uhs(card) ? "ultra high speed " :
 			(mmc_card_highspeed(card) ? "high speed " : ""),
 			(mmc_card_hs200(card) ? "HS200 " : ""),
 			mmc_card_ddr_mode(card) ? "DDR " : "",
-			type, card->rca);
+			uhs_bus_speed_mode, type, card->rca);
 	}
 
 #ifdef CONFIG_DEBUG_FS

Signature · 5 lines

1.7.1.1

--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Namjae Jeon

Reviewed-by

2012-03-30 08:58 UTC #2 lore raw

2012/3/30 Aaron Lu <[email protected]>:

Quoted 11 lines

Hi,
Quoted 4 lines · Subhash Jadavani
When UHS-I card is detected also print the bus speed mode in which UHS-I card will be running.
Signed-off-by Subhash Jadavani <[email protected]>
Acked-by Aaron Lu <[email protected]>
-Aaron

Looks good to me.

Reviewed-by Namjae Jeon <[email protected]>

Thanks.

Quoted 64 lines

Quoted 51 lines

---
drivers/mmc/core/bus.c | 17 +++++++++++++++--

 1 files changed, 15 insertions(+), 2 deletions(-)

drivers/mmc/core/bus.c +14 -1

index 5d011a3..3f60606 100644
@@ -267,6 +267,15 @@ int mmc_add_card(struct mmc_card *card)
  {
       int ret;
       const char *type;
+     const char *uhs_bus_speed_mode = "";
+     static const char *const uhs_speeds[] = {
+             [UHS_SDR12_BUS_SPEED] = "SDR12 ",
+             [UHS_SDR25_BUS_SPEED] = "SDR25 ",
+             [UHS_SDR50_BUS_SPEED] = "SDR50 ",
+             [UHS_SDR104_BUS_SPEED] = "SDR104 ",
+             [UHS_DDR50_BUS_SPEED] = "DDR50 ",
+     };
+
 
       dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);

@@ -296,6 +305,10 @@ int mmc_add_card(struct mmc_card *card)
               break;
       }
 
+     if (mmc_sd_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),

@@ -303,13 +316,13 @@ int mmc_add_card(struct mmc_card *card)
                       mmc_card_ddr_mode(card) ? "DDR " : "",
                       type);
       } else {
-             pr_info("%s: new %s%s%s%s card at address %04x\n",
+             pr_info("%s: new %s%s%s%s%s card at address %04x\n",
                       mmc_hostname(card->host),

mmc_card_uhs(card) ? "ultra high speed " :
(mmc_card_highspeed(card) ? "high speed " : ""), (mmc_card_hs200(card) ? "HS200 " : ""), mmc_card_ddr_mode(card) ? "DDR " : "",
- type, card->rca);
+ uhs_bus_speed_mode, type, card->rca); }

Quoted 8 lines

#ifdef CONFIG_DEBUG_FS
--
1.7.1.1
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Chris Ball

2012-04-01 04:29 UTC #3 lore raw

In reply to Subhash Jadavani

Hi,

Quoted 45 lines · Subhash Jadavani

When UHS-I card is detected also print the bus speed mode in which UHS-I card will be running.

Signed-off-by Subhash Jadavani <[email protected]>

---
 drivers/mmc/core/bus.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

drivers/mmc/core/bus.c +14 -1

index 5d011a3..3f60606 100644
@@ -267,6 +267,15 @@ int mmc_add_card(struct mmc_card *card)
 {
 	int ret;
 	const char *type;
+	const char *uhs_bus_speed_mode = "";
+	static const char *const uhs_speeds[] = {
+		[UHS_SDR12_BUS_SPEED] = "SDR12 ",
+		[UHS_SDR25_BUS_SPEED] = "SDR25 ",
+		[UHS_SDR50_BUS_SPEED] = "SDR50 ",
+		[UHS_SDR104_BUS_SPEED] = "SDR104 ",
+		[UHS_DDR50_BUS_SPEED] = "DDR50 ",
+	};
+
 
 	dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);

@@ -296,6 +305,10 @@ int mmc_add_card(struct mmc_card *card)
 		break;
 	}
 
+	if (mmc_sd_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),

@@ -303,13 +316,13 @@ int mmc_add_card(struct mmc_card *card)
 			mmc_card_ddr_mode(card) ? "DDR " : "",
 			type);
 	} else {
-		pr_info("%s: new %s%s%s%s card at address %04x\n",
+		pr_info("%s: new %s%s%s%s%s card at address %04x\n",

drivers/mmc/core/bus.c int mmc_add_card(struct mmc_card *card) · line 328

Quoted 10 lines

drivers/mmc/core/bus.c +1 -1

 			mmc_hostname(card->host),
 			mmc_card_uhs(card) ? "ultra high speed " :
 			(mmc_card_highspeed(card) ? "high speed " : ""),
 			(mmc_card_hs200(card) ? "HS200 " : ""),
 			mmc_card_ddr_mode(card) ? "DDR " : "",
-			type, card->rca);
+			uhs_bus_speed_mode, type, card->rca);
 	}
 
 #ifdef CONFIG_DEBUG_FS

Thanks, pushed to mmc-next for 3.5 with Aaron's ACK.

- Chris.

Signature · 2 lines

Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child