@@ -929,28 +929,46 @@ struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops);
static inline int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val)
{
+ if (unlikely(dev->is_removed)) {
+ *val = ~0;
+ return -ENODEV;
+ }
return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val);
}
static inline int pci_read_config_word(const struct pci_dev *dev, int where, u16 *val)
{
+ if (unlikely(dev->is_removed)) {
+ *val = ~0;
+ return -ENODEV;
+ }
return pci_bus_read_config_word(dev->bus, dev->devfn, where, val);
}
static inline int pci_read_config_dword(const struct pci_dev *dev, int where,
u32 *val)
{
+ if (unlikely(dev->is_removed)) {
+ *val = ~0;
+ return -ENODEV;
+ }
return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val);
}
static inline int pci_write_config_byte(const struct pci_dev *dev, int where, u8 val)
{
+ if (unlikely(dev->is_removed))
+ return -ENODEV;
return pci_bus_write_config_byte(dev->bus, dev->devfn, where, val);
}
static inline int pci_write_config_word(const struct pci_dev *dev, int where, u16 val)
{
+ if (unlikely(dev->is_removed))
+ return -ENODEV;
return pci_bus_write_config_word(dev->bus, dev->devfn, where, val);
}
static inline int pci_write_config_dword(const struct pci_dev *dev, int where,
u32 val)
{
+ if (unlikely(dev->is_removed))
+ return -ENODEV;
return pci_bus_write_config_dword(dev->bus, dev->devfn, where, val);
}
If we've detected that the PCI device is removed, there is no need to access the device's config space. This patch has all the device config reads and writes return error when in such a state. If the device is not present on a config read, the value returned will be set to all 1's. This is the same as what hardware is expected to return when accessing a removed device, but software can do this faster without relying on hardware. Signed-off-by: Keith Busch <keith.busch@intel.com> Cc: Lukas Wunner <lukas@wunner.de> --- include/linux/pci.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)