From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB06CC3DA7A for ; Wed, 28 Dec 2022 11:07:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232927AbiL1LG7 (ORCPT ); Wed, 28 Dec 2022 06:06:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232926AbiL1LGH (ORCPT ); Wed, 28 Dec 2022 06:06:07 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3FA3633B; Wed, 28 Dec 2022 03:06:05 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 67EC5B81639; Wed, 28 Dec 2022 11:06:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13F85C433EF; Wed, 28 Dec 2022 11:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672225563; bh=lJpwlNPpvXa6jku/j9h+GGYNV+nQqONdy+wVJQRc0Ts=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QzbncZ1LmdxvQ7mAagGM9YaRG+SDTwfL6rC6Li2oSWEHJmD/13viwLX51YfmLQN/t xbvaRHOBB3ih3taMGn4BXAu3fQcXc767uGkdmexGNEIdbkWPk6XOrmfRfgH8zS14F+ 9qdFzrO3YvQIaJaWS5TYIGGDlAWHl7eFuYZuaewa/6PHJeOaZoNZzNe3oczXShjAXq amiYJDmz/fSJ2L6SP12Zy0m8F4aUX2oPNILG6mEbN5PS34YCGnTtT/pPnYBeu7gRld xPiO27IBcJCj0Gz8lVGLv7pt7Mqq6uBRvVIn+2AnCzKayjStuyNmL19RuU4Kapl2aE 8z4o0OsoTIqvw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pAUG5-0006BR-Gi; Wed, 28 Dec 2022 12:06:05 +0100 Date: Wed, 28 Dec 2022 12:06:05 +0100 From: Johan Hovold To: Sasha Levin Cc: stable-commits@vger.kernel.org, johan+linaro@kernel.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Kishon Vijay Abraham I , Vinod Koul , linux-kernel@vger.kernel.org Subject: Re: Patch "phy: qcom-qmp-combo: fix runtime suspend" has been added to the 5.15-stable tree Message-ID: References: <20221225150913.691403-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 27, 2022 at 03:26:47PM -0500, Sasha Levin wrote: > On Tue, Dec 27, 2022 at 02:24:39PM +0100, Johan Hovold wrote: > >On Tue, Dec 27, 2022 at 08:04:11AM -0500, Sasha Levin wrote: > >> On Tue, Dec 27, 2022 at 10:14:59AM +0100, Johan Hovold wrote: > >> >On Sun, Dec 25, 2022 at 10:09:13AM -0500, Sasha Levin wrote: > >> >> This is a note to let you know that I've just added the patch titled > >> >> > >> >> phy: qcom-qmp-combo: fix runtime suspend > >> >> > >> >> to the 5.15-stable tree which can be found at: > >> >> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > >> >> > >> >> The filename of the patch is: > >> >> phy-qcom-qmp-combo-fix-runtime-suspend.patch > >> >> and it can be found in the queue-5.15 subdirectory. > >> >> > >> >> If you, or anyone else, feels it should not be added to the stable tree, > >> >> please let know about it. > >> >> > >> >> > >> >> > >> >> commit d17b3a7b0119f7d92788acbe0f3d3b31bd8f892b > >> >> Author: Johan Hovold > >> >> Date: Mon Nov 14 09:13:45 2022 +0100 > >> >> > >> >> phy: qcom-qmp-combo: fix runtime suspend > >> >> > >> >> [ Upstream commit c7b98de745cffdceefc077ad5cf9cda032ef8959 ] > >> >> > >> >> Drop the confused runtime-suspend type check which effectively broke > >> >> runtime PM if the DP child node happens to be parsed before the USB > >> >> child node during probe (e.g. due to order of child nodes in the > >> >> devicetree). > >> >> > >> >> Instead use the new driver data USB PHY pointer to access the USB > >> >> configuration and resources. > >> >> > >> >> Fixes: 52e013d0bffa ("phy: qcom-qmp: Add support for DP in USB3+DP combo phy") > >> >> Reviewed-by: Dmitry Baryshkov > >> >> Signed-off-by: Johan Hovold > >> >> Link: https://lore.kernel.org/r/20221114081346.5116-6-johan+linaro@kernel.org > >> >> Signed-off-by: Vinod Koul > >> >> Signed-off-by: Sasha Levin > >> > > >> >This one was not marked for stable and can not be backported without > >> >further dependencies. This driver did not even exist in 5.15, and no, > >> >you should no try to backport the split of the original driver either. > >> > >> I'll drop this patch. > >> > >> >Sasha, please stop this madness. > >> > >> So help me understand this... The fixes tag says: > >> > >> Fixes: 52e013d0bffa ("phy: qcom-qmp: Add support for DP in USB3+DP combo phy") > >> > >> 52e013d0bffa was merged in v5.10. Does the tag point to the wrong > >> commit? > > > >The fixes tag is correct, but the qmp driver has since been split into > >multiple drivers. > > > >But first, the commit in question will not even compile without > >7a7d86d14d07 ("phy: qcom-qmp-combo: fix broken power on") which from > >what I can tell has not yet been backported (even though it has a stable > >tag). > > > >Did you make sure that you compile-tested this patch after applying it > >to 5.15? > > https://linux.kernelci.org/build/stable-rc/branch/queue%2F5.15/kernel/v5.15.85-687-g210b69cd4594/ Hard to tell from that link whether this particular driver was actually built. But importantly it can not build without 7a7d86d14d07 ("phy: qcom-qmp-combo: fix broken power on") which I did not see in the stable queue. > >Second, this commit fixes the combo driver which did not exist before > >94a407cc17a4 (phy: qcom-qmp: create copies of QMP PHY driver) which > >split the older driver into multiple drivers. This onef and all the > >follow-on cleanups should not be backported. > > > >If we find anything that really needs to be fixed in stable kernels > >prior to the driver split, those fixes need to be backported properly > >to the older version of the driver. This should not be automated. > > Ack, I'll blacklist this driver, thank you. Perfect, thanks. Johan