From nobody Mon Oct 6 11:47:24 2025 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 342832D6639; Mon, 21 Jul 2025 15:36:56 +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=1753112217; cv=none; b=nSm/D1T32c+t1H0xqAmKmTJ/bMGscLk0QASG60H9yyAsaONS4JmfaFfJwMqin9yuULIVtp4fF0XqVqDlGgP+2mv6q1RS45ENm/tJYT8ImIcarumiwIp4mLn6OQTQoW28q2NJcGKfjTl5Jm8Q+Ot956dK4K1DylKPHlvnxNgQ8TQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753112217; c=relaxed/simple; bh=H7SIoY7UhYXgj19KT+9VPfKyOxw3tlbt63/7BfTcRzc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O3R3Z6txO8Ae/UD8WtCtZFhbe46G3BZkG3+dDEh+MwVt3QtbuCoFrB8p6l678lb8CSn0I2reoTdqApDq6u7mwJwcA8YybEwNUTbYzHboHcxn4v+ISwKh8RQ6H9Lu8F2+vhepHQJQzVNbalrA5THzkz0lWDc8SxP+Lfb7SEx4sNY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qdpXppOs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qdpXppOs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9D73C4CEED; Mon, 21 Jul 2025 15:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753112216; bh=H7SIoY7UhYXgj19KT+9VPfKyOxw3tlbt63/7BfTcRzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qdpXppOsgqBFK9pec7+NjI7X5NO2i/j/Er1p95jfCs9CjtroXPNCUqFV+/SG9PTek W/QJp0cRuj6vPMDeRIsdJHvHH4HpIdzu7AayXRIiR6EpnpMOI+EghTsSv0HfvuNi75 CYEfyWnY7Ewm2zBgkaSA88712ZoT98pKvpfSeeG1y18auI3mF+2BVdutsZGl7JiUFI 08zSLO0E8msle0f4Sy37Vsk6RQ/prcZN7N8t+lVxRKkzCUMFaqNFN8WmrP5WSXoSpO JEZrKdhXSmexqmcuS/Y4PBltEqDZ7+D9ioHHzuYSKcytBQzE03CV2NyHVFKhjaYwn2 HscvSbPgD9HrA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1udsZK-000000002Ff-0oAn; Mon, 21 Jul 2025 17:36:46 +0200 From: Johan Hovold To: Bjorn Helgaas Cc: Manivannan Sadhasivam , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/3] PCI/pwrctrl: Fix device leak at registration Date: Mon, 21 Jul 2025 17:36:07 +0200 Message-ID: <20250721153609.8611-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250721153609.8611-1-johan+linaro@kernel.org> References: <20250721153609.8611-1-johan+linaro@kernel.org> 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 Content-Type: text/plain; charset="utf-8" Make sure to drop the reference to the pwrctrl device taken by of_find_device_by_node() when registering a PCI device. Fixes: b458ff7e8176 ("PCI/pwrctl: Ensure that pwrctl drivers are probed bef= ore PCI client drivers") Cc: stable@vger.kernel.org # 6.13 Cc: Manivannan Sadhasivam Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- drivers/pci/bus.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 69048869ef1c..0394a9c77b38 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -362,11 +362,15 @@ void pci_bus_add_device(struct pci_dev *dev) * before PCI client drivers. */ pdev =3D of_find_device_by_node(dn); - if (pdev && of_pci_supply_present(dn)) { - if (!device_link_add(&dev->dev, &pdev->dev, - DL_FLAG_AUTOREMOVE_CONSUMER)) - pci_err(dev, "failed to add device link to power control device %s\n", - pdev->name); + if (pdev) { + if (of_pci_supply_present(dn)) { + if (!device_link_add(&dev->dev, &pdev->dev, + DL_FLAG_AUTOREMOVE_CONSUMER)) { + pci_err(dev, "failed to add device link to power control device %s\n", + pdev->name); + } + } + put_device(&pdev->dev); } =20 if (!dn || of_device_is_available(dn)) --=20 2.49.1 From nobody Mon Oct 6 11:47:24 2025 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 0CD071ADC90; Mon, 21 Jul 2025 15:36:57 +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=1753112217; cv=none; b=i4pdSHa+7WLeIC7MhA1oB+rnaW+VvB3UOXpi+yOAVl3688p7N/Q5sHVol9ssDNwXBDo56ziXpVEuz2STV0CULu4BHMk13DzhDvB4rv1GU1L0lwnYGM/gkbKGHK1liEXhGpVy0YNCtnbV5tnUDkfh2CxrJe9VZv8JIaFoJd3D+gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753112217; c=relaxed/simple; bh=zxoeM+AI8QziYunKUu9GbEUPVSVeqvBaUFHxaPVVke4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xp9AYLHlH1BWrrlqga0TUqjIUxISIkgmbLcS5mYDQSo6xjTDSL+9Ax6VjrvSJSWoAFiLreLzAkpspMSUX0YbM9BeFbGJPaBcOcheySudfyHL25ePPEfJLdPBQtpbUXAZWGdQEK2OUASuOOzk1Tfpj0k/zhBh2GCyxd87QzJg4nA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WBop5EWm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WBop5EWm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D600CC4AF09; Mon, 21 Jul 2025 15:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753112216; bh=zxoeM+AI8QziYunKUu9GbEUPVSVeqvBaUFHxaPVVke4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WBop5EWm6ZdCtmYtxJXx0h1kFdiRcr0j5nfe8ki7tEdKioXsp2wdBOnaI6FBOPt1C kl0Qw02BarnHZaLDM0sYyzyT57e9Yy6ykB2DYGzmy4j4s2YTuk+24KYXuloIANSy/f diQRsWkl70v5zZvUYfVKyFq79RAsBDPUTxx6rUoiZVer5IT8zryT73TqHVJ5o1jEEo 7PXvwSU107ADXxj2gP1kw5OTFjXnmAuvHLf2f20hm15QHv4S1RwOaCFKI4cA+JIWBe EXDLWDVKAYw9dPgrbxogQtiqjb1QfLyLNXZybHKFY8LL31TA0lTqYn7gq3HWyPqQdv YSun25UlMsdBg== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1udsZK-000000002Fh-18NF; Mon, 21 Jul 2025 17:36:46 +0200 From: Johan Hovold To: Bjorn Helgaas Cc: Manivannan Sadhasivam , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/3] PCI/pwrctrl: Fix device and OF node leak at bus scan Date: Mon, 21 Jul 2025 17:36:08 +0200 Message-ID: <20250721153609.8611-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250721153609.8611-1-johan+linaro@kernel.org> References: <20250721153609.8611-1-johan+linaro@kernel.org> 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 Content-Type: text/plain; charset="utf-8" Make sure to drop the references to the pwrctrl OF node and device taken by of_pci_find_child_device() and of_find_device_by_node() respectively when scanning the bus. Fixes: 957f40d039a9 ("PCI/pwrctrl: Move creation of pwrctrl devices to pci_= scan_device()") Cc: stable@vger.kernel.org # 6.15 Cc: Manivannan Sadhasivam Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- drivers/pci/probe.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 4b8693ec9e4c..c5f59de790c7 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2515,9 +2515,15 @@ static struct platform_device *pci_pwrctrl_create_de= vice(struct pci_bus *bus, in struct device_node *np; =20 np =3D of_pci_find_child_device(dev_of_node(&bus->dev), devfn); - if (!np || of_find_device_by_node(np)) + if (!np) return NULL; =20 + pdev =3D of_find_device_by_node(np); + if (pdev) { + put_device(&pdev->dev); + goto err_put_of_node; + } + /* * First check whether the pwrctrl device really needs to be created or * not. This is decided based on at least one of the power supplies @@ -2525,17 +2531,24 @@ static struct platform_device *pci_pwrctrl_create_d= evice(struct pci_bus *bus, in */ if (!of_pci_supply_present(np)) { pr_debug("PCI/pwrctrl: Skipping OF node: %s\n", np->name); - return NULL; + goto err_put_of_node; } =20 /* Now create the pwrctrl device */ pdev =3D of_platform_device_create(np, NULL, &host->dev); if (!pdev) { pr_err("PCI/pwrctrl: Failed to create pwrctrl device for node: %s\n", np= ->name); - return NULL; + goto err_put_of_node; } =20 + of_node_put(np); + return pdev; + +err_put_of_node: + of_node_put(np); + + return NULL; } =20 /* --=20 2.49.1 From nobody Mon Oct 6 11:47:24 2025 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 52ED4DDBC; Mon, 21 Jul 2025 15:36:57 +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=1753112217; cv=none; b=qVZNGbX4oEWRPhKlGWPTjf2uzAlMj9qLSG3oEfgrTspV8DMBlqo8GCY5tJuUlo0FUqlvckJU1riuA0o345wVl4/siSMxZovfsfiHkl5Mg6Km0FhpVYXLJ0f2RM+QvoNqwWA4Qt0D7tYZUlqNCDRpx1K+0rkLdlONIRT3stzMMOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753112217; c=relaxed/simple; bh=NyfC6eKa4Ljazxpe6Tq7U85iunAK2tAH9AMpKX5rfjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BCoOeAbrsGbPlyf6NaPGU9Vl4UXcm1HzmZl2Xg3ndRp6sM/R2ZWC0mlLzWfjoHQSl25nSyIiztsCtOuGVbzhVm7vDIHU3NVbqMu3NxS2k7hp0ufEHESGVnVbAuHo2omIdtvbC/TqsOSfjJVdN7NFFrI2X6z4nJojavNDWPqJ9WY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WJW6a4s1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WJW6a4s1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6766C4AF0B; Mon, 21 Jul 2025 15:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753112216; bh=NyfC6eKa4Ljazxpe6Tq7U85iunAK2tAH9AMpKX5rfjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJW6a4s1pR1Hzwr0Z3PepYH7odBo0NsP7GMG1Zvj8c/OHobX5cbDnnJ+O7o+pqF6a rGVdoQ7wKGEcofqsxgo2I+gITQD7yzSJm3O8gJfNTBXExloTcy3KqoJyeQBJ4BVIye p3s6fwDeA4sZJK+luULwhbqJC0RvArHCUHZWZLtSoy53jVNXBVaCazo6QQUMw8VJYB p5HiNUbGsCci/Qbn9Mp9D6P8NH31+cGkWFht+cT9bAYIg3ij875zzejKfZtomr7K8+ 4Pb1ehTkmWanWIGQq5zZPFezdqpIM9UwqA9hRlgu87/XSPa3wknM/a5s4iQOQq8dYc 6WRsMQAebIAkA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1udsZK-000000002Fk-1Sw3; Mon, 21 Jul 2025 17:36:46 +0200 From: Johan Hovold To: Bjorn Helgaas Cc: Manivannan Sadhasivam , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 3/3] PCI/pwrctrl: Fix device leak at device stop Date: Mon, 21 Jul 2025 17:36:09 +0200 Message-ID: <20250721153609.8611-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250721153609.8611-1-johan+linaro@kernel.org> References: <20250721153609.8611-1-johan+linaro@kernel.org> 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 Content-Type: text/plain; charset="utf-8" Make sure to drop the reference to the pwrctrl device taken by of_find_device_by_node() when stopping a PCI device. Fixes: 681725afb6b9 ("PCI/pwrctl: Remove pwrctl device without iterating ov= er all children of pwrctl parent") Cc: stable@vger.kernel.org # 6.13 Cc: Manivannan Sadhasivam Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- drivers/pci/remove.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 445afdfa6498..16f21edbc29d 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -31,6 +31,8 @@ static void pci_pwrctrl_unregister(struct device *dev) return; =20 of_device_unregister(pdev); + put_device(&pdev->dev); + of_node_clear_flag(np, OF_POPULATED); } =20 --=20 2.49.1