* [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode
@ 2019-08-26 4:46 Kai-Heng Feng
2019-08-26 4:46 ` [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally Kai-Heng Feng
2019-08-26 4:53 ` [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: Kai-Heng Feng @ 2019-08-26 4:46 UTC (permalink / raw)
To: stern; +Cc: gregkh, linux-usb, usb-storage, linux-kernel, Kai-Heng Feng
The option named "auto_delink_en" is a bit misleading, as setting it to
false doesn't really disable auto-delink but let auto-delink be firmware
controlled.
Rename it to reflect the real usage of this parameter.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/usb/storage/realtek_cr.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index cc794e25a0b6..4d86cfcc0b40 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -36,9 +36,9 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader");
MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>");
MODULE_LICENSE("GPL");
-static int auto_delink_en = 1;
-module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(auto_delink_en, "enable auto delink");
+static int auto_delink_mode = 1;
+module_param(auto_delink_mode, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(auto_delink_mode, "auto delink mode (0=firmware, 1=software [default])");
#ifdef CONFIG_REALTEK_AUTOPM
static int ss_en = 1;
@@ -567,7 +567,7 @@ static int config_autodelink_after_power_on(struct us_data *us)
if (retval < 0)
return -EIO;
- if (auto_delink_en) {
+ if (auto_delink_mode) {
CLR_BIT(value, 0);
CLR_BIT(value, 1);
SET_BIT(value, 2);
@@ -630,7 +630,7 @@ static int config_autodelink_before_power_down(struct us_data *us)
if (!CHK_AUTO_DELINK(chip))
return 0;
- if (auto_delink_en) {
+ if (auto_delink_mode) {
retval = rts51x_read_mem(us, 0xFE77, &value, 1);
if (retval < 0)
return -EIO;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally
2019-08-26 4:46 [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Kai-Heng Feng
@ 2019-08-26 4:46 ` Kai-Heng Feng
2019-08-26 4:53 ` Greg KH
2019-08-26 4:53 ` [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Greg KH
1 sibling, 1 reply; 4+ messages in thread
From: Kai-Heng Feng @ 2019-08-26 4:46 UTC (permalink / raw)
To: stern; +Cc: gregkh, linux-usb, usb-storage, linux-kernel, Kai-Heng Feng
Auto-delink requires writing special registers to ums-realtek device.
Unconditionally enable auto-delink may break newer devices.
So only enable auto-delink by default for the original three IDs,
0x0138, 0x0158 and 0x0159.
Realtek is working on a patch to properly support auto-delink for other
IDs.
BugLink: https://bugs.launchpad.net/bugs/1838886
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/usb/storage/realtek_cr.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 4d86cfcc0b40..376f41d0cbc3 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -36,6 +36,10 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader");
MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>");
MODULE_LICENSE("GPL");
+static int auto_delink_enable = -1;
+module_param(auto_delink_enable, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(auto_delink_enable, "enable auto delink (-1=auto [default], 0=disable, 1=enable)");
+
static int auto_delink_mode = 1;
module_param(auto_delink_mode, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(auto_delink_mode, "auto delink mode (0=firmware, 1=software [default])");
@@ -996,12 +1000,22 @@ static int init_realtek_cr(struct us_data *us)
goto INIT_FAIL;
}
- if (CHECK_FW_VER(chip, 0x5888) || CHECK_FW_VER(chip, 0x5889) ||
- CHECK_FW_VER(chip, 0x5901))
- SET_AUTO_DELINK(chip);
- if (STATUS_LEN(chip) == 16) {
- if (SUPPORT_AUTO_DELINK(chip))
+ if (auto_delink_enable == -1) {
+ if (CHECK_PID(chip, 0x0138) || CHECK_PID(chip, 0x0158) ||
+ CHECK_PID(chip, 0x0159))
+ auto_delink_enable = 1;
+ else
+ auto_delink_enable = 0;
+ }
+
+ if (auto_delink_enable) {
+ if (CHECK_FW_VER(chip, 0x5888) || CHECK_FW_VER(chip, 0x5889) ||
+ CHECK_FW_VER(chip, 0x5901))
SET_AUTO_DELINK(chip);
+ if (STATUS_LEN(chip) == 16) {
+ if (SUPPORT_AUTO_DELINK(chip))
+ SET_AUTO_DELINK(chip);
+ }
}
#ifdef CONFIG_REALTEK_AUTOPM
if (ss_en)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally
2019-08-26 4:46 ` [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally Kai-Heng Feng
@ 2019-08-26 4:53 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2019-08-26 4:53 UTC (permalink / raw)
To: Kai-Heng Feng; +Cc: stern, linux-usb, usb-storage, linux-kernel
On Mon, Aug 26, 2019 at 12:46:30PM +0800, Kai-Heng Feng wrote:
> Auto-delink requires writing special registers to ums-realtek device.
> Unconditionally enable auto-delink may break newer devices.
>
> So only enable auto-delink by default for the original three IDs,
> 0x0138, 0x0158 and 0x0159.
>
> Realtek is working on a patch to properly support auto-delink for other
> IDs.
>
> BugLink: https://bugs.launchpad.net/bugs/1838886
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
> drivers/usb/storage/realtek_cr.c | 24 +++++++++++++++++++-----
> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
> index 4d86cfcc0b40..376f41d0cbc3 100644
> --- a/drivers/usb/storage/realtek_cr.c
> +++ b/drivers/usb/storage/realtek_cr.c
> @@ -36,6 +36,10 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader");
> MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>");
> MODULE_LICENSE("GPL");
>
> +static int auto_delink_enable = -1;
> +module_param(auto_delink_enable, int, S_IRUGO | S_IWUSR);
> +MODULE_PARM_DESC(auto_delink_enable, "enable auto delink (-1=auto [default], 0=disable, 1=enable)");
> +
> static int auto_delink_mode = 1;
> module_param(auto_delink_mode, int, S_IRUGO | S_IWUSR);
> MODULE_PARM_DESC(auto_delink_mode, "auto delink mode (0=firmware, 1=software [default])");
> @@ -996,12 +1000,22 @@ static int init_realtek_cr(struct us_data *us)
> goto INIT_FAIL;
> }
This patch doesn't apply as I can't take your first patch. Can you redo
it and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode
2019-08-26 4:46 [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Kai-Heng Feng
2019-08-26 4:46 ` [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally Kai-Heng Feng
@ 2019-08-26 4:53 ` Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2019-08-26 4:53 UTC (permalink / raw)
To: Kai-Heng Feng; +Cc: stern, linux-usb, usb-storage, linux-kernel
On Mon, Aug 26, 2019 at 12:46:29PM +0800, Kai-Heng Feng wrote:
> The option named "auto_delink_en" is a bit misleading, as setting it to
> false doesn't really disable auto-delink but let auto-delink be firmware
> controlled.
>
> Rename it to reflect the real usage of this parameter.
>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
> drivers/usb/storage/realtek_cr.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
> index cc794e25a0b6..4d86cfcc0b40 100644
> --- a/drivers/usb/storage/realtek_cr.c
> +++ b/drivers/usb/storage/realtek_cr.c
> @@ -36,9 +36,9 @@ MODULE_DESCRIPTION("Driver for Realtek USB Card Reader");
> MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>");
> MODULE_LICENSE("GPL");
>
> -static int auto_delink_en = 1;
> -module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
> -MODULE_PARM_DESC(auto_delink_en, "enable auto delink");
> +static int auto_delink_mode = 1;
> +module_param(auto_delink_mode, int, S_IRUGO | S_IWUSR);
> +MODULE_PARM_DESC(auto_delink_mode, "auto delink mode (0=firmware, 1=software [default])");
We can not just rename module parameters, as that will break working
systems that have their startup scripts using those names :(
sorry,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-26 4:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-26 4:46 [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Kai-Heng Feng
2019-08-26 4:46 ` [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally Kai-Heng Feng
2019-08-26 4:53 ` Greg KH
2019-08-26 4:53 ` [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).