From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A771D4C85 for ; Mon, 2 Dec 2024 07:11:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733123470; cv=none; b=OFVfSolKyqqa/z/PABbEGnOZAPdxjRjnWi/Hmp79bihlu8Mpq9lKz7X+H+STZgMngzQlM0mR0A5dXK7+Nozkh6mwySiXgAawvxGMtCDnrPCGXF5dXVZ76nmH1c1STfa1iGKazlZOqohkCK9AJ32AGHeP32d5taQQkEy2UEaXSsc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733123470; c=relaxed/simple; bh=P7e6pmJd2LwCcMtIh+xs1sVFv/Ibe//zWGF6APvwuig=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=lLasHP3HlKRhbu3NLhDIza8J1c5LfNrSq1v4crGCJDjCGHkblL+0LlaWknvTThJtNTI4qzqCPPas2kgmp9HGaHf9P1q9+H7hEC1n/YbtlNmHCHD/QdZm0ommKuH9q58bqXhwP0uWukwW1ivwDI1sj4Isvpv+IX2CwmQMHwmvsAc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=v4roW96C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="v4roW96C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93CECC4CED2; Mon, 2 Dec 2024 07:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733123470; bh=P7e6pmJd2LwCcMtIh+xs1sVFv/Ibe//zWGF6APvwuig=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=v4roW96CrrT51AZfUKmOvDck+FwW5LSBnC763556GV9m/0rouD0zFG89B/+462C79 Bch0mTlRU9724NdNKy4IWLew0RjVEwy98sy3BbJD33skjmFisdJYn7pnA16TdqPHLl Kpq5H4Q5FgeBcqBsq80B2gHnEP8UPTUdD/mVGEp4= Date: Mon, 2 Dec 2024 08:11:06 +0100 From: Greg Kroah-Hartman To: Chen-Yu Tsai Cc: Koichiro Den , stable@vger.kernel.org, AngeloGioacchino Del Regno , =?iso-8859-1?Q?N=EDcolas_F=2E_R=2E_A=2E?= Prado Subject: Re: [PATCH 6.6 433/538] arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled Message-ID: <2024120254-pry-shut-6670@gregkh> References: <20241002125751.964700919@linuxfoundation.org> <20241002125809.530901902@linuxfoundation.org> <6itvivhxbjlpky5hn6x2hmc3kzz4regcvmsk226t6ippjad7yk@26xug5lrdqdw> <2024120210-discolor-saloon-a47a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Mon, Dec 02, 2024 at 02:53:49PM +0800, Chen-Yu Tsai wrote: > On Mon, Dec 2, 2024 at 2:27 PM Greg Kroah-Hartman > wrote: > > > > On Mon, Dec 02, 2024 at 11:36:33AM +0800, Chen-Yu Tsai wrote: > > > On Sun, Dec 1, 2024 at 8:15 PM Koichiro Den wrote: > > > > > > > > On Wed, Oct 02, 2024 at 03:01:12PM +0200, Greg Kroah-Hartman wrote: > > > > > 6.6-stable review patch. If anyone has any objections, please let me know. > > > > > > > > > > ------------------ > > > > > > > > > > From: Chen-Yu Tsai > > > > > > > > > > commit 09d385679487c58f0859c1ad4f404ba3df2f8830 upstream. > > > > > > > > > > USB 3.0 on xhci1 is not used, as the controller shares the same PHY as > > > > > pcie1. The latter is enabled to support the M.2 PCIe WLAN card on this > > > > > design. > > > > > > > > > > Mark USB 3.0 as disabled on this controller using the > > > > > "mediatek,u3p-dis-msk" property. > > > > > > > > > > Reported-by: Nícolas F. R. A. Prado #KernelCI > > > > > Closes: https://lore.kernel.org/all/9fce9838-ef87-4d1b-b3df-63e1ddb0ec51@notapiano/ > > > > > Fixes: b6267a396e1c ("arm64: dts: mediatek: cherry: Enable T-PHYs and USB XHCI controllers") > > > > > Cc: stable@vger.kernel.org > > > > > Signed-off-by: Chen-Yu Tsai > > > > > Link: https://lore.kernel.org/r/20240731034411.371178-2-wenst@chromium.org > > > > > Signed-off-by: AngeloGioacchino Del Regno > > > > > Signed-off-by: Greg Kroah-Hartman > > > > > --- > > > > > arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 1 + > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi > > > > > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi > > > > > @@ -1312,6 +1312,7 @@ > > > > > usb2-lpm-disable; > > > > > vusb33-supply = <&mt6359_vusb_ldo_reg>; > > > > > vbus-supply = <&usb_vbus>; > > > > > + mediatek,u3p-dis-msk = <1>; > > > > > }; > > > > > > > > > > #include > > > > > > > > > > > > > > > > > > It looks like this change is applied to xhci3 instead of xhci1. The same > > > > appears in the backport for linux-6.1.y. Could you take a look? > > > > > > Agree that it's applied to the wrong node. It won't cause any issues > > > since xhci3 is USB 2.0 only, but we should we fix it regardless. > > > > Great, can someone please send a patch so that we get this correct? > > Would you like a revert plus a correct backport, or just a fixup? Which ever is easier for you is fine. thanks, greg k-h