net/ice/base: add compatibility check for package version

1. Perform a check against the package version to make sure that
it will be compatible with the shared code implementation. There
will be points in time when the shared code and package will need
to be changed in lock step; the mechanism added here is meant to
deal with those situations.
2. Support package tunnel labels owned by PF. VXLAN and GENEVE
tunnel labels names in the package are changing to incorporate
the PF that owns them.

Signed-off-by: Dan Nowlin <dan.nowlin@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Leyi Rong <leyi.rong@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index eccc9b2..12e1eb3 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -7,19 +7,12 @@
 #include "ice_protocol_type.h"
 #include "ice_flow.h"
 
+/* To support tunneling entries by PF, the package will append the PF number to
+ * the label; for example TNL_VXLAN_PF0, TNL_VXLAN_PF1, TNL_VXLAN_PF2, etc.
+ */
 static const struct ice_tunnel_type_scan tnls[] = {
-       { TNL_VXLAN,            "TNL_VXLAN" },
-       { TNL_GTPC,             "TNL_GTPC" },
-       { TNL_GTPC_TEID,        "TNL_GTPC_TEID" },
-       { TNL_GTPU,             "TNL_GTPC" },
-       { TNL_GTPU_TEID,        "TNL_GTPU_TEID" },
-       { TNL_VXLAN_GPE,        "TNL_VXLAN_GPE" },
-       { TNL_GENEVE,           "TNL_GENEVE" },
-       { TNL_NAT,              "TNL_NAT" },
-       { TNL_ROCE_V2,          "TNL_ROCE_V2" },
-       { TNL_MPLSO_UDP,        "TNL_MPLSO_UDP" },
-       { TNL_UDP2_END,         "TNL_UDP2_END" },
-       { TNL_UPD_END,          "TNL_UPD_END" },
+       { TNL_VXLAN,            "TNL_VXLAN_PF" },
+       { TNL_GENEVE,           "TNL_GENEVE_PF" },
        { TNL_LAST,             "" }
 };
 
