From patchwork Mon Aug 26 04:46:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11113935 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC42D1398 for ; Mon, 26 Aug 2019 04:46:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA6F722CF5 for ; Mon, 26 Aug 2019 04:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727657AbfHZEqh (ORCPT ); Mon, 26 Aug 2019 00:46:37 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:43325 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725270AbfHZEqh (ORCPT ); Mon, 26 Aug 2019 00:46:37 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1i26tl-00010H-RL; Mon, 26 Aug 2019 04:46:34 +0000 From: Kai-Heng Feng To: stern@rowland.harvard.edu Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH 1/2] USB: storage: ums-realtek: Rename module parameter auto_delink_en to auto_delink_mode Date: Mon, 26 Aug 2019 12:46:29 +0800 Message-Id: <20190826044630.21949-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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 --- 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 "); 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; From patchwork Mon Aug 26 04:46:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11113933 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 318FB1398 for ; Mon, 26 Aug 2019 04:46:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D3C2217F4 for ; Mon, 26 Aug 2019 04:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729658AbfHZEqk (ORCPT ); Mon, 26 Aug 2019 00:46:40 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:43330 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725270AbfHZEqj (ORCPT ); Mon, 26 Aug 2019 00:46:39 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1i26tp-00014D-8f; Mon, 26 Aug 2019 04:46:37 +0000 From: Kai-Heng Feng To: stern@rowland.harvard.edu Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-kernel@vger.kernel.org, Kai-Heng Feng Subject: [PATCH 2/2] USB: storage: ums-realtek: Enable auto-delink optionally Date: Mon, 26 Aug 2019 12:46:30 +0800 Message-Id: <20190826044630.21949-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190826044630.21949-1-kai.heng.feng@canonical.com> References: <20190826044630.21949-1-kai.heng.feng@canonical.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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 --- 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 "); 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)