cxgb3 - Firmware update

Update firmware version.
Allow the driver to be up and running with older FW image

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index e958bbe30623..2b49b96a6fdb 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -960,16 +960,18 @@ int t3_get_fw_version(struct adapter *adapter, u32 *vers)
 /**
  *      t3_check_fw_version - check if the FW is compatible with this driver
  *      @adapter: the adapter
- *
+ *      @must_load: set to 1 if loading a new FW image is required
+
  *      Checks if an adapter's FW is compatible with the driver.  Returns 0
  *      if the versions are compatible, a negative error otherwise.
  */
-int t3_check_fw_version(struct adapter *adapter)
+int t3_check_fw_version(struct adapter *adapter, int *must_load)
 {
         int ret;
         u32 vers;
         unsigned int type, major, minor;
 
+        *must_load = 1;
         ret = t3_get_fw_version(adapter, &vers);
         if (ret)
                 return ret;
@@ -982,9 +984,17 @@ int t3_check_fw_version(struct adapter *adapter)
             minor == FW_VERSION_MINOR)
                 return 0;
 
-        CH_ERR(adapter, "found wrong FW version(%u.%u), "
-               "driver needs version %u.%u\n", major, minor,
-               FW_VERSION_MAJOR, FW_VERSION_MINOR);
+        if (major != FW_VERSION_MAJOR)
+                CH_ERR(adapter, "found wrong FW version(%u.%u), "
+                       "driver needs version %u.%u\n", major, minor,
+                       FW_VERSION_MAJOR, FW_VERSION_MINOR);
+        else {
+                *must_load = 0;
+                CH_WARN(adapter, "found wrong FW minor version(%u.%u), "
+                        "driver compiled for version %u.%u\n", major, minor,
+                        FW_VERSION_MAJOR, FW_VERSION_MINOR);
+        }
+
         return -EINVAL;
 }