Skip to content

Commit 86d17af

Browse files
Philipp Stannerbjorn-helgaas
authored andcommitted
crypto: qat - replace deprecated PCI functions
pcim_iomap_table() and pcim_iomap_regions_request_all() have been deprecated by the PCI subsystem in commit e354bb8 ("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>
1 parent bdcddd0 commit 86d17af

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,21 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
129129
/* Find and map all the device's BARS */
130130
bar_mask = pci_select_bars(pdev, IORESOURCE_MEM) & ADF_GEN4_BAR_MASK;
131131

132-
ret = pcim_iomap_regions_request_all(pdev, bar_mask, pci_name(pdev));
132+
ret = pcim_request_all_regions(pdev, pci_name(pdev));
133133
if (ret) {
134-
dev_err(&pdev->dev, "Failed to map pci regions.\n");
134+
dev_err(&pdev->dev, "Failed to request PCI regions.\n");
135135
goto out_err;
136136
}
137137

138138
i = 0;
139139
for_each_set_bit(bar_nr, &bar_mask, PCI_STD_NUM_BARS) {
140140
bar = &accel_pci_dev->pci_bars[i++];
141-
bar->virt_addr = pcim_iomap_table(pdev)[bar_nr];
141+
bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);
142+
if (!bar->virt_addr) {
143+
dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");
144+
ret = -ENOMEM;
145+
goto out_err;
146+
}
142147
}
143148

144149
pci_set_master(pdev);

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,21 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
131131
/* Find and map all the device's BARS */
132132
bar_mask = pci_select_bars(pdev, IORESOURCE_MEM) & ADF_GEN4_BAR_MASK;
133133

134-
ret = pcim_iomap_regions_request_all(pdev, bar_mask, pci_name(pdev));
134+
ret = pcim_request_all_regions(pdev, pci_name(pdev));
135135
if (ret) {
136-
dev_err(&pdev->dev, "Failed to map pci regions.\n");
136+
dev_err(&pdev->dev, "Failed to request PCI regions.\n");
137137
goto out_err;
138138
}
139139

140140
i = 0;
141141
for_each_set_bit(bar_nr, &bar_mask, PCI_STD_NUM_BARS) {
142142
bar = &accel_pci_dev->pci_bars[i++];
143-
bar->virt_addr = pcim_iomap_table(pdev)[bar_nr];
143+
bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);
144+
if (!bar->virt_addr) {
145+
dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");
146+
ret = -ENOMEM;
147+
goto out_err;
148+
}
144149
}
145150

146151
pci_set_master(pdev);

0 commit comments

Comments
 (0)