Add the checks to allow an emulated slot. An emulated slot will use native Hotplug, AER, and PME services. It also needs to specify itself as a hotplug bridge in order for bridge sizing to account for hotplug reserved windows. Signed-off-by: Jon Derrick <jonathan.derrick@xxxxxxxxx> --- drivers/pci/pci-acpi.c | 3 +++ drivers/pci/pcie/portdrv_core.c | 11 ++++++++--- drivers/pci/probe.c | 2 +- include/linux/pci.h | 2 ++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 0c02d50..b693e9f 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -796,6 +796,9 @@ bool pciehp_is_native(struct pci_dev *bridge) if (!IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE)) return false; + if (pcie_port_slot_emulated(bridge)) + return true; + pcie_capability_read_dword(bridge, PCI_EXP_SLTCAP, &slot_cap); if (!(slot_cap & PCI_EXP_SLTCAP_HPC)) return false; diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 5075cb9..5979bb7 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -193,6 +193,11 @@ static int pcie_init_service_irqs(struct pci_dev *dev, int *irqs, int mask) return 0; } +static inline bool is_port_native_or_emulated(struct pci_dev *dev) +{ + return pcie_ports_native || pcie_port_slot_emulated(dev); +} + /** * get_port_device_capability - discover capabilities of a PCI Express port * @dev: PCI Express port to examine @@ -209,7 +214,7 @@ static int get_port_device_capability(struct pci_dev *dev) int services = 0; if (dev->is_hotplug_bridge && - (pcie_ports_native || host->native_pcie_hotplug)) { + (is_port_native_or_emulated(dev) || host->native_pcie_hotplug)) { services |= PCIE_PORT_SERVICE_HP; /* @@ -222,7 +227,7 @@ static int get_port_device_capability(struct pci_dev *dev) #ifdef CONFIG_PCIEAER if (dev->aer_cap && pci_aer_available() && - (pcie_ports_native || host->native_aer)) { + (is_port_native_or_emulated(dev) || host->native_aer)) { services |= PCIE_PORT_SERVICE_AER; /* @@ -239,7 +244,7 @@ static int get_port_device_capability(struct pci_dev *dev) * those yet. */ if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && - (pcie_ports_native || host->native_pme)) { + (is_port_native_or_emulated(dev) || host->native_pme)) { services |= PCIE_PORT_SERVICE_PME; /* diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 512cb43..b04b0c2 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1477,7 +1477,7 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev) u32 reg32; pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, ®32); - if (reg32 & PCI_EXP_SLTCAP_HPC) + if (reg32 & PCI_EXP_SLTCAP_HPC || pcie_port_slot_emulated(pdev)) pdev->is_hotplug_bridge = 1; } diff --git a/include/linux/pci.h b/include/linux/pci.h index 3840a54..0391e39 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1536,6 +1536,8 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d, #define pcie_ports_native false #endif +#define pcie_port_slot_emulated(dev) false + #define PCIE_LINK_STATE_L0S BIT(0) #define PCIE_LINK_STATE_L1 BIT(1) #define PCIE_LINK_STATE_CLKPM BIT(2) -- 1.8.3.1