ice: Allow different FW API versions based on MAC type

Allow the driver to be compatible with different FW API versions based
on the device's MAC type. Currently, E810 is only compatible with one
FW API version. Now the driver can be compatible with different FW API
versions for both E810 and E830. For example, E810 FW API version is
1.5.0 and E830 is 1.7.0.

Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c
index ffe660f34992c6bf148e745a15364fd64d16cad3..ca80b34f2f8a43509582acb8261139a61a8af261 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_controlq.c
+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c
@@ -510,16 +510,19 @@ shutdown_sq_out:
  */
 static bool ice_aq_ver_check(struct ice_hw *hw)
 {
-       if (hw->api_maj_ver > EXP_FW_API_VER_MAJOR) {
+       u8 exp_fw_api_ver_major = EXP_FW_API_VER_MAJOR_BY_MAC(hw);
+       u8 exp_fw_api_ver_minor = EXP_FW_API_VER_MINOR_BY_MAC(hw);
+
+       if (hw->api_maj_ver > exp_fw_api_ver_major) {
                /* Major API version is newer than expected, don't load */
                dev_warn(ice_hw_to_dev(hw),
                         "The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n");
                return false;
-       } else if (hw->api_maj_ver == EXP_FW_API_VER_MAJOR) {
-               if (hw->api_min_ver > (EXP_FW_API_VER_MINOR + 2))
+       } else if (hw->api_maj_ver == exp_fw_api_ver_major) {
+               if (hw->api_min_ver > (exp_fw_api_ver_minor + 2))
                        dev_info(ice_hw_to_dev(hw),
                                 "The driver for the device detected a newer version of the NVM image than expected. Please install the most recent version of the network driver.\n");
-               else if ((hw->api_min_ver + 2) < EXP_FW_API_VER_MINOR)
+               else if ((hw->api_min_ver + 2) < exp_fw_api_ver_minor)
                        dev_info(ice_hw_to_dev(hw),
                                 "The driver for the device detected an older version of the NVM image than expected. Please update the NVM image.\n");
        } else {

diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h b/drivers/net/ethernet/intel/ice/ice_controlq.h
index 8f2fd1613a952d22e1bf488cd455febcf0621292..1d54b1cdb1c5ab73669bcec21e866bbac8eb4960 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_controlq.h
+++ b/drivers/net/ethernet/intel/ice/ice_controlq.h
@@ -21,9 +21,18 @@
 /* Defines that help manage the driver vs FW API checks.
  * Take a look at ice_aq_ver_check in ice_controlq.c for actual usage.
  */
-#define EXP_FW_API_VER_BRANCH          0x00
-#define EXP_FW_API_VER_MAJOR           0x01
-#define EXP_FW_API_VER_MINOR           0x05
+#define EXP_FW_API_VER_MAJOR_E810      0x01
+#define EXP_FW_API_VER_MINOR_E810      0x05
+
+#define EXP_FW_API_VER_MAJOR_E830      0x01
+#define EXP_FW_API_VER_MINOR_E830      0x07
+
+#define EXP_FW_API_VER_MAJOR_BY_MAC(hw) ((hw)->mac_type == ICE_MAC_E830 ? \
+                                        EXP_FW_API_VER_MAJOR_E830 : \
+                                        EXP_FW_API_VER_MAJOR_E810)
+#define EXP_FW_API_VER_MINOR_BY_MAC(hw) ((hw)->mac_type == ICE_MAC_E830 ? \
+                                        EXP_FW_API_VER_MINOR_E830 : \
+                                        EXP_FW_API_VER_MINOR_E810)
 
 /* Different control queue types: These are mainly for SW consumption. */
 enum ice_ctl_q {