| Message ID | 20230804080435.191196-1-wangxiongfeng2@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fe8aa8e3379326ecb77203cae50e8e83c054aedc |
| Headers | show |
| Series | powerpc/powernv/pci: use pci_dev_id() to simplify the code | expand |
On 04/08/2023 10:04, Xiongfeng Wang wrote: > PCI core API pci_dev_id() can be used to get the BDF number for a pci > device. We don't need to compose it mannually. Use pci_dev_id() to > simplify the code a little bit. > > Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> > --- LGTM Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com> Fred > arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c > index cb637827bc58..28fac4770073 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -997,14 +997,14 @@ static void pnv_pci_ioda_dma_dev_setup(struct pci_dev *pdev) > struct pnv_ioda_pe *pe; > > /* Check if the BDFN for this device is associated with a PE yet */ > - pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8)); > + pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev)); > if (!pe) { > /* VF PEs should be pre-configured in pnv_pci_sriov_enable() */ > if (WARN_ON(pdev->is_virtfn)) > return; > > pnv_pci_configure_bus(pdev->bus); > - pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8)); > + pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev)); > pci_info(pdev, "Configured PE#%x\n", pe ? pe->pe_number : 0xfffff); > > > @@ -2526,7 +2526,7 @@ static struct iommu_group *pnv_pci_device_group(struct pci_controller *hose, > if (WARN_ON(!phb)) > return ERR_PTR(-ENODEV); > > - pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8)); > + pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev)); > if (!pe) > return ERR_PTR(-ENODEV); >
On Fri, 04 Aug 2023 16:04:35 +0800, Xiongfeng Wang wrote: > PCI core API pci_dev_id() can be used to get the BDF number for a pci > device. We don't need to compose it mannually. Use pci_dev_id() to > simplify the code a little bit. > > Applied to powerpc/next. [1/1] powerpc/powernv/pci: use pci_dev_id() to simplify the code https://git.kernel.org/powerpc/c/fe8aa8e3379326ecb77203cae50e8e83c054aedc cheers
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index cb637827bc58..28fac4770073 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -997,14 +997,14 @@ static void pnv_pci_ioda_dma_dev_setup(struct pci_dev *pdev) struct pnv_ioda_pe *pe; /* Check if the BDFN for this device is associated with a PE yet */ - pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8)); + pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev)); if (!pe) { /* VF PEs should be pre-configured in pnv_pci_sriov_enable() */ if (WARN_ON(pdev->is_virtfn)) return; pnv_pci_configure_bus(pdev->bus); - pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8)); + pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev)); pci_info(pdev, "Configured PE#%x\n", pe ? pe->pe_number : 0xfffff); @@ -2526,7 +2526,7 @@ static struct iommu_group *pnv_pci_device_group(struct pci_controller *hose, if (WARN_ON(!phb)) return ERR_PTR(-ENODEV); - pe = pnv_pci_bdfn_to_pe(phb, pdev->devfn | (pdev->bus->number << 8)); + pe = pnv_pci_bdfn_to_pe(phb, pci_dev_id(pdev)); if (!pe) return ERR_PTR(-ENODEV);
PCI core API pci_dev_id() can be used to get the BDF number for a pci device. We don't need to compose it mannually. Use pci_dev_id() to simplify the code a little bit. Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> --- arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)