Skip to content

Commit

Permalink
core/pci: Use macro as vendor ID register offset
Browse files Browse the repository at this point in the history
This uses macro as PCI config register (vendor ID) offset because
it's more indicative.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
  • Loading branch information
Gavin Shan authored and stewartsmith committed Jun 15, 2017
1 parent 4a38543 commit f3105cb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions core/pci.c
Expand Up @@ -229,7 +229,7 @@ static struct pci_device *pci_scan_one(struct phb *phb, struct pci_device *paren
bool had_crs = false;

for (retries = 0; retries < 40; retries++) {
rc = pci_cfg_read32(phb, bdfn, 0, &vdid);
rc = pci_cfg_read32(phb, bdfn, PCI_CFG_VENDOR_ID, &vdid);
if (rc)
return NULL;
if (vdid == 0xffffffff || vdid == 0x00000000)
Expand All @@ -250,7 +250,7 @@ static struct pci_device *pci_scan_one(struct phb *phb, struct pci_device *paren
* capture it's own bus number, so any subsequent error
* messages will be properly tagged
*/
pci_cfg_write32(phb, bdfn, 0, vdid);
pci_cfg_write32(phb, bdfn, PCI_CFG_VENDOR_ID, vdid);

pd = zalloc(sizeof(struct pci_device));
if (!pd) {
Expand Down Expand Up @@ -1753,8 +1753,8 @@ static int __pci_restore_bridge_buses(struct phb *phb,
uint32_t vdid;

/* Make all devices below a bridge "re-capture" the bdfn */
if (pci_cfg_read32(phb, pd->bdfn, 0, &vdid) == 0)
pci_cfg_write32(phb, pd->bdfn, 0, vdid);
if (pci_cfg_read32(phb, pd->bdfn, PCI_CFG_VENDOR_ID, &vdid) == 0)
pci_cfg_write32(phb, pd->bdfn, PCI_CFG_VENDOR_ID, vdid);
return 0;
}

Expand Down

0 comments on commit f3105cb

Please sign in to comment.