From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
To: <linux-pci@vger.kernel.org>
Cc: <linux@yadro.com>,
Sergey Miroshnichenko <s.miroshnichenko@yadro.com>,
Lukas Wunner <lukas@wunner.de>
Subject: [PATCH] PCI: pciehp: Fix re-enabling the slot marked for safe removal
Date: Fri, 1 Mar 2019 19:12:51 +0300 [thread overview]
Message-ID: <20190301161251.26774-1-s.miroshnichenko@yadro.com> (raw)
During the safe removal procedure, a Data Link Layer State Changed event
may occur after pciehp_power_off_slot(), and it is handled when the slot is
already set to OFF_STATE. This results in re-enabling the device and makes
it impossible to actually safely remove it.
Add a check for a Presence Detect Changed bit to filter out this interrupt.
It is still possible to re-enable the device if it remains in the slot
after pressing the Attention Button by pressing it again.
Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
Cc: Lukas Wunner <lukas@wunner.de>
---
drivers/pci/hotplug/pciehp_ctrl.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 3f3df4c29f6e..941f77b71df4 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -251,6 +251,14 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events)
return;
}
+ /* Handle the DLLSC from the slot which just has been turned off */
+ if ((events & PCI_EXP_SLTSTA_DLLSC) &&
+ !(events & PCI_EXP_SLTSTA_PDC) &&
+ present && !link_active) {
+ mutex_unlock(&ctrl->state_lock);
+ return;
+ }
+
switch (ctrl->state) {
case BLINKINGON_STATE:
cancel_delayed_work(&ctrl->button_work);
--
2.20.1
next reply other threads:[~2019-03-01 16:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-01 16:12 Sergey Miroshnichenko [this message]
2019-03-05 11:01 ` [PATCH] PCI: pciehp: Fix re-enabling the slot marked for safe removal Lukas Wunner
2019-03-12 12:03 ` Sergey Miroshnichenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190301161251.26774-1-s.miroshnichenko@yadro.com \
--to=s.miroshnichenko@yadro.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux@yadro.com \
--cc=lukas@wunner.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).