From patchwork Sun Oct 20 05:27:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 13842981 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8C8D1D3C927 for ; Sun, 20 Oct 2024 05:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qD6VNzKF34o+eEOtqDGp2McA39VJOqH+0vbVa25DYuU=; b=VAt/XbHWF10ytr EBDk7hNsTTwU2/obtQURpSV9JYVYrXfG6aFmcGDIWXWwwMyF/J4oaG9/N/eQo4XvhFiampoEXRf8r n0s5Dsf0RlYFSXStNkz9n7CiokQi5x7vzyPlgJHbaOfPnkCdxQbdX6/x/fHs/3wNqbtu5PSBY01Xf cHcIqfP16Sx4xEL63Wkwk3pX8FhbSw4HP1ukCuNwskrz2Vy5mKqOJ1KIJ7fLyRsGWBnkz6MNwySct UbUZsRXgNp96G0tlrYxXpzJiAnbuTPNH+BwbjcEwDRjbDgDz3ghugttgOzxabad5McUbAao5vwIW8 YXAXEAgUWpXG+WQsjoow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUY-00000004RmB-0UVi; Sun, 20 Oct 2024 05:28:38 +0000 Received: from pv50p00im-hyfv10021501.me.com ([17.58.6.48]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUV-00000004Rkp-0ETX for linux-phy@lists.infradead.org; Sun, 20 Oct 2024 05:28:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1729402109; bh=KnWmUxlYWWRbTvdeYT3kWc/oYa/wGqdAwM1ag6tzhOY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To; b=Yfh2oBZanXoWXjDU7Yt67Qlkt/SaoaBWFzJwQJXGpmjrNQMCsvnd+owTYQVy9mlqY cgavEfm+Oe/uyPfX5gRM1UYXQVjqQbE9GxBzRR8PcJ3dIi6EQPVLfjJq1RDy26eYH9 lV7hA8oqs+SS7UM3n+i6Epg3EYUPsYinm5tZW4xH6lqmXqPnLP8Mm9Q71NyOHJNr58 lzQFtugZMN93Dnk8t/QmgYqcuLyfFPye3lcV3tDsr9wl+t/45phSrCGcvOAMTkePX8 cYmfs6xLMbkaN0CkQK9VVqPSkSQqqUO0pZnYhdUPImepRcemYBb4LK3xbQqV41cG8A dBYc+GcN/PldQ== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-hyfv10021501.me.com (Postfix) with ESMTPSA id 95ACB2C00F7; Sun, 20 Oct 2024 05:28:23 +0000 (UTC) From: Zijun Hu Date: Sun, 20 Oct 2024 13:27:46 +0800 Subject: [PATCH 1/6] phy: core: Fix API devm_phy_put() can not release the phy MIME-Version: 1.0 Message-Id: <20241020-phy_core_fix-v1-1-078062f7da71@quicinc.com> References: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> To: Vinod Koul , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , Rob Herring , Arnd Bergmann , Lee Jones Cc: Zijun Hu , stable@vger.kernel.org, linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.1 X-Proofpoint-ORIG-GUID: gv-M2zT64WpCFnIo56TxGzChfILMIwkn X-Proofpoint-GUID: gv-M2zT64WpCFnIo56TxGzChfILMIwkn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-20_02,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2410200032 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_222835_148482_28003BBF X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Zijun Hu For devm_phy_put(), its comment says it needs to invoke phy_put() to release the phy, but it does not do that actually, so it can not fully undo what the API devm_phy_get() does, that is wrong, fixed by using devres_release() instead of devres_destroy() within the API. BTW, the API is directly used by below source files in error handling path, so also fix relevant issue within these source files: drivers/pci/controller/cadence/pcie-cadence.c drivers/net/ethernet/ti/am65-cpsw-nuss.c Fixes: ff764963479a ("drivers: phy: add generic PHY framework") Cc: stable@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: Zijun Hu --- drivers/phy/phy-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index f053b525ccff..f190d7126613 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -737,7 +737,7 @@ void devm_phy_put(struct device *dev, struct phy *phy) if (!phy) return; - r = devres_destroy(dev, devm_phy_release, devm_phy_match, phy); + r = devres_release(dev, devm_phy_release, devm_phy_match, phy); dev_WARN_ONCE(dev, r, "couldn't find PHY resource\n"); } EXPORT_SYMBOL_GPL(devm_phy_put); From patchwork Sun Oct 20 05:27:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 13842982 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02E8ED3C935 for ; Sun, 20 Oct 2024 05:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cU4dexSOR9V08J1lsbbUSiz5ixar1AadtUas8IU1kgs=; b=o4AiibpN8xtwFJ WlUPgKo/cFpnVc4ATuVnwRqKTnKA2qEU4NyIb2We0ScsPvylMYtQ5c3uSxbWy2AVzFUvU1hCnhJ4u 0D/6JYq3z8AnA+NZkJHN5FxAvn1NC4sEXcTmtUD2r2IG/QiS2fUZjAGOufetpCpfXCWZQDQaS9iXc RJ16wI8bN63jyypRmFm1FOqiWBLH22CKjQED9I6H0NsqCpt+Gh8oDmrpEtgsbWWzqRiQQFW/h6km0 NVnjIGdOkOzz1yiTrmWmWru+aFLghEbrXvzDgN6zzLCnKTYXcX0VEk7cNJBSvTiaI1YXnzsuxwFYF Zua7Ek5XbS3UiBdkhzqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUY-00000004RmR-24c3; Sun, 20 Oct 2024 05:28:38 +0000 Received: from pv50p00im-hyfv10021501.me.com ([17.58.6.48]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUW-00000004RlI-1iH2 for linux-phy@lists.infradead.org; Sun, 20 Oct 2024 05:28:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1729402115; bh=/56WqmOxBRcMrRRa1vGi/MoooLtUKmliYmk1pSnTxZg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To; b=Q63jTXseUlZM5zGMoEAcD3TCLGKT4z1uctoS3tY42/SWQMCODg1fSeWrmtsTCNzEg omfKpnFSannVfDGabpksUdpRiWec6dAMe//2WObN5hmGKqEWEnEepeTv3tUyeLhVqb JBiLEZrU4MQ9j34cIzab57GqaXoVCzInghDlWCz+7umB8v6ckVrZKJsPAGnwAKzbGY FkWiAeBkcJylCxxoGexq227OnoVajqG4GiqfQjA3Jm2ZDueBoK98JH2oydMsUAI1ny 3RTPsQMshZYlR9II7p5op2bfczG2TJ5apWXvYBkFYLHajgEAqKFmuxj8aBCMo7SZxc ol0y+3rlnKrtA== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-hyfv10021501.me.com (Postfix) with ESMTPSA id E90132C00D3; Sun, 20 Oct 2024 05:28:29 +0000 (UTC) From: Zijun Hu Date: Sun, 20 Oct 2024 13:27:47 +0800 Subject: [PATCH 2/6] phy: core: Fix API devm_of_phy_provider_unregister() can not unregister the phy provider MIME-Version: 1.0 Message-Id: <20241020-phy_core_fix-v1-2-078062f7da71@quicinc.com> References: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> To: Vinod Koul , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , Rob Herring , Arnd Bergmann , Lee Jones Cc: Zijun Hu , stable@vger.kernel.org, linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.1 X-Proofpoint-ORIG-GUID: hazZhiyjtEeOvE2ZPoxwF1ec4un2usrl X-Proofpoint-GUID: hazZhiyjtEeOvE2ZPoxwF1ec4un2usrl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-20_02,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2410200032 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_222836_500345_513E80F9 X-CRM114-Status: GOOD ( 10.12 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Zijun Hu For devm_of_phy_provider_unregister(), its comment says it needs to invoke of_phy_provider_unregister() to unregister the phy provider but it does not do that actually, so it can not fully undo what the API devm_of_phy_provider_register() does, that is wrong, fixed by using devres_release() instead of devres_destroy() within the API. Fixes: ff764963479a ("drivers: phy: add generic PHY framework") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu --- drivers/phy/phy-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index f190d7126613..de07e1616b34 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -1259,12 +1259,12 @@ EXPORT_SYMBOL_GPL(of_phy_provider_unregister); * of_phy_provider_unregister to unregister the phy provider. */ void devm_of_phy_provider_unregister(struct device *dev, - struct phy_provider *phy_provider) + struct phy_provider *phy_provider) { int r; - r = devres_destroy(dev, devm_phy_provider_release, devm_phy_match, - phy_provider); + r = devres_release(dev, devm_phy_provider_release, devm_phy_match, + phy_provider); dev_WARN_ONCE(dev, r, "couldn't find PHY provider device resource\n"); } EXPORT_SYMBOL_GPL(devm_of_phy_provider_unregister); From patchwork Sun Oct 20 05:27:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 13842983 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D90ED3C927 for ; Sun, 20 Oct 2024 05:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zwd+43hM50DB79lY0TlTCXeR26aAHmqn+u2R1ihDplg=; b=S3UxR6c/y8I/kB Z1abgcsvwSpYtfDzxYnxcAQ29RTncYrLu7IiNHDGR0H5t+GDvKTIKC9kPGSPe3QvGuHt6H033c36n GHfrVmByI+DmBqzcWVAxZACKlSHSw7uPEPqVgk1wtF5TY8afR4DCDUErqBU1jktlVZroKkEnJpE0j RY6KDd7WBSGqWr1/VT9Tfe/q6/ts1EII+p3Sd/WADVImHD5IOx3TiFl08Gb28qhdBI6FZ19vcUtwD 5zzP4QH/gjLEO6/4s8wfrK0gSqCnavGViP1wT/c6qHXhvKQVGXB/1/21JWBE2DEhoKNIqOFIF4uMu LMZJo7hhsQpjzPYlI07w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUg-00000004RpM-0AAI; Sun, 20 Oct 2024 05:28:46 +0000 Received: from pv50p00im-hyfv10021501.me.com ([17.58.6.48]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUd-00000004Ro4-0f4v for linux-phy@lists.infradead.org; Sun, 20 Oct 2024 05:28:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1729402121; bh=4UkJl6ESTHl0MKzkJU4NiOf/LCaIG4/FzrobNoV6pGo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To; b=agl/5G5aRiA/jFm9Z5d6jJMG/1kcv7KbHcP1dOJ30kvE9JiD6zhw22+qXm3HiR7ps Wy2Wh0ZdOeP2xGhQYTTsxqfDQrpBorcxcjs0mi1EzdW4uSEmwsE2pTIjOfb7T+jLmB tohHnrKZ6m0KxnHZO3hIUwK0ZLKmYY7/lDP9LKtc6h2EgpjeG61ZsxkmZTCU1l1RxO YBU7LTQT/G3D2VxNdDC/MXLKV2XLw/8RZDgeAbCF5csG6U87xZhT4sQCXD8U3S1U4E KI7UAvMi1Gn+yVFWW5RwGV3QwQMPbN6oAvOWKs2en5yJYJCBn3cGHM+8Ui/hpTt7i+ VdDEGYC/OvQwA== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-hyfv10021501.me.com (Postfix) with ESMTPSA id 3E7BC2C0130; Sun, 20 Oct 2024 05:28:35 +0000 (UTC) From: Zijun Hu Date: Sun, 20 Oct 2024 13:27:48 +0800 Subject: [PATCH 3/6] phy: core: Fix API devm_phy_destroy() can not destroy the phy MIME-Version: 1.0 Message-Id: <20241020-phy_core_fix-v1-3-078062f7da71@quicinc.com> References: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> To: Vinod Koul , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , Rob Herring , Arnd Bergmann , Lee Jones Cc: Zijun Hu , stable@vger.kernel.org, linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.1 X-Proofpoint-ORIG-GUID: U-x97Lqmim6E_t_TfbzbHgSP6RIq63vt X-Proofpoint-GUID: U-x97Lqmim6E_t_TfbzbHgSP6RIq63vt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-20_02,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2410200032 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_222843_248277_922890DC X-CRM114-Status: GOOD ( 10.72 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Zijun Hu For devm_phy_destroy(), its comment says it needs to invoke phy_destroy() to destroy the phy, but it does not do that actually, so it can not fully undo what the API devm_phy_create() does, that is wrong, fixed by using devres_release() instead of devres_destroy() within the API. Fixes: ff764963479a ("drivers: phy: add generic PHY framework") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu --- drivers/phy/phy-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index de07e1616b34..52ca590a58b9 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -1121,7 +1121,7 @@ void devm_phy_destroy(struct device *dev, struct phy *phy) { int r; - r = devres_destroy(dev, devm_phy_consume, devm_phy_match, phy); + r = devres_release(dev, devm_phy_consume, devm_phy_match, phy); dev_WARN_ONCE(dev, r, "couldn't find PHY resource\n"); } EXPORT_SYMBOL_GPL(devm_phy_destroy); From patchwork Sun Oct 20 05:27:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 13842984 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4088D3C934 for ; Sun, 20 Oct 2024 05:28:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XONzYwTEhC8C1UlrhLBrH8dBAcL2eRPQOZdAi6vIsdI=; b=hywnsPbzZUfapV qO7hBakfkYoL+SUCEPwJvuQaWFPOyQidOprPzYilrJaIY9EAUeEgkVbEE20JqjgXPUp887WAKKy7b Zq2zVtKA2eg2lh3zltBe9h134h7JfNzHDPjDvAeGDSSUi/aSoj/Qpcm7f6hunm1hzOUw39ClE0Rce VOAmD0ey0+B8iDWavEmNU0A7A87hdVwOPBvZpmR7iGR1dHPZYAbc9mefgl1RE6QFFk4lHt1zljoBS kEXP1PP/O07ylzKzoxUim0hDJa8ovLTIbmE5gS6NFyHu2INi/xB1Tou03mOs9qs04qiFxMN8SyMyU nSlxhda6dnHwr7JrMZ4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUl-00000004RqU-1wzI; Sun, 20 Oct 2024 05:28:51 +0000 Received: from pv50p00im-hyfv10021501.me.com ([17.58.6.48]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUi-00000004Rpn-379B for linux-phy@lists.infradead.org; Sun, 20 Oct 2024 05:28:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1729402128; bh=bqgD9TqeRl3fISVSF8RjYIENXrO/0dTFirpvQNfH4Dk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To; b=gpwA6Nebi6sHyPqVwriErkrRAhyENlFTXgZcArARP8mEwzKBlNqcKlFYAJFtkECLL ya6kIrNGTXEdErFwr9yHehnypMbo9TDrumZZVglnayEeMonZDR5aZs/1tiJDj2Fw9+ J3ydjynv9shdosxmzgJvzSjJPXAjWXXdlUQ+szT2HoIjJhJYbHqH6eXd1vvyxofr2f GmoO62berrK2gd/Yg3SXJDmt9x+R3qrzq0AgXDWFse12ZjC6bDj+QnAWaW6//FYFKY gNmBNGcpgnjES50eYR2OZ5vIeOUL4gQ8+J7hbss9dMaXasTJCXA6ivJJwcJs6DTzZa vefo6h7EQZJsg== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-hyfv10021501.me.com (Postfix) with ESMTPSA id 7D78D2C013F; Sun, 20 Oct 2024 05:28:42 +0000 (UTC) From: Zijun Hu Date: Sun, 20 Oct 2024 13:27:49 +0800 Subject: [PATCH 4/6] phy: core: Add missing of_node_put() for an error handling path of _of_phy_get() MIME-Version: 1.0 Message-Id: <20241020-phy_core_fix-v1-4-078062f7da71@quicinc.com> References: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> To: Vinod Koul , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , Rob Herring , Arnd Bergmann , Lee Jones Cc: Zijun Hu , stable@vger.kernel.org, linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.1 X-Proofpoint-ORIG-GUID: UKGJg6bDUiFHKz2zU5QVA92RCrgayaQo X-Proofpoint-GUID: UKGJg6bDUiFHKz2zU5QVA92RCrgayaQo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-20_02,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2410200032 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_222848_833750_F83DCD0E X-CRM114-Status: GOOD ( 10.80 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Zijun Hu It is wrong for _of_phy_get() not to decrease the OF node refcount which was increased by previous of_parse_phandle_with_args() when returns due to of_device_is_compatible() error. Fixed by adding of_node_put() before the error return. Fixes: b7563e2796f8 ("phy: work around 'phys' references to usb-nop-xceiv devices") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu --- drivers/phy/phy-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 52ca590a58b9..967878b78797 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -629,8 +629,11 @@ static struct phy *_of_phy_get(struct device_node *np, int index) return ERR_PTR(-ENODEV); /* This phy type handled by the usb-phy subsystem for now */ - if (of_device_is_compatible(args.np, "usb-nop-xceiv")) + if (of_device_is_compatible(args.np, "usb-nop-xceiv")) { + /* Put refcount above of_parse_phandle_with_args() got */ + of_node_put(args.np); return ERR_PTR(-ENODEV); + } mutex_lock(&phy_provider_mutex); phy_provider = of_phy_provider_lookup(args.np); From patchwork Sun Oct 20 05:27:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 13842985 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C260ED3C934 for ; Sun, 20 Oct 2024 05:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OMfPu6OONn3WfGSgjttAs/X4eb13kLSlXq2trcGSTck=; b=ssMwfZyoSSZ3Ch kdiZ80sM7ZfiQIPlA+oXMOWEaJoEwjlGB2Sbe6u/fNYJG038U/p4L7LY+f0KbNDcerflemrs1fAXg DDvqOroSkpXBPPZmPkCKHgfBNjtFHvNMQBmnP1D72gdwuEtDgfc5/cPWUe5P4yXSNLIIJiBUfZzUm jMtXlDHnfU5BjawfMtJY752AoFk8M46mHpLp4zkzofD/S3tQsLe582NXXW2fizywfqMXBkhCkAmGH dl8ivpbT6zgbWtToPXdt2blmOZuVFDVAFGVzFnduWwhPsPn6oWHKBe/1neOdSeAFXk0wDXHWBj8FR pYYncCvpRf/ia/sAbADw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUr-00000004Rsl-0bzF; Sun, 20 Oct 2024 05:28:57 +0000 Received: from pv50p00im-hyfv10021501.me.com ([17.58.6.48]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUp-00000004Rra-05a1 for linux-phy@lists.infradead.org; Sun, 20 Oct 2024 05:28:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1729402134; bh=rVON13sMMqtKSwCrl4E1Uhkm6hLNfvRtGi981NVB7Gs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To; b=ou5YHP16ry9CgCybtpG62r35ZB2cpiklwmT1he10nlofB7CO0oQAY7P6knGVfStrr yBHd4FL3CbryCTpHZiGvlUqpAwIJuCz1SGhnCSMegnb0s4chbCotaXY5qCM7iwVsNm x9gTXClBdLxoOSTIa/hsOwn5k/IFUpuhe8+O84o2bpcvE9ZNYahhHOm/NMzj5flyGg Gu69Wosh8q8FpXgoaGr5LnQQpxlJcHOliGHy+88OWLHps3KIDYPV0MJ8y0AbgpBwuY p4f0Qq0jSPQ1Ae9OWaKCljqZAv3IVssLla7cnWNzd4dazBw8+ni3tVqzaGCfj3xMCd fj92LWGujUoww== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-hyfv10021501.me.com (Postfix) with ESMTPSA id CD6C22C0130; Sun, 20 Oct 2024 05:28:48 +0000 (UTC) From: Zijun Hu Date: Sun, 20 Oct 2024 13:27:50 +0800 Subject: [PATCH 5/6] phy: core: Add missing of_node_put() in of_phy_provider_lookup() MIME-Version: 1.0 Message-Id: <20241020-phy_core_fix-v1-5-078062f7da71@quicinc.com> References: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> To: Vinod Koul , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , Rob Herring , Arnd Bergmann , Lee Jones Cc: Zijun Hu , stable@vger.kernel.org, linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.1 X-Proofpoint-ORIG-GUID: hKZD5y-4RY3sylApKTy1YAx6Oj9Jx6jl X-Proofpoint-GUID: hKZD5y-4RY3sylApKTy1YAx6Oj9Jx6jl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-20_02,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2410200032 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_222855_114819_53256621 X-CRM114-Status: GOOD ( 11.16 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Zijun Hu The for_each_child_of_node() macro automatically decrements the child refcount at the end of every iteration. On early exits, of_node_put() must be used to manually decrement the refcount and avoid memory leaks. The macro called by of_phy_provider_lookup() has such early exit, but it does not call of_node_put() before early exit. Fixed by adding missing of_node_put() in of_phy_provider_lookup(). Fixes: 2a4c37016ca9 ("phy: core: Fix of_phy_provider_lookup to return PHY provider for sub node") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu --- The impact of this change is wide since of_phy_provider_lookup() is indirectly called by APIs phy_get(), of_phy_get(), and devm_of_phy_get_by_index(). The following kernel mainline commit has similar fix: Commit: b337cc3ce475 ("backlight: lm3509_bl: Fix early returns in for_each_child_of_node()") --- drivers/phy/phy-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 967878b78797..24bd619a33dd 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -143,10 +143,11 @@ static struct phy_provider *of_phy_provider_lookup(struct device_node *node) list_for_each_entry(phy_provider, &phy_provider_list, list) { if (phy_provider->dev->of_node == node) return phy_provider; - for_each_child_of_node(phy_provider->children, child) - if (child == node) + if (child == node) { + of_node_put(child); return phy_provider; + } } return ERR_PTR(-EPROBE_DEFER); From patchwork Sun Oct 20 05:27:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 13842986 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0750D3C934 for ; Sun, 20 Oct 2024 05:29:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OWa8e2lgb9iDjBn2v7j1sNbkE/47yJN+/uZDM1GR0iY=; b=j52diVkA/jnByW QhRnEWfIaNc9VHKtwIh1Ieotl9OjFpGQJbbaPobzILuTxO4Oz2KuKd3yf6h5zFRV4ozh26jvSUnhB jCSmf/Gq+QjSaggyLyV1A6sIVo23pnJMFQZbzDqtKsemElJy7SlMyMb8anYiwIXRy8tdcU9YXYXIp WGHltq6moqxYCdSQhVFFpEhEET+C+KsYWzxnA1qCffIQnozmszpkLPk6MaZ7dSNU/4nGjW82Cnkd2 T5kME0Gz8dr/nmzwUbSlGcOEsFEErHhx9NWZ/4hwSt5QcasqACCXdahLnF9j9vftkvKFiBu1oKesz iICapoWSy45uXlUHBzFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUy-00000004Ruz-2h6E; Sun, 20 Oct 2024 05:29:04 +0000 Received: from pv50p00im-hyfv10021501.me.com ([17.58.6.48]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2OUv-00000004RtU-0wQi for linux-phy@lists.infradead.org; Sun, 20 Oct 2024 05:29:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1729402140; bh=Pzj4HJoWnL6JTLVf/LzhBRoFLqsQjjCajmU0HHRJmCM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To; b=FzsUprEnaIdjyWcgh24n4owqgCzwCEevOvHP5TBSaiI+GpFyVFF48q7MSLp5srmER 49VkFoBQ5XoQpE1j98Fz9ev9yh+BpUPjVvlh2BafPiLQAfKq2SsJQ07ku9Ojbg/XP2 qQjJHhxdEPOqQNcrLMXTrx5ZDPZaVo46b169DrWuHQ7/ae1Hvj/yoA0J4KYc6WN3H5 jtMwQfYBRhwhSywsNxKuMi4qXJ3zMT5IUD10mNexJhH0YpjHb6B0tjQL/CKMBbFHoH a5N7/J7iztEt7vk1VaMooWxFcs+nn+rmK9i3u80xPHGABylS8yFXBCxdO4oGvU8vqs Vz/Asg70Uh8Zg== Received: from [192.168.1.26] (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-hyfv10021501.me.com (Postfix) with ESMTPSA id 24D4C2C0141; Sun, 20 Oct 2024 05:28:54 +0000 (UTC) From: Zijun Hu Date: Sun, 20 Oct 2024 13:27:51 +0800 Subject: [PATCH 6/6] phy: core: Simplify API of_phy_simple_xlate() implementation MIME-Version: 1.0 Message-Id: <20241020-phy_core_fix-v1-6-078062f7da71@quicinc.com> References: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com> To: Vinod Koul , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , Rob Herring , Arnd Bergmann , Lee Jones Cc: Zijun Hu , stable@vger.kernel.org, linux-phy@lists.infradead.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Zijun Hu X-Mailer: b4 0.14.1 X-Proofpoint-ORIG-GUID: 0V1SomLf6-r1ySnqSOHR_zWePw_E5J9r X-Proofpoint-GUID: 0V1SomLf6-r1ySnqSOHR_zWePw_E5J9r X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-20_02,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2410200032 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_222901_320120_EB8144CA X-CRM114-Status: GOOD ( 10.11 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Zijun Hu Simplify of_phy_simple_xlate() implementation by API class_find_device_by_of_node() which is also safer since it subsys_get() @phy_class subsystem firstly then iterates devices. Also comment its parameter @dev with unused in passing since the parameter provides no available input info but acts as an auto variable. Signed-off-by: Zijun Hu --- drivers/phy/phy-core.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 24bd619a33dd..102fc6b6ff71 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -748,7 +748,7 @@ EXPORT_SYMBOL_GPL(devm_phy_put); /** * of_phy_simple_xlate() - returns the phy instance from phy provider - * @dev: the PHY provider device + * @dev: the PHY provider device unused * @args: of_phandle_args (not used here) * * Intended to be used by phy provider for the common case where #phy-cells is @@ -759,20 +759,13 @@ EXPORT_SYMBOL_GPL(devm_phy_put); struct phy *of_phy_simple_xlate(struct device *dev, const struct of_phandle_args *args) { - struct phy *phy; - struct class_dev_iter iter; - - class_dev_iter_init(&iter, &phy_class, NULL, NULL); - while ((dev = class_dev_iter_next(&iter))) { - phy = to_phy(dev); - if (args->np != phy->dev.of_node) - continue; + struct device *target_dev; - class_dev_iter_exit(&iter); - return phy; + target_dev = class_find_device_by_of_node(&phy_class, args->np); + if (target_dev) { + put_device(target_dev); + return to_phy(target_dev); } - - class_dev_iter_exit(&iter); return ERR_PTR(-ENODEV); } EXPORT_SYMBOL_GPL(of_phy_simple_xlate);