PCI: add help pci_dev_id
Subsystems (12)
Heiner Kallweit
maintainerv2 cover PCI: add help pci_dev_id
In several places in the kernel we find PCI_DEVID used like this:PCI_DEVID(dev->bus->number, dev->devfn) Therefore create a helper for it.
v2:
- apply the change to all affected places in the kernel
Heiner Kallweit (9):
PCI: add helper pci_dev_id
PCI: use helper pci_dev_id
r8169: use new helper pci_dev_id powerpc/powernv/npu: use helper pci_dev_id drm/amdkfd: use helper pci_dev_id
iommu/amd: use helper pci_dev_id
iommu/vt-d: use helper pci_dev_id
stmmac: pci: use helper pci_dev_id platform/chrome: chromeos_laptop: use helper pci_dev_id
arch/powerpc/platforms/powernv/npu-dma.c | 14 ++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +-- drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/net/ethernet/realtek/r8169.c | 3 +-- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- drivers/pci/msi.c | 6 +++--- drivers/pci/search.c | 10 +++------- drivers/platform/chrome/chromeos_laptop.c | 2 +- include/linux/pci.h | 5 +++++ 11 files changed, 24 insertions(+), 27 deletions(-)
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 1/9 PCI: add helper pci_dev_id
In several places in the kernel we find PCI_DEVID used like this:PCI_DEVID(dev->bus->number, dev->devfn) Therefore create a helper for it.
--- include/linux/pci.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/pci.h +5 -0
@@ -598,6 +598,11 @@ struct pci_bus {#define to_pci_bus (n) container_of(n, struct pci_bus, dev) +static inline u16 pci_dev_id (struct pci_dev *dev) +{ +return PCI_DEVID (dev->bus->number, dev->devfn); +} +/* * Returns true if the PCI bus is root (behind host-PCI bridge), * false otherwise
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 2/9 PCI: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/pci/msi.c | 6 +++--- drivers/pci/search.c | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/pci/msi.c +3 -3
@@ -1338,7 +1338,7 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, struct msi_desc *desc) {return (irq_hw_number_t )desc->msi_attrib.entry_nr | -PCI_DEVID (dev->bus->number, dev->devfn) <<11 | +pci_dev_id (dev) <<11 | (pci_domain_nr (dev->bus) &0xFFFFFFFF ) <<27 ; }
@@ -1508,7 +1508,7 @@ static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data)u32 pci_msi_domain_get_msi_rid (struct irq_domain *domain,struct pci_dev *pdev) {struct device_node *of_node; -u32 rid =PCI_DEVID (pdev->bus->number, pdev->devfn); +u32 rid =pci_dev_id (pdev);pci_for_each_dma_alias (pdev, get_msi_id_cb, &rid);
@@ -1531,7 +1531,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)struct irq_domain *pci_msi_get_device_domain (struct pci_dev *pdev) {struct irq_domain *dom; -u32 rid =PCI_DEVID (pdev->bus->number, pdev->devfn); +u32 rid =pci_dev_id (pdev);pci_for_each_dma_alias (pdev, get_msi_id_cb, &rid); dom =of_msi_map_get_device_domain (&pdev->dev, rid);
drivers/pci/search.c +3 -7
@@ -33,7 +33,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,struct pci_bus *bus;int ret; - ret =fn (pdev,PCI_DEVID (pdev->bus->number, pdev->devfn), data); + ret =fn (pdev,pci_dev_id (pdev), data);if (ret)return ret;
@@ -88,9 +88,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,return ret;continue ;case PCI_EXP_TYPE_PCIE_BRIDGE : - ret =fn (tmp, -PCI_DEVID (tmp->bus->number, - tmp->devfn), data); + ret =fn (tmp,pci_dev_id (tmp), data);if (ret)return ret;continue ;
@@ -101,9 +99,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,PCI_DEVID (tmp->subordinate->number, PCI_DEVFN(0, 0)), data); else - ret =fn (tmp, -PCI_DEVID (tmp->bus->number, - tmp->devfn), data); + ret =fn (tmp,pci_dev_id (tmp), data);if (ret)return ret; }
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 3/9 r8169: use new helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/realtek/r8169.c +1 -2
@@ -7020,8 +7020,7 @@ static int r8169_mdio_register(struct rtl8169_private *tp) new_bus->priv = tp; new_bus->parent = &pdev->dev; new_bus->irq[0 ] =PHY_IGNORE_INTERRUPT ; -snprintf (new_bus->id,MII_BUS_ID_SIZE ,"r8169-%x" , -PCI_DEVID (pdev->bus->number, pdev->devfn)); +snprintf (new_bus->id,MII_BUS_ID_SIZE ,"r8169-%x" ,pci_dev_id (pdev)); new_bus->read = r8169_mdio_read_reg; new_bus->write = r8169_mdio_write_reg;
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 4/9 powerpc/powernv/npu: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- arch/powerpc/platforms/powernv/npu-dma.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
arch/powerpc/platforms/powernv/npu-dma.c +6 -8
@@ -1213,9 +1213,8 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,* Currently we only support radix and non-zero LPCR only makes sense * for hash tables so skiboot expects the LPCR parameter to be a zero. */ - ret =opal_npu_map_lpar (nphb->opal_id, -PCI_DEVID (gpdev->bus->number, gpdev->devfn), lparid, -0 /* LPCR bits */ ); + ret =opal_npu_map_lpar (nphb->opal_id,pci_dev_id (gpdev), lparid, +0 /* LPCR bits */ );if (ret) {dev_err (&gpdev->dev,"Error %d mapping device to LPAR\n" , ret);return ret;
@@ -1224,7 +1223,7 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,dev_dbg (&gpdev->dev,"init context opalid=%llu msr=%lx\n" , nphb->opal_id, msr); ret =opal_npu_init_context (nphb->opal_id,0 /*__unused*/ , msr, -PCI_DEVID (gpdev->bus->number, gpdev->devfn)); +pci_dev_id (gpdev));if (ret <0 )dev_err (&gpdev->dev,"Failed to init context: %d\n" , ret);else
@@ -1258,7 +1257,7 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev)dev_dbg (&gpdev->dev,"destroy context opalid=%llu\n" , nphb->opal_id); ret =opal_npu_destroy_context (nphb->opal_id,0 /*__unused*/ , -PCI_DEVID (gpdev->bus->number, gpdev->devfn)); +pci_dev_id (gpdev));if (ret <0 ) {dev_err (&gpdev->dev,"Failed to destroy context: %d\n" , ret);return ret;
@@ -1266,9 +1265,8 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev)/* Set LPID to 0 anyway, just to be safe */ dev_dbg (&gpdev->dev,"Map LPAR opalid=%llu lparid=0\n" , nphb->opal_id); - ret =opal_npu_map_lpar (nphb->opal_id, -PCI_DEVID (gpdev->bus->number, gpdev->devfn),0 /*LPID*/ , -0 /* LPCR bits */ ); + ret =opal_npu_map_lpar (nphb->opal_id,pci_dev_id (gpdev),0 /*LPID*/ , +0 /* LPCR bits */ );if (ret)dev_err (&gpdev->dev,"Error %d mapping device to LPAR\n" , ret);
Signature · 1 line
2.21.0
Re: [PATCH v2 4/9] powerpc/powernv/npu: use helper pci_dev_id
Quoted 3 lines · Heiner Kallweit
Use new helper
pci_dev_id()to simplify the code.Signed-off-by Heiner Kallweit <[email protected]>
Quoted 51 lines
--- arch/powerpc/platforms/powernv/npu-dma.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)arch/powerpc/platforms/powernv/npu-dma.c +6
-8@@ -1213,9 +1213,8 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,* Currently we only support radix and non-zero LPCR only makes sense * for hash tables so skiboot expects the LPCR parameter to be a zero. */ - ret =opal_npu_map_lpar (nphb->opal_id, -PCI_DEVID (gpdev->bus->number, gpdev->devfn), lparid, -0 /* LPCR bits */ ); + ret =opal_npu_map_lpar (nphb->opal_id,pci_dev_id (gpdev), lparid, +0 /* LPCR bits */ );if (ret) {dev_err (&gpdev->dev,"Error %d mapping device to LPAR\n" , ret);return ret;@@ -1224,7 +1223,7 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,dev_dbg (&gpdev->dev,"init context opalid=%llu msr=%lx\n" , nphb->opal_id, msr); ret =opal_npu_init_context (nphb->opal_id,0 /*__unused*/ , msr, -PCI_DEVID (gpdev->bus->number, gpdev->devfn)); +pci_dev_id (gpdev));if (ret <0 )dev_err (&gpdev->dev,"Failed to init context: %d\n" , ret);else @@ -1258,7 +1257,7 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev)dev_dbg (&gpdev->dev,"destroy context opalid=%llu\n" , nphb->opal_id); ret =opal_npu_destroy_context (nphb->opal_id,0 /*__unused*/ , -PCI_DEVID (gpdev->bus->number, gpdev->devfn)); +pci_dev_id (gpdev));if (ret <0 ) {dev_err (&gpdev->dev,"Failed to destroy context: %d\n" , ret);return ret;@@ -1266,9 +1265,8 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev)/* Set LPID to 0 anyway, just to be safe */ dev_dbg (&gpdev->dev,"Map LPAR opalid=%llu lparid=0\n" , nphb->opal_id); - ret =opal_npu_map_lpar (nphb->opal_id, -PCI_DEVID (gpdev->bus->number, gpdev->devfn),0 /*LPID*/ , -0 /* LPCR bits */ ); + ret =opal_npu_map_lpar (nphb->opal_id,pci_dev_id (gpdev),0 /*LPID*/ , +0 /* LPCR bits */ );if (ret)dev_err (&gpdev->dev,"Error %d mapping device to LPAR\n" , ret);
Signature · 1 line
Alexey
Heiner Kallweit
maintainerPATCH v2 5/9 drm/amdkfd: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -2
@@ -1272,8 +1272,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) dev->node_props.vendor_id = gpu->pdev->vendor; dev->node_props.device_id = gpu->pdev->device; - dev->node_props.location_id =PCI_DEVID (gpu->pdev->bus->number, - gpu->pdev->devfn); + dev->node_props.location_id =pci_dev_id (gpu->pdev); dev->node_props.max_engine_clk_fcompute =amdgpu_amdkfd_get_max_engine_clock_in_mhz (dev->gpu->kgd); dev->node_props.max_engine_clk_ccompute =
Signature · 1 line
2.21.0
Re: [PATCH v2 5/9] drm/amdkfd: use helper pci_dev_id
Am 24.04.19 um 21:14 schrieb Heiner Kallweit:
Quoted 3 lines
Use new helper
pci_dev_id()to simplify the code.Signed-off-by Heiner Kallweit <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0
-0
drivers/gpu/drm/amd/amdkfd/kfd_topology.c int kfd_topology_add_device(struct kfd_dev *gpu) · line 1278
Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1
-2@@ -1272,8 +1272,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) dev->node_props.vendor_id = gpu->pdev->vendor; dev->node_props.device_id = gpu->pdev->device; - dev->node_props.location_id =PCI_DEVID (gpu->pdev->bus->number, - gpu->pdev->devfn); + dev->node_props.location_id =pci_dev_id (gpu->pdev); dev->node_props.max_engine_clk_fcompute =amdgpu_amdkfd_get_max_engine_clock_in_mhz (dev->gpu->kgd); dev->node_props.max_engine_clk_ccompute =
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Heiner Kallweit
maintainerPATCH v2 6/9 iommu/amd: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +1 -1
@@ -165,7 +165,7 @@ static inline u16 get_pci_device_id(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev); -return PCI_DEVID (pdev->bus->number, pdev->devfn); +return pci_dev_id (pdev); } static inline int get_acpihid_device_id(struct device *dev,
Signature · 1 line
2.21.0
Re: [PATCH v2 6/9] iommu/amd: use helper pci_dev_id
Quoted 3 lines · Heiner Kallweit
Use new helper
pci_dev_id()to simplify the code.Signed-off-by Heiner Kallweit <[email protected]>
Quoted 20 lines
--- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/amd_iommu.c +1
-1@@ -165,7 +165,7 @@ static inline u16 get_pci_device_id(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev); -return PCI_DEVID (pdev->bus->number, pdev->devfn); +return pci_dev_id (pdev); } static inline int get_acpihid_device_id(struct device *dev,Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 7/9 iommu/vt-d: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +1 -1
@@ -1391,7 +1391,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)/* pdev will be returned if device is not a vf */ pf_pdev =pci_physfn (pdev); - info->pfsid =PCI_DEVID (pf_pdev->bus->number, pf_pdev->devfn); + info->pfsid =pci_dev_id (pf_pdev); }#ifdef CONFIG_INTEL_IOMMU_SVM
drivers/iommu/intel_irq_remapping.c +1 -1
@@ -424,7 +424,7 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev)set_irte_sid (irte,SVT_VERIFY_SID_SQ ,SQ_ALL_16 , data.alias); elseset_irte_sid (irte ,SVT_VERIFY_SID_SQ ,SQ_ALL_16 , - PCI_DEVID(dev->bus->number, dev->devfn)); +pci_dev_id (dev ));return 0 ; }
Signature · 1 line
2.21.0
Re: [PATCH v2 7/9] iommu/vt-d: use helper pci_dev_id
Quoted 3 lines · Heiner Kallweit
Use new helper
pci_dev_id()to simplify the code.Signed-off-by Heiner Kallweit <[email protected]>
Quoted 34 lines
--- drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/iommu/intel-iommu.c +1
-1@@ -1391,7 +1391,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)/* pdev will be returned if device is not a vf */ pf_pdev =pci_physfn (pdev); - info->pfsid =PCI_DEVID (pf_pdev->bus->number, pf_pdev->devfn); + info->pfsid =pci_dev_id (pf_pdev); }#ifdef CONFIG_INTEL_IOMMU_SVM drivers/iommu/intel_irq_remapping.c +1
-1@@ -424,7 +424,7 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev)set_irte_sid (irte,SVT_VERIFY_SID_SQ ,SQ_ALL_16 , data.alias); elseset_irte_sid (irte ,SVT_VERIFY_SID_SQ ,SQ_ALL_16 , - PCI_DEVID(dev->bus->number, dev->devfn)); +pci_dev_id (dev ));return 0 ; }Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 8/9 stmmac: pci: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +1 -1
@@ -208,7 +208,7 @@ static int quark_default_data(struct pci_dev *pdev, ret =1 ; } - plat->bus_id =PCI_DEVID (pdev->bus->number, pdev->devfn); + plat->bus_id =pci_dev_id (pdev); plat->phy_addr = ret; plat->interface =PHY_INTERFACE_MODE_RMII ;
Signature · 1 line
2.21.0
Heiner Kallweit
maintainerPATCH v2 9/9 platform/chrome: chromeos_laptop: use helper pci_dev_id
In reply to Heiner KallweitUse new helper pci_dev_id() to simplify the code.
--- drivers/platform/chrome/chromeos_laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/chrome/chromeos_laptop.c +1 -1
@@ -125,7 +125,7 @@ static bool chromeos_laptop_match_adapter_devid(struct device *dev, u32 devid)return false; pdev =to_pci_dev (dev); -return devid ==PCI_DEVID (pdev->bus->number, pdev->devfn); +return devid ==pci_dev_id (pdev); }static void chromeos_laptop_check_adapter (struct i2c_adapter *adapter)
Signature · 1 line
2.21.0
Re: [PATCH v2 9/9] platform/chrome: chromeos_laptop: use helper pci_dev_id
Hi Heiner,
Quoted 3 lines · Heiner Kallweit
Use new helper
pci_dev_id()to simplify the code.Signed-off-by Heiner Kallweit <[email protected]>
Quoted 21 lines
--- drivers/platform/chrome/chromeos_laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/platform/chrome/chromeos_laptop.c +1
-1@@ -125,7 +125,7 @@ static bool chromeos_laptop_match_adapter_devid(struct device *dev, u32 devid)return false; pdev =to_pci_dev (dev); -return devid ==PCI_DEVID (pdev->bus->number, pdev->devfn); +return devid ==pci_dev_id (pdev); }static void chromeos_laptop_check_adapter (struct i2c_adapter *adapter)Signature · 1 line
2.21.0
Signature · 7 lines
Benson Leung Staff Software Engineer Chrome OS Kernel Google Inc. [email protected] Chromium OS Project [email protected]
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 18 lines · Heiner Kallweit
In several places in the kernel we find
PCI_DEVIDused like this:PCI_DEVID(dev->bus->number, dev->devfn)Therefore create a helper for it.v2:
- apply the change to all affected places in the kernelHeiner Kallweit (9):
PCI: add helperpci_dev_id
PCI: use helperpci_dev_id
r8169: use new helperpci_dev_idpowerpc/powernv/npu: use helperpci_dev_iddrm/amdkfd: use helperpci_dev_id
iommu/amd: use helperpci_dev_id
iommu/vt-d: use helperpci_dev_id
stmmac: pci: use helperpci_dev_idplatform/chrome:chromeos_laptop: use helperpci_dev_id
Quoted 12 lines
arch/powerpc/platforms/powernv/npu-dma.c | 14 ++++++-------- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +-- drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/net/ethernet/realtek/r8169.c | 3 +-- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- drivers/pci/msi.c | 6 +++--- drivers/pci/search.c | 10 +++------- drivers/platform/chrome/chromeos_laptop.c | 2 +- include/linux/pci.h | 5 +++++ 11 files changed, 24 insertions(+), 27 deletions(-)
Applied with acks/reviewed-by from Benson, Joerg, Christian, Alexey, and David to pci/misc for v5.2, thanks!
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx