Linux-PCI Archive on
 help / color / Atom feed
From: Sergey Miroshnichenko <>
To: <>
Cc: <>,
	Sergey Miroshnichenko <>,
	Lukas Wunner <>
Subject: [PATCH] PCI: pciehp: Fix re-enabling the slot marked for safe removal
Date: Fri, 1 Mar 2019 19:12:51 +0300
Message-ID: <> (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 <>
Cc: Lukas Wunner <>
 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)
+	/* 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) {

             reply index

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 ` 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-PCI Archive on

Archives are clonable:
	git clone --mirror linux-pci/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-pci linux-pci/ \
	public-inbox-index linux-pci

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone