| From 3943af9d01e94330d0cfac6fccdbc829aad50c92 Mon Sep 17 00:00:00 2001 |
| From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> |
| Date: Tue, 12 Mar 2019 15:05:48 +0300 |
| Subject: PCI: pciehp: Ignore Link State Changes after powering off a slot |
| |
| From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> |
| |
| commit 3943af9d01e94330d0cfac6fccdbc829aad50c92 upstream. |
| |
| During a safe hot remove, the OS powers off the slot, which may cause a |
| Data Link Layer State Changed event. The slot has already been set to |
| OFF_STATE, so that event results in re-enabling the device, making it |
| impossible to safely remove it. |
| |
| Clear out the Presence Detect Changed and Data Link Layer State Changed |
| events when the disabled slot has settled down. |
| |
| It is still possible to re-enable the device if it remains in the slot |
| after pressing the Attention Button by pressing it again. |
| |
| Fixes the problem that Micah reported below: an NVMe drive power button may |
| not actually turn off the drive. |
| |
| Link: https://bugzilla.kernel.org/show_bug.cgi?id=203237 |
| Reported-by: Micah Parrish <micah.parrish@hpe.com> |
| Tested-by: Micah Parrish <micah.parrish@hpe.com> |
| Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> |
| [bhelgaas: changelog, add bugzilla URL] |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Reviewed-by: Lukas Wunner <lukas@wunner.de> |
| Cc: stable@vger.kernel.org # v4.19+ |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/hotplug/pciehp_ctrl.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/pci/hotplug/pciehp_ctrl.c |
| +++ b/drivers/pci/hotplug/pciehp_ctrl.c |
| @@ -115,6 +115,10 @@ static void remove_board(struct controll |
| * removed from the slot/adapter. |
| */ |
| msleep(1000); |
| + |
| + /* Ignore link or presence changes caused by power off */ |
| + atomic_and(~(PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_PDC), |
| + &ctrl->pending_events); |
| } |
| |
| /* turn off Green LED */ |