On Fri, Oct 15, 2021 at 02:29:16PM -0500, Bjorn Helgaas wrote:
> On Sat, Jul 31, 2021 at 02:39:00PM +0200, Lukas Wunner wrote:
> > One fix for a pciehp error recovery issue spotted by Stuart
> > plus three cleanups. Please review and test. Thanks!
> >
> > Lukas Wunner (4):
> > PCI: pciehp: Ignore Link Down/Up caused by error-induced Hot Reset
> > PCI/portdrv: Remove unused resume err_handler
> > PCI/portdrv: Remove unused pcie_port_bus_{,un}register() declarations
> > PCI/ERR: Reduce compile time for CONFIG_PCIEAER=n
>
> Applied to pci/hotplug for v5.16, thanks!
>
> I split off the pm_iter() to its own patch at the beginning.
Thanks a lot, I wouldn't have gotten around to respinning the series
until in a couple of days, so it's helpful that you took over.
The lkp robot reported a trivial build issue caused by a dangling
'#ifdef CONFIG_PCI_ERROR_RECOVERY'. If you could squash the below
fix into the top-most commit on the branch I'd be grateful. Thanks!
-- >8 --
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 4d3f0e2..b0923bd 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1542,7 +1542,7 @@ static int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0;
}
-#ifdef CONFIG_PCI_ERROR_RECOVERY
+#if defined(CONFIG_PCIEAER) || defined(CONFIG_EEH)
/**
* pci_uevent_ers - emit a uevent during recovery path of PCI device
* @pdev: PCI device undergoing error recovery
