From nobody Sat Feb 7 20:39:37 2026 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 648512367D5; Fri, 25 Apr 2025 08:57:59 +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=1745571480; cv=none; b=L3ykPpQOoWEI1zaU6+7K5lDoqBFtsrpATM167Xf0vgl69tN/iugXdKbqUpXsxgCFjfENACbyfJ8Vr3TvW9Z3EHTkYz/Qv1Rf7Q2xVpbSTg9yOMWcIx9/xNLgezz6xFW1zfW3whgu+rBaNFRM31+RYPmGT2f+MxK0j89ErrKQEVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571480; c=relaxed/simple; bh=SJjOmLS6N4kbYOZUh7McqDYQHoY2qAv/ch95M7/xp/c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OIVpKscYXdEupfZXewOt/fNjmDW9XVp6+ccL15JPK4S1M0gfeMcCXhyqnrv/NHtPhMZYmsqBz03xpH/XAlhG/kV2y7TRI7vjjRuE2UqYjUp4HWX5ENCgN2IYmQ5m1Fl4raKAhm6NGG+n5X0R4BWFCKWn86zP9vQPqkkS7SPwpbg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UzFrajcy; 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="UzFrajcy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98B81C4CEEA; Fri, 25 Apr 2025 08:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571479; bh=SJjOmLS6N4kbYOZUh7McqDYQHoY2qAv/ch95M7/xp/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UzFrajcyCWUQp4NoCuoJGoQpoo4y3MriQf/v7TbQeYVD2C8nnK9mKVhAUV/n5/cHB uozUBKgiEJTaxhvBZ5VOThFQNmQOQCDPxRvHwiuGNn31XeDS+Aj94qqD2bmgksgUHW AmADXjU6lKbDZN+knO59/Xz6PERMNByLLi15I+/HVid6fh3+lGviletKQZhDh7X17i P1FKsUib9mIrYjBdLASOYFXls1sakHURx85B++fDmM4rVXRXA02dBKNMVOSTUUM71m TEGDQ6fxrCbj2XXoVuIQD/WnHSjXdIEB9vG2M/gUhiTL75atMpYzJf5YeKtqn8GEQy /ejOJNzaFI8zQ== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, Elad Nachman Subject: [PATCH v2 1/8] net: prestera: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:34 +0200 Message-ID: <20250425085740.65304-3-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Furthermore, the PCI function being managed implies that it's not necessary to call pci_release_regions() manually. Remove the calls to pci_release_regions(). Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner Acked-by: Elad Nachman Reviewed-by: Jacob Keller --- drivers/net/ethernet/marvell/prestera/prestera_pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_pci.c b/drivers= /net/ethernet/marvell/prestera/prestera_pci.c index 35857dc19542..c45d108b2f6d 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_pci.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_pci.c @@ -845,9 +845,9 @@ static int prestera_pci_probe(struct pci_dev *pdev, goto err_pci_enable_device; } =20 - err =3D pci_request_regions(pdev, driver_name); + err =3D pcim_request_all_regions(pdev, driver_name); if (err) { - dev_err(&pdev->dev, "pci_request_regions failed\n"); + dev_err(&pdev->dev, "pcim_request_all_regions failed\n"); goto err_pci_request_regions; } =20 @@ -938,7 +938,6 @@ static int prestera_pci_probe(struct pci_dev *pdev, err_pp_ioremap: err_mem_ioremap: err_dma_mask: - pci_release_regions(pdev); err_pci_request_regions: err_pci_enable_device: return err; @@ -953,7 +952,6 @@ static void prestera_pci_remove(struct pci_dev *pdev) pci_free_irq_vectors(pdev); destroy_workqueue(fw->wq); prestera_fw_uninit(fw); - pci_release_regions(pdev); } =20 static const struct pci_device_id prestera_pci_devices[] =3D { --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 EDBCE2367D5; Fri, 25 Apr 2025 08:58:06 +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=1745571487; cv=none; b=SfTvYsZmutzztTcmDZ/NYkKHPXdcT9Hq3YANsqgQ63SoQOvweKM17Ruxb//m+ItaOTCRfKvMYAEhMRVR66uF2Z58Tlns03BeUCCMFNi4bYw6GzU5BW2DV4WTkngjlMFxdrzq6Ly5r8Y5yJ40p00oUVgGYYcebtZmYTtY2Kz1piU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571487; c=relaxed/simple; bh=Yvoue+F0edeKn+VVijS0ELNZWKE39hZnWZ8xXcZpPKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bDYrL5eAOJnhdeSETNj0HwRzejKvzosvE8jwgy3soVRr9MUnICUoYAocC6GqJpTOo/Gmn/tOIOEPczskQ49neHoxfIp4OrFyVHj1wY99ees0pnhJWJHjdEqEqFvNFotIiVrHVTbowraoLB17qdx/YJijhA+GXe1UvQhbp3JKH+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Fy5NNKAd; 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="Fy5NNKAd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D8EEC4CEE4; Fri, 25 Apr 2025 08:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571486; bh=Yvoue+F0edeKn+VVijS0ELNZWKE39hZnWZ8xXcZpPKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fy5NNKAdc+O9dq8VB8U2ZCFdvYGQHFATOAYQ9d5sWnMFUIIjRvY61cNk2+K43bwOi 13EoiuUH88j1mrbF9W0J+1y90tgisJVeZQVZ97cQIhwazkNMrHr1ui4/EWDFQ8hmTZ VVAq0aK+7oVTDl2vy1XVzrA4unS//OyLRZsKyEyiF3g5GcBUTwvMhjg+w6UItwAfNV 3041sc3geLGJBDnAsd0ZTil9esn9aYlfCmz6D8pRdQlHqNRCXUREtbMcWZxBaoNfpy dufhDbq1x7MZGeHt+AIYvAzMBhtuPNSV5hpqZAZGKNO7Qf+LCsFhGMUbWRNE+tPCpz oVqfIooMixUIA== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 2/8] net: octeontx2: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:35 +0200 Message-ID: <20250425085740.65304-4-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Furthermore, the PCI function being managed implies that it's not necessary to call pci_release_regions() manually. Remove the calls to pci_release_regions(). Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner --- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 14 ++++---------- .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 14 ++++---------- drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 12 +++++------- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers= /net/ethernet/marvell/octeontx2/nic/otx2_pf.c index cfed9ec5b157..0aee8e3861f3 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c @@ -3048,7 +3048,7 @@ static int otx2_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) return err; } =20 - err =3D pci_request_regions(pdev, DRV_NAME); + err =3D pcim_request_all_regions(pdev, DRV_NAME); if (err) { dev_err(dev, "PCI request regions failed 0x%x\n", err); return err; @@ -3057,7 +3057,7 @@ static int otx2_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) err =3D dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); if (err) { dev_err(dev, "DMA mask config failed, abort\n"); - goto err_release_regions; + return err; } =20 pci_set_master(pdev); @@ -3067,10 +3067,8 @@ static int otx2_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) qos_txqs =3D min_t(int, qcount, OTX2_QOS_MAX_LEAF_NODES); =20 netdev =3D alloc_etherdev_mqs(sizeof(*pf), qcount + qos_txqs, qcount); - if (!netdev) { - err =3D -ENOMEM; - goto err_release_regions; - } + if (!netdev) + return -ENOMEM; =20 pci_set_drvdata(pdev, netdev); SET_NETDEV_DEV(netdev, &pdev->dev); @@ -3246,8 +3244,6 @@ static int otx2_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) err_free_netdev: pci_set_drvdata(pdev, NULL); free_netdev(netdev); -err_release_regions: - pci_release_regions(pdev); return err; } =20 @@ -3447,8 +3443,6 @@ static void otx2_remove(struct pci_dev *pdev) pci_free_irq_vectors(pf->pdev); pci_set_drvdata(pdev, NULL); free_netdev(netdev); - - pci_release_regions(pdev); } =20 static struct pci_driver otx2_pf_driver =3D { diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers= /net/ethernet/marvell/octeontx2/nic/otx2_vf.c index 7ef3ba477d49..fb4da816d218 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c @@ -548,7 +548,7 @@ static int otx2vf_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) return err; } =20 - err =3D pci_request_regions(pdev, DRV_NAME); + err =3D pcim_request_all_regions(pdev, DRV_NAME); if (err) { dev_err(dev, "PCI request regions failed 0x%x\n", err); return err; @@ -557,7 +557,7 @@ static int otx2vf_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) err =3D dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); if (err) { dev_err(dev, "DMA mask config failed, abort\n"); - goto err_release_regions; + return err; } =20 pci_set_master(pdev); @@ -565,10 +565,8 @@ static int otx2vf_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) qcount =3D num_online_cpus(); qos_txqs =3D min_t(int, qcount, OTX2_QOS_MAX_LEAF_NODES); netdev =3D alloc_etherdev_mqs(sizeof(*vf), qcount + qos_txqs, qcount); - if (!netdev) { - err =3D -ENOMEM; - goto err_release_regions; - } + if (!netdev) + return -ENOMEM; =20 pci_set_drvdata(pdev, netdev); SET_NETDEV_DEV(netdev, &pdev->dev); @@ -765,8 +763,6 @@ static int otx2vf_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) err_free_netdev: pci_set_drvdata(pdev, NULL); free_netdev(netdev); -err_release_regions: - pci_release_regions(pdev); return err; } =20 @@ -815,8 +811,6 @@ static void otx2vf_remove(struct pci_dev *pdev) pci_free_irq_vectors(vf->pdev); pci_set_drvdata(pdev, NULL); free_netdev(netdev); - - pci_release_regions(pdev); } =20 static struct pci_driver otx2vf_driver =3D { diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c b/drivers/net= /ethernet/marvell/octeontx2/nic/rep.c index 04e08e06f30f..0bb8a971c4ff 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/rep.c @@ -763,7 +763,7 @@ static int rvu_rep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) return err; } =20 - err =3D pci_request_regions(pdev, DRV_NAME); + err =3D pcim_request_all_regions(pdev, DRV_NAME); if (err) { dev_err(dev, "PCI request regions failed 0x%x\n", err); return err; @@ -772,7 +772,7 @@ static int rvu_rep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) err =3D dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); if (err) { dev_err(dev, "DMA mask config failed, abort\n"); - goto err_release_regions; + goto err_set_drv_data; } =20 pci_set_master(pdev); @@ -780,7 +780,7 @@ static int rvu_rep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) { err =3D -ENOMEM; - goto err_release_regions; + goto err_set_drv_data; } =20 pci_set_drvdata(pdev, priv); @@ -797,7 +797,7 @@ static int rvu_rep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) =20 err =3D otx2_init_rsrc(pdev, priv); if (err) - goto err_release_regions; + goto err_set_drv_data; =20 priv->iommu_domain =3D iommu_get_domain_for_dev(dev); =20 @@ -820,9 +820,8 @@ static int rvu_rep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) otx2_disable_mbox_intr(priv); otx2_pfaf_mbox_destroy(priv); pci_free_irq_vectors(pdev); -err_release_regions: +err_set_drv_data: pci_set_drvdata(pdev, NULL); - pci_release_regions(pdev); return err; } =20 @@ -842,7 +841,6 @@ static void rvu_rep_remove(struct pci_dev *pdev) otx2_pfaf_mbox_destroy(priv); pci_free_irq_vectors(priv->pdev); pci_set_drvdata(pdev, NULL); - pci_release_regions(pdev); } =20 static struct pci_driver rvu_rep_driver =3D { --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 84A241EB1B9; Fri, 25 Apr 2025 08:58:13 +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=1745571493; cv=none; b=oRrsqEbhpU908F6+U0ygZKBLCbO1FOQTYwsUJAqqjU1sT29E2muUw9XP9MYPeZ5H0t+TRmNE9LnrlNDd25EEpY5xbHnAO781Fp0mmuMvXAGWaiioNLr898uvZegJPhzlub07bLGn6yaWwqdZEavfQgqeqyt1rddS+o4SctdAS4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571493; c=relaxed/simple; bh=m+Vi1J2g9X6f8XLQfZWFFa2VyVsNzxMlpbDST6gpme8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jFUxaoG68cCifT1Do5vySKwUzxDTvb2X6MjMg0wom0P5s0+gYJqzWm/Vhu9Jlc5JlIwQqErcc+CsFWO6fc24UCZ/CVPqK78Ld0LVSZe8tfCQI+3QhyU0yFGRjbKJ6uxPRIgjfsYmEMfZwkpCAuPECMJJ6fFl5t2w5Mp8yjS05ZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rZrO9gEe; 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="rZrO9gEe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4E40C4CEEB; Fri, 25 Apr 2025 08:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571493; bh=m+Vi1J2g9X6f8XLQfZWFFa2VyVsNzxMlpbDST6gpme8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rZrO9gEeE+tVfuQHltwGYKi6PyXbaHgIHTGo3zYBdKuknJVc4pYQyrvxYaW/quK/p XVpoCi7xYLfak/z98WjxUqsqr4J7KcOeflv5dPAgiGnQ3q5vGz5iG1xqrrNPUVBnHk NiHbBIPqNflJ6S4v0F/1dM4yDmZaXV/zjdzd9JX0MK1n8a1+DpaPUZOLZUgSxPfj/x iKxaqgfLLdwq+Kw4I2uAhMUG3FhEupoGxt05KXz+ZP5nRa8K/CITUBEA4fvnUchgp5 0sj7IxsrtduNvon79eUafdIC7hSX4L8AlzXeR7SX7cIILhBRj3bF2T37RRc3FRuLS+ QExag8BAQtuZw== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 3/8] net: tulip: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:36 +0200 Message-ID: <20250425085740.65304-5-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Jacob Keller --- drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethe= rnet/dec/tulip/tulip_core.c index c8c53121557f..bec76e7bf5dd 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1411,7 +1411,7 @@ static int tulip_init_one(struct pci_dev *pdev, const= struct pci_device_id *ent) =20 /* grab all resources from both PIO and MMIO regions, as we * don't want anyone else messing around with our hardware */ - if (pci_request_regions(pdev, DRV_NAME)) + if (pcim_request_all_regions(pdev, DRV_NAME)) return -ENODEV; =20 ioaddr =3D pcim_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size); diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/eth= ernet/dec/tulip/winbond-840.c index 5930cdec6f2f..e593273b2867 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -375,7 +375,7 @@ static int w840_probe1(struct pci_dev *pdev, const stru= ct pci_device_id *ent) return -ENOMEM; SET_NETDEV_DEV(dev, &pdev->dev); =20 - if (pci_request_regions(pdev, DRV_NAME)) + if (pcim_request_all_regions(pdev, DRV_NAME)) goto err_out_netdev; =20 ioaddr =3D pci_iomap(pdev, TULIP_BAR, netdev_res_size); --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 50E3E208997; Fri, 25 Apr 2025 08:58:19 +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=1745571500; cv=none; b=k7IGZMK6IGs1PvvOopa2Etw3AvigcG2EMtVIF3nMVZ+ljTgph3T9sjoh2U04sTrNzEINlOGxfP/kwOD4RqlqK/9bfl6hwdMQ2QiUBNxxW5iQW6iP+rrID+ttoTilzzX5iROZXorO52iXku828Hwhrel00IPu7LUWQqPulHyNoC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571500; c=relaxed/simple; bh=SNLiMhOsszlezKYixhj6I8LuSgz6s/EcE4gCa2JfaPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k8oz2yvCebAnEMh5Jbc7V8xS/XL+td+bUIPL7fsfsdK0oHLKU8qFfJe1mNjeHwBuY8R7lYl15TCKr4Hl/t+m8ra62pl0b5HyOuJmBmPpvdqopCCyAkvC6gPeHIPV7ym2+uSSaPPOOFW46f7dtPPQX7PHmbTMU5UbeTf/8/GETss= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AXIUSdEa; 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="AXIUSdEa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91555C4CEE4; Fri, 25 Apr 2025 08:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571499; bh=SNLiMhOsszlezKYixhj6I8LuSgz6s/EcE4gCa2JfaPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AXIUSdEaBTP+wb5An5Kz724b5QqR+D1UiEHOKdeoLvVgJ5WB7Ukiadkby+TIGRQoj YIgfc8OWqfSB6+eo3/1SYXbZENETrVmHPFIowyIW+yZjXC+eN1acFx/Npw8LPfFA1n J0bzN/Se98urxB7Fv8EoLYTbpFMu9+/K5myOkjjBQtZwjJ2fYp/azg3I2LTc9pcv5o rPwDpPCuRbnLio5id4DD4I2NNE5m5jcVlh9P6AQEqgE3fJLON9Xoga8JLJ1npP9m1S BLaLhhmnztpzdyL1djs2LAIxk4DDuvGn+bfaVWM5dLh4nPCDMIc8CR1Qe5SxGcItaN Wjw28w7OZXEkg== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 4/8] net: ethernet: natsemi: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:37 +0200 Message-ID: <20250425085740.65304-6-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Jacob Keller --- drivers/net/ethernet/natsemi/natsemi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/= natsemi/natsemi.c index 05606692e631..dd279788cf9e 100644 --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c @@ -846,7 +846,7 @@ static int natsemi_probe1(struct pci_dev *pdev, const s= truct pci_device_id *ent) return -ENOMEM; SET_NETDEV_DEV(dev, &pdev->dev); =20 - i =3D pci_request_regions(pdev, DRV_NAME); + i =3D pcim_request_all_regions(pdev, DRV_NAME); if (i) goto err_pci_request_regions; =20 --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 4466A23AE9A; Fri, 25 Apr 2025 08:58:26 +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=1745571507; cv=none; b=rbaY8q2FOIPfDABWzFU7gaFOIYV7X3UvIjbhgSRBhM197RvXK6f+LrO/rsp3OwWDlkz/Tl4YnhrXhmNaxYBcV3e1yDJgHQzyfrQrxXktxDs/dsye3vyZW4wJj4rahNIzxs3weHnNMMhaN6jWvGOi5L5+lwGlqgt2lLIriIQx9Us= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571507; c=relaxed/simple; bh=ReLh28MMXe+RCC+isNK/dhc8sJPi0We7tbuIOvBGcMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lcSFhu+430llhAPSVs/dLirKAeoy0JOzG8/5DX4fIBlJ4Yuv05ahXFdugSGebTvyyfYnE2PGRtycEY1oXxohR8l07ZFly7Vc86CvaIznriSVedY8Yng1yJIYjHiEP/cd71eBuZiGyo6Hvld7gk3rzoUd8l3RelqPz4stl26OVjk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QYUZQrCs; 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="QYUZQrCs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56035C4CEEA; Fri, 25 Apr 2025 08:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571506; bh=ReLh28MMXe+RCC+isNK/dhc8sJPi0We7tbuIOvBGcMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QYUZQrCso3T23LALKw0C7Xd397quUlqZYpWiKk/VQfZ9Ut/+uMgj4EkwVQeor3alh NItGOYyddkAC+RODzbwkyubLdDUXr0qIgf5ln/ndPKYL2+DjJyg2pTavXrlY97Mfqm gXkDzipiyPOaB66oPZ45HGkjedVytgq1whLTfr1wy19bfn5DH/BwHuyhK9W9gzX+nD kT2FYv7rR6fysxtZ/wpIUEbShtnTqOeyLiryXitRzDaYdyY2jAHBcESzqQpeWGr+iR DQVQhnfsa+67LbQpP1vuUCjI3qRNT13MqRbz3bgwYu6FYWWiN4FS8VKJ17VsvjC8AR 3yD1Oovvs9ezw== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 5/8] net: ethernet: sis900: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:38 +0200 Message-ID: <20250425085740.65304-7-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Jacob Keller --- drivers/net/ethernet/sis/sis900.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/s= is900.c index 332cbd725900..df869f82cae8 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c @@ -468,7 +468,7 @@ static int sis900_probe(struct pci_dev *pci_dev, SET_NETDEV_DEV(net_dev, &pci_dev->dev); =20 /* We do a request_region() to register /proc/ioports info. */ - ret =3D pci_request_regions(pci_dev, "sis900"); + ret =3D pcim_request_all_regions(pci_dev, "sis900"); if (ret) goto err_out; =20 --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 EBD00239581; Fri, 25 Apr 2025 08:58:33 +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=1745571514; cv=none; b=Viwjn1WUS6PcQCsUc9k/efzTv6rBK/6r4sw+2YzWxbAGErrMhUr4cZk6RkwJ40eN3uevwO9S4nhFXEVm0jcYggf6toFRbQLZYkVzQn827caR90dCWS2X4zhC83cr9b9Yr4uNNfc2aRgpo8s+MF/B3MewT6m13Q0vdI9XW5/EOwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571514; c=relaxed/simple; bh=JwQgJ9CbA/kRE+Ux8ehyLiYx0Jiy2Yv7pNe812gJer0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IOzVRMNDznxLRXUvnpfvDRJCtwjatYjmdgyP3NQWBEEXJK0R4mdahwze/rfmRQgbMEhYghbguY4Hnttg4OlGSc1/vonWFUEMIzyoRW62Hc9hC/nZKCRJlFWyNU6Uz3xL+X+1KA83dPCZh0iUc6LpCtENtjf12+AF1MtPyJAqZ8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m/IbDZMY; 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="m/IbDZMY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D782C4CEE4; Fri, 25 Apr 2025 08:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571513; bh=JwQgJ9CbA/kRE+Ux8ehyLiYx0Jiy2Yv7pNe812gJer0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m/IbDZMYVFFXSrcufpLhIzufuUvYqMslGiwePnXGDVIEK41y8v48e8eEYaS2Cqo+g C/NMce59ezEwNMvldNt1t/Bt2bc9v13er4AJgamAxSExVbOwX1HGnPj3YA6ixJ8oPM mgiKN5dsu3g/h38hc/5Qs6dNOvCv9tc0QthrCXJEn4bfBRSrvmfkvya8Zu7Ayosb2J Iw1A1dvG/fatcvCI9oGCZD42NGaicAdECTTQlAoxcBRRFJkP97bzfr06852N2Yyj19 L550ongKlfHvDzpzp6bPYCAb3Gi7MdZm0LXv0DnxZ+XV0S669mdFkpe3TJCPcv+NOb 7rKzHpJjBxitg== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 6/8] net: mdio: thunder: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:39 +0200 Message-ID: <20250425085740.65304-8-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Furthermore, the PCI function being managed implies that it's not necessary to call pci_release_regions() manually. Remove the calls to pci_release_regions(). Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Jacob Keller --- drivers/net/mdio/mdio-thunder.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/mdio/mdio-thunder.c b/drivers/net/mdio/mdio-thunde= r.c index 1e1aa72b1eff..a3047f7258a7 100644 --- a/drivers/net/mdio/mdio-thunder.c +++ b/drivers/net/mdio/mdio-thunder.c @@ -40,16 +40,16 @@ static int thunder_mdiobus_pci_probe(struct pci_dev *pd= ev, return err; } =20 - err =3D pci_request_regions(pdev, KBUILD_MODNAME); + err =3D pcim_request_all_regions(pdev, KBUILD_MODNAME); if (err) { - dev_err(&pdev->dev, "pci_request_regions failed\n"); + dev_err(&pdev->dev, "pcim_request_all_regions failed\n"); goto err_disable_device; } =20 nexus->bar0 =3D pcim_iomap(pdev, 0, pci_resource_len(pdev, 0)); if (!nexus->bar0) { err =3D -ENOMEM; - goto err_release_regions; + goto err_disable_device; } =20 i =3D 0; @@ -107,9 +107,6 @@ static int thunder_mdiobus_pci_probe(struct pci_dev *pd= ev, } return 0; =20 -err_release_regions: - pci_release_regions(pdev); - err_disable_device: pci_set_drvdata(pdev, NULL); return err; @@ -129,7 +126,6 @@ static void thunder_mdiobus_pci_remove(struct pci_dev *= pdev) mdiobus_unregister(bus->mii_bus); oct_mdio_writeq(0, bus->register_base + SMI_EN); } - pci_release_regions(pdev); pci_set_drvdata(pdev, NULL); } =20 --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 8026723BD1B; Fri, 25 Apr 2025 08:58:40 +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=1745571520; cv=none; b=h0oxscGBEjLQHgFqdxdQyuUiX9u/DXLaDzv/BEhM6C6epyHv6xEQi5jVTu4Y7RZbq53QXhD0rhITXeFmk3r4DL0brbEyPnX1HV+je4UB5dH0KejmMmUZm5HdB3zhsL97O6JJWjmZ38haCAQw7BD2esr4Ie5AzOtKA1/C05CrpFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571520; c=relaxed/simple; bh=/riavgLrn/g2Hnn+PvsGhLQKcPhklIh8LsugSyRIhnc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e10Zw95R6WYLPg32uQCDFrzBYkzLih1EmnOINvXKA1zRONnBfUZkWQ5164BBkpMFe6hrsMIboTfSp69xZcYusXV9gJgu8JkicO7c5q9dxRbeb0WG+64iuFF6NevYkpW7NE1GK53bGVBiZhW6GSNRq9Z2Yxb0TJ/xjIj3j+p2OXU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q4vcUWZM; 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="Q4vcUWZM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECFD9C4CEEF; Fri, 25 Apr 2025 08:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571520; bh=/riavgLrn/g2Hnn+PvsGhLQKcPhklIh8LsugSyRIhnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q4vcUWZMRmElkhA8v6VQgdgQvXSMS9Xu2h+CVmbQbZY5E1Wo8QmqF/GEDh8Es9vZy dERS/Wq6Cd2a6eI+wRYazECrl8TBsvymEX+AQ+E3HB1FS6rEjNh5T7FK376sQXmQSY tqku3xiNxvmHwM2UsQknFrZOB/4gc+p6dOpZ1gkJaSV8oBZv1FpFLRUQ8sq78AIdBJ V1Uqs3qPr9+wQhuTZ7pY/lJ6+CKJaH0ZYEUwii+lCcfi/wowTTIUkuIRpUh9amA0iC pzmbg/mfqa3KgtLTo+zo5HeWLXr9patZTNIdqV2HS0OOkE8Bws7cXC5Mh0rZ8vOF3C uCb8UTQl+E+9w== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 7/8] net: thunder_bgx: Use pure PCI devres API Date: Fri, 25 Apr 2025 10:57:40 +0200 Message-ID: <20250425085740.65304-9-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" The currently used function pci_request_regions() is one of the problematic "hybrid devres" PCI functions, which are sometimes managed through devres, and sometimes not (depending on whether pci_enable_device() or pcim_enable_device() has been called before). The PCI subsystem wants to remove this behavior and, therefore, needs to port all users to functions that don't have this problem. Furthermore, the PCI function being managed implies that it's not necessary to call pci_release_regions() manually. Remove the calls to pci_release_regions(). Replace pci_request_regions() with pcim_request_all_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Jacob Keller --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/ne= t/ethernet/cavium/thunder/thunder_bgx.c index 608cc6af5af1..c9369bdd04e0 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1605,7 +1605,7 @@ static int bgx_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) return dev_err_probe(dev, err, "Failed to enable PCI device\n"); } =20 - err =3D pci_request_regions(pdev, DRV_NAME); + err =3D pcim_request_all_regions(pdev, DRV_NAME); if (err) { dev_err(dev, "PCI request regions failed 0x%x\n", err); goto err_disable_device; @@ -1616,7 +1616,7 @@ static int bgx_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) if (!bgx->reg_base) { dev_err(dev, "BGX: Cannot map CSR memory space, aborting\n"); err =3D -ENOMEM; - goto err_release_regions; + goto err_disable_device; } =20 set_max_bgx_per_node(pdev); @@ -1688,8 +1688,6 @@ static int bgx_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) err_enable: bgx_vnic[bgx->bgx_id] =3D NULL; pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); -err_release_regions: - pci_release_regions(pdev); err_disable_device: pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); @@ -1710,7 +1708,6 @@ static void bgx_remove(struct pci_dev *pdev) pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); =20 bgx_vnic[bgx->bgx_id] =3D NULL; - pci_release_regions(pdev); pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); } --=20 2.48.1 From nobody Sat Feb 7 20:39:37 2026 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 0CDA2242D94; Fri, 25 Apr 2025 08:58:46 +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=1745571527; cv=none; b=f60UXqaYpm/simcFoZji2euKN0K2eAuQKXeqDEx9PqFcTAjUDDYgfirb1msovs7F0C/PAf7LtG9UefaPoAESaeTFqoEle5G2C2KT/uvxcjjNBf93/5e8OdXNMz9bUGt/tMZ4xT2HKKVJAlecB9Ra0dXQpXDx2Qz8bWwyMosVs1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745571527; c=relaxed/simple; bh=189wyjGuYuaHlkManBiYipumPeAhOLGmKz8J7H5MS8g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TVq/wuUeJ5zN3wamr5tWjbU5ZjywadNletzY0mvP3aWCVZQysMD1nAwzfFOuU9Swx9umEc1zfokuFt2thq+F4pUPRxeAsFPILmN+yW3z9iEmarSvb2bdmu4P1pAcb2Gj1Q10pg0VL+8MK+96nyaLBX6u4tMO551tE7grRaiaeNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VxBcml0/; 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="VxBcml0/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 669C7C4CEE4; Fri, 25 Apr 2025 08:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745571526; bh=189wyjGuYuaHlkManBiYipumPeAhOLGmKz8J7H5MS8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VxBcml0/2zzf7TV0kg2cY1Y1PQOb5g1wqcAAoFO/PPePO/MHbGgE6egAB98PCUNLF HdJvDZh37bJ2MZofOYdkxT5XBcUD7fiBd5XkPcVitRKjPvqoWWxN2O3m/v1ICvl+/2 KVWXSXmR1nrWONKydXVyGy+er1VzAxcfUBc82Bu+J6+HceLRcHGQaA/XUEwXma08UQ vKHQqw31i2egxr9bPprVVeQhqmAqsk/n0lFHZUg0aTiAsyXq6NiCNHnrPbV+jLEIDv d9Ln2ZFWNkljVMIZZ1xQRu8ZY3BSYZS09zND5o9DkQerc4Jws/Prtzk9Iql5E+BLi2 rWPJ/aU7vJdRA== From: Philipp Stanner To: Sunil Goutham , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Taras Chornyi , Daniele Venzano , Heiner Kallweit , Russell King , Philipp Stanner , Helge Deller , Simon Horman , Jacob Keller , Ingo Molnar , Thomas Gleixner , Al Viro , Shannon Nelson , Sabrina Dubroca Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH v2 8/8] net: thunder_bgx: Don't disable PCI device manually Date: Fri, 25 Apr 2025 10:57:41 +0200 Message-ID: <20250425085740.65304-10-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425085740.65304-2-phasta@kernel.org> References: <20250425085740.65304-2-phasta@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" thunder_bgx's PCI device is enabled with pcim_enable_device(), a managed devres function which ensures that the device gets enabled on driver detach automatically. Remove the calls to pci_disable_device(). Signed-off-by: Philipp Stanner Reviewed-by: Jacob Keller --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/ne= t/ethernet/cavium/thunder/thunder_bgx.c index c9369bdd04e0..3b7ad744b2dd 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1608,7 +1608,7 @@ static int bgx_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) err =3D pcim_request_all_regions(pdev, DRV_NAME); if (err) { dev_err(dev, "PCI request regions failed 0x%x\n", err); - goto err_disable_device; + goto err_zero_drv_data; } =20 /* MAP configuration registers */ @@ -1616,7 +1616,7 @@ static int bgx_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) if (!bgx->reg_base) { dev_err(dev, "BGX: Cannot map CSR memory space, aborting\n"); err =3D -ENOMEM; - goto err_disable_device; + goto err_zero_drv_data; } =20 set_max_bgx_per_node(pdev); @@ -1688,8 +1688,7 @@ static int bgx_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) err_enable: bgx_vnic[bgx->bgx_id] =3D NULL; pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); -err_disable_device: - pci_disable_device(pdev); +err_zero_drv_data: pci_set_drvdata(pdev, NULL); return err; } @@ -1708,7 +1707,6 @@ static void bgx_remove(struct pci_dev *pdev) pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx); =20 bgx_vnic[bgx->bgx_id] =3D NULL; - pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); } =20 --=20 2.48.1