bnxt_en: Implement faster recovery for firmware fatal error.

During some fatal firmware error conditions, the PCI config space
register 0x2e which normally contains the subsystem ID will become
0xffff.  This register will revert back to the normal value after
the chip has completed core reset.  If we detect this condition,
we can poll this config register immediately for the value to revert.
Because we use config read cycles to poll this register, there is no
possibility of Master Abort if we happen to read it during core reset.
This speeds up recovery significantly as we don't have to wait for the
conservative min_time before polling MMIO to see if the firmware has
come out of reset.  As soon as this register changes value we can
proceed to re-initialize the device.

Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>
Reviewed-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Reviewed-by: Andy Gospodarek <gospo@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7512879a551a8ba69b717cfb7624557dc6244130..f2cf89d61eb2338dcc44fe861a4240eb6193d2e6 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10935,6 +10935,11 @@ static void bnxt_fw_reset_close(struct bnxt *bp)
         * kernel memory.
         */
        if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state)) {
+               u16 val = 0;
+
+               pci_read_config_word(bp->pdev, PCI_SUBSYSTEM_ID, &val);
+               if (val == 0xffff)
+                       bp->fw_reset_min_dsecs = 0;
                bnxt_tx_disable(bp);
                bnxt_disable_napi(bp);
                bnxt_disable_int_sync(bp);
@@ -11620,6 +11625,20 @@ static void bnxt_fw_reset_task(struct work_struct *work)
                if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state)) {
                        u32 val;
 
+                       if (!bp->fw_reset_min_dsecs) {
+                               u16 val;
+
+                               pci_read_config_word(bp->pdev, PCI_SUBSYSTEM_ID,
+                                                    &val);
+                               if (val == 0xffff) {
+                                       if (bnxt_fw_reset_timeout(bp)) {
+                                               netdev_err(bp->dev, "Firmware reset aborted, PCI config space invalid\n");
+                                               goto fw_reset_abort;
+                                       }
+                                       bnxt_queue_fw_reset_work(bp, HZ / 1000);
+                                       return;
+                               }
+                       }
                        val = bnxt_fw_health_readl(bp,
                                                   BNXT_FW_RESET_INPROG_REG);
                        if (val)