net/ice/base: log if DDP/FW do not support QinQ

Currently if the driver supports QinQ there is no message/information
if the DDP and/or FW don't support QinQ. Add functionality that prints
if the DDP and/or FW don't support QinQ if the driver attempts to
configured DVM. This will make it more obvious to users in the field
that they need to update their DDP and/or FW.

This required a small refactor so some of the existing code could be
shared and used by this new print functionality.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/ice/base/ice_vlan_mode.c b/drivers/net/ice/base/ice_vlan_mode.c
index 0a035ad..29c6509 100644 (file)
--- a/drivers/net/ice/base/ice_vlan_mode.c
+++ b/drivers/net/ice/base/ice_vlan_mode.c
@@ -130,18 +130,11 @@ static void ice_cache_vlan_mode(struct ice_hw *hw)
 }
 
 /**
- * ice_is_dvm_supported - check if Double VLAN Mode is supported
- * @hw: pointer to the hardware structure
- *
- * Returns true if Double VLAN Mode (DVM) is supported and false if only Single
- * VLAN Mode (SVM) is supported. In order for DVM to be supported the DDP and
- * firmware must support it, otherwise only SVM is supported. This function
- * should only be called while the global config lock is held and after the
- * package has been successfully downloaded.
+ * ice_pkg_supports_dvm - find out if DDP supports DVM
+ * @hw: pointer to the HW structure
  */
-static bool ice_is_dvm_supported(struct ice_hw *hw)
+static bool ice_pkg_supports_dvm(struct ice_hw *hw)
 {
-       struct ice_aqc_get_vlan_mode get_vlan_mode = { 0 };
        enum ice_status status;
        bool pkg_supports_dvm;
 
@@ -152,8 +145,17 @@ static bool ice_is_dvm_supported(struct ice_hw *hw)
                return false;
        }
 
-       if (!pkg_supports_dvm)
-               return false;
+       return pkg_supports_dvm;
+}
+
+/**
+ * ice_fw_supports_dvm - find out if FW supports DVM
+ * @hw: pointer to the HW structure
+ */
+static bool ice_fw_supports_dvm(struct ice_hw *hw)
+{
+       struct ice_aqc_get_vlan_mode get_vlan_mode = { 0 };
+       enum ice_status status;
 
        /* If firmware returns success, then it supports DVM, else it only
         * supports SVM
@@ -168,6 +170,31 @@ static bool ice_is_dvm_supported(struct ice_hw *hw)
        return true;
 }
 
+/**
+ * ice_is_dvm_supported - check if Double VLAN Mode is supported
+ * @hw: pointer to the hardware structure
+ *
+ * Returns true if Double VLAN Mode (DVM) is supported and false if only Single
+ * VLAN Mode (SVM) is supported. In order for DVM to be supported the DDP and
+ * firmware must support it, otherwise only SVM is supported. This function
+ * should only be called while the global config lock is held and after the
+ * package has been successfully downloaded.
+ */
+static bool ice_is_dvm_supported(struct ice_hw *hw)
+{
+       if (!ice_pkg_supports_dvm(hw)) {
+               ice_debug(hw, ICE_DBG_PKG, "DDP doesn't support DVM\n");
+               return false;
+       }
+
+       if (!ice_fw_supports_dvm(hw)) {
+               ice_debug(hw, ICE_DBG_PKG, "FW doesn't support DVM\n");
+               return false;
+       }
+
+       return true;
+}
+
 #define ICE_EXTERNAL_VLAN_ID_FV_IDX                    11
 #define ICE_SW_LKUP_VLAN_LOC_LKUP_IDX                  1
 #define ICE_SW_LKUP_VLAN_PKT_FLAGS_LKUP_IDX            2
@@ -375,6 +402,30 @@ enum ice_status ice_set_vlan_mode(struct ice_hw *hw)
        return ice_set_svm(hw);
 }
 
+/**
+ * ice_print_dvm_not_supported - print if DDP and/or FW doesn't support DVM
+ * @hw: pointer to the HW structure
+ *
+ * The purpose of this function is to print that  QinQ is not supported due to
+ * incompatibilty from the DDP and/or FW. This will give a hint to the user to
+ * update one and/or both components if they expect QinQ functionality.
+ */
+static void ice_print_dvm_not_supported(struct ice_hw *hw)
+{
+       bool pkg_supports_dvm = ice_pkg_supports_dvm(hw);
+       bool fw_supports_dvm = ice_fw_supports_dvm(hw);
+
+       if (!fw_supports_dvm && !pkg_supports_dvm)
+               ice_info(hw, "QinQ functionality cannot be enabled on this device. "
+                            "Update your DDP package and NVM to versions that support QinQ.\n");
+       else if (!pkg_supports_dvm)
+               ice_info(hw, "QinQ functionality cannot be enabled on this device. "
+                            "Update your DDP package to a version that supports QinQ.\n");
+       else if (!fw_supports_dvm)
+               ice_info(hw, "QinQ functionality cannot be enabled on this device. "
+                            "Update your NVM to a version that supports QinQ.\n");
+}
+
 /**
  * ice_post_pkg_dwnld_vlan_mode_cfg - configure VLAN mode after DDP download
  * @hw: pointer to the HW structure
@@ -394,4 +445,6 @@ void ice_post_pkg_dwnld_vlan_mode_cfg(struct ice_hw *hw)
 
        if (ice_is_dvm_ena(hw))
                ice_change_proto_id_to_dvm();
+       else
+               ice_print_dvm_not_supported(hw);
 }