On Fri, Jun 25, 2021 at 03:38:41PM -0500, stuart hayes wrote: > I have a system that is failing to recover after an EDR event with (or > without...) this patch. It looks like the problem is similar to what this > patch is trying to fix, except that on my system, the hotplug port is > downstream of the root port that has DPC, so the "link down" event on it is > not being ignored. So the hotplug code disables the slot (which contains an > NVMe device on this system) while the nvme driver is trying to use it, which > results in a failed recovery and another EDR event, and the kernel ends up > with the DPC trigger status bit set in the root port, so everything > downstream is gone. > > I added the hack below so the hotplug code will ignore the "link down" > events on the ports downstream of the root port during DPC recovery, and it > recovers no problem. (I'm not proposing this as a correct fix.) Please help me understand what's causing the Link Down event in the first place: With DPC, the hardware (only) disables the link on the port containing the error. Since that's the Root Port above the hotplug port in your case, the link between the hotplug port and the NVMe drive should remain up. Since your patch sets the PCI_DPC_RECOVERING flag during invocation of the dev->driver->err_handler->slot_reset() hook, I assume that's what's causing the Link Down. However pcie_portdrv_slot_reset() only restores and saves PCI config space, I don't think that's causing a Link Down? Is maybe nvme_slot_reset() causing the Link Down on the parent hotplug port? Thanks, Lukas > > diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c > index b576aa890c76..dfd983c3c5bf 100644 > --- a/drivers/pci/pcie/err.c > +++ b/drivers/pci/pcie/err.c > @@ -119,8 +132,10 @@ static int report_slot_reset(struct pci_dev *dev, void > *data) > !dev->driver->err_handler->slot_reset) > goto out; > > + set_bit(PCI_DPC_RECOVERING, &dev->priv_flags); > err_handler = dev->driver->err_handler; > vote = err_handler->slot_reset(dev); > + clear_bit(PCI_DPC_RECOVERING, &dev->priv_flags); > *result = merge_result(*result, vote); > out: > device_unlock(&dev->dev);
