lkml.org 
[lkml]   [2019]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/2] USB: storage: ums-realtek: Make auto-delink support optionally
    Date
    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>
    ---
    v2:
    - Use auto_delink_support instead of auto_delink_enable.

    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 beaffac805af..b304cca7c4fa 100644
    --- a/drivers/usb/storage/realtek_cr.c
    +++ b/drivers/usb/storage/realtek_cr.c
    @@ -40,6 +40,10 @@ static int auto_delink_en = 1;
    module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
    MODULE_PARM_DESC(auto_delink_en, "auto delink mode (0=firmware, 1=software [default])");

    +static int auto_delink_support = -1;
    +module_param(auto_delink_support, int, S_IRUGO | S_IWUSR);
    +MODULE_PARM_DESC(auto_delink_support, "enable auto delink (-1=auto [default], 0=disable, 1=enable)");
    +
    #ifdef CONFIG_REALTEK_AUTOPM
    static int ss_en = 1;
    module_param(ss_en, int, S_IRUGO | S_IWUSR);
    @@ -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_support == -1) {
    + if (CHECK_PID(chip, 0x0138) || CHECK_PID(chip, 0x0158) ||
    + CHECK_PID(chip, 0x0159))
    + auto_delink_support = 1;
    + else
    + auto_delink_support = 0;
    + }
    +
    + if (auto_delink_support) {
    + 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
    \
     
     \ /
      Last update: 2019-08-26 07:45    [W:8.152 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site