From nobody Wed Dec 17 17:23:47 2025 Received: from out-175.mta0.migadu.com (out-175.mta0.migadu.com [91.218.175.175]) (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 D68B215D5AA for ; Fri, 31 May 2024 16:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717172043; cv=none; b=Y5kH9Jr2WsDgHgipHscptBEuriwTNp9RIONF9Mfb+0hazMw3Z/rWmgSqw3t+u7/D+US53KJ7EvLqtuuVbMYV01pkfNP2zcdd24wy/YLJpRY7qzerJYGp5UWByjkDN/r9/H9XMl6TQcdsyJXy8e5qima210bZrOtmOHmYMFyNEg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717172043; c=relaxed/simple; bh=Sv0kXO5U58sa8ekVvYxZwcS1u8+AOzbc+91VoW2BY08=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qWqMfc31ZcYFKO1wvACSaeeqURdocBSnSScnWrtQxYbZhXm0lnZUQXUpwa9mVlgjLT5drPWDY2jOTcbhA0KezXxcNpc7dqV10+V/Oo21tlu59nJuv+uyZfedwKmwt9i9q4F6SpBPis5VzCmkSA40pBf3G+05JZ9rCUcYd8GxYJs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=m6msWpFG; arc=none smtp.client-ip=91.218.175.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="m6msWpFG" X-Envelope-To: lpieralisi@kernel.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1717172039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I+69+SauXlRGr83vkRntKy+tG2GRCo2TNeZSKQRi5Ls=; b=m6msWpFGkT0ZKL73//fG5tT1q77SGccs1qwOMNeHBsM2Lo6GiyTjmUxklipEv563PwqDmg 6aQrurBeO/FcbhMNypxa3TxV3FcY4jnwLZLsR5ifQYJ5o0K/eRRzPfrSuN6JsYPAuhpWmt alRyRkFBE27d2sQzZutpxT0TORlIcBI= X-Envelope-To: kw@linux.com X-Envelope-To: robh@kernel.org X-Envelope-To: linux-pci@vger.kernel.org X-Envelope-To: thippeswamy.havalige@amd.com X-Envelope-To: linux-arm-kernel@lists.infradead.org X-Envelope-To: markus.elfring@web.de X-Envelope-To: dan.carpenter@linaro.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: bhelgaas@google.com X-Envelope-To: michal.simek@amd.com X-Envelope-To: sean.anderson@linux.dev X-Envelope-To: bharat.kumar.gogada@xilinx.com X-Envelope-To: lorenzo.pieralisi@arm.com X-Envelope-To: michal.simek@xilinx.com X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson To: Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Rob Herring , linux-pci@vger.kernel.org Cc: Thippeswamy Havalige , linux-arm-kernel@lists.infradead.org, Markus Elfring , Dan Carpenter , linux-kernel@vger.kernel.org, Bjorn Helgaas , Michal Simek , Sean Anderson , Bharat Kumar Gogada , Lorenzo Pieralisi , Michal Simek Subject: [PATCH v4 5/7] PCI: xilinx-nwl: Clean up clock on probe failure/removal Date: Fri, 31 May 2024 12:13:35 -0400 Message-Id: <20240531161337.864994-6-sean.anderson@linux.dev> In-Reply-To: <20240531161337.864994-1-sean.anderson@linux.dev> References: <20240531161337.864994-1-sean.anderson@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Make sure we turn off the clock on probe failure and device removal. Fixes: de0a01f52966 ("PCI: xilinx-nwl: Enable the clock through CCF") Signed-off-by: Sean Anderson --- Changes in v4: - Move if to after pci_host_probe drivers/pci/controller/pcie-xilinx-nwl.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/control= ler/pcie-xilinx-nwl.c index c0a60cebdb2e..e85158dc4e6c 100644 --- a/drivers/pci/controller/pcie-xilinx-nwl.c +++ b/drivers/pci/controller/pcie-xilinx-nwl.c @@ -779,6 +779,7 @@ static int nwl_pcie_probe(struct platform_device *pdev) return -ENODEV; =20 pcie =3D pci_host_bridge_priv(bridge); + platform_set_drvdata(pdev, pcie); =20 pcie->dev =3D dev; =20 @@ -801,13 +802,13 @@ static int nwl_pcie_probe(struct platform_device *pde= v) err =3D nwl_pcie_bridge_init(pcie); if (err) { dev_err(dev, "HW Initialization failed\n"); - return err; + goto err_clk; } =20 err =3D nwl_pcie_init_irq_domain(pcie); if (err) { dev_err(dev, "Failed creating IRQ Domain\n"); - return err; + goto err_clk; } =20 bridge->sysdata =3D pcie; @@ -817,11 +818,24 @@ static int nwl_pcie_probe(struct platform_device *pde= v) err =3D nwl_pcie_enable_msi(pcie); if (err < 0) { dev_err(dev, "failed to enable MSI support: %d\n", err); - return err; + goto err_clk; } } =20 - return pci_host_probe(bridge); + err =3D pci_host_probe(bridge); + if (!err) + return 0; + +err_clk: + clk_disable_unprepare(pcie->clk); + return err; +} + +static void nwl_pcie_remove(struct platform_device *pdev) +{ + struct nwl_pcie *pcie =3D platform_get_drvdata(pdev); + + clk_disable_unprepare(pcie->clk); } =20 static struct platform_driver nwl_pcie_driver =3D { @@ -831,5 +845,6 @@ static struct platform_driver nwl_pcie_driver =3D { .of_match_table =3D nwl_pcie_of_match, }, .probe =3D nwl_pcie_probe, + .remove_new =3D nwl_pcie_remove, }; builtin_platform_driver(nwl_pcie_driver); --=20 2.35.1.1320.gc452695387.dirty