* [PATCH 1/3] mmc: debugfs: fix memory leak for mmc_ext_csd_open
@ 2015-09-22 1:18 Shawn Lin
2015-09-22 1:19 ` [PATCH 2/3] mmc: debugfs: implement ios show for SDR12 and SDR25 Shawn Lin
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Shawn Lin @ 2015-09-22 1:18 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, linux-kernel, Shawn Lin
buf allocated isn't been freed before return, so we fix it.
Fixes: 736bb6bb01a ("mmc: Add Extended CSD register to debugfs")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/core/debugfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index e914210..b2ab936 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -304,6 +304,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp)
filp->private_data = buf;
kfree(ext_csd);
+ kfree(buf);
return 0;
out_free:
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] mmc: debugfs: implement ios show for SDR12 and SDR25
2015-09-22 1:18 [PATCH 1/3] mmc: debugfs: fix memory leak for mmc_ext_csd_open Shawn Lin
@ 2015-09-22 1:19 ` Shawn Lin
2015-09-23 19:33 ` Ulf Hansson
2015-09-22 1:20 ` [PATCH 3/3] mmc: debugfs: implement ios show for driver type Shawn Lin
[not found] ` <CAK7Sx+gO2=jhQ-DpNqm4o+JUqKv+38a1C9CtZ4sZrUQ5XGJqHQ@mail.gmail.com>
2 siblings, 1 reply; 6+ messages in thread
From: Shawn Lin @ 2015-09-22 1:19 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, linux-kernel, Shawn Lin
This patch add MMC_TIMING_UHS_SDR12 and MMC_TIMING_UHS_SDR25
for mmc_ios_show to show the ios->timing if mmc card runs under
these two mode.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/core/debugfs.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index b2ab936..31155e8 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -126,6 +126,12 @@ static int mmc_ios_show(struct seq_file *s, void *data)
case MMC_TIMING_SD_HS:
str = "sd high-speed";
break;
+ case MMC_TIMING_UHS_SDR12:
+ str = "mmc uhs SDR12";
+ break;
+ case MMC_TIMING_UHS_SDR25:
+ str = "mmc uhs SDR25";
+ break;
case MMC_TIMING_UHS_SDR50:
str = "sd uhs SDR50";
break;
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] mmc: debugfs: implement ios show for driver type
2015-09-22 1:18 [PATCH 1/3] mmc: debugfs: fix memory leak for mmc_ext_csd_open Shawn Lin
2015-09-22 1:19 ` [PATCH 2/3] mmc: debugfs: implement ios show for SDR12 and SDR25 Shawn Lin
@ 2015-09-22 1:20 ` Shawn Lin
2015-09-23 21:42 ` Ulf Hansson
[not found] ` <CAK7Sx+gO2=jhQ-DpNqm4o+JUqKv+38a1C9CtZ4sZrUQ5XGJqHQ@mail.gmail.com>
2 siblings, 1 reply; 6+ messages in thread
From: Shawn Lin @ 2015-09-22 1:20 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, linux-kernel, Shawn Lin
This patch add ios->drv_type for mmc_ios_show to show the
card's driver type.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/core/debugfs.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 31155e8..5243e5f 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -172,6 +172,25 @@ static int mmc_ios_show(struct seq_file *s, void *data)
}
seq_printf(s, "signal voltage:\t%u (%s)\n", ios->chip_select, str);
+ switch (ios->drv_type) {
+ case MMC_SET_DRIVER_TYPE_A:
+ str = "driver type A";
+ break;
+ case MMC_SET_DRIVER_TYPE_B:
+ str = "driver type B";
+ break;
+ case MMC_SET_DRIVER_TYPE_C:
+ str = "driver type C";
+ break;
+ case MMC_SET_DRIVER_TYPE_D:
+ str = "driver type D";
+ break;
+ default:
+ str = "invalid";
+ break;
+ }
+ seq_printf(s, "driver type:\t%u (%s)\n", ios->drv_type, str);
+
return 0;
}
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] mmc: debugfs: fix memory leak for mmc_ext_csd_open
[not found] ` <CAK7Sx+gO2=jhQ-DpNqm4o+JUqKv+38a1C9CtZ4sZrUQ5XGJqHQ@mail.gmail.com>
@ 2015-09-22 1:37 ` Shawn Lin
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Lin @ 2015-09-22 1:37 UTC (permalink / raw)
To: trick wong; +Cc: shawn.lin, Ulf Hansson, linux-mmc, linux-kernel
On 2015/9/22 9:29, trick wong wrote:
> In the correct path,this buf will used later.why freed?
>
right.
sorry for this noise, withdraw this patch[1/3].
> 2015-09-22 9:18 GMT+08:00 Shawn Lin <shawn.lin@rock-chips.com
> <mailto:shawn.lin@rock-chips.com>>:
>
> buf allocated isn't been freed before return, so we fix it.
>
> Fixes: 736bb6bb01a ("mmc: Add Extended CSD register to debugfs")
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com
> <mailto:shawn.lin@rock-chips.com>>
> ---
>
> drivers/mmc/core/debugfs.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
> index e914210..b2ab936 100644
> --- a/drivers/mmc/core/debugfs.c
> +++ b/drivers/mmc/core/debugfs.c
> @@ -304,6 +304,7 @@ static int mmc_ext_csd_open(struct inode *inode,
> struct file *filp)
>
> filp->private_data = buf;
> kfree(ext_csd);
> + kfree(buf);
> return 0;
>
> out_free:
> --
> 2.3.7
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> <mailto:majordomo@vger.kernel.org>
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
Best Regards
Shawn Lin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] mmc: debugfs: implement ios show for SDR12 and SDR25
2015-09-22 1:19 ` [PATCH 2/3] mmc: debugfs: implement ios show for SDR12 and SDR25 Shawn Lin
@ 2015-09-23 19:33 ` Ulf Hansson
0 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2015-09-23 19:33 UTC (permalink / raw)
To: Shawn Lin; +Cc: linux-mmc, linux-kernel@vger.kernel.org
On 22 September 2015 at 03:19, Shawn Lin <shawn.lin@rock-chips.com> wrote:
> This patch add MMC_TIMING_UHS_SDR12 and MMC_TIMING_UHS_SDR25
> for mmc_ios_show to show the ios->timing if mmc card runs under
> these two mode.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> ---
>
> drivers/mmc/core/debugfs.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
> index b2ab936..31155e8 100644
> --- a/drivers/mmc/core/debugfs.c
> +++ b/drivers/mmc/core/debugfs.c
> @@ -126,6 +126,12 @@ static int mmc_ios_show(struct seq_file *s, void *data)
> case MMC_TIMING_SD_HS:
> str = "sd high-speed";
> break;
> + case MMC_TIMING_UHS_SDR12:
> + str = "mmc uhs SDR12";
/s/mmc/sd
> + break;
> + case MMC_TIMING_UHS_SDR25:
> + str = "mmc uhs SDR25";
/s/mmc/sd
> + break;
> case MMC_TIMING_UHS_SDR50:
> str = "sd uhs SDR50";
> break;
> --
> 2.3.7
>
>
Otherwise it looks good.
Kind regards
Uffe
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] mmc: debugfs: implement ios show for driver type
2015-09-22 1:20 ` [PATCH 3/3] mmc: debugfs: implement ios show for driver type Shawn Lin
@ 2015-09-23 21:42 ` Ulf Hansson
0 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2015-09-23 21:42 UTC (permalink / raw)
To: Shawn Lin; +Cc: linux-mmc, linux-kernel@vger.kernel.org
On 22 September 2015 at 03:20, Shawn Lin <shawn.lin@rock-chips.com> wrote:
> This patch add ios->drv_type for mmc_ios_show to show the
> card's driver type.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Thanks, applied for next!
Kind regards
Uffe
> ---
>
> drivers/mmc/core/debugfs.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
> index 31155e8..5243e5f 100644
> --- a/drivers/mmc/core/debugfs.c
> +++ b/drivers/mmc/core/debugfs.c
> @@ -172,6 +172,25 @@ static int mmc_ios_show(struct seq_file *s, void *data)
> }
> seq_printf(s, "signal voltage:\t%u (%s)\n", ios->chip_select, str);
>
> + switch (ios->drv_type) {
> + case MMC_SET_DRIVER_TYPE_A:
> + str = "driver type A";
> + break;
> + case MMC_SET_DRIVER_TYPE_B:
> + str = "driver type B";
> + break;
> + case MMC_SET_DRIVER_TYPE_C:
> + str = "driver type C";
> + break;
> + case MMC_SET_DRIVER_TYPE_D:
> + str = "driver type D";
> + break;
> + default:
> + str = "invalid";
> + break;
> + }
> + seq_printf(s, "driver type:\t%u (%s)\n", ios->drv_type, str);
> +
> return 0;
> }
>
> --
> 2.3.7
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-23 21:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 1:18 [PATCH 1/3] mmc: debugfs: fix memory leak for mmc_ext_csd_open Shawn Lin
2015-09-22 1:19 ` [PATCH 2/3] mmc: debugfs: implement ios show for SDR12 and SDR25 Shawn Lin
2015-09-23 19:33 ` Ulf Hansson
2015-09-22 1:20 ` [PATCH 3/3] mmc: debugfs: implement ios show for driver type Shawn Lin
2015-09-23 21:42 ` Ulf Hansson
[not found] ` <CAK7Sx+gO2=jhQ-DpNqm4o+JUqKv+38a1C9CtZ4sZrUQ5XGJqHQ@mail.gmail.com>
2015-09-22 1:37 ` [PATCH 1/3] mmc: debugfs: fix memory leak for mmc_ext_csd_open Shawn Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox