net/bnxt: modify resource reservation strategy

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

diff --git a/drivers/net/bnxt/tf_core/tf_tbl.c b/drivers/net/bnxt/tf_core/tf_tbl.c
index 17fb550..1921151 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_tbl.c
+++ b/drivers/net/bnxt/tf_core/tf_tbl.c
@@ -41,6 +41,7 @@ tf_tbl_bind(struct tf *tfp,
            struct tf_tbl_cfg_parms *parms)
 {
        int rc, d, i;
+       int db_rc[TF_DIR_MAX] = { 0 };
        struct tf_rm_create_db_parms db_cfg = { 0 };
        struct tbl_rm_db *tbl_db;
        struct tfp_calloc_parms cparms;
@@ -79,18 +80,21 @@ tf_tbl_bind(struct tf *tfp,
                db_cfg.rm_db = (void *)&tbl_db->tbl_db[d];
                if (tf_session_is_shared_session(tfs) &&
                        (!tf_session_is_shared_session_creator(tfs)))
-                       rc = tf_rm_create_db_no_reservation(tfp, &db_cfg);
+                       db_rc[d] = tf_rm_create_db_no_reservation(tfp, &db_cfg);
                else
-                       rc = tf_rm_create_db(tfp, &db_cfg);
-               if (rc) {
+                       db_rc[d] = tf_rm_create_db(tfp, &db_cfg);
+               if (db_rc[d]) {
                        TFP_DRV_LOG(ERR,
                                    "%s: Table DB creation failed\n",
                                    tf_dir_2_str(d));
 
-                       return rc;
                }
        }
 
+       /* No db created */
+       if (db_rc[TF_DIR_RX] && db_rc[TF_DIR_TX])
+               return db_rc[TF_DIR_RX];
+
        TFP_DRV_LOG(INFO,
                    "Table Type - initialized\n");
 
@@ -109,14 +113,16 @@ tf_tbl_unbind(struct tf *tfp)
 
        rc = tf_session_get_db(tfp, TF_MODULE_TYPE_TABLE, &tbl_db_ptr);
        if (rc) {
-               TFP_DRV_LOG(ERR,
-                           "Failed to get em_ext_db from session, rc:%s\n",
+               TFP_DRV_LOG(INFO,
+                           "Tbl_db is not initialized, rc:%s\n",
                            strerror(-rc));
-               return rc;
+               return 0;
        }
        tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
 
        for (i = 0; i < TF_DIR_MAX; i++) {
+               if (tbl_db->tbl_db[i] == NULL)
+                       continue;
                fparms.dir = i;
                fparms.rm_db = tbl_db->tbl_db[i];
                rc = tf_rm_free_db(tfp, &fparms);
@@ -621,23 +627,36 @@ tf_tbl_get_resc_info(struct tf *tfp,
                     struct tf_tbl_resource_info *tbl)
 {
        int rc;
-       int d;
+       int d, i;
        struct tf_resource_info *dinfo;
        struct tf_rm_get_alloc_info_parms ainfo;
        void *tbl_db_ptr = NULL;
        struct tbl_rm_db *tbl_db;
+       uint16_t base = 0, shift = 0;
+       struct tf_dev_info *dev;
+       struct tf_session *tfs;
 
        TF_CHECK_PARMS2(tfp, tbl);
 
+       /* Retrieve the session information */
+       rc = tf_session_get_session_internal(tfp, &tfs);
+       if (rc)
+               return rc;
+
+       /* Retrieve the device information */
+       rc = tf_session_get_device(tfs, &dev);
+       if (rc)
+               return rc;
+
        rc = tf_session_get_db(tfp, TF_MODULE_TYPE_TABLE, &tbl_db_ptr);
        if (rc) {
-               TFP_DRV_LOG(ERR,
-                           "Failed to get em_ext_db from session, rc:%s\n",
-                           strerror(-rc));
-               return rc;
+               TFP_DRV_LOG(INFO,
+                           "No resource allocated for table from session\n");
+               return 0;
        }
        tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
 
+
        /* check if reserved resource for WC is multiple of num_slices */
        for (d = 0; d < TF_DIR_MAX; d++) {
                ainfo.rm_db = tbl_db->tbl_db[d];
@@ -648,7 +667,33 @@ tf_tbl_get_resc_info(struct tf *tfp,
                rc = tf_rm_get_all_info(&ainfo, TF_TBL_TYPE_MAX);
                if (rc)
                        return rc;
+
+               if (dev->ops->tf_dev_get_tbl_info) {
+                       /* Adjust all */
+                       for (i = 0; i < TF_TBL_TYPE_MAX; i++) {
+                               /* Only get table info if required for the device */
+                               rc = dev->ops->tf_dev_get_tbl_info(tfp,
+                                                                  tbl_db->tbl_db[d],
+                                                                  i,
+                                                                  &base,
+                                                                  &shift);
+                               if (rc) {
+                                       TFP_DRV_LOG(ERR,
+                                                   "%s: Failed to get table info:%d\n",
+                                                   tf_dir_2_str(d),
+                                                   i);
+                                       return rc;
+                               }
+                               if (dinfo[i].stride)
+                                       TF_TBL_RM_TO_PTR(&dinfo[i].start,
+                                                        dinfo[i].start,
+                                                        base,
+                                                        shift);
+                       }
+               }
        }
 
+
+
        return 0;
 }