net/sfc: fence off 8 bits in Rx mark for tunnel offload

[dpdk.git] / drivers / net / bnxt / tf_core / tf_msg.c

diff --git a/drivers/net/bnxt/tf_core/tf_msg.c b/drivers/net/bnxt/tf_core/tf_msg.c
index 18eea83..0fbb2fe 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_msg.c
+++ b/drivers/net/bnxt/tf_core/tf_msg.c
@@ -58,6 +58,16 @@ static_assert(sizeof(struct hwrm_tf_tbl_type_set_input) ==
  */
 #define TF_PCI_BUF_SIZE_MAX 88
 
+/**
+ * This is the length of shared session name "tf_share"
+ */
+#define TF_SHARED_SESSION_NAME_LEN 8
+
+/**
+ * This is the length of tcam shared session name "tf_shared-wc_tcam"
+ */
+#define TF_TCAM_SHARED_SESSION_NAME_LEN 17
+
 /**
  * If data bigger than TF_PCI_BUF_SIZE_MAX then use DMA method
  */
@@ -126,13 +136,17 @@ tf_msg_session_open(struct bnxt *bp,
        struct hwrm_tf_session_open_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
        int name_len;
-       char *name;
+       char *session_name;
+       char *tcam_session_name;
 
        /* Populate the request */
        name_len = strnlen(ctrl_chan_name, TF_SESSION_NAME_MAX);
-       name = &ctrl_chan_name[name_len - strlen("tf_shared")];
-       if (!strncmp(name, "tf_shared", strlen("tf_shared")))
-               tfp_memcpy(&req.session_name, name, strlen("tf_share"));
+       session_name = &ctrl_chan_name[name_len - strlen("tf_shared")];
+       tcam_session_name = &ctrl_chan_name[name_len - strlen("tf_shared-wc_tcam")];
+       if (!strncmp(tcam_session_name, "tf_shared-wc_tcam", strlen("tf_shared-wc_tcam")))
+               tfp_memcpy(&req.session_name, tcam_session_name, TF_TCAM_SHARED_SESSION_NAME_LEN);
+       else if (!strncmp(session_name, "tf_shared", strlen("tf_shared")))
+               tfp_memcpy(&req.session_name, session_name, TF_SHARED_SESSION_NAME_LEN);
        else
                tfp_memcpy(&req.session_name, ctrl_chan_name, TF_SESSION_NAME_MAX);
 
@@ -177,6 +191,9 @@ tf_msg_session_client_register(struct tf *tfp,
        struct tfp_send_msg_parms parms = { 0 };
        uint8_t fw_session_id;
        struct tf_dev_info *dev;
+       int name_len;
+       char *session_name;
+       char *tcam_session_name;
 
        /* Retrieve the device information */
        rc = tf_session_get_device(tfs, &dev);
@@ -197,9 +214,24 @@ tf_msg_session_client_register(struct tf *tfp,
 
        /* Populate the request */
        req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
-       tfp_memcpy(&req.session_client_name,
-                  ctrl_channel_name,
-                  TF_SESSION_NAME_MAX);
+       name_len = strnlen(ctrl_channel_name, TF_SESSION_NAME_MAX);
+       session_name = &ctrl_channel_name[name_len - strlen("tf_shared")];
+       tcam_session_name = &ctrl_channel_name[name_len -
+               strlen("tf_shared-wc_tcam")];
+       if (!strncmp(tcam_session_name,
+                               "tf_shared-wc_tcam",
+                               strlen("tf_shared-wc_tcam")))
+               tfp_memcpy(&req.session_client_name,
+                               tcam_session_name,
+                               TF_TCAM_SHARED_SESSION_NAME_LEN);
+       else if (!strncmp(session_name, "tf_shared", strlen("tf_shared")))
+               tfp_memcpy(&req.session_client_name,
+                               session_name,
+                               TF_SHARED_SESSION_NAME_LEN);
+       else
+               tfp_memcpy(&req.session_client_name,
+                               ctrl_channel_name,
+                               TF_SESSION_NAME_MAX);
 
        parms.tf_type = HWRM_TF_SESSION_REGISTER;
        parms.req_data = (uint32_t *)&req;
@@ -267,31 +299,13 @@ tf_msg_session_client_unregister(struct tf *tfp,
 
 int
 tf_msg_session_close(struct tf *tfp,
-                    struct tf_session *tfs)
+                    uint8_t fw_session_id,
+                    int mailbox)
 {
        int rc;
        struct hwrm_tf_session_close_input req = { 0 };
        struct hwrm_tf_session_close_output resp = { 0 };
        struct tfp_send_msg_parms parms = { 0 };
-       uint8_t fw_session_id;
-       struct tf_dev_info *dev;
-
-       /* Retrieve the device information */
-       rc = tf_session_get_device(tfs, &dev);
-       if (rc) {
-               TFP_DRV_LOG(ERR,
-                           "Failed to lookup device, rc:%s\n",
-                           strerror(-rc));
-               return rc;
-       }
-
-       rc = tf_session_get_fw_session_id(tfp, &fw_session_id);
-       if (rc) {
-               TFP_DRV_LOG(ERR,
-                           "Unable to lookup FW id, rc:%s\n",
-                           strerror(-rc));
-               return rc;
-       }
 
        /* Populate the request */
        req.fw_session_id = tfp_cpu_to_le_32(fw_session_id);
@@ -301,7 +315,7 @@ tf_msg_session_close(struct tf *tfp,
        parms.req_size = sizeof(req);
        parms.resp_data = (uint32_t *)&resp;
        parms.resp_size = sizeof(resp);
-       parms.mailbox = dev->ops->tf_dev_get_mailbox();
+       parms.mailbox = mailbox;
 
        rc = tfp_send_msg_direct(tf_session_get_bp(tfp),
                                 &parms);
@@ -426,18 +440,18 @@ tf_msg_session_resc_qcaps(struct tf *tfp,
         * Should always get expected number of entries
         */
        if (tfp_le_to_cpu_32(resp.size) != size) {
-               TFP_DRV_LOG(ERR,
-                           "%s: QCAPS message size error, rc:%s\n",
+               TFP_DRV_LOG(WARNING,
+                           "%s: QCAPS message size error, rc:%s, request %d vs response %d\n",
                            tf_dir_2_str(dir),
-                           strerror(EINVAL));
-               rc = -EINVAL;
-               goto cleanup;
+                           strerror(EINVAL),
+                           size,
+                           resp.size);
        }
 
        /* Post process the response */
        data = (struct tf_rm_resc_req_entry *)qcaps_buf.va_addr;
 
-       for (i = 0; i < size; i++) {
+       for (i = 0; i < resp.size; i++) {
                query[i].type = tfp_le_to_cpu_32(data[i].type);
                query[i].min = tfp_le_to_cpu_16(data[i].min);
                query[i].max = tfp_le_to_cpu_16(data[i].max);
@@ -2217,7 +2231,7 @@ tf_msg_get_if_tbl_entry(struct tf *tfp,
        if (rc != 0)
                return rc;
 
-       tfp_memcpy(params->data, resp.data, req.size);
+       tfp_memcpy(&params->data[0], resp.data, req.size);
 
        return 0;
 }