3f327e39b4
When a PCI host bridge device receives a Bus Check notification, we
must re-enumerate starting with the bridge to discover changes (devices
that have been added or removed).
Prior to 668192b678 ("PCI: acpiphp: Move host bridge hotplug to
pci_root.c"), this happened in _handle_hotplug_event_bridge(). After that
commit, _handle_hotplug_event_bridge() is not installed for host bridges,
and the host bridge notify handler, _handle_hotplug_event_root() did not
re-enumerate.
This patch adds re-enumeration to _handle_hotplug_event_root().
This fixes cases where we don't notice the addition or removal of
PCI devices, e.g., the PCI-to-USB ExpressCard in the bugzilla below.
[bhelgaas: changelog, references]
Reference: https://lkml.kernel.org/r/CAAh6nkmbKR3HTqm5ommevsBwhL_u0N8Rk7Wsms_LfP=nBgKNew@mail.gmail.com
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=57961
Reported-by: Gavin Guo <tuffkidtt@gmail.com>
Tested-by: Gavin Guo <tuffkidtt@gmail.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
CC: stable@vger.kernel.org # v3.9+
84 lines
2.4 KiB
C
84 lines
2.4 KiB
C
/*
|
|
* File pci-acpi.h
|
|
*
|
|
* Copyright (C) 2004 Intel
|
|
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
|
|
*/
|
|
|
|
#ifndef _PCI_ACPI_H_
|
|
#define _PCI_ACPI_H_
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
#ifdef CONFIG_ACPI
|
|
extern acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev,
|
|
struct pci_bus *pci_bus);
|
|
extern acpi_status pci_acpi_remove_bus_pm_notifier(struct acpi_device *dev);
|
|
extern acpi_status pci_acpi_add_pm_notifier(struct acpi_device *dev,
|
|
struct pci_dev *pci_dev);
|
|
extern acpi_status pci_acpi_remove_pm_notifier(struct acpi_device *dev);
|
|
extern phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle);
|
|
|
|
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
|
|
{
|
|
struct pci_bus *pbus = pdev->bus;
|
|
|
|
/* Find a PCI root bus */
|
|
while (!pci_is_root_bus(pbus))
|
|
pbus = pbus->parent;
|
|
|
|
return DEVICE_ACPI_HANDLE(pbus->bridge);
|
|
}
|
|
|
|
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
|
|
{
|
|
struct device *dev;
|
|
|
|
if (pci_is_root_bus(pbus))
|
|
dev = pbus->bridge;
|
|
else
|
|
dev = &pbus->self->dev;
|
|
|
|
return DEVICE_ACPI_HANDLE(dev);
|
|
}
|
|
|
|
void acpi_pci_add_bus(struct pci_bus *bus);
|
|
void acpi_pci_remove_bus(struct pci_bus *bus);
|
|
|
|
#ifdef CONFIG_ACPI_PCI_SLOT
|
|
void acpi_pci_slot_init(void);
|
|
void acpi_pci_slot_enumerate(struct pci_bus *bus, acpi_handle handle);
|
|
void acpi_pci_slot_remove(struct pci_bus *bus);
|
|
#else
|
|
static inline void acpi_pci_slot_init(void) { }
|
|
static inline void acpi_pci_slot_enumerate(struct pci_bus *bus,
|
|
acpi_handle handle) { }
|
|
static inline void acpi_pci_slot_remove(struct pci_bus *bus) { }
|
|
#endif
|
|
|
|
#ifdef CONFIG_HOTPLUG_PCI_ACPI
|
|
void acpiphp_init(void);
|
|
void acpiphp_enumerate_slots(struct pci_bus *bus, acpi_handle handle);
|
|
void acpiphp_remove_slots(struct pci_bus *bus);
|
|
void acpiphp_check_host_bridge(acpi_handle handle);
|
|
#else
|
|
static inline void acpiphp_init(void) { }
|
|
static inline void acpiphp_enumerate_slots(struct pci_bus *bus,
|
|
acpi_handle handle) { }
|
|
static inline void acpiphp_remove_slots(struct pci_bus *bus) { }
|
|
static inline void acpiphp_check_host_bridge(acpi_handle handle) { }
|
|
#endif
|
|
|
|
#else /* CONFIG_ACPI */
|
|
static inline void acpi_pci_add_bus(struct pci_bus *bus) { }
|
|
static inline void acpi_pci_remove_bus(struct pci_bus *bus) { }
|
|
#endif /* CONFIG_ACPI */
|
|
|
|
#ifdef CONFIG_ACPI_APEI
|
|
extern bool aer_acpi_firmware_first(void);
|
|
#else
|
|
static inline bool aer_acpi_firmware_first(void) { return false; }
|
|
#endif
|
|
|
|
#endif /* _PCI_ACPI_H_ */
|