[5.13,15/22] usb: mtu3: restore HS function when set SS/SSP

Message ID	20210910122916.432121640@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Chunfeng Yun <chunfeng.yun@mediatek.com> Subject: [PATCH 5.13 15/22] usb: mtu3: restore HS function when set SS/SSP Date: Fri, 10 Sep 2021 14:30:14 +0200 Message-Id: <20210910122916.432121640@linuxfoundation.org> In-Reply-To: <20210910122915.942645251@linuxfoundation.org> References: <20210910122915.942645251@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.13,02/22] igmp: Add ip_mc_list lock in ip_check_mc_rcu [5.13,03/22] net: ll_temac: Remove left-over debug message [5.13,05/22] blk-mq: fix kernel panic during iterating over flush request [5.13,06/22] blk-mq: fix is_flush_rq [5.13,09/22] Bluetooth: Add additional Bluetooth part for Realtek 8852AE [5.13,10/22] Bluetooth: btusb: Make the CSR clone chip force-suspend workaround more generic [5.13,12/22] usb: xhci-mtk: fix issue of out-of-bounds array access [5.13,15/22] usb: mtu3: restore HS function when set SS/SSP [5.13,16/22] usb: mtu3: use @mult for HS isoc or intr [5.13,18/22] xhci: fix even more unsafe memory usage in xhci tracing [5.13,21/22] x86/reboot: Limit Dell Optiplex 990 quirk to early BIOS versions

Message ID

20210910122916.432121640@linuxfoundation.org

State

Superseded

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Chunfeng Yun <chunfeng.yun@mediatek.com>
Subject: [PATCH 5.13 15/22] usb: mtu3: restore HS function when set SS/SSP
Date: Fri, 10 Sep 2021 14:30:14 +0200
Message-Id: <20210910122916.432121640@linuxfoundation.org>
In-Reply-To: <20210910122915.942645251@linuxfoundation.org>
References: <20210910122915.942645251@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Sept. 10, 2021, 12:30 p.m. UTC

From: Chunfeng Yun <chunfeng.yun@mediatek.com>

commit e88f28514065a6c48aadc367efb0ef6378a01543 upstream.

Due to HS function is disabled when set as FS, need restore
it when set as SS/SSP.

Fixes: dc4c1aa7eae9 ("usb: mtu3: add ->udc_set_speed()")
Cc: stable@vger.kernel.org
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1628836253-7432-1-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/usb/mtu3/mtu3_core.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -227,11 +227,13 @@  void mtu3_set_speed(struct mtu3 *mtu, en
 		mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
 		break;
 	case USB_SPEED_SUPER:
+		mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
 		mtu3_clrbits(mtu->ippc_base, SSUSB_U3_CTRL(0),
 			     SSUSB_U3_PORT_SSP_SPEED);
 		break;
 	case USB_SPEED_SUPER_PLUS:
-			mtu3_setbits(mtu->ippc_base, SSUSB_U3_CTRL(0),
+		mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, HS_ENABLE);
+		mtu3_setbits(mtu->ippc_base, SSUSB_U3_CTRL(0),
 			     SSUSB_U3_PORT_SSP_SPEED);
 		break;
 	default:

[5.13,15/22] usb: mtu3: restore HS function when set SS/SSP

Commit Message

Patch