crypto: qat - replace deprecated PCI functions

pcim_iomap_table() and pcim_iomap_regions_request_all() have been
deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()").

Replace these functions with their successors, pcim_iomap() and
pcim_request_all_regions().

Link: https://lore.kernel.org/r/20241030112743.104395-4-pstanner@redhat.com
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

diff --git a/drivers/crypto/intel/qat/qat_420xx/adf_drv.c b/drivers/crypto/intel/qat/qat_420xx/adf_drv.c
index f49818a13013a3538989268f8d09a0a08509ea06..788a11cdb34b5a8fe566159cf80a72272bca2b40 100644 (file)
--- a/drivers/crypto/intel/qat/qat_420xx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_420xx/adf_drv.c
@@ -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);

diff --git a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
index 659905e4595034a8b994eb9719cd2a413df8d6f2..115eabfd1f6ba3c7e5a93c0efa3876fca5ddb733 100644 (file)
--- a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
@@ -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);