Commit f326ce16 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/devm' 

- Export pcim_request_all_regions(), a managed interface to request all
  BARs (Philipp Stanner)

- Replace pcim_iomap_regions_request_all() with pcim_request_all_regions(),
  and pcim_iomap_table()[n] with pcim_iomap(n), in the following drivers:
  ahci, crypto qat, crypto octeontx2, intel_th, iwlwifi, ntb idt, serial
  rp2, ALSA korg1212 (Philipp Stanner)

- Remove the now unused pcim_iomap_regions_request_all() (Philipp Stanner)

- Export pcim_iounmap_region(), a managed interface to unmap and release a
  PCI BAR (Philipp Stanner)

- Replace pcim_iomap_regions(mask) with pcim_iomap_region(n), and
  pcim_iounmap_regions(mask) with pcim_iounmap_region(n), in the following
  drivers: fpga dfl-pci, block mtip32xx, gpio-merrifield, cavium (Philipp
  Stanner)

* pci/devm:
  ethernet: cavium: Replace deprecated PCI functions
  gpio: Replace deprecated PCI functions
  fpga/dfl-pci.c: Replace deprecated PCI functions
  PCI: Deprecate pcim_iounmap_regions()
  PCI: Make pcim_iounmap_region() a public function
  PCI: Remove pcim_iomap_regions_request_all()
  ALSA: korg1212: Replace deprecated PCI functions
  serial: rp2: Replace deprecated PCI functions
  ntb: idt: Replace deprecated PCI functions
  wifi: iwlwifi: replace deprecated PCI functions
  intel_th: pci: Replace deprecated PCI functions
  crypto: marvell - replace deprecated PCI functions
  crypto: qat - replace deprecated PCI functions
  ata: ahci: Replace deprecated PCI functions
  PCI: Make pcim_request_all_regions() a public function
parents 73bdd730 64fe9bc3

Documentation/driver-api/driver-model/devres.rst

+0 −1
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ PCI 
  pcim_enable_device()		: after success, some PCI ops become managed

  pcim_iomap()			: do iomap() on a single BAR

  pcim_iomap_regions()		: do request_region() and iomap() on multiple BARs

  pcim_iomap_regions_request_all() : do request_region() on all and iomap() on multiple BARs

  pcim_iomap_table()		: array of mapped addresses indexed by BAR

  pcim_iounmap()		: do iounmap() on a single BAR

  pcim_iounmap_regions()	: do iounmap() and release_region() on multiple BARs

drivers/ata/acard-ahci.c

+4 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 
	/* AHCI controllers often implement SFF compatible interface.

	 * Grab all PCI BARs just in case.

	 */

	rc = pcim_iomap_regions_request_all(pdev, 1 << AHCI_PCI_BAR, DRV_NAME);

	rc = pcim_request_all_regions(pdev, DRV_NAME);

	if (rc == -EBUSY)

		pcim_pin_device(pdev);

	if (rc)
@@ -386,7 +386,9 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 
	if (!(hpriv->flags & AHCI_HFLAG_NO_MSI))

		pci_enable_msi(pdev);



	hpriv->mmio = pcim_iomap_table(pdev)[AHCI_PCI_BAR];

	hpriv->mmio = pcim_iomap(pdev, AHCI_PCI_BAR, 0);

	if (!hpriv->mmio)

		return -ENOMEM;



	/* save initial config */

	ahci_save_initial_config(&pdev->dev, hpriv);

drivers/ata/ahci.c

+4 −2
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* AHCI controllers often implement SFF compatible interface.

	 * Grab all PCI BARs just in case.

	 */

	rc = pcim_iomap_regions_request_all(pdev, 1 << ahci_pci_bar, DRV_NAME);

	rc = pcim_request_all_regions(pdev, DRV_NAME);

	if (rc == -EBUSY)

		pcim_pin_device(pdev);

	if (rc)
@@ -1893,7 +1893,9 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ahci_sb600_enable_64bit(pdev))

		hpriv->flags &= ~AHCI_HFLAG_32BIT_ONLY;



	hpriv->mmio = pcim_iomap_table(pdev)[ahci_pci_bar];

	hpriv->mmio = pcim_iomap(pdev, ahci_pci_bar, 0);

	if (!hpriv->mmio)

		return -ENOMEM;



	/* detect remapped nvme devices */

	ahci_remap_check(pdev, ahci_pci_bar, hpriv);

drivers/crypto/intel/qat/qat_420xx/adf_drv.c

+8 −3
Original line number Diff line number Diff line
@@ -129,16 +129,21 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Find and map all the device's BARS */

	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM) & ADF_GEN4_BAR_MASK;



	ret = pcim_iomap_regions_request_all(pdev, bar_mask, pci_name(pdev));

	ret = pcim_request_all_regions(pdev, pci_name(pdev));

	if (ret) {

		dev_err(&pdev->dev, "Failed to map pci regions.\n");

		dev_err(&pdev->dev, "Failed to request PCI regions.\n");

		goto out_err;

	}



	i = 0;

	for_each_set_bit(bar_nr, &bar_mask, PCI_STD_NUM_BARS) {

		bar = &accel_pci_dev->pci_bars[i++];

		bar->virt_addr = pcim_iomap_table(pdev)[bar_nr];

		bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);

		if (!bar->virt_addr) {

			dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");

			ret = -ENOMEM;

			goto out_err;

		}

	}



	pci_set_master(pdev);

drivers/crypto/intel/qat/qat_4xxx/adf_drv.c

+8 −3
Original line number Diff line number Diff line
@@ -131,16 +131,21 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Find and map all the device's BARS */

	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM) & ADF_GEN4_BAR_MASK;



	ret = pcim_iomap_regions_request_all(pdev, bar_mask, pci_name(pdev));

	ret = pcim_request_all_regions(pdev, pci_name(pdev));

	if (ret) {

		dev_err(&pdev->dev, "Failed to map pci regions.\n");

		dev_err(&pdev->dev, "Failed to request PCI regions.\n");

		goto out_err;

	}



	i = 0;

	for_each_set_bit(bar_nr, &bar_mask, PCI_STD_NUM_BARS) {

		bar = &accel_pci_dev->pci_bars[i++];

		bar->virt_addr = pcim_iomap_table(pdev)[bar_nr];

		bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);

		if (!bar->virt_addr) {

			dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");

			ret = -ENOMEM;

			goto out_err;

		}

	}



	pci_set_master(pdev);