cxgb4: FW upgrade fixes

[ Upstream commit 26747211486c5bc7dd014c3caab206576e00c0d0 ]

Disable FW_OK flag while flashing Firmware. This will help to fix any
potential mailbox timeouts during Firmware flash.

Grab new devlog parameters after Firmware restart. When we FLASH new
Firmware onto an adapter, the new Firmware may have the Firmware Device Log
located at a different memory address or have a different size for it.

Signed-off-by: Arjun Vynipadath <arjun@chelsio.com>
Signed-off-by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index cf61a5869c6e06627ada3947397a3c8889c2d662..a1b9d6c74309a53461b3259ecbc49c6b0d3be56a 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -6076,13 +6076,18 @@ int t4_fw_upgrade(struct adapter *adap, unsigned int mbox,
        if (!t4_fw_matches_chip(adap, fw_hdr))
                return -EINVAL;
 
+       /* Disable FW_OK flag so that mbox commands with FW_OK flag set
+        * wont be sent when we are flashing FW.
+        */
+       adap->flags &= ~FW_OK;
+
        ret = t4_fw_halt(adap, mbox, force);
        if (ret < 0 && !force)
-               return ret;
+               goto out;
 
        ret = t4_load_fw(adap, fw_data, size);
        if (ret < 0)
-               return ret;
+               goto out;
 
        /*
         * Older versions of the firmware don't understand the new
@@ -6093,7 +6098,17 @@ int t4_fw_upgrade(struct adapter *adap, unsigned int mbox,
         * its header flags to see if it advertises the capability.
         */
        reset = ((be32_to_cpu(fw_hdr->flags) & FW_HDR_FLAGS_RESET_HALT) == 0);
-       return t4_fw_restart(adap, mbox, reset);
+       ret = t4_fw_restart(adap, mbox, reset);
+
+       /* Grab potentially new Firmware Device Log parameters so we can see
+        * how healthy the new Firmware is.  It's okay to contact the new
+        * Firmware for these parameters even though, as far as it's
+        * concerned, we've never said "HELLO" to it ...
+        */
+       (void)t4_init_devlog_params(adap);
+out:
+       adap->flags |= FW_OK;
+       return ret;
 }
 
 /**