diff options
| author | Jordan Niethe <jniethe5@gmail.com> | 2019-08-09 14:12:20 +1000 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2019-08-16 15:51:55 +1000 |
| commit | e4e2aa9cc2cbaab9c6c0ee3a1f4e36292128762a (patch) | |
| tree | 3baf40df5b7ccde86c729634583655252a478530 /hw/npu3-nvlink.c | |
| parent | f68639c6fcdf9261290a4601eda1ae6a406ba95a (diff) | |
| download | skiboot-e4e2aa9cc2cbaab9c6c0ee3a1f4e36292128762a.zip skiboot-e4e2aa9cc2cbaab9c6c0ee3a1f4e36292128762a.tar.gz skiboot-e4e2aa9cc2cbaab9c6c0ee3a1f4e36292128762a.tar.bz2 | |
pci: Use a macro for accessing PCI BDF Function Number
Currently when the Function Number bits of a BDF are needed the bit
operations to get it are free coded. There are many places where the
Function Number is used, so make a macro to use instead of free coding
it everytime.
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'hw/npu3-nvlink.c')
| -rw-r--r-- | hw/npu3-nvlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/npu3-nvlink.c b/hw/npu3-nvlink.c index c61e1b7..3939f2c 100644 --- a/hw/npu3-nvlink.c +++ b/hw/npu3-nvlink.c @@ -30,7 +30,7 @@ (dev)->npu->nvlink.phb.opal_id, \ PCI_BUS_NUM((dev)->nvlink.pvd->bdfn), \ PCI_DEV((dev)->nvlink.pvd->bdfn), \ - (dev)->nvlink.pvd->bdfn & 0x7, ##a) + PCI_FUNC((dev)->nvlink.pvd->bdfn), ##a) #define NPU3DEVDBG(dev, fmt, a...) NPU3DEVLOG(PR_DEBUG, dev, fmt, ##a) #define NPU3DEVINF(dev, fmt, a...) NPU3DEVLOG(PR_INFO, dev, fmt, ##a) #define NPU3DEVERR(dev, fmt, a...) NPU3DEVLOG(PR_ERR, dev, fmt, ##a) @@ -614,7 +614,7 @@ static void npu3_dev_assign_gmb(struct npu3_dev *dev, uint64_t addr, assert(0); } - mode += dev->nvlink.pvd->bdfn & 0x7; + mode += PCI_FUNC(dev->nvlink.pvd->bdfn); val = NPU3_GPU_MEM_BAR_ENABLE | NPU3_GPU_MEM_BAR_POISON; @@ -1594,7 +1594,7 @@ int64_t npu3_init_context(struct phb *phb, uint64_t msr, uint64_t bdf) lparshort = GETFIELD(NPU3_XTS_BDF_MAP_LPARSHORT, map); NPU3DBG(npu, "Found LPARSHORT 0x%x for bdf %02llx:%02llx.%llx\n", - lparshort, PCI_BUS_NUM(bdf), PCI_DEV(bdf), bdf & 0x7); + lparshort, PCI_BUS_NUM(bdf), PCI_DEV(bdf), PCI_FUNC(bdf)); rc = npu3_init_context_pid(npu, lparshort, msr); if (rc) @@ -1711,7 +1711,7 @@ int64_t npu3_map_lpar(struct phb *phb, uint64_t bdf, uint64_t lparid, if (!dev || dev->nvlink.gpu->bdfn != bdf) { NPU3ERR(npu, "Can't find a link for bdf %02llx:%02llx.%llx\n", - PCI_BUS_NUM(bdf), PCI_DEV(bdf), bdf & 0x7); + PCI_BUS_NUM(bdf), PCI_DEV(bdf), PCI_FUNC(bdf)); rc = OPAL_PARAMETER; goto out; } |