Skip to contentSkip to conversation

Fix pci-e port driver slot_reset bad default return value

PATCH In review Zhang, Yanmin 2 participants 2 messages Apr 30, 2009 – May 12, 2009 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix pci-e port driver slot_reset bad default return value

When an upstream port reports an AER error to root port, kernel starts error recovery procedures. The default return value of function pcie_portdrv_slot_reset is PCI_ERS_RESULT_NONE. If all port service drivers of the downstream port under the upstream port have no slot_reset method in pci_error_handlers, aer recovery would stop without resume. Below patch against 2.6.30-rc3 fixes it.

Signed-off-by: Zhang Yanmin <[email protected]>

---

drivers/pci/pcie/aer/aerdrv.h +3 -0
diff -Nraup linux-2.6.30-rc3/drivers/pci/pcie/aer/aerdrv.h linux-2.6.30-rc3_aerport/drivers/pci/pcie/aer/aerdrv.h
@@ -95,6 +95,9 @@ struct aer_broadcast_data {
 static inline pci_ers_result_t merge_result(enum pci_ers_result orig,
 		enum pci_ers_result new)
 {
+	if (new == PCI_ERS_RESULT_NONE)
+		return orig;
+
 	switch (orig) {
 	case PCI_ERS_RESULT_CAN_RECOVER:
 	case PCI_ERS_RESULT_RECOVERED:
drivers/pci/pcie/portdrv_pci.c +1 -1
diff -Nraup linux-2.6.30-rc3/drivers/pci/pcie/portdrv_pci.c linux-2.6.30-rc3_aerport/drivers/pci/pcie/portdrv_pci.c
@@ -200,7 +200,7 @@ static int slot_reset_iter(struct device
 
 static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
 {
-	pci_ers_result_t status = PCI_ERS_RESULT_NONE;
+	pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
 	int retval;
 
 	/* If fatal, restore cfg space for possible link reset at upstream */
#1 lore raw
Quoted 8 lines · Yanmin

When an upstream port reports an AER error to root port, kernel starts error recovery procedures. The default return value of function pcie_portdrv_slot_reset is PCI_ERS_RESULT_NONE. If all port service drivers of the downstream port under the upstream port have no slot_reset method in pci_error_handlers, aer recovery would stop without resume. Below patch against 2.6.30-rc3 fixes it.

Signed-off-by: Zhang Yanmin <[email protected]>

This one is in my for-linus branch now. Thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center