From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795017650; b=QvZ+rMQ1xI6QahM4yu65uD620otpHNysNCAESn8A6i4LgC68l4oJP19AYcR1s5qh+hNy yti9Mm+zIyKeABxOwUnBWX6ZbelAm6P5oZ0u1ngkQIl8TWq7KQXYBLMfJzBUYTEoadqXQ HtDlRG2jC17ePknhEtMKkkjTq1e7lABlpqmDiDnPcFASakQ6N9tD28+kWJj5rhXNhGP4o iDhCeZh0ZQBX+BPVOWzpV5U8XCJnIjqjiUh2IhaYThMKw9aVq9BXVLosvnwH3FmPeN2gM HYI7jTIV4iSqve4UL3yp1BNk43rsUwIY/grr0j1E/Ay8FgJvrG/sVb6fWmZgxYCTo1A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795017650; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Pmrw+n4oc0ORVUEclBs6aqMoosDTr/+ffhQOj22w4LM=; b=JiHkifZaiEb/3QkVJSAhOBtLUvKaLK7v+3/7cLh6o0vanqIcMWDDsmgm6a/E7edAbXzI McoxWB6K/LWiZ4MHPjRZLFFIM1rL5ukNqDgUchiIPc1GE/B6U6DLUReUEzE5iTzS7wKaP 1eIP2s8avDN1XEnywGMQbMzkT1bDcHWGJ1A3Yc4AVJCvdZ/Hz3Z7rzwO/JXhxpTxr8v8V n0Ku+PRDVTbVKAwBs6De5NWEiGPL4F4KgQGfApy5H9BmML8wqz2949jC0jjbVdfWRNfjb ooxa0L7H5i2eZj6bG7oUhH4R954BrLTfgfuIojXpDHLtZTNgr3CYRt5Hx1OffWu07TA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MCs0uYNo; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50CD9606A31C; Wed, 18 Nov 2026 16:00:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=MCs0uYNo Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2DB71F000D1; Wed, 18 Nov 2026 16:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795017650; bh=Pmrw+n4oc0ORVUEclBs6aqMoosDTr/+ffhQOj22w4LM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MCs0uYNo15QcNCK2nfdwvwOeJNUYTTRGJQkxZ2SSqVyq51yHPmrL1MlnHBMQtUrTY 7ZCUpCkKkv1NXZqVs++c+73UZI5gS5NkcK5Lx94fdve0kP6eE4H/J6QoV2NAw3j3Aq iWJEq5oek4P157FgLf0ezcY+qdPF1+1NyAF4H5c0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ijae Kim , Myeonghun Pak , Manivannan Sadhasivam , Sasha Levin Subject: [PATCH 7.3 0919/2651] PCI: aardvark: Disable PHY on probe failures Date: Wed, 18 Nov 2026 15:35:59 +0100 Message-ID: <20261118150320.979104245@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Myeonghun Pak [ Upstream commit 28cc5bc5a6c6cffbe7ba27c0acbfbe06747fa173 ] advk_pcie_setup_phy() initializes and powers on the PHY before the emulated bridge and IRQ domains are created. If any of those later initialization steps or pci_host_probe() fails, probe returns without powering off or exiting the PHY. Replace the direct returns with staged cleanup labels. Remove IRQ domains in reverse order, release the emulated bridge allocation only after successful initialization, and disable the PHY on every failure after advk_pcie_setup_phy() succeeds. A setup_phy() failure still returns directly, so its partial internal cleanup is not repeated. Fixes: 366697018c9a ("PCI: aardvark: Add PHY support") Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Signed-off-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260910221725.91980-1-mhun512@gmail.com Signed-off-by: Sasha Levin --- drivers/pci/controller/pci-aardvark.c | 31 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index ecb81ac730199..2bbdb73cfb45b 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -1864,28 +1864,25 @@ static int advk_pcie_probe(struct platform_device *pdev) ret = advk_sw_pci_bridge_init(pcie); if (ret) { dev_err(dev, "Failed to register emulated root PCI bridge\n"); - return ret; + goto err_disable_phy; } ret = advk_pcie_init_irq_domain(pcie); if (ret) { dev_err(dev, "Failed to initialize irq\n"); - return ret; + goto err_cleanup_bridge; } ret = advk_pcie_init_msi_irq_domain(pcie); if (ret) { dev_err(dev, "Failed to initialize irq\n"); - advk_pcie_remove_irq_domain(pcie); - return ret; + goto err_remove_irq_domain; } ret = advk_pcie_init_rp_irq_domain(pcie); if (ret) { dev_err(dev, "Failed to initialize irq\n"); - advk_pcie_remove_msi_irq_domain(pcie); - advk_pcie_remove_irq_domain(pcie); - return ret; + goto err_remove_msi_irq_domain; } bridge->sysdata = pcie; @@ -1893,14 +1890,22 @@ static int advk_pcie_probe(struct platform_device *pdev) bridge->map_irq = advk_pcie_map_irq; ret = pci_host_probe(bridge); - if (ret < 0) { - advk_pcie_remove_rp_irq_domain(pcie); - advk_pcie_remove_msi_irq_domain(pcie); - advk_pcie_remove_irq_domain(pcie); - return ret; - } + if (ret < 0) + goto err_remove_rp_irq_domain; return 0; + +err_remove_rp_irq_domain: + advk_pcie_remove_rp_irq_domain(pcie); +err_remove_msi_irq_domain: + advk_pcie_remove_msi_irq_domain(pcie); +err_remove_irq_domain: + advk_pcie_remove_irq_domain(pcie); +err_cleanup_bridge: + pci_bridge_emul_cleanup(&pcie->bridge); +err_disable_phy: + advk_pcie_disable_phy(pcie); + return ret; } static void advk_pcie_remove(struct platform_device *pdev) -- 2.53.0