net/bnxt: remove settings for multiple session

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

diff --git a/drivers/net/bnxt/tf_core/tf_global_cfg.c b/drivers/net/bnxt/tf_core/tf_global_cfg.c
index f420452..98a42b2 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_global_cfg.c
+++ b/drivers/net/bnxt/tf_core/tf_global_cfg.c
@@ -12,10 +12,13 @@
 #include "tfp.h"
 
 struct tf;
+
 /**
- * Global Cfg DBs.
+ * Global cfg database
  */
-static void *global_cfg_db[TF_DIR_MAX];
+struct tf_global_cfg_db {
+       struct tf_global_cfg_cfg *global_cfg_db[TF_DIR_MAX];
+};
 
 /**
  * Init flag, set on bind and cleared on unbind
@@ -72,40 +75,62 @@ tf_global_cfg_get_hcapi_type(struct tf_global_cfg_get_hcapi_parms *parms)
 }
 
 int
-tf_global_cfg_bind(struct tf *tfp __rte_unused,
+tf_global_cfg_bind(struct tf *tfp,
                   struct tf_global_cfg_cfg_parms *parms)
 {
+       struct tfp_calloc_parms cparms;
+       struct tf_global_cfg_db *global_cfg_db;
+
        TF_CHECK_PARMS2(tfp, parms);
 
        if (init) {
-               TFP_DRV_LOG(ERR,
-                           "Global Cfg DB already initialized\n");
+               TFP_DRV_LOG(ERR, "Global Cfg DB already initialized\n");
                return -EINVAL;
        }
 
-       global_cfg_db[TF_DIR_RX] = parms->cfg;
-       global_cfg_db[TF_DIR_TX] = parms->cfg;
+       cparms.nitems = 1;
+       cparms.size = sizeof(struct tf_global_cfg_db);
+       cparms.alignment = 0;
+       if (tfp_calloc(&cparms) != 0) {
+               TFP_DRV_LOG(ERR, "global_rm_db alloc error %s\n",
+                           strerror(ENOMEM));
+               return -ENOMEM;
+       }
+
+       global_cfg_db = cparms.mem_va;
+       global_cfg_db->global_cfg_db[TF_DIR_RX] = parms->cfg;
+       global_cfg_db->global_cfg_db[TF_DIR_TX] = parms->cfg;
+
+       tf_session_set_global_db(tfp, (void *)global_cfg_db);
 
        init = 1;
 
-       TFP_DRV_LOG(INFO,
-                   "Global Cfg - initialized\n");
+       TFP_DRV_LOG(INFO, "Global Cfg - initialized\n");
 
        return 0;
 }
 
 int
-tf_global_cfg_unbind(struct tf *tfp __rte_unused)
+tf_global_cfg_unbind(struct tf *tfp)
 {
+       int rc;
+       struct tf_global_cfg_db *global_cfg_db_ptr;
+
+       TF_CHECK_PARMS1(tfp);
+
        /* Bail if nothing has been initialized */
        if (!init) {
-               TFP_DRV_LOG(INFO,
-                           "No Global Cfg DBs created\n");
+               TFP_DRV_LOG(INFO, "No Global Cfg DBs created\n");
                return 0;
        }
 
-       global_cfg_db[TF_DIR_RX] = NULL;
-       global_cfg_db[TF_DIR_TX] = NULL;
+       rc = tf_session_get_global_db(tfp, (void **)&global_cfg_db_ptr);
+       if (rc) {
+               TFP_DRV_LOG(INFO, "global_cfg_db is not initialized\n");
+               return 0;
+       }
+
+       tfp_free((void *)global_cfg_db_ptr);
        init = 0;
 
        return 0;
@@ -117,19 +142,25 @@ tf_global_cfg_set(struct tf *tfp,
 {
        int rc;
        struct tf_global_cfg_get_hcapi_parms hparms;
+       struct tf_global_cfg_db *global_cfg_db_ptr;
        uint16_t hcapi_type;
 
        TF_CHECK_PARMS3(tfp, parms, parms->config);
 
        if (!init) {
-               TFP_DRV_LOG(ERR,
-                           "%s: No Global Cfg DBs created\n",
+               TFP_DRV_LOG(ERR, "%s: No Global Cfg DBs created\n",
                            tf_dir_2_str(parms->dir));
                return -EINVAL;
        }
 
+       rc = tf_session_get_global_db(tfp, (void **)&global_cfg_db_ptr);
+       if (rc) {
+               TFP_DRV_LOG(INFO, "No global cfg DBs initialized\n");
+               return 0;
+       }
+
        /* Convert TF type to HCAPI type */
-       hparms.global_cfg_db = global_cfg_db[parms->dir];
+       hparms.global_cfg_db = global_cfg_db_ptr->global_cfg_db[parms->dir];
        hparms.db_index = parms->type;
        hparms.hcapi_type = &hcapi_type;
        rc = tf_global_cfg_get_hcapi_type(&hparms);
@@ -161,6 +192,7 @@ tf_global_cfg_get(struct tf *tfp,
 {
        int rc;
        struct tf_global_cfg_get_hcapi_parms hparms;
+       struct tf_global_cfg_db *global_cfg_db_ptr;
        uint16_t hcapi_type;
 
        TF_CHECK_PARMS3(tfp, parms, parms->config);
@@ -172,7 +204,14 @@ tf_global_cfg_get(struct tf *tfp,
                return -EINVAL;
        }
 
-       hparms.global_cfg_db = global_cfg_db[parms->dir];
+       rc = tf_session_get_global_db(tfp, (void **)&global_cfg_db_ptr);
+       if (rc) {
+               TFP_DRV_LOG(INFO, "No Global cfg DBs initialized\n");
+               return 0;
+       }
+
+       /* Convert TF type to HCAPI type */
+       hparms.global_cfg_db = global_cfg_db_ptr->global_cfg_db[parms->dir];
        hparms.db_index = parms->type;
        hparms.hcapi_type = &hcapi_type;
        rc = tf_global_cfg_get_hcapi_type(&hparms);