Commit 6f450c82 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'phase-out-hybrid-pci-devres-api' 

Philipp Stanner says:

====================
Phase out hybrid PCI devres API

Fixes a number of minor issues with the usage of the PCI API in net.
Notbaly, it replaces calls to the sometimes-managed
pci_request_regions() to the always-managed pcim_request_all_regions(),
enabling us to remove that hybrid functionality from PCI.
====================

Link: https://patch.msgid.link/20250425085740.65304-2-phasta@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 034ebd3c 1549bd06

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+4 −9
Original line number Diff line number Diff line
@@ -1605,10 +1605,10 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return dev_err_probe(dev, err, "Failed to enable PCI device\n");

	}



	err = pci_request_regions(pdev, DRV_NAME);

	err = 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;

	}



	/* MAP configuration registers */
@@ -1616,7 +1616,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (!bgx->reg_base) {

		dev_err(dev, "BGX: Cannot map CSR memory space, aborting\n");

		err = -ENOMEM;

		goto err_release_regions;

		goto err_zero_drv_data;

	}



	set_max_bgx_per_node(pdev);
@@ -1688,10 +1688,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_enable:

	bgx_vnic[bgx->bgx_id] = NULL;

	pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);

err_release_regions:

	pci_release_regions(pdev);

err_disable_device:

	pci_disable_device(pdev);

err_zero_drv_data:

	pci_set_drvdata(pdev, NULL);

	return err;

}
@@ -1710,8 +1707,6 @@ static void bgx_remove(struct pci_dev *pdev) 
	pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);



	bgx_vnic[bgx->bgx_id] = NULL;

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

}

drivers/net/ethernet/dec/tulip/tulip_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* 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;



	ioaddr = pcim_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);

drivers/net/ethernet/dec/tulip/winbond-840.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return -ENOMEM;

	SET_NETDEV_DEV(dev, &pdev->dev);



	if (pci_request_regions(pdev, DRV_NAME))

	if (pcim_request_all_regions(pdev, DRV_NAME))

		goto err_out_netdev;



	ioaddr = pci_iomap(pdev, TULIP_BAR, netdev_res_size);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c

+4 −10
Original line number Diff line number Diff line
@@ -3048,7 +3048,7 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return err;

	}



	err = pci_request_regions(pdev, DRV_NAME);

	err = 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 struct pci_device_id *id) 
	err = 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;

	}



	pci_set_master(pdev);
@@ -3067,10 +3067,8 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	qos_txqs = min_t(int, qcount, OTX2_QOS_MAX_LEAF_NODES);



	netdev = alloc_etherdev_mqs(sizeof(*pf), qcount + qos_txqs, qcount);

	if (!netdev) {

		err = -ENOMEM;

		goto err_release_regions;

	}

	if (!netdev)

		return -ENOMEM;



	pci_set_drvdata(pdev, netdev);

	SET_NETDEV_DEV(netdev, &pdev->dev);
@@ -3246,8 +3244,6 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
err_free_netdev:

	pci_set_drvdata(pdev, NULL);

	free_netdev(netdev);

err_release_regions:

	pci_release_regions(pdev);

	return err;

}
@@ -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);

}



static struct pci_driver otx2_pf_driver = {

drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c

+4 −10
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return err;

	}



	err = pci_request_regions(pdev, DRV_NAME);

	err = 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 struct pci_device_id *id) 
	err = 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;

	}



	pci_set_master(pdev);
@@ -565,10 +565,8 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	qcount = num_online_cpus();

	qos_txqs = min_t(int, qcount, OTX2_QOS_MAX_LEAF_NODES);

	netdev = alloc_etherdev_mqs(sizeof(*vf), qcount + qos_txqs, qcount);

	if (!netdev) {

		err = -ENOMEM;

		goto err_release_regions;

	}

	if (!netdev)

		return -ENOMEM;



	pci_set_drvdata(pdev, netdev);

	SET_NETDEV_DEV(netdev, &pdev->dev);
@@ -765,8 +763,6 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
err_free_netdev:

	pci_set_drvdata(pdev, NULL);

	free_netdev(netdev);

err_release_regions:

	pci_release_regions(pdev);

	return err;

}
@@ -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);

}



static struct pci_driver otx2vf_driver = {