net/bnxt: modify table processing

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

diff --git a/drivers/net/bnxt/tf_core/tf_em_internal.c b/drivers/net/bnxt/tf_core/tf_em_internal.c
index 3b1e4e3..0720bb9 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_em_internal.c
+++ b/drivers/net/bnxt/tf_core/tf_em_internal.c
@@ -349,6 +349,7 @@ tf_em_int_bind(struct tf *tfp,
               struct tf_em_cfg_parms *parms)
 {
        int rc;
+       int db_rc[TF_DIR_MAX] = { 0 };
        int i;
        struct tf_rm_create_db_parms db_cfg = { 0 };
        struct tf_rm_get_alloc_info_parms iparms;
@@ -408,18 +409,18 @@ tf_em_int_bind(struct tf *tfp,
                db_cfg.rm_db = (void *)&em_db->em_db[i];
                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[i] = tf_rm_create_db_no_reservation(tfp, &db_cfg);
                else
-                       rc = tf_rm_create_db(tfp, &db_cfg);
-               if (rc) {
-                       TFP_DRV_LOG(ERR,
-                                   "%s: EM Int DB creation failed\n",
-                                   tf_dir_2_str(i));
+                       db_rc[i] = tf_rm_create_db(tfp, &db_cfg);
+       }
 
-                       return rc;
-               }
+       /* No db created */
+       if (db_rc[TF_DIR_RX] && db_rc[TF_DIR_TX]) {
+               TFP_DRV_LOG(ERR, "EM Int DB creation failed\n");
+               return db_rc[TF_DIR_RX];
        }
 
+
        if (!tf_session_is_shared_session(tfs)) {
                for (i = 0; i < TF_DIR_MAX; i++) {
                        iparms.rm_db = em_db->em_db[i];
@@ -509,9 +510,6 @@ tf_em_int_unbind(struct tf *tfp)
 
        rc = tf_session_get_db(tfp, TF_MODULE_TYPE_EM, &em_db_ptr);
        if (rc) {
-               TFP_DRV_LOG(INFO,
-                           "Em_db is not initialized, rc:%s\n",
-                           strerror(-rc));
                return 0;
        }
        em_db = (struct em_rm_db *)em_db_ptr;
@@ -545,18 +543,21 @@ tf_em_get_resc_info(struct tf *tfp,
        TF_CHECK_PARMS2(tfp, em);
 
        rc = tf_session_get_db(tfp, TF_MODULE_TYPE_EM, &em_db_ptr);
-       if (rc) {
-               TFP_DRV_LOG(INFO,
-                           "No resource allocated for em from session\n");
-               return 0;
-       }
+       if (rc == -ENOMEM)
+               return 0;  /* db does not exist */
+       else if (rc)
+               return rc; /* db error */
+
        em_db = (struct em_rm_db *)em_db_ptr;
 
-       /* check if reserved resource for WC is multiple of num_slices */
+       /* check if reserved resource for EM is multiple of num_slices */
        for (d = 0; d < TF_DIR_MAX; d++) {
                ainfo.rm_db = em_db->em_db[d];
                dinfo = em[d].info;
 
+               if (!ainfo.rm_db)
+                       continue;
+
                ainfo.info = (struct tf_rm_alloc_info *)dinfo;
                ainfo.subtype = 0;
                rc = tf_rm_get_all_info(&ainfo, TF_EM_TBL_TYPE_MAX);