net/bnxt: fix format specifier for unsigned numbers
[dpdk.git] / drivers / net / bnxt / tf_core / tf_core.c
index 00b2775..24d4909 100644 (file)
@@ -34,7 +34,8 @@ tf_open_session(struct tf *tfp,
         * side. It is assumed that the Firmware will be supported if
         * firmware open session succeeds.
         */
-       if (parms->device_type != TF_DEVICE_TYPE_WH) {
+       if (parms->device_type != TF_DEVICE_TYPE_WH &&
+           parms->device_type != TF_DEVICE_TYPE_SR) {
                TFP_DRV_LOG(ERR,
                            "Unsupported device type %d\n",
                            parms->device_type);
@@ -43,15 +44,28 @@ tf_open_session(struct tf *tfp,
 
        /* Verify control channel and build the beginning of session_id */
        rc = sscanf(parms->ctrl_chan_name,
-                   "%x:%x:%x.%d",
+                   "%x:%x:%x.%u",
                    &domain,
                    &bus,
                    &slot,
                    &device);
        if (rc != 4) {
-               TFP_DRV_LOG(ERR,
+               /* PCI Domain not provided (optional in DPDK), thus we
+                * force domain to 0 and recheck.
+                */
+               domain = 0;
+
+               /* Check parsing of bus/slot/device */
+               rc = sscanf(parms->ctrl_chan_name,
+                           "%x:%x.%u",
+                           &bus,
+                           &slot,
+                           &device);
+               if (rc != 3) {
+                       TFP_DRV_LOG(ERR,
                            "Failed to scan device ctrl_chan_name\n");
-               return -EINVAL;
+                       return -EINVAL;
+               }
        }
 
        parms->session_id.internal.domain = domain;
@@ -62,7 +76,6 @@ tf_open_session(struct tf *tfp,
        /* Session vs session client is decided in
         * tf_session_open_session()
         */
-       printf("TF_OPEN, %s\n", parms->ctrl_chan_name);
        rc = tf_session_open_session(tfp, &oparms);
        /* Logging handled by tf_session_open_session */
        if (rc)
@@ -89,7 +102,7 @@ tf_attach_session(struct tf *tfp,
 
        /* Verify control channel */
        rc = sscanf(parms->ctrl_chan_name,
-                   "%x:%x:%x.%d",
+                   "%x:%x:%x.%u",
                    &domain,
                    &bus,
                    &slot,
@@ -102,7 +115,7 @@ tf_attach_session(struct tf *tfp,
 
        /* Verify 'attach' channel */
        rc = sscanf(parms->attach_chan_name,
-                   "%x:%x:%x.%d",
+                   "%x:%x:%x.%u",
                    &domain,
                    &bus,
                    &slot,
@@ -290,7 +303,6 @@ int tf_get_global_cfg(struct tf *tfp,
        int rc = 0;
        struct tf_session *tfs;
        struct tf_dev_info *dev;
-       struct tf_dev_global_cfg_parms gparms = { 0 };
 
        TF_CHECK_PARMS2(tfp, parms);
 
@@ -329,12 +341,7 @@ int tf_get_global_cfg(struct tf *tfp,
                return -EOPNOTSUPP;
        }
 
-       gparms.dir = parms->dir;
-       gparms.type = parms->type;
-       gparms.offset = parms->offset;
-       gparms.config = parms->config;
-       gparms.config_sz_in_bytes = parms->config_sz_in_bytes;
-       rc = dev->ops->tf_dev_get_global_cfg(tfp, &gparms);
+       rc = dev->ops->tf_dev_get_global_cfg(tfp, parms);
        if (rc) {
                TFP_DRV_LOG(ERR,
                            "%s: Global Cfg get failed, rc:%s\n",
@@ -358,7 +365,6 @@ int tf_set_global_cfg(struct tf *tfp,
        int rc = 0;
        struct tf_session *tfs;
        struct tf_dev_info *dev;
-       struct tf_dev_global_cfg_parms gparms = { 0 };
 
        TF_CHECK_PARMS2(tfp, parms);
 
@@ -397,12 +403,7 @@ int tf_set_global_cfg(struct tf *tfp,
                return -EOPNOTSUPP;
        }
 
-       gparms.dir = parms->dir;
-       gparms.type = parms->type;
-       gparms.offset = parms->offset;
-       gparms.config = parms->config;
-       gparms.config_sz_in_bytes = parms->config_sz_in_bytes;
-       rc = dev->ops->tf_dev_set_global_cfg(tfp, &gparms);
+       rc = dev->ops->tf_dev_set_global_cfg(tfp, parms);
        if (rc) {
                TFP_DRV_LOG(ERR,
                            "%s: Global Cfg set failed, rc:%s\n",
@@ -521,6 +522,7 @@ tf_free_identifier(struct tf *tfp,
        fparms.dir = parms->dir;
        fparms.type = parms->ident_type;
        fparms.id = parms->id;
+       fparms.ref_cnt = &parms->ref_cnt;
        rc = dev->ops->tf_dev_free_ident(tfp, &fparms);
        if (rc) {
                TFP_DRV_LOG(ERR,
@@ -533,6 +535,139 @@ tf_free_identifier(struct tf *tfp,
        return 0;
 }
 
+int
+tf_search_identifier(struct tf *tfp,
+                    struct tf_search_identifier_parms *parms)
+{
+       int rc;
+       struct tf_session *tfs;
+       struct tf_dev_info *dev;
+       struct tf_ident_search_parms sparms;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       /* Can't do static initialization due to UT enum check */
+       memset(&sparms, 0, sizeof(struct tf_ident_search_parms));
+
+       /* Retrieve the session information */
+       rc = tf_session_get_session(tfp, &tfs);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup session, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       if (dev->ops->tf_dev_search_ident == NULL) {
+               rc = -EOPNOTSUPP;
+               TFP_DRV_LOG(ERR,
+                           "%s: Operation not supported, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       sparms.dir = parms->dir;
+       sparms.type = parms->ident_type;
+       sparms.search_id = parms->search_id;
+       sparms.hit = &parms->hit;
+       sparms.ref_cnt = &parms->ref_cnt;
+       rc = dev->ops->tf_dev_search_ident(tfp, &sparms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Identifier search failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       return 0;
+}
+
+int
+tf_search_tcam_entry(struct tf *tfp,
+                    struct tf_search_tcam_entry_parms *parms)
+{
+       int rc;
+       struct tf_session *tfs;
+       struct tf_dev_info *dev;
+       struct tf_tcam_alloc_search_parms sparms;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       memset(&sparms, 0, sizeof(struct tf_tcam_alloc_search_parms));
+
+       /* Retrieve the session information */
+       rc = tf_session_get_session(tfp, &tfs);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup session, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       if (dev->ops->tf_dev_alloc_search_tcam == NULL) {
+               rc = -EOPNOTSUPP;
+               TFP_DRV_LOG(ERR,
+                           "%s: Operation not supported, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       sparms.dir = parms->dir;
+       sparms.type = parms->tcam_tbl_type;
+       sparms.key = parms->key;
+       sparms.key_size = TF_BITS2BYTES_WORD_ALIGN(parms->key_sz_in_bits);
+       sparms.mask = parms->mask;
+       sparms.priority = parms->priority;
+       sparms.alloc = parms->alloc;
+
+       /* Result is an in/out and so no need to copy during outputs */
+       sparms.result = parms->result;
+       sparms.result_size =
+               TF_BITS2BYTES_WORD_ALIGN(parms->result_sz_in_bits);
+
+       rc = dev->ops->tf_dev_alloc_search_tcam(tfp, &sparms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: TCAM allocation failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Copy the outputs */
+       parms->hit = sparms.hit;
+       parms->search_status = sparms.search_status;
+       parms->ref_cnt = sparms.ref_cnt;
+       parms->idx = sparms.idx;
+
+       return 0;
+}
+
 int
 tf_alloc_tcam_entry(struct tf *tfp,
                    struct tf_alloc_tcam_entry_parms *parms)
@@ -806,6 +941,71 @@ tf_alloc_tbl_entry(struct tf *tfp,
        return 0;
 }
 
+int
+tf_search_tbl_entry(struct tf *tfp,
+                   struct tf_search_tbl_entry_parms *parms)
+{
+       int rc;
+       struct tf_session *tfs;
+       struct tf_dev_info *dev;
+       struct tf_tbl_alloc_search_parms sparms;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       /* Retrieve the session information */
+       rc = tf_session_get_session(tfp, &tfs);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup session, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: Failed to lookup device, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       if (dev->ops->tf_dev_alloc_search_tbl == NULL) {
+               rc = -EOPNOTSUPP;
+               TFP_DRV_LOG(ERR,
+                           "%s: Operation not supported, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       memset(&sparms, 0, sizeof(struct tf_tbl_alloc_search_parms));
+       sparms.dir = parms->dir;
+       sparms.type = parms->type;
+       sparms.result = parms->result;
+       sparms.result_sz_in_bytes = parms->result_sz_in_bytes;
+       sparms.alloc = parms->alloc;
+       sparms.tbl_scope_id = parms->tbl_scope_id;
+       rc = dev->ops->tf_dev_alloc_search_tbl(tfp, &sparms);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "%s: TBL allocation failed, rc:%s\n",
+                           tf_dir_2_str(parms->dir),
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* Return the outputs from the search */
+       parms->hit = sparms.hit;
+       parms->search_status = sparms.search_status;
+       parms->ref_cnt = sparms.ref_cnt;
+       parms->idx = sparms.idx;
+
+       return 0;
+}
+
 int
 tf_free_tbl_entry(struct tf *tfp,
                  struct tf_free_tbl_entry_parms *parms)
@@ -1140,6 +1340,44 @@ tf_alloc_tbl_scope(struct tf *tfp,
 
        return rc;
 }
+int
+tf_map_tbl_scope(struct tf *tfp,
+                  struct tf_map_tbl_scope_parms *parms)
+{
+       struct tf_session *tfs;
+       struct tf_dev_info *dev;
+       int rc;
+
+       TF_CHECK_PARMS2(tfp, parms);
+
+       /* Retrieve the session information */
+       rc = tf_session_get_session(tfp, &tfs);
+       if (rc) {
+               TFP_DRV_LOG(ERR,
+                           "Failed to lookup session, rc:%s\n",
+                           strerror(-rc));
+               return rc;
+       }
+
+       /* 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;
+       }
+
+       if (dev->ops->tf_dev_map_tbl_scope != NULL) {
+               rc = dev->ops->tf_dev_map_tbl_scope(tfp, parms);
+       } else {
+               TFP_DRV_LOG(ERR,
+                           "Map table scope not supported by device\n");
+               return -EINVAL;
+       }
+
+       return rc;
+}
 
 int
 tf_free_tbl_scope(struct tf *tfp,