| Message ID | 20240806065050.28725-1-412574090@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 87d5403378cccc557af9e02a8a2c8587ad8b7e9a |
| Headers | show |
| Series | PCI/ERR: Use PCI_POSSIBLE_ERROR() to check config reads | expand |
On Tue, Aug 06, 2024 at 02:50:50PM +0800, 412574090@163.com wrote: > From: weiyufeng <weiyufeng@kylinos.cn> > > Use PCI_POSSIBLE_ERROR() to check the response we get when we read data > from hardware. This unifies PCI error response checking and makes error > checks consistent and easier to find. > > Signed-off-by: weiyufeng <weiyufeng@kylinos.cn> Thanks, applied to pci/hotplug for v6.12. > --- > drivers/pci/hotplug/cpqphp_pci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c > index e9f1fb333a71..718bc6cf12cb 100644 > --- a/drivers/pci/hotplug/cpqphp_pci.c > +++ b/drivers/pci/hotplug/cpqphp_pci.c > @@ -138,7 +138,7 @@ static int PCI_RefinedAccessConfig(struct pci_bus *bus, unsigned int devfn, u8 o > > if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &vendID) == -1) > return -1; > - if (vendID == 0xffffffff) > + if (PCI_POSSIBLE_ERROR(vendID)) > return -1; > return pci_bus_read_config_dword(bus, devfn, offset, value); > } > @@ -253,7 +253,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num > *dev_num = tdevice; > ctrl->pci_bus->number = tbus; > pci_bus_read_config_dword(ctrl->pci_bus, *dev_num, PCI_VENDOR_ID, &work); > - if (!nobridge || (work == 0xffffffff)) > + if (!nobridge || PCI_POSSIBLE_ERROR(work)) > return 0; > > dbg("bus_num %d devfn %d\n", *bus_num, *dev_num); > -- > 2.25.1 >
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c index e9f1fb333a71..718bc6cf12cb 100644 --- a/drivers/pci/hotplug/cpqphp_pci.c +++ b/drivers/pci/hotplug/cpqphp_pci.c @@ -138,7 +138,7 @@ static int PCI_RefinedAccessConfig(struct pci_bus *bus, unsigned int devfn, u8 o if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &vendID) == -1) return -1; - if (vendID == 0xffffffff) + if (PCI_POSSIBLE_ERROR(vendID)) return -1; return pci_bus_read_config_dword(bus, devfn, offset, value); } @@ -253,7 +253,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num *dev_num = tdevice; ctrl->pci_bus->number = tbus; pci_bus_read_config_dword(ctrl->pci_bus, *dev_num, PCI_VENDOR_ID, &work); - if (!nobridge || (work == 0xffffffff)) + if (!nobridge || PCI_POSSIBLE_ERROR(work)) return 0; dbg("bus_num %d devfn %d\n", *bus_num, *dev_num);