1 files changed, 31 insertions, 40 deletions

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index 30395f5e5e87..5d4f1761dc0c 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -1,23 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-/* Intel(R) Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2017 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Contact Information:
- * e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- */
+/* Copyright(c) 2013 - 2018 Intel Corporation. */
 
 #include "fm10k.h"
 #include "fm10k_vf.h"
@@ -262,7 +244,8 @@ process_mbx:
                 }
 
                 /* guarantee we have free space in the SM mailbox */
-                if (!hw->mbx.ops.tx_ready(&hw->mbx, FM10K_VFMBX_MSG_MTU)) {
+                if (hw->mbx.state == FM10K_STATE_OPEN &&
+                    !hw->mbx.ops.tx_ready(&hw->mbx, FM10K_VFMBX_MSG_MTU)) {
                         /* keep track of how many times this occurs */
                         interface->hw_sm_mbx_full++;
 
@@ -320,6 +303,28 @@ void fm10k_iov_suspend(struct pci_dev *pdev)
         }
 }
 
+static void fm10k_mask_aer_comp_abort(struct pci_dev *pdev)
+{
+        u32 err_mask;
+        int pos;
+
+        pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);
+        if (!pos)
+                return;
+
+        /* Mask the completion abort bit in the ERR_UNCOR_MASK register,
+         * preventing the device from reporting these errors to the upstream
+         * PCIe root device. This avoids bringing down platforms which upgrade
+         * non-fatal completer aborts into machine check exceptions. Completer
+         * aborts can occur whenever a VF reads a queue it doesn't own.
+         */
+        pci_read_config_dword(pdev, pos + PCI_ERR_UNCOR_MASK, &err_mask);
+        err_mask |= PCI_ERR_UNC_COMP_ABORT;
+        pci_write_config_dword(pdev, pos + PCI_ERR_UNCOR_MASK, err_mask);
+
+        mmiowb();
+}
+
 int fm10k_iov_resume(struct pci_dev *pdev)
 {
         struct fm10k_intfc *interface = pci_get_drvdata(pdev);
@@ -335,6 +340,12 @@ int fm10k_iov_resume(struct pci_dev *pdev)
         if (!iov_data)
                 return -ENOMEM;
 
+        /* Lower severity of completer abort error reporting as
+         * the VFs can trigger this any time they read a queue
+         * that they don't own.
+         */
+        fm10k_mask_aer_comp_abort(pdev);
+
         /* allocate hardware resources for the VFs */
         hw->iov.ops.assign_resources(hw, num_vfs, num_vfs);
 
@@ -478,20 +489,6 @@ void fm10k_iov_disable(struct pci_dev *pdev)
         fm10k_iov_free_data(pdev);
 }
 
-static void fm10k_disable_aer_comp_abort(struct pci_dev *pdev)
-{
-        u32 err_sev;
-        int pos;
-
-        pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);
-        if (!pos)
-                return;
-
-        pci_read_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, &err_sev);
-        err_sev &= ~PCI_ERR_UNC_COMP_ABORT;
-        pci_write_config_dword(pdev, pos + PCI_ERR_UNCOR_SEVER, err_sev);
-}
-
 int fm10k_iov_configure(struct pci_dev *pdev, int num_vfs)
 {
         int current_vfs = pci_num_vf(pdev);
@@ -513,12 +510,6 @@ int fm10k_iov_configure(struct pci_dev *pdev, int num_vfs)
 
         /* allocate VFs if not already allocated */
         if (num_vfs && num_vfs != current_vfs) {
-                /* Disable completer abort error reporting as
-                 * the VFs can trigger this any time they read a queue
-                 * that they don't own.
-                 */
-                fm10k_disable_aer_comp_abort(pdev);
-
                 err = pci_enable_sriov(pdev, num_vfs);
                 if (err) {
                         dev_err(&pdev->dev,