* [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card
@ 2012-03-30 6:40 Subhash Jadavani
2012-03-30 8:51 ` Aaron Lu
2012-04-01 4:29 ` Chris Ball
0 siblings, 2 replies; 4+ messages in thread
From: Subhash Jadavani @ 2012-03-30 6:40 UTC (permalink / raw)
To: linux-mmc; +Cc: linux-arm-msm, aaron.lu, arindam.nath, 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 <subhashj@codeaurora.org>
---
drivers/mmc/core/bus.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 5d011a3..3f60606 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -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
--
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.
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card
2012-03-30 6:40 [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card Subhash Jadavani
@ 2012-03-30 8:51 ` Aaron Lu
2012-03-30 8:58 ` Namjae Jeon
2012-04-01 4:29 ` Chris Ball
1 sibling, 1 reply; 4+ messages in thread
From: Aaron Lu @ 2012-03-30 8:51 UTC (permalink / raw)
To: Subhash Jadavani; +Cc: linux-mmc, linux-arm-msm, arindam.nath
Hi,
On Fri, Mar 30, 2012 at 12:10:18PM +0530, Subhash Jadavani wrote:
> 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 <subhashj@codeaurora.org>
Acked-by: Aaron Lu <aaron.lu@amd.com>
-Aaron
> ---
> drivers/mmc/core/bus.c | 17 +++++++++++++++--
> 1 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index 5d011a3..3f60606 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -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
> --
> 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.
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card
2012-03-30 8:51 ` Aaron Lu
@ 2012-03-30 8:58 ` Namjae Jeon
0 siblings, 0 replies; 4+ messages in thread
From: Namjae Jeon @ 2012-03-30 8:58 UTC (permalink / raw)
To: Subhash Jadavani, Chris Ball
Cc: linux-mmc, linux-arm-msm, arindam.nath, Aaron Lu
2012/3/30 Aaron Lu <aaron.lu@amd.com>:
> Hi,
>
> On Fri, Mar 30, 2012 at 12:10:18PM +0530, Subhash Jadavani wrote:
>> 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 <subhashj@codeaurora.org>
>
> Acked-by: Aaron Lu <aaron.lu@amd.com>
>
> -Aaron
Looks good to me.
Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>
Thanks.
>
>> ---
>> drivers/mmc/core/bus.c | 17 +++++++++++++++--
>> 1 files changed, 15 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
>> index 5d011a3..3f60606 100644
>> --- a/drivers/mmc/core/bus.c
>> +++ b/drivers/mmc/core/bus.c
>> @@ -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
>> --
>> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card
2012-03-30 6:40 [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card Subhash Jadavani
2012-03-30 8:51 ` Aaron Lu
@ 2012-04-01 4:29 ` Chris Ball
1 sibling, 0 replies; 4+ messages in thread
From: Chris Ball @ 2012-04-01 4:29 UTC (permalink / raw)
To: Subhash Jadavani; +Cc: linux-mmc, linux-arm-msm, aaron.lu, arindam.nath
Hi,
On Fri, Mar 30 2012, Subhash Jadavani wrote:
> 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 <subhashj@codeaurora.org>
> ---
> drivers/mmc/core/bus.c | 17 +++++++++++++++--
> 1 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index 5d011a3..3f60606 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -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
Thanks, pushed to mmc-next for 3.5 with Aaron's ACK.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-01 4:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-30 6:40 [PATCH v2 1/1] mmc: bus: print bus speed mode of UHS-I card Subhash Jadavani
2012-03-30 8:51 ` Aaron Lu
2012-03-30 8:58 ` Namjae Jeon
2012-04-01 4:29 ` Chris Ball
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox