[PATCH NEXT 2/6] PCI/AER: Clear uncorrectable fatal error status bits

[Oza Pawandeep]

During ERR_FATAL handling, AER calls pci_cleanup_aer_uncorrect_error_status
which should handle pci_channel_io_frozen case in order to determine if it
has to clear fatal bits or nonfatal bits.

Signed-off-by: Oza Pawandeep <p...@codeaurora.org>

diff --git a/drivers/pci/pcie/aer/aerdrv_core.c 
b/drivers/pci/pcie/aer/aerdrv_core.c
index 309f3f5..6745e37 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -60,7 +60,12 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev 
*dev)
        pos = dev->aer_cap;
        pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, &status);
        pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, &mask);
-       status &= ~mask; /* Clear corresponding nonfatal bits */
+
+       if (dev->error_state == pci_channel_io_normal)
+               status &= ~mask; /* Clear corresponding nonfatal bits */
+       else
+               status &= mask; /* Clear corresponding fatal bits */
+
        if (status)
                pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);
 
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index f7ce0cb..00d2875 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -288,6 +288,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 
service)
        struct pci_dev *pdev, *temp;
        pci_ers_result_t result;
 
+       dev->error_state = pci_channel_io_frozen;
        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
                udev = dev;
        else
@@ -323,6 +324,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 
service)
                if (pcie_wait_for_link(udev, true))
                        pci_rescan_bus(udev->bus);
                pci_info(dev, "Device recovery from fatal error successful\n");
+               dev->error_state = pci_channel_io_normal;
        } else {
                pci_uevent_ers(dev, PCI_ERS_RESULT_DISCONNECT);
                pci_info(dev, "Device recovery from fatal error failed\n");
-- 
2.7.4