| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20200925230138.29011-1-ashok.raj@intel.com>
Date: Fri, 25 Sep 2020 16:01:38 -0700
From: Ashok Raj <ashok.raj@...el.com>
To: linux-pci@...r.kernel.org, Bjorn Helgaas <bhelgaas@...gle.com>
Cc: Ashok Raj <ashok.raj@...el.com>,
Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@...el.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH 1/1] pci: pciehp: Handle MRL interrupts to enable slot for hotplug.
When Mechanical Retention Lock (MRL) is present, Linux doesn't process
those change events.
The following changes need to be enabled when MRL is present.
1. Subscribe to MRL change events in SlotControl.
2. When MRL is closed,
- If there is no ATTN button, then POWER on the slot.
- If there is ATTN button, and an MRL event pending, ignore
Presence Detect. Since we want ATTN button to drive the
hotplug event.
Signed-off-by: Ashok Raj <ashok.raj@...el.com>
Co-developed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@...ux.intel.com>
---
drivers/pci/hotplug/pciehp.h | 1 +
drivers/pci/hotplug/pciehp_ctrl.c | 69 +++++++++++++++++++++++++++++++++++++++
drivers/pci/hotplug/pciehp_hpc.c | 27 ++++++++++++++-
3 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 4fd200d8b0a9..24a1c9c8ac78 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -155,6 +155,7 @@ void pciehp_request(struct controller *ctrl, int action);
void pciehp_handle_button_press(struct controller *ctrl);
void pciehp_handle_disable_request(struct controller *ctrl);
void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events);
+void pciehp_handle_mrl_change(struct controller *ctrl);
int pciehp_configure_device(struct controller *ctrl);
void pciehp_unconfigure_device(struct controller *ctrl, bool presence);
void pciehp_queue_pushbutton_work(struct work_struct *work);
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 9f85815b4f53..c4310ee3678b 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -227,6 +227,7 @@ void pciehp_handle_disable_request(struct controller *ctrl)
void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events)
{
int present, link_active;
+ u8 getstatus = 0;
/*
* If the slot is on and presence or link has changed, turn it off.
@@ -275,6 +276,16 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events)
if (link_active)
ctrl_info(ctrl, "Slot(%s): Link Up\n",
slot_name(ctrl));
+ if (MRL_SENS(ctrl)) {
+ pciehp_get_latch_status(ctrl, &getstatus);
+ /*
+ * If slot is closed && ATTN button exists
+ * don't continue, let the ATTN button
+ * drive the hot-plug
+ */
+ if (!getstatus && ATTN_BUTTN(ctrl))
+ return;
+ }
ctrl->request_result = pciehp_enable_slot(ctrl);
break;
default:
@@ -283,6 +294,64 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events)
}
}
+void pciehp_handle_mrl_change(struct controller *ctrl)
+{
+ u8 getstatus = 0;
+ int present, link_active;
+
+ pciehp_get_latch_status(ctrl, &getstatus);
+
+ present = pciehp_card_present(ctrl);
+ link_active = pciehp_check_link_active(ctrl);
+
+ ctrl_info(ctrl, "Slot(%s): Card %spresent\n",
+ slot_name(ctrl), present ? "" : "not ");
+
+ ctrl_info(ctrl, "Slot(%s): Link %s\n",
+ slot_name(ctrl), link_active ? "Up" : "Down");
+
+ ctrl_info(ctrl, "Slot(%s): Latch %s\n",
+ slot_name(ctrl), getstatus ? "Open" : "Closed");
+
+ /*
+ * Need to handle only MRL Open. When MRL is closed with
+ * a Card Present, either the ATTN button, or the PDC indication
+ * should power the slot and add the card in the slot
+ */
+ if (getstatus) {
+ /*
+ * If slot was powered on, time to power off
+ * and remove the card
+ */
+ mutex_lock(&ctrl->state_lock);
+ if (ctrl->state == ON_STATE) {
+ mutex_unlock(&ctrl->state_lock);
+ pciehp_handle_disable_request(ctrl);
+ } else
+ mutex_unlock(&ctrl->state_lock);
+ } else {
+ /*
+ * If latch is closed, and previous state is OFF
+ * Then enable the slot
+ */
+ mutex_lock(&ctrl->state_lock);
+ if (ctrl->state == OFF_STATE) {
+ /*
+ * Only continue to power on the slot when the
+ * Attention button is not present. When button
+ * present, button press event will process the
+ * hot-add part of the flow.
+ */
+ if ((present || link_active) && !ATTN_BUTTN(ctrl)) {
+ ctrl->state = POWERON_STATE;
+ mutex_unlock(&ctrl->state_lock);
+ ctrl->request_result = pciehp_enable_slot(ctrl);
+ } else
+ mutex_unlock(&ctrl->state_lock);
+ }
+ }
+}
+
static int __pciehp_enable_slot(struct controller *ctrl)
{
u8 getstatus = 0;
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 53433b37e181..5a4b5cfbfe48 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -605,7 +605,7 @@ static irqreturn_t pciehp_isr(int irq, void *dev_id)
*/
status &= PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD |
PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_CC |
- PCI_EXP_SLTSTA_DLLSC;
+ PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_MRLSC;
/*
* If we've already reported a power fault, don't report it again
@@ -658,6 +658,12 @@ static irqreturn_t pciehp_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}
+ /*
+ * If MRL is triggered, if ATTN button exists, ignore the event.
+ */
+ if (ATTN_BUTTN(ctrl) && (events & PCI_EXP_SLTSTA_MRLSC))
+ events &= ~PCI_EXP_SLTSTA_PDC;
+
/* Save pending events for consumption by IRQ thread. */
atomic_or(events, &ctrl->pending_events);
return IRQ_WAKE_THREAD;
@@ -688,6 +694,13 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
goto out;
}
+ /*
+ * If ATTN is present and MRL is triggered
+ * ignore the Presence Change Event.
+ */
+ if (ATTN_BUTTN(ctrl) && (events & PCI_EXP_SLTSTA_MRLSC))
+ events &= ~PCI_EXP_SLTSTA_PDC;
+
/* Check Attention Button Pressed */
if (events & PCI_EXP_SLTSTA_ABP) {
ctrl_info(ctrl, "Slot(%s): Attention button pressed\n",
@@ -712,6 +725,10 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
pciehp_handle_disable_request(ctrl);
else if (events & (PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_DLLSC))
pciehp_handle_presence_or_link_change(ctrl, events);
+
+ if (events & PCI_EXP_SLTSTA_MRLSC)
+ pciehp_handle_mrl_change(ctrl);
+
up_read(&ctrl->reset_lock);
ret = IRQ_HANDLED;
@@ -768,6 +785,14 @@ static void pcie_enable_notification(struct controller *ctrl)
cmd |= PCI_EXP_SLTCTL_ABPE;
else
cmd |= PCI_EXP_SLTCTL_PDCE;
+
+ /*
+ * If MRL sensor is present, then subscribe for MRL
+ * Changes to be notified as well.
+ */
+ if (MRL_SENS(ctrl))
+ cmd |= PCI_EXP_SLTCTL_MRLSCE;
+
if (!pciehp_poll_mode)
cmd |= PCI_EXP_SLTCTL_HPIE | PCI_EXP_SLTCTL_CCIE;
--
2.7.4
Powered by blists - more mailing lists