| Message ID | 20241004023351.6946-1-manivannan.sadhasivam@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | bus: mhi: host: pci_generic: Use pcim_iomap_region() to request and map MHI BAR | expand |
On 10/3/2024 7:33 PM, Manivannan Sadhasivam wrote: > Use of both pcim_iomap_regions() and pcim_iomap_table() APIs are > deprecated. Hence, switch to pcim_iomap_region() API which handles both the > request and map of the MHI BAR region. > > Cc: Loic Poulain <loic.poulain@linaro.org> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > > Compile tested only. > > drivers/bus/mhi/host/pci_generic.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 9938bb034c1c..07645ce2119a 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -917,12 +917,12 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, > return err; > } > > - err = pcim_iomap_regions(pdev, 1 << bar_num, pci_name(pdev)); > - if (err) { > + mhi_cntrl->regs = pcim_iomap_region(pdev, 1 << bar_num, pci_name(pdev)); > + if (IS_ERR(mhi_cntrl->regs)) { > + err = PTR_ERR(mhi_cntrl->regs); > dev_err(&pdev->dev, "failed to map pci region: %d\n", err); > return err; > } > - mhi_cntrl->regs = pcim_iomap_table(pdev)[bar_num]; > mhi_cntrl->reg_len = pci_resource_len(pdev, bar_num); > > err = dma_set_mask_and_coherent(&pdev->dev, dma_mask); Reviewed-by: Mayank Rana <quic_mrana@quicinc.com> Regards, Mayank
On Fri, Oct 04, 2024 at 08:03:51AM +0530, Manivannan Sadhasivam wrote: > Use of both pcim_iomap_regions() and pcim_iomap_table() APIs are > deprecated. Hence, switch to pcim_iomap_region() API which handles both the > request and map of the MHI BAR region. > > Cc: Loic Poulain <loic.poulain@linaro.org> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Applied to mhi-next! - Mani > --- > > Compile tested only. > > drivers/bus/mhi/host/pci_generic.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 9938bb034c1c..07645ce2119a 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -917,12 +917,12 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, > return err; > } > > - err = pcim_iomap_regions(pdev, 1 << bar_num, pci_name(pdev)); > - if (err) { > + mhi_cntrl->regs = pcim_iomap_region(pdev, 1 << bar_num, pci_name(pdev)); > + if (IS_ERR(mhi_cntrl->regs)) { > + err = PTR_ERR(mhi_cntrl->regs); > dev_err(&pdev->dev, "failed to map pci region: %d\n", err); > return err; > } > - mhi_cntrl->regs = pcim_iomap_table(pdev)[bar_num]; > mhi_cntrl->reg_len = pci_resource_len(pdev, bar_num); > > err = dma_set_mask_and_coherent(&pdev->dev, dma_mask); > -- > 2.25.1 >
diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c index 9938bb034c1c..07645ce2119a 100644 --- a/drivers/bus/mhi/host/pci_generic.c +++ b/drivers/bus/mhi/host/pci_generic.c @@ -917,12 +917,12 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, return err; } - err = pcim_iomap_regions(pdev, 1 << bar_num, pci_name(pdev)); - if (err) { + mhi_cntrl->regs = pcim_iomap_region(pdev, 1 << bar_num, pci_name(pdev)); + if (IS_ERR(mhi_cntrl->regs)) { + err = PTR_ERR(mhi_cntrl->regs); dev_err(&pdev->dev, "failed to map pci region: %d\n", err); return err; } - mhi_cntrl->regs = pcim_iomap_table(pdev)[bar_num]; mhi_cntrl->reg_len = pci_resource_len(pdev, bar_num); err = dma_set_mask_and_coherent(&pdev->dev, dma_mask);
Use of both pcim_iomap_regions() and pcim_iomap_table() APIs are deprecated. Hence, switch to pcim_iomap_region() API which handles both the request and map of the MHI BAR region. Cc: Loic Poulain <loic.poulain@linaro.org> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- Compile tested only. drivers/bus/mhi/host/pci_generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)