@@ -485,8 +478,17 @@ void ice_init_pkg_hints(struct ice_hw *hw, struct ice_seg *ice_seg)
 
        while (label_name && hw->tnl.count < ICE_TUNNEL_MAX_ENTRIES) {
                for (i = 0; tnls[i].type != TNL_LAST; i++) {
-                       if (!strncmp(label_name, tnls[i].label_prefix,
-                                    strlen(tnls[i].label_prefix))) {
+                       size_t len = strlen(tnls[i].label_prefix);
+
+                       /* Look for matching label start, before continuing */
+                       if (strncmp(label_name, tnls[i].label_prefix, len))
+                               continue;
+
+                       /* Make sure this label matches our PF. Note that the PF
+                        * character ('0' - '7') will be located where our
+                        * prefix string's null terminator is located.
+                        */
+                       if ((label_name[len] - '0') == hw->pf_id) {
                                hw->tnl.tbl[hw->tnl.count].type = tnls[i].type;
                                hw->tnl.tbl[hw->tnl.count].valid = false;
                                hw->tnl.tbl[hw->tnl.count].in_use = false;
@@ -1083,12 +1085,8 @@ enum ice_status ice_download_pkg(struct ice_hw *hw, struct ice_seg *ice_seg)
 enum ice_status
 ice_init_pkg_info(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr)
 {
-       struct ice_aqc_get_pkg_info_resp *pkg_info;
        struct ice_global_metadata_seg *meta_seg;
        struct ice_generic_seg_hdr *seg_hdr;
-       enum ice_status status;
-       u16 size;
-       u32 i;
 
        ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__);
        if (!pkg_hdr)
@@ -1127,7 +1125,25 @@ ice_init_pkg_info(struct ice_hw *hw, struct ice_pkg_hdr *pkg_hdr)
                return ICE_ERR_CFG;
        }
 
-#define ICE_PKG_CNT    4
+       return ICE_SUCCESS;
+}
+
+/**
+ * ice_get_pkg_info
+ * @hw: pointer to the hardware structure
+ *
+ * Store details of the package currently loaded in HW into the HW structure.
+ */
+enum ice_status
+ice_get_pkg_info(struct ice_hw *hw)
+{
+       struct ice_aqc_get_pkg_info_resp *pkg_info;
+       enum ice_status status;
+       u16 size;
+       u32 i;
+
+       ice_debug(hw, ICE_DBG_TRACE, "ice_init_pkg_info\n");
+
        size = sizeof(*pkg_info) + (sizeof(pkg_info->pkg_info[0]) *
                                    (ICE_PKG_CNT - 1));
        pkg_info = (struct ice_aqc_get_pkg_info_resp *)ice_malloc(hw, size);
@@ -1310,6 +1326,32 @@ static void ice_init_pkg_regs(struct ice_hw *hw)
        ice_init_fd_mask_regs(hw);
 }
 
+/**
+ * ice_chk_pkg_version - check package version for compatibility with driver
+ * @hw: pointer to the hardware structure
+ * @pkg_ver: pointer to a version structure to check
+ *
+ * Check to make sure that the package about to be downloaded is compatible with
+ * the driver. To be compatible, the major and minor components of the package
+ * version must match our ICE_PKG_SUPP_VER_MAJ and ICE_PKG_SUPP_VER_MNR
+ * definitions.
+ */
+static enum ice_status
+ice_chk_pkg_version(struct ice_hw *hw, struct ice_pkg_ver *pkg_ver)
+{
+       if (pkg_ver->major != ICE_PKG_SUPP_VER_MAJ ||
+           pkg_ver->minor != ICE_PKG_SUPP_VER_MNR) {
+               ice_info(hw, "ERROR: Incompatible package: %d.%d.%d.%d - requires package version: %d.%d.*.*\n",
+                        pkg_ver->major, pkg_ver->minor, pkg_ver->update,
+                        pkg_ver->draft, ICE_PKG_SUPP_VER_MAJ,
+                        ICE_PKG_SUPP_VER_MNR);
+
+               return ICE_ERR_NOT_SUPPORTED;
+       }
+
+       return ICE_SUCCESS;
+}
+
 /**
  * ice_init_pkg - initialize/download package
  * @hw: pointer to the hardware structure
@@ -1357,6 +1399,13 @@ enum ice_status ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
        if (status)
                return status;
 
+       /* before downloading the package, check package version for
+        * compatibility with driver
+        */
+       status = ice_chk_pkg_version(hw, &hw->pkg_ver);
+       if (status)
+               return status;
+
        /* find segment in given package */
        seg = (struct ice_seg *)ice_find_seg_in_pkg(hw, SEGMENT_TYPE_ICE, pkg);
        if (!seg) {
@@ -1373,6 +1422,15 @@ enum ice_status ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
                status = ICE_SUCCESS;
        }
 
+       /* Get information on the package currently loaded in HW, then make sure
+        * the driver is compatible with this version.
+        */
+       if (!status) {
+               status = ice_get_pkg_info(hw);
+               if (!status)
+                       status = ice_chk_pkg_version(hw, &hw->active_pkg_ver);
+       }
+
        if (!status) {
                hw->seg = seg;
                /* on successful package download update other required

diff --git a/drivers/net/ice/base/ice_flex_pipe.h b/drivers/net/ice/base/ice_flex_pipe.h
index e8cc9ce..375758c 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.h
+++ b/drivers/net/ice/base/ice_flex_pipe.h
@@ -7,12 +7,18 @@
 
 #include "ice_type.h"
 
+/* Package minimal version supported */
+#define ICE_PKG_SUPP_VER_MAJ   1
+#define ICE_PKG_SUPP_VER_MNR   2
+
 /* Package format version */
 #define ICE_PKG_FMT_VER_MAJ    1
 #define ICE_PKG_FMT_VER_MNR    0
 #define ICE_PKG_FMT_VER_UPD    0
 #define ICE_PKG_FMT_VER_DFT    0
 
+#define ICE_PKG_CNT 4
+
 enum ice_status
 ice_update_pkg(struct ice_hw *hw, struct ice_buf *bufs, u32 count);
 enum ice_status
@@ -28,6 +34,8 @@ enum ice_status ice_download_pkg(struct ice_hw *hw, struct ice_seg *ice_seg);
 
 enum ice_status
 ice_init_pkg_info(struct ice_hw *hw, struct ice_pkg_hdr *pkg_header);
+enum ice_status
+ice_get_pkg_info(struct ice_hw *hw);
 
 void ice_init_pkg_hints(struct ice_hw *hw, struct ice_seg *ice_seg);
 

diff --git a/drivers/net/ice/base/ice_flex_type.h b/drivers/net/ice/base/ice_flex_type.h
index 7133983..d23b2ae 100644 (file)
--- a/drivers/net/ice/base/ice_flex_type.h
+++ b/drivers/net/ice/base/ice_flex_type.h
@@ -455,17 +455,7 @@ struct ice_pkg_enum {
 
 enum ice_tunnel_type {
        TNL_VXLAN = 0,
-       TNL_GTPC,
-       TNL_GTPC_TEID,
-       TNL_GTPU,
-       TNL_GTPU_TEID,
-       TNL_VXLAN_GPE,
        TNL_GENEVE,
-       TNL_NAT,
-       TNL_ROCE_V2,
-       TNL_MPLSO_UDP,
-       TNL_UDP2_END,
-       TNL_UPD_END,
        TNL_LAST = 0xFF,
        TNL_ALL = 0xFF,
 };