Skip to contentSkip to conversation

pcie-dpc: Decode extended reasons

PATCH Applied Keith Busch 3 participants 4 messages Feb 3, 2017 – Feb 10, 2017 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pcie-dpc: Decode extended reasons

This is just informational to decode the currently defined extended event reasons rather than just using the generic "extended" explanation.

---
 drivers/pci/pcie/pcie-dpc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pci/pcie/pcie-dpc.c +6 -2
index d91e538..9ca74f4 100644
@@ -77,11 +77,15 @@ static irqreturn_t dpc_irq(int irq, void *context)
 
 	if (status & PCI_EXP_DPC_STATUS_TRIGGER) {
 		u16 reason = (status >> 1) & 0x3;
+		u16 ext_reason = (status >> 5) & 0x3;
 
-		dev_warn(&dpc->dev->device, "DPC %s triggered, remove downstream devices\n",
+		dev_warn(&dpc->dev->device, "DPC %s detected, remove downstream devices\n",
 			 (reason == 0) ? "unmasked uncorrectable error" :
 			 (reason == 1) ? "ERR_NONFATAL" :
-			 (reason == 2) ? "ERR_FATAL" : "extended error");
+			 (reason == 2) ? "ERR_FATAL" :
+			 (ext_reason == 0) ? "RP PIO error" :
+			 (ext_reason == 1) ? "software trigger" :
+					     "reserved error");
 		schedule_work(&dpc->work);
 	}
 	return IRQ_HANDLED;
Signature · 1 line
2.7.2
#1 lore raw

PATCH 2/2 pcie-dpc: Wait for root port busy to clear

Root Ports implementing DPC optionally advertise extensions that, when advertised, require the driver wait for the RP Busy status to clear prior to releasing from containment. Results are undefined if we release from containment while this bit is set.

---
 drivers/pci/pcie/pcie-dpc.c   | 26 +++++++++++++++++++++++++-
 include/uapi/linux/pci_regs.h |  1 +
 2 files changed, 26 insertions(+), 1 deletion(-)
drivers/pci/pcie/pcie-dpc.c +25 -1
index 9ca74f4..2acd9de 100644
@@ -20,8 +20,28 @@ struct dpc_dev {
 	struct pcie_device	*dev;
 	struct work_struct	work;
 	int			cap_pos;
+	bool			rp;
 };
 
+static int dpc_wait_rp_inactive(struct dpc_dev *dpc)
+{
+	unsigned long timeout = jiffies + HZ;
+	struct pci_dev *pdev = dpc->dev->port;
+	u16 status;
+
+	pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_STATUS, &status);
+	while (status & PCI_EXP_DPC_RP_BUSY &&
+					!time_after(jiffies, timeout)) {
+		msleep(10);
+		pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_STATUS, &status);
+	}
+	if (status & PCI_EXP_DPC_RP_BUSY) {
+		dev_warn(&pdev->dev, "DPC root port still busy\n");
+		return -EBUSY;
+	}
+	return 0;
+}
+
 static void dpc_wait_link_inactive(struct pci_dev *pdev)
 {
 	unsigned long timeout = jiffies + HZ;
@@ -34,7 +54,7 @@ static void dpc_wait_link_inactive(struct pci_dev *pdev)
 		pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status);
 	}
 	if (lnk_status & PCI_EXP_LNKSTA_DLLLA)
-		dev_warn(&pdev->dev, "Link state not disabled for DPC event");
+		dev_warn(&pdev->dev, "Link state not disabled for DPC event\n");
 }
 
 static void interrupt_event_handler(struct work_struct *work)
@@ -56,6 +76,8 @@ static void interrupt_event_handler(struct work_struct *work)
 	pci_unlock_rescan_remove();
 
 	dpc_wait_link_inactive(pdev);
+	if (dpc->rp && dpc_wait_rp_inactive(dpc))
+		return;
 	pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_STATUS,
 		PCI_EXP_DPC_STATUS_TRIGGER | PCI_EXP_DPC_STATUS_INTERRUPT);
 }
@@ -119,6 +141,8 @@ static int dpc_probe(struct pcie_device *dev)
 	pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CAP, &cap);
 	pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, &ctl);
 
+	dpc->rp = (cap & PCI_EXP_DPC_CAP_RP_EXT);
+
 	ctl |= PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN;
 	pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl);
 
include/uapi/linux/pci_regs.h +1 -0
index 174d114..c1b94b0 100644
@@ -973,6 +973,7 @@
 #define PCI_EXP_DPC_STATUS		8	/* DPC Status */
 #define  PCI_EXP_DPC_STATUS_TRIGGER	0x01	/* Trigger Status */
 #define  PCI_EXP_DPC_STATUS_INTERRUPT	0x08	/* Interrupt Status */
+#define  PCI_EXP_DPC_RP_BUSY		0x10	/* Root Port Busy */
 
 #define PCI_EXP_DPC_SOURCE_ID		10	/* DPC Source Identifier */
 
Signature · 1 line
2.7.2
#2 lore raw

RE: [PATCH 2/2] pcie-dpc: Wait for root port busy to clear

Hi Keith

Quoted 7 lines

-----Original Message-----
From: Keith Busch [mailto:[email protected]]
Sent: 03 February 2017 21:46
To: [email protected]; Bjorn Helgaas
Cc: Gabriele Paoloni; Keith Busch
Subject: [PATCH 2/2] pcie-dpc: Wait for root port busy to clear

Quoted 5 lines

Root Ports implementing DPC optionally advertise extensions that, when advertised, require the driver wait for the RP Busy status to clear prior
to releasing from containment. Results are undefined if we release from containment while this bit is set.

Many thanks for this I should be able to test it in March. BTW the patch looks ok to me

Cheers
Gab

Quoted 3 lines

---

[...]

#3 lore raw
In reply to Keith Busch
Quoted 4 lines · Keith Busch

This is just informational to decode the currently defined extended event reasons rather than just using the generic "extended" explanation.

Applied both of these to pci/dpc for v4.11, thanks, Keith!

Quoted 29 lines
---
 drivers/pci/pcie/pcie-dpc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pci/pcie/pcie-dpc.c +6 -2
index d91e538..9ca74f4 100644
@@ -77,11 +77,15 @@ static irqreturn_t dpc_irq(int irq, void *context)
 
 	if (status & PCI_EXP_DPC_STATUS_TRIGGER) {
 		u16 reason = (status >> 1) & 0x3;
+		u16 ext_reason = (status >> 5) & 0x3;
 
-		dev_warn(&dpc->dev->device, "DPC %s triggered, remove downstream devices\n",
+		dev_warn(&dpc->dev->device, "DPC %s detected, remove downstream devices\n",
 			 (reason == 0) ? "unmasked uncorrectable error" :
 			 (reason == 1) ? "ERR_NONFATAL" :
-			 (reason == 2) ? "ERR_FATAL" : "extended error");
+			 (reason == 2) ? "ERR_FATAL" :
+			 (ext_reason == 0) ? "RP PIO error" :
+			 (ext_reason == 1) ? "software trigger" :
+					     "reserved error");
 		schedule_work(&dpc->work);
 	}
 	return IRQ_HANDLED;
Signature · 1 line
2.7.2