| Message ID | 20240801174608.50592-5-pstanner@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Remove pcim_iomap_regions_request_all() | expand |
On Thu, 2024-08-01 at 19:46 +0200, Philipp Stanner wrote: > 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() > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > --- > drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 14 +++++++++--- > -- > drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 13 +++++++++--- > - > 2 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c > b/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c > index 400e36d9908f..ace39b2f2627 100644 > --- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c > +++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c > @@ -739,18 +739,22 @@ static int otx2_cptpf_probe(struct pci_dev > *pdev, > dev_err(dev, "Unable to get usable DMA > configuration\n"); > goto clear_drvdata; > } > - /* Map PF's configuration registers */ > - err = pcim_iomap_regions_request_all(pdev, 1 << > PCI_PF_REG_BAR_NUM, > - OTX2_CPT_DRV_NAME); > + err = pcim_request_all_regions(pdev, OTX2_CPT_DRV_NAME); > if (err) { > - dev_err(dev, "Couldn't get PCI resources 0x%x\n", > err); > + dev_err(dev, "Couldn't request PCI resources > 0x%x\n", err); > goto clear_drvdata; > } > pci_set_master(pdev); > pci_set_drvdata(pdev, cptpf); > cptpf->pdev = pdev; > > - cptpf->reg_base = > pcim_iomap_table(pdev)[PCI_PF_REG_BAR_NUM]; > + /* Map PF's configuration registers */ > + cptpf->reg_base = pcim_iomap(pdev, PCI_PF_REG_BAR_NUM, 0); > + if (!cptpf->reg_base) { > + dev_err(dev, "Couldn't ioremap PCI resource 0x%x\n", > err); > + err = -ENOMEM; Just saw I messed that one up. err has to be set before printing it, of course. Will fix that in a v2. > + goto clear_drvdata; > + } > > /* Check if AF driver is up, otherwise defer probe */ > err = cpt_is_pf_usable(cptpf); > diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c > b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c > index 527d34cc258b..e2210bf9605a 100644 > --- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c > +++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c > @@ -358,9 +358,8 @@ static int otx2_cptvf_probe(struct pci_dev *pdev, > dev_err(dev, "Unable to get usable DMA > configuration\n"); > goto clear_drvdata; > } > - /* Map VF's configuration registers */ > - ret = pcim_iomap_regions_request_all(pdev, 1 << > PCI_PF_REG_BAR_NUM, > - OTX2_CPTVF_DRV_NAME); > + > + ret = pcim_request_all_regions(pdev, OTX2_CPTVF_DRV_NAME); > if (ret) { > dev_err(dev, "Couldn't get PCI resources 0x%x\n", > ret); > goto clear_drvdata; > @@ -369,7 +368,13 @@ static int otx2_cptvf_probe(struct pci_dev > *pdev, > pci_set_drvdata(pdev, cptvf); > cptvf->pdev = pdev; > > - cptvf->reg_base = > pcim_iomap_table(pdev)[PCI_PF_REG_BAR_NUM]; > + /* Map VF's configuration registers */ > + cptvf->reg_base = pcim_iomap(pdev, PCI_PF_REG_BAR_NUM, 0); > + if (!cptvf->reg_base) { > + dev_err(dev, "Couldn't ioremap PCI resource 0x%x\n", > ret); > + ret = -ENOMEM; Same here. P. > + goto clear_drvdata; > + } > > otx2_cpt_set_hw_caps(pdev, &cptvf->cap_flag); >
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c index 400e36d9908f..ace39b2f2627 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c @@ -739,18 +739,22 @@ static int otx2_cptpf_probe(struct pci_dev *pdev, dev_err(dev, "Unable to get usable DMA configuration\n"); goto clear_drvdata; } - /* Map PF's configuration registers */ - err = pcim_iomap_regions_request_all(pdev, 1 << PCI_PF_REG_BAR_NUM, - OTX2_CPT_DRV_NAME); + err = pcim_request_all_regions(pdev, OTX2_CPT_DRV_NAME); if (err) { - dev_err(dev, "Couldn't get PCI resources 0x%x\n", err); + dev_err(dev, "Couldn't request PCI resources 0x%x\n", err); goto clear_drvdata; } pci_set_master(pdev); pci_set_drvdata(pdev, cptpf); cptpf->pdev = pdev; - cptpf->reg_base = pcim_iomap_table(pdev)[PCI_PF_REG_BAR_NUM]; + /* Map PF's configuration registers */ + cptpf->reg_base = pcim_iomap(pdev, PCI_PF_REG_BAR_NUM, 0); + if (!cptpf->reg_base) { + dev_err(dev, "Couldn't ioremap PCI resource 0x%x\n", err); + err = -ENOMEM; + goto clear_drvdata; + } /* Check if AF driver is up, otherwise defer probe */ err = cpt_is_pf_usable(cptpf); diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c index 527d34cc258b..e2210bf9605a 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c +++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c @@ -358,9 +358,8 @@ static int otx2_cptvf_probe(struct pci_dev *pdev, dev_err(dev, "Unable to get usable DMA configuration\n"); goto clear_drvdata; } - /* Map VF's configuration registers */ - ret = pcim_iomap_regions_request_all(pdev, 1 << PCI_PF_REG_BAR_NUM, - OTX2_CPTVF_DRV_NAME); + + ret = pcim_request_all_regions(pdev, OTX2_CPTVF_DRV_NAME); if (ret) { dev_err(dev, "Couldn't get PCI resources 0x%x\n", ret); goto clear_drvdata; @@ -369,7 +368,13 @@ static int otx2_cptvf_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, cptvf); cptvf->pdev = pdev; - cptvf->reg_base = pcim_iomap_table(pdev)[PCI_PF_REG_BAR_NUM]; + /* Map VF's configuration registers */ + cptvf->reg_base = pcim_iomap(pdev, PCI_PF_REG_BAR_NUM, 0); + if (!cptvf->reg_base) { + dev_err(dev, "Couldn't ioremap PCI resource 0x%x\n", ret); + ret = -ENOMEM; + goto clear_drvdata; + } otx2_cpt_set_hw_caps(pdev, &cptvf->cap_flag);
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() Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 14 +++++++++----- drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 9 deletions(-)