Patch "cxl: Route eeh events to all drivers in cxl_pci_error_detected()" has been added to the 4.11-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
cxl: Route eeh events to all drivers in cxl_pci_error_detected()
to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cxl-route-eeh-events-to-all-drivers-in-cxl_pci_error_detected.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4f58f0bf155e87dda31a3088b1e107fa9dd79f0eMon Sep 17 00:00:00 2001
From: Vaibhav Jain <[email protected]>
Date: Thu, 27 Apr 2017 10:58:22 +0530
Subject: cxl: Route eeh events to all drivers in cxl_pci_error_detected()
From: Vaibhav Jain <[email protected]>
commit 4f58f0bf155e87dda31a3088b1e107fa9dd79f0e upstream.
Fix a boundary condition where in some cases an eeh event that results in card reset isn't passed on to a driver attached to the virtual PCI device associated with a slice. This will happen in case when a slice attached device driver returns a value other than PCI_ERS_RESULT_NEED_RESET from the eeh error_detected() callback. This would result in an early return from cxl_pci_error_detected() and other drivers attached to other AFUs on the card wont be notified.
The patch fixes this by making sure that all slice attached device-drivers are notified and the return values from error_detected() callback are aggregated in a scheme where request for 'disconnect' trumps all and 'none' trumps 'need_reset'.
--- drivers/misc/cxl/pci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/misc/cxl/pci.c +9 -6
@@ -1782,7 +1782,7 @@ static pci_ers_result_t cxl_pci_error_de {struct cxl *adapter =pci_get_drvdata (pdev);struct cxl_afu *afu; -pci_ers_result_t result =PCI_ERS_RESULT_NEED_RESET ; +pci_ers_result_t result =PCI_ERS_RESULT_NEED_RESET , afu_result;int i;/* At this point, we could still have an interrupt pending.
@@ -1886,15 +1886,18 @@ static pci_ers_result_t cxl_pci_error_defor (i =0 ; i < adapter->slices; i++) { afu = adapter->afu[i]; - result =cxl_vphb_error_detected (afu, state); - -/* Only continue if everyone agrees on NEED_RESET */ -if (result !=PCI_ERS_RESULT_NEED_RESET ) -return result; + afu_result =cxl_vphb_error_detected (afu, state);cxl_context_detach_all (afu); cxl_ops->afu_deactivate_mode (afu, afu->current_mode);pci_deconfigure_afu (afu); + +/* Disconnect trumps all, NONE trumps NEED_RESET */ +if (afu_result ==PCI_ERS_RESULT_DISCONNECT ) + result =PCI_ERS_RESULT_DISCONNECT ; +else if ((afu_result ==PCI_ERS_RESULT_NONE ) && + (result ==PCI_ERS_RESULT_NEED_RESET )) + result =PCI_ERS_RESULT_NONE ; }/* should take the context lock here */
Patches currently in stable-queue which might be from [email protected] are
queue-4.11/cxl-force-context-lock-during-eeh-flow.patch queue-4.11/cxl-route-eeh-events-to-all-drivers-in-cxl_pci_error_detected.patch