diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
index 0e25207fc3..4212065b32 100644
--- a/drivers/net/bnxt/bnxt_stats.c
+++ b/drivers/net/bnxt/bnxt_stats.c
@@ -942,7 +942,7 @@ int bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev)
 	ret = bnxt_hwrm_port_clr_stats(bp);
 	if (ret != 0)
 		PMD_DRV_LOG(ERR, "Failed to reset xstats: %s\n",
-			    strerror(-ret));
+			    rte_strerror(-ret));
 
 	bnxt_clear_prev_stat(bp);
 
diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c
index 964a5aeb05..558085ec0c 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt.c
+++ b/drivers/net/bnxt/rte_pmd_bnxt.c
@@ -149,7 +149,7 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -191,7 +191,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -249,7 +249,7 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -308,7 +308,7 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -365,7 +365,7 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on)
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -409,7 +409,7 @@ int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -600,7 +600,7 @@ int rte_pmd_bnxt_get_vf_stats(uint16_t port,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -636,7 +636,7 @@ int rte_pmd_bnxt_reset_vf_stats(uint16_t port,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -670,7 +670,7 @@ int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -705,7 +705,7 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -744,7 +744,7 @@ int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -827,7 +827,7 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf,
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
@@ -871,7 +871,7 @@ int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on)
 	if (rc != 0) {
 		PMD_DRV_LOG(ERR,
 			"Error during getting device (port %u) info: %s\n",
-			port, strerror(-rc));
+			port, rte_strerror(-rc));
 
 		return rc;
 	}
diff --git a/drivers/net/bnxt/tf_core/tf_core.c b/drivers/net/bnxt/tf_core/tf_core.c
index 3a812bee3a..2c7ee09888 100644
--- a/drivers/net/bnxt/tf_core/tf_core.c
+++ b/drivers/net/bnxt/tf_core/tf_core.c
@@ -205,7 +205,7 @@ int tf_insert_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -215,7 +215,7 @@ int tf_insert_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -232,7 +232,7 @@ int tf_insert_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: EM insert failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -261,7 +261,7 @@ int tf_delete_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -271,7 +271,7 @@ int tf_delete_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -285,7 +285,7 @@ int tf_delete_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: EM delete failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -313,7 +313,7 @@ int tf_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -323,7 +323,7 @@ int tf_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -338,7 +338,7 @@ int tf_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -347,7 +347,7 @@ int tf_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Global Cfg get failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -375,7 +375,7 @@ int tf_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -385,7 +385,7 @@ int tf_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -400,7 +400,7 @@ int tf_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -409,7 +409,7 @@ int tf_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Global Cfg set failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -437,7 +437,7 @@ tf_alloc_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -447,7 +447,7 @@ tf_alloc_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -456,7 +456,7 @@ tf_alloc_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -468,7 +468,7 @@ tf_alloc_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Identifier allocation failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -497,7 +497,7 @@ tf_free_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -507,7 +507,7 @@ tf_free_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -516,7 +516,7 @@ tf_free_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -529,7 +529,7 @@ tf_free_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Identifier free failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -556,7 +556,7 @@ tf_search_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -566,7 +566,7 @@ tf_search_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -575,7 +575,7 @@ tf_search_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -589,7 +589,7 @@ tf_search_identifier(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Identifier search failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -615,7 +615,7 @@ tf_search_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -625,7 +625,7 @@ tf_search_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -634,7 +634,7 @@ tf_search_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -656,7 +656,7 @@ tf_search_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM allocation failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -688,7 +688,7 @@ tf_alloc_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -698,7 +698,7 @@ tf_alloc_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -707,7 +707,7 @@ tf_alloc_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -720,7 +720,7 @@ tf_alloc_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM allocation failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -748,7 +748,7 @@ tf_set_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -758,7 +758,7 @@ tf_set_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -768,7 +768,7 @@ tf_set_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -786,7 +786,7 @@ tf_set_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM set failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	TFP_DRV_LOG(DEBUG,
@@ -816,7 +816,7 @@ tf_get_tcam_entry(struct tf *tfp __rte_unused,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -826,7 +826,7 @@ tf_get_tcam_entry(struct tf *tfp __rte_unused,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -835,7 +835,7 @@ tf_get_tcam_entry(struct tf *tfp __rte_unused,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -853,7 +853,7 @@ tf_get_tcam_entry(struct tf *tfp __rte_unused,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM get failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	parms->key_sz_in_bits = gparms.key_size * 8;
@@ -881,7 +881,7 @@ tf_free_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -891,7 +891,7 @@ tf_free_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -900,7 +900,7 @@ tf_free_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -912,7 +912,7 @@ tf_free_tcam_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM free failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -935,7 +935,7 @@ tf_move_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -945,7 +945,7 @@ tf_move_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -954,7 +954,7 @@ tf_move_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -963,7 +963,7 @@ tf_move_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM shared entries move failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -986,7 +986,7 @@ tf_clear_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -996,7 +996,7 @@ tf_clear_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1005,7 +1005,7 @@ tf_clear_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1014,7 +1014,7 @@ tf_clear_tcam_shared_entries(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: TCAM shared entries clear failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1042,7 +1042,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1052,7 +1052,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1067,7 +1067,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Operation not supported, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return -EOPNOTSUPP;
 		}
 
@@ -1076,7 +1076,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: External table allocation failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	} else if (dev->ops->tf_dev_is_sram_managed(tfp, parms->type)) {
@@ -1085,7 +1085,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: SRAM table allocation failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	} else {
@@ -1094,7 +1094,7 @@ tf_alloc_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Table allocation failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}
@@ -1124,7 +1124,7 @@ tf_free_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1134,7 +1134,7 @@ tf_free_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1149,7 +1149,7 @@ tf_free_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Operation not supported, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return -EOPNOTSUPP;
 		}
 
@@ -1158,7 +1158,7 @@ tf_free_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Table free failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	} else if (dev->ops->tf_dev_is_sram_managed(tfp, parms->type)) {
@@ -1167,7 +1167,7 @@ tf_free_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: SRAM table free failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	} else {
@@ -1177,7 +1177,7 @@ tf_free_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Table free failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}
@@ -1204,7 +1204,7 @@ tf_set_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1214,7 +1214,7 @@ tf_set_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1231,7 +1231,7 @@ tf_set_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Operation not supported, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return -EOPNOTSUPP;
 		}
 
@@ -1240,7 +1240,7 @@ tf_set_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Table set failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}  else if (dev->ops->tf_dev_is_sram_managed(tfp, parms->type)) {
@@ -1249,7 +1249,7 @@ tf_set_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: SRAM table set failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	} else {
@@ -1258,7 +1258,7 @@ tf_set_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Operation not supported, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return -EOPNOTSUPP;
 		}
 
@@ -1267,7 +1267,7 @@ tf_set_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Table set failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}
@@ -1295,7 +1295,7 @@ tf_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1305,7 +1305,7 @@ tf_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	gparms.dir = parms->dir;
@@ -1320,7 +1320,7 @@ tf_get_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: SRAM table get failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	} else {
@@ -1329,7 +1329,7 @@ tf_get_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Operation not supported, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return -EOPNOTSUPP;
 		}
 
@@ -1338,7 +1338,7 @@ tf_get_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: Table get failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}
@@ -1366,7 +1366,7 @@ tf_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1376,7 +1376,7 @@ tf_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1393,7 +1393,7 @@ tf_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s, External table type not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 
 		return rc;
 	} else if (dev->ops->tf_dev_is_sram_managed(tfp, parms->type)) {
@@ -1402,7 +1402,7 @@ tf_bulk_get_tbl_entry(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s: SRAM table bulk get failed, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 		}
 		return rc;
 	}
@@ -1412,7 +1412,7 @@ tf_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -1421,7 +1421,7 @@ tf_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Table get bulk failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	return rc;
@@ -1442,7 +1442,7 @@ int tf_get_shared_tbl_increment(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1452,7 +1452,7 @@ int tf_get_shared_tbl_increment(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1463,7 +1463,7 @@ int tf_get_shared_tbl_increment(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -1472,7 +1472,7 @@ int tf_get_shared_tbl_increment(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Get table increment not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1494,7 +1494,7 @@ tf_alloc_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1503,7 +1503,7 @@ tf_alloc_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1532,7 +1532,7 @@ tf_map_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1541,7 +1541,7 @@ tf_map_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1571,7 +1571,7 @@ tf_free_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1580,7 +1580,7 @@ tf_free_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1612,7 +1612,7 @@ tf_set_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1622,7 +1622,7 @@ tf_set_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1631,7 +1631,7 @@ tf_set_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1646,7 +1646,7 @@ tf_set_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: If_tbl set failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1670,7 +1670,7 @@ tf_get_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1680,7 +1680,7 @@ tf_get_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1689,7 +1689,7 @@ tf_get_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1704,7 +1704,7 @@ tf_get_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: If_tbl get failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1725,7 +1725,7 @@ int tf_get_session_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1734,7 +1734,7 @@ int tf_get_session_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1744,7 +1744,7 @@ int tf_get_session_info(struct tf *tfp,
 		rc = -EOPNOTSUPP;
 		TFP_DRV_LOG(ERR,
 			    "Operation not supported, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1752,14 +1752,14 @@ int tf_get_session_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Ident get resc info failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	if (dev->ops->tf_dev_get_tbl_resc_info == NULL) {
 		rc = -EOPNOTSUPP;
 		TFP_DRV_LOG(ERR,
 			    "Operation not supported, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1767,14 +1767,14 @@ int tf_get_session_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Tbl get resc info failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	if (dev->ops->tf_dev_get_tcam_resc_info == NULL) {
 		rc = -EOPNOTSUPP;
 		TFP_DRV_LOG(ERR,
 			    "Operation not supported, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1782,14 +1782,14 @@ int tf_get_session_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "TCAM get resc info failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	if (dev->ops->tf_dev_get_em_resc_info == NULL) {
 		rc = -EOPNOTSUPP;
 		TFP_DRV_LOG(ERR,
 			    "Operation not supported, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1797,7 +1797,7 @@ int tf_get_session_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "EM get resc info failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return 0;
@@ -1861,7 +1861,7 @@ int tf_query_sram_resources(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -1870,7 +1870,7 @@ int tf_query_sram_resources(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Get SRAM resc info failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1901,7 +1901,7 @@ int tf_query_sram_resources(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EOPNOTSUPP;
 	}
 
@@ -1911,7 +1911,7 @@ int tf_query_sram_resources(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Get SRAM resc info failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1943,7 +1943,7 @@ int tf_set_sram_policy(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1952,7 +1952,7 @@ int tf_set_sram_policy(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: SRAM policy set failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1984,7 +1984,7 @@ int tf_get_sram_policy(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1993,7 +1993,7 @@ int tf_get_sram_policy(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: SRAM policy get failed, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
diff --git a/drivers/net/bnxt/tf_core/tf_em_common.c b/drivers/net/bnxt/tf_core/tf_em_common.c
index c518150d1f..162bc275b9 100644
--- a/drivers/net/bnxt/tf_core/tf_em_common.c
+++ b/drivers/net/bnxt/tf_core/tf_em_common.c
@@ -51,7 +51,7 @@ tf_create_tbl_pool_external(enum tf_dir dir,
 
 	if (tfp_calloc(&parms) != 0) {
 		TFP_DRV_LOG(ERR, "%s: TBL: external pool failure %s\n",
-			    tf_dir_2_str(dir), strerror(ENOMEM));
+			    tf_dir_2_str(dir), rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -61,7 +61,7 @@ tf_create_tbl_pool_external(enum tf_dir dir,
 
 	if (rc != 0) {
 		TFP_DRV_LOG(ERR, "%s: TBL: stack init failure %s\n",
-			    tf_dir_2_str(dir), strerror(-rc));
+			    tf_dir_2_str(dir), rte_strerror(-rc));
 		goto cleanup;
 	}
 
@@ -78,7 +78,7 @@ tf_create_tbl_pool_external(enum tf_dir dir,
 		rc = stack_push(pool, j);
 		if (rc != 0) {
 			TFP_DRV_LOG(ERR, "%s TBL: stack failure %s\n",
-				    tf_dir_2_str(dir), strerror(-rc));
+				    tf_dir_2_str(dir), rte_strerror(-rc));
 			goto cleanup;
 		}
 
@@ -93,7 +93,7 @@ tf_create_tbl_pool_external(enum tf_dir dir,
 	if (!stack_is_full(pool)) {
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR, "%s TBL: stack failure %s\n",
-			    tf_dir_2_str(dir), strerror(-rc));
+			    tf_dir_2_str(dir), rte_strerror(-rc));
 		goto cleanup;
 	}
 	return 0;
@@ -921,7 +921,7 @@ tf_em_ext_common_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "em_ext_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -980,7 +980,7 @@ tf_em_ext_common_unbind(struct tf *tfp)
 	rc = tf_session_get_session_internal(tfp, &tfs);
 	if (rc) {
 		TFP_DRV_LOG(ERR, "Failed to get tf_session, rc:%s\n",
-		strerror(-rc));
+		rte_strerror(-rc));
 		return rc;
 	}
 
@@ -989,7 +989,7 @@ tf_em_ext_common_unbind(struct tf *tfp)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -997,7 +997,7 @@ tf_em_ext_common_unbind(struct tf *tfp)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1157,7 +1157,7 @@ int tf_em_ext_map_tbl_scope(struct tf *tfp,
 		rc = -EOPNOTSUPP;
 		TFP_DRV_LOG(ERR,
 			    "Map table scope operation not supported, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1167,14 +1167,14 @@ int tf_em_ext_map_tbl_scope(struct tf *tfp,
 
 	if (tfp_calloc(&aparms) != 0) {
 		TFP_DRV_LOG(ERR, "Map tbl scope alloc data error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 	data = aparms.mem_va;
 
 	if (tfp_calloc(&aparms) != 0) {
 		TFP_DRV_LOG(ERR, "Map tbl scope alloc mask error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		rc = -ENOMEM;
 		goto clean;
 	}
@@ -1188,7 +1188,7 @@ int tf_em_ext_map_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Map table scope config failure, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		goto cleaner;
 	}
 
@@ -1203,7 +1203,7 @@ int tf_em_ext_map_tbl_scope(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Map tbl scope, set failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 cleaner:
 	tfp_free(mask);
diff --git a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
index d72ac83295..fe9c710f26 100644
--- a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
+++ b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
@@ -130,7 +130,7 @@ tf_em_hash_delete_int_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -165,7 +165,7 @@ tf_em_move_int_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
diff --git a/drivers/net/bnxt/tf_core/tf_em_host.c b/drivers/net/bnxt/tf_core/tf_em_host.c
index 9efffe4ee5..55d27b88a2 100644
--- a/drivers/net/bnxt/tf_core/tf_em_host.c
+++ b/drivers/net/bnxt/tf_core/tf_em_host.c
@@ -182,7 +182,7 @@ tf_em_alloc_page_table(struct hcapi_cfa_em_table *tbl)
 			TFP_DRV_LOG(WARNING,
 				"Failed to allocate page table: lvl: %d, rc:%s\n",
 				i,
-				strerror(-rc));
+				rte_strerror(-rc));
 			goto cleanup;
 		}
 
@@ -379,7 +379,7 @@ tf_em_ext_alloc(struct tf *tfp,
 	rc = tf_session_get_session_internal(tfp, &tfs);
 	if (rc) {
 		TFP_DRV_LOG(ERR, "Failed to get tf_session, rc:%s\n",
-		strerror(-rc));
+		rte_strerror(-rc));
 		return rc;
 	}
 
@@ -387,7 +387,7 @@ tf_em_ext_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			"Failed to get em_ext_db from session, rc:%s\n",
-			strerror(-rc));
+			rte_strerror(-rc));
 		return rc;
 	}
 	ext_db = (struct em_ext_db *)ext_ptr;
@@ -396,7 +396,7 @@ tf_em_ext_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "EEM: PF query error rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		goto cleanup;
 	}
 
@@ -420,7 +420,7 @@ tf_em_ext_alloc(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			"Failed to allocate session table scope, rc:%s\n",
-			strerror(-rc));
+			rte_strerror(-rc));
 		goto cleanup;
 	}
 
@@ -436,7 +436,7 @@ tf_em_ext_alloc(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "EEM: Unable to query for EEM capability,"
 				    " rc:%s\n",
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			goto cleanup_ts;
 		}
 	}
@@ -456,7 +456,7 @@ tf_em_ext_alloc(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "EEM: Unable to register for EEM ctx,"
 				    " rc:%s\n",
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			goto cleanup_ts;
 		}
 
@@ -473,7 +473,7 @@ tf_em_ext_alloc(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "TBL: Unable to configure EEM in firmware"
 				    " rc:%s\n",
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			goto cleanup_full;
 		}
 
@@ -485,7 +485,7 @@ tf_em_ext_alloc(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "EEM: Unable to enable EEM in firmware"
 				    " rc:%s\n",
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			goto cleanup_full;
 		}
 
@@ -501,7 +501,7 @@ tf_em_ext_alloc(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "%s TBL: Unable to allocate idx pools %s\n",
 				    tf_dir_2_str(dir),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			goto cleanup_full;
 		}
 	}
@@ -547,7 +547,7 @@ tf_em_ext_free(struct tf *tfp,
 	rc = tf_session_get_session_internal(tfp, &tfs);
 	if (rc) {
 		TFP_DRV_LOG(ERR, "Failed to get tf_session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EINVAL;
 	}
 
@@ -555,7 +555,7 @@ tf_em_ext_free(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			"Failed to get em_ext_db from session, rc:%s\n",
-			strerror(-rc));
+			rte_strerror(-rc));
 		return rc;
 	}
 	ext_db = (struct em_ext_db *)ext_ptr;
diff --git a/drivers/net/bnxt/tf_core/tf_em_internal.c b/drivers/net/bnxt/tf_core/tf_em_internal.c
index 46de63a9da..21cf19c45e 100644
--- a/drivers/net/bnxt/tf_core/tf_em_internal.c
+++ b/drivers/net/bnxt/tf_core/tf_em_internal.c
@@ -49,7 +49,7 @@ tf_em_insert_int_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -113,7 +113,7 @@ tf_em_delete_int_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -153,7 +153,7 @@ tf_em_move_callback(void *user_data,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(parms.dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -163,7 +163,7 @@ tf_em_move_callback(void *user_data,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(parms.dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -202,7 +202,7 @@ tf_em_int_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "em_rm_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -232,7 +232,7 @@ tf_em_int_bind(struct tf *tfp,
 				    "%s, EM Allocation must be in blocks of %d, failure %s\n",
 				    tf_dir_2_str(i),
 				    TF_SESSION_EM_ENTRY_SIZE,
-				    strerror(-rc));
+				    rte_strerror(-rc));
 
 			return rc;
 		}
@@ -278,7 +278,7 @@ tf_em_int_bind(struct tf *tfp,
 				TFP_DRV_LOG(ERR,
 					 "%s, EM stack allocation failure %s\n",
 					 tf_dir_2_str(i),
-					 strerror(-rc));
+					 rte_strerror(-rc));
 				return rc;
 			}
 
diff --git a/drivers/net/bnxt/tf_core/tf_global_cfg.c b/drivers/net/bnxt/tf_core/tf_global_cfg.c
index 3a8030a2fb..ba748fdc23 100644
--- a/drivers/net/bnxt/tf_core/tf_global_cfg.c
+++ b/drivers/net/bnxt/tf_core/tf_global_cfg.c
@@ -83,7 +83,7 @@ tf_global_cfg_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "global_rm_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -141,7 +141,7 @@ tf_global_cfg_set(struct tf *tfp,
 			    "%s, Failed type lookup, type:%d, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    parms->type,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -151,7 +151,7 @@ tf_global_cfg_set(struct tf *tfp,
 			    "%s, Set failed, type:%d, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    parms->type,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return 0;
@@ -185,7 +185,7 @@ tf_global_cfg_get(struct tf *tfp,
 			    "%s, Failed type lookup, type:%d, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    parms->type,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -196,7 +196,7 @@ tf_global_cfg_get(struct tf *tfp,
 			    "%s, Get failed, type:%d, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    parms->type,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return 0;
diff --git a/drivers/net/bnxt/tf_core/tf_identifier.c b/drivers/net/bnxt/tf_core/tf_identifier.c
index 7d9d9595dd..21e60a8ad5 100644
--- a/drivers/net/bnxt/tf_core/tf_identifier.c
+++ b/drivers/net/bnxt/tf_core/tf_identifier.c
@@ -39,7 +39,7 @@ tf_ident_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "ident_rm_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -124,7 +124,7 @@ tf_ident_alloc(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get ident_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	ident_db = (struct ident_rm_db *)ident_db_ptr;
@@ -164,7 +164,7 @@ tf_ident_free(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get ident_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	ident_db = (struct ident_rm_db *)ident_db_ptr;
@@ -222,7 +222,7 @@ tf_ident_search(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get ident_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	ident_db = (struct ident_rm_db *)ident_db_ptr;
diff --git a/drivers/net/bnxt/tf_core/tf_if_tbl.c b/drivers/net/bnxt/tf_core/tf_if_tbl.c
index 578d361417..4d85b77b4e 100644
--- a/drivers/net/bnxt/tf_core/tf_if_tbl.c
+++ b/drivers/net/bnxt/tf_core/tf_if_tbl.c
@@ -65,7 +65,7 @@ tf_if_tbl_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "if_tbl_rm_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -143,7 +143,7 @@ tf_if_tbl_set(struct tf *tfp,
 			    "%s, If Tbl set failed, type:%d, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    parms->type,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return 0;
@@ -187,7 +187,7 @@ tf_if_tbl_get(struct tf *tfp,
 			    "%s, If Tbl get failed, type:%d, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    parms->type,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return 0;
diff --git a/drivers/net/bnxt/tf_core/tf_msg.c b/drivers/net/bnxt/tf_core/tf_msg.c
index 1c66c7e01a..5e180813d8 100644
--- a/drivers/net/bnxt/tf_core/tf_msg.c
+++ b/drivers/net/bnxt/tf_core/tf_msg.c
@@ -216,7 +216,7 @@ tf_msg_session_client_register(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -224,7 +224,7 @@ tf_msg_session_client_register(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Unable to lookup FW id, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -291,7 +291,7 @@ tf_msg_session_client_unregister(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -299,7 +299,7 @@ tf_msg_session_client_unregister(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Unable to lookup FW id, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -361,7 +361,7 @@ tf_msg_session_qcfg(struct tf *tfp)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -370,7 +370,7 @@ tf_msg_session_qcfg(struct tf *tfp)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -378,7 +378,7 @@ tf_msg_session_qcfg(struct tf *tfp)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Unable to lookup FW id, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -447,7 +447,7 @@ tf_msg_session_resc_qcaps(struct tf *tfp,
 		TFP_DRV_LOG(WARNING,
 			    "%s: QCAPS message size error, rc:%s, request %d vs response %d\n",
 			    tf_dir_2_str(dir),
-			    strerror(EINVAL),
+			    rte_strerror(EINVAL),
 			    size,
 			    resp.size);
 	}
@@ -498,7 +498,7 @@ tf_msg_session_resc_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -509,7 +509,7 @@ tf_msg_session_resc_alloc(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -559,7 +559,7 @@ tf_msg_session_resc_alloc(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Alloc message size error, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(EINVAL));
+			    rte_strerror(EINVAL));
 		rc = -EINVAL;
 		goto cleanup;
 	}
@@ -605,7 +605,7 @@ tf_msg_session_resc_info(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -616,7 +616,7 @@ tf_msg_session_resc_info(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -666,7 +666,7 @@ tf_msg_session_resc_info(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Alloc message size error, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(EINVAL));
+			    rte_strerror(EINVAL));
 		rc = -EINVAL;
 		goto cleanup;
 	}
@@ -712,7 +712,7 @@ tf_msg_session_resc_flush(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -722,7 +722,7 @@ tf_msg_session_resc_flush(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -731,7 +731,7 @@ tf_msg_session_resc_flush(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -797,7 +797,7 @@ tf_msg_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -807,7 +807,7 @@ tf_msg_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -816,7 +816,7 @@ tf_msg_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -830,7 +830,7 @@ tf_msg_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Invalid parameters for msg type, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -893,7 +893,7 @@ tf_msg_hash_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -903,7 +903,7 @@ tf_msg_hash_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -912,7 +912,7 @@ tf_msg_hash_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -927,7 +927,7 @@ tf_msg_hash_insert_em_internal_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Record size to large, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -982,7 +982,7 @@ tf_msg_delete_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -992,7 +992,7 @@ tf_msg_delete_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1001,7 +1001,7 @@ tf_msg_delete_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1050,7 +1050,7 @@ tf_msg_move_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1060,7 +1060,7 @@ tf_msg_move_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1069,7 +1069,7 @@ tf_msg_move_em_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(em_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1120,7 +1120,7 @@ int tf_msg_ext_em_ctxt_mem_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1129,7 +1129,7 @@ int tf_msg_ext_em_ctxt_mem_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	/* Retrieve the session information */
@@ -1149,7 +1149,7 @@ int tf_msg_ext_em_ctxt_mem_alloc(struct tf *tfp,
 		rc = tfp_send_msg_direct(tf_session_get_bp(tfp), &parms);
 		if (rc) {
 			TFP_DRV_LOG(ERR, "Failed ext_em_alloc error rc:%s\n",
-				strerror(-rc));
+				rte_strerror(-rc));
 			return rc;
 		}
 
@@ -1180,7 +1180,7 @@ int tf_msg_ext_em_ctxt_mem_free(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1189,7 +1189,7 @@ int tf_msg_ext_em_ctxt_mem_free(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	/* Retrieve the session information */
@@ -1231,7 +1231,7 @@ tf_msg_em_mem_rgtr(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1240,7 +1240,7 @@ tf_msg_em_mem_rgtr(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	fw_se_id = tfs->session_id.internal.fw_session_id;
@@ -1284,7 +1284,7 @@ tf_msg_em_mem_unrgtr(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1293,7 +1293,7 @@ tf_msg_em_mem_unrgtr(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1334,7 +1334,7 @@ tf_msg_em_qcaps(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	fw_se_id = tfs->session_id.internal.fw_session_id;
@@ -1345,7 +1345,7 @@ tf_msg_em_qcaps(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1401,7 +1401,7 @@ tf_msg_em_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1411,7 +1411,7 @@ tf_msg_em_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1465,7 +1465,7 @@ tf_msg_ext_em_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1475,7 +1475,7 @@ tf_msg_ext_em_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	fw_se_id = tfs->session_id.internal.fw_session_id;
@@ -1534,7 +1534,7 @@ tf_msg_em_op(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1544,7 +1544,7 @@ tf_msg_em_op(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1585,7 +1585,7 @@ tf_msg_tcam_entry_set(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1594,7 +1594,7 @@ tf_msg_tcam_entry_set(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1664,7 +1664,7 @@ tf_msg_tcam_entry_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1673,7 +1673,7 @@ tf_msg_tcam_entry_get(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1705,7 +1705,7 @@ tf_msg_tcam_entry_get(struct tf *tfp,
 			    tf_dir_2_str(parms->dir),
 			    parms->key_size,
 			    resp.key_size,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	parms->key_size = resp.key_size;
@@ -1734,7 +1734,7 @@ tf_msg_tcam_entry_free(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1743,7 +1743,7 @@ tf_msg_tcam_entry_free(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(in_parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1793,7 +1793,7 @@ tf_msg_set_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1803,7 +1803,7 @@ tf_msg_set_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1812,7 +1812,7 @@ tf_msg_set_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1877,7 +1877,7 @@ tf_msg_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1887,7 +1887,7 @@ tf_msg_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1896,7 +1896,7 @@ tf_msg_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	flags = (dir == TF_DIR_TX ?
@@ -1964,7 +1964,7 @@ tf_msg_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1974,7 +1974,7 @@ tf_msg_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1983,7 +1983,7 @@ tf_msg_get_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2043,7 +2043,7 @@ tf_msg_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2053,7 +2053,7 @@ tf_msg_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2062,7 +2062,7 @@ tf_msg_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2082,7 +2082,7 @@ tf_msg_set_global_cfg(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Invalid parameters for msg type, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2140,7 +2140,7 @@ tf_msg_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2150,7 +2150,7 @@ tf_msg_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2159,7 +2159,7 @@ tf_msg_bulk_get_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Unable to lookup FW id, rc:%s\n",
 			    tf_dir_2_str(dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	flags = (dir == TF_DIR_TX ?
@@ -2217,7 +2217,7 @@ tf_msg_get_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2227,7 +2227,7 @@ tf_msg_get_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup device, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2278,7 +2278,7 @@ tf_msg_set_if_tbl_entry(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Failed to lookup session, rc:%s\n",
 			    tf_dir_2_str(params->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2366,7 +2366,7 @@ tf_msg_session_set_hotup_state(struct tf *tfp, uint16_t state)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2375,7 +2375,7 @@ tf_msg_session_set_hotup_state(struct tf *tfp, uint16_t state)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2383,7 +2383,7 @@ tf_msg_session_set_hotup_state(struct tf *tfp, uint16_t state)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Unable to lookup FW id, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2421,7 +2421,7 @@ tf_msg_session_get_hotup_state(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2430,7 +2430,7 @@ tf_msg_session_get_hotup_state(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup device, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -2438,7 +2438,7 @@ tf_msg_session_get_hotup_state(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Unable to lookup FW id, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
diff --git a/drivers/net/bnxt/tf_core/tf_rm.c b/drivers/net/bnxt/tf_core/tf_rm.c
index 9b85f5397d..05d05befaa 100644
--- a/drivers/net/bnxt/tf_core/tf_rm.c
+++ b/drivers/net/bnxt/tf_core/tf_rm.c
@@ -1059,7 +1059,7 @@ tf_rm_get_pool(struct tf_rm_new_db *rm_db,
 			    "%s: Invalid pool for this type:%d, rc:%s\n",
 			    tf_dir_2_str(rm_db->dir),
 			    tmp_subtype,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	*new_subtype = tmp_subtype;
@@ -1106,7 +1106,7 @@ tf_rm_allocate(struct tf_rm_allocate_parms *parms)
 		TFP_DRV_LOG(ERR,
 			    "%s: Allocation failed, rc:%s\n",
 			    tf_dir_2_str(rm_db->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1120,7 +1120,7 @@ tf_rm_allocate(struct tf_rm_allocate_parms *parms)
 		TFP_DRV_LOG(ERR,
 			    "%s: Alloc adjust of base index failed, rc:%s\n",
 			    tf_dir_2_str(rm_db->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return -EINVAL;
 	}
 
diff --git a/drivers/net/bnxt/tf_core/tf_session.c b/drivers/net/bnxt/tf_core/tf_session.c
index 253d716572..a1f9848aed 100644
--- a/drivers/net/bnxt/tf_core/tf_session.c
+++ b/drivers/net/bnxt/tf_core/tf_session.c
@@ -78,11 +78,11 @@ tf_session_create(struct tf *tfp,
 		if (rc == -EEXIST)
 			TFP_DRV_LOG(ERR,
 				    "Session is already open, rc:%s\n",
-				    strerror(-rc));
+				    rte_strerror(-rc));
 		else
 			TFP_DRV_LOG(ERR,
 				    "Open message send failed, rc:%s\n",
-				    strerror(-rc));
+				    rte_strerror(-rc));
 
 		parms->open_cfg->session_id.id = TF_FW_SESSION_ID_INVALID;
 		return rc;
@@ -97,7 +97,7 @@ tf_session_create(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Failed to allocate session info, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		goto cleanup;
 	}
 	tfp->session = (struct tf_session_info *)cparms.mem_va;
@@ -111,7 +111,7 @@ tf_session_create(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Failed to allocate session data, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		goto cleanup;
 	}
 	tfp->session->core_data = cparms.mem_va;
@@ -154,7 +154,7 @@ tf_session_create(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Failed to allocate session client, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		goto cleanup;
 	}
 	client = cparms.mem_va;
@@ -226,7 +226,7 @@ tf_session_create(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "FW Session close failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 	if (tfp->session) {
 		tfp_free(tfp->session->core_data);
@@ -268,7 +268,7 @@ tf_session_client_create(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -289,7 +289,7 @@ tf_session_client_create(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to create client on session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -303,7 +303,7 @@ tf_session_client_create(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to allocate session client, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		goto cleanup;
 	}
 	client = cparms.mem_va;
@@ -320,7 +320,7 @@ tf_session_client_create(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Session Firmware id lookup failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -373,7 +373,7 @@ tf_session_client_destroy(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to lookup session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -405,7 +405,7 @@ tf_session_client_destroy(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Client destroy on FW Failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	ll_delete(&tfs->client_ll, &client->ll_entry);
@@ -435,7 +435,7 @@ tf_session_open_session(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "Failed to create session, ctrl_chan_name:%s, rc:%s\n",
 				    parms->open_cfg->ctrl_chan_name,
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 
@@ -457,7 +457,7 @@ tf_session_open_session(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 			      "Failed to create client on session 0x%x, rc:%s\n",
 			      parms->open_cfg->session_id.id,
-			      strerror(-rc));
+			      rte_strerror(-rc));
 			return rc;
 		}
 
@@ -480,7 +480,7 @@ tf_session_attach_session(struct tf *tfp __rte_unused,
 
 	TFP_DRV_LOG(ERR,
 		    "Attach not yet supported, rc:%s\n",
-		    strerror(-rc));
+		    rte_strerror(-rc));
 	return rc;
 }
 
@@ -503,7 +503,7 @@ tf_session_close_session(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Session lookup failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -511,7 +511,7 @@ tf_session_close_session(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Invalid session id, unable to close, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -531,7 +531,7 @@ tf_session_close_session(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Client not part of the session, unable to close, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -556,7 +556,7 @@ tf_session_close_session(struct tf *tfp,
 			TFP_DRV_LOG(ERR,
 				    "Failed to unregister Client %d, rc:%s\n",
 				    client->session_client_id.id,
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 
@@ -576,7 +576,7 @@ tf_session_close_session(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Device lookup failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -586,7 +586,7 @@ tf_session_close_session(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Unable to lookup FW id, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -596,7 +596,7 @@ tf_session_close_session(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Device unbind failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	rc = tf_msg_session_close(tfp, fw_session_id, mailbox);
@@ -604,7 +604,7 @@ tf_session_close_session(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "FW Session close failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	/* Final cleanup as we're last user of the session thus we
@@ -658,7 +658,7 @@ tf_session_get_session_internal(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Session not created, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -689,7 +689,7 @@ tf_session_get_session(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Internal FID lookup\n, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -698,7 +698,7 @@ tf_session_get_session(struct tf *tfp,
 		TFP_DRV_LOG
 			(ERR,
 			"Ctrl channel not registered with session\n, rc:%s\n",
-			strerror(-rc));
+			rte_strerror(-rc));
 		return -EINVAL;
 	}
 
@@ -810,7 +810,7 @@ tf_session_get_fw_session_id(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Session not created, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -818,7 +818,7 @@ tf_session_get_fw_session_id(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Invalid Argument(s), rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -842,7 +842,7 @@ tf_session_get_session_id(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Session not created, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -850,7 +850,7 @@ tf_session_get_session_id(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Invalid Argument(s), rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1152,7 +1152,7 @@ tf_session_set_hotup_state(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Session lookup failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1160,7 +1160,7 @@ tf_session_set_hotup_state(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Only shared session able to set state, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1169,7 +1169,7 @@ tf_session_set_hotup_state(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Set session hot upgrade state failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return rc;
@@ -1186,7 +1186,7 @@ tf_session_get_hotup_state(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Session lookup failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1194,7 +1194,7 @@ tf_session_get_hotup_state(struct tf *tfp,
 		rc = -EINVAL;
 		TFP_DRV_LOG(ERR,
 			    "Only shared session able to get state, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -1203,7 +1203,7 @@ tf_session_get_hotup_state(struct tf *tfp,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Get session hot upgrade state failed, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return rc;
diff --git a/drivers/net/bnxt/tf_core/tf_sram_mgr.c b/drivers/net/bnxt/tf_core/tf_sram_mgr.c
index 87e8882fed..afbc3a3e46 100644
--- a/drivers/net/bnxt/tf_core/tf_sram_mgr.c
+++ b/drivers/net/bnxt/tf_core/tf_sram_mgr.c
@@ -494,7 +494,7 @@ static struct tf_sram_block
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Failed to allocate block, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return NULL;
 	}
 	block = (struct tf_sram_block *)cparms.mem_va;
@@ -588,7 +588,7 @@ tf_sram_mgr_bind(void **sram_handle)
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "Failed to allocate SRAM mgmt data, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	sram = (struct tf_sram *)cparms.mem_va;
@@ -628,7 +628,7 @@ tf_sram_mgr_unbind(void *sram_handle)
 					/* Log error */
 					TFP_DRV_LOG(ERR,
 						  "No SRAM slice list, rc:%s\n",
-						  strerror(-rc));
+						  rte_strerror(-rc));
 					return rc;
 				}
 				if (tf_sram_get_block_cnt(slice_list))
@@ -670,7 +670,7 @@ int tf_sram_mgr_alloc(void *sram_handle,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "No SRAM slice list, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -759,7 +759,7 @@ tf_sram_mgr_free(void *sram_handle,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "No SRAM slice list, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -781,7 +781,7 @@ tf_sram_mgr_free(void *sram_handle,
 	rc = tf_sram_free_slice(parms->slice_size, slice_offset,
 				block, &block_is_empty);
 	if (rc) {
-		TFP_DRV_LOG(ERR, "Error freeing slice (%s)\n", strerror(-rc));
+		TFP_DRV_LOG(ERR, "Error freeing slice (%s)\n", rte_strerror(-rc));
 		return rc;
 	}
 #if (STATS_CLEAR_ON_READ_SUPPORT == 0)
@@ -805,7 +805,7 @@ tf_sram_mgr_free(void *sram_handle,
 				    "%s, Failed type lookup, type:%s, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
 				    tf_tbl_type_2_str(parms->tbl_type),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 		/* Clear the counter
@@ -821,7 +821,7 @@ tf_sram_mgr_free(void *sram_handle,
 				    "%s, Set failed, type:%s, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
 				    tf_tbl_type_2_str(parms->tbl_type),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}
@@ -836,14 +836,14 @@ tf_sram_mgr_free(void *sram_handle,
 
 		if (rc) {
 			TFP_DRV_LOG(ERR, "Free block_id(%d) failed error(%s)\n",
-				    block_id, strerror(-rc));
+				    block_id, rte_strerror(-rc));
 		}
 		fparms.index = block_id + 1;
 		rc = tf_rm_free(&fparms);
 
 		if (rc) {
 			TFP_DRV_LOG(ERR, "Free next block_id(%d) failed error(%s)\n",
-				    block_id + 1, strerror(-rc));
+				    block_id + 1, rte_strerror(-rc));
 		}
 		/* Free local entry regardless */
 		tf_sram_free_block(slice_list, block);
@@ -937,7 +937,7 @@ int tf_sram_mgr_is_allocated(void *sram_handle,
 		/* Log error */
 		TFP_DRV_LOG(ERR,
 			    "No SRAM slice list, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
diff --git a/drivers/net/bnxt/tf_core/tf_tbl.c b/drivers/net/bnxt/tf_core/tf_tbl.c
index f5f3889934..0fbcba6c76 100644
--- a/drivers/net/bnxt/tf_core/tf_tbl.c
+++ b/drivers/net/bnxt/tf_core/tf_tbl.c
@@ -45,7 +45,7 @@ tf_tbl_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "tbl_rm_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -143,7 +143,7 @@ tf_tbl_alloc(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get tbl_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -195,7 +195,7 @@ tf_tbl_free(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -234,7 +234,7 @@ tf_tbl_free(struct tf *tfp __rte_unused,
 				    "%s, Failed type lookup, type:%s, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
 				    tf_tbl_type_2_str(parms->type),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 		/* Clear the counter
@@ -250,7 +250,7 @@ tf_tbl_free(struct tf *tfp __rte_unused,
 				    "%s, Set failed, type:%s, rc:%s\n",
 				    tf_dir_2_str(parms->dir),
 				    tf_tbl_type_2_str(parms->type),
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			return rc;
 		}
 	}
@@ -302,7 +302,7 @@ tf_tbl_set(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -341,7 +341,7 @@ tf_tbl_set(struct tf *tfp,
 			    "%s, Failed type lookup, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -356,7 +356,7 @@ tf_tbl_set(struct tf *tfp,
 			    "%s, Set failed, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -393,7 +393,7 @@ tf_tbl_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -432,7 +432,7 @@ tf_tbl_get(struct tf *tfp,
 			    "%s, Failed type lookup, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -449,7 +449,7 @@ tf_tbl_get(struct tf *tfp,
 			    "%s, Get failed, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -485,7 +485,7 @@ tf_tbl_bulk_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -517,7 +517,7 @@ tf_tbl_bulk_get(struct tf *tfp,
 			    "%s, Failed type lookup, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -535,7 +535,7 @@ tf_tbl_bulk_get(struct tf *tfp,
 			    "%s, Bulk get failed, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 
 	return rc;
diff --git a/drivers/net/bnxt/tf_core/tf_tbl_sram.c b/drivers/net/bnxt/tf_core/tf_tbl_sram.c
index 3a6f1c68c7..39dbe11610 100644
--- a/drivers/net/bnxt/tf_core/tf_tbl_sram.c
+++ b/drivers/net/bnxt/tf_core/tf_tbl_sram.c
@@ -114,7 +114,7 @@ static int tf_tbl_sram_get_info(struct tf_tbl_sram_get_info_parms *parms)
 			    "%s: Failed to get hcapi_type %s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->tbl_type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	parms->bank_id = tf_tbl_sram_hcapi_2_bank[hcapi_type];
@@ -129,7 +129,7 @@ static int tf_tbl_sram_get_info(struct tf_tbl_sram_get_info_parms *parms)
 			    "%s: Failed to get slice cnt %s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->tbl_type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	if (slices)
@@ -168,7 +168,7 @@ tf_tbl_sram_unbind(struct tf *tfp __rte_unused)
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get sram_handle from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	if (sram_handle)
@@ -204,7 +204,7 @@ tf_tbl_sram_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get tbl_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -214,7 +214,7 @@ tf_tbl_sram_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get sram_handle from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -290,7 +290,7 @@ tf_tbl_sram_free(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -299,7 +299,7 @@ tf_tbl_sram_free(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get sram_handle from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -345,7 +345,7 @@ tf_tbl_sram_free(struct tf *tfp __rte_unused,
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
 			    parms->idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		rc = -ENOMEM;
 		return rc;
 	}
@@ -417,7 +417,7 @@ tf_tbl_sram_set(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -426,7 +426,7 @@ tf_tbl_sram_set(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get sram_handle from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -489,7 +489,7 @@ tf_tbl_sram_set(struct tf *tfp,
 				    tf_dir_2_str(parms->dir),
 				    tf_tbl_type_2_str(parms->type),
 				    parms->idx,
-				    strerror(-rc));
+				    rte_strerror(-rc));
 			rc = -ENOMEM;
 			return rc;
 		}
@@ -504,7 +504,7 @@ tf_tbl_sram_set(struct tf *tfp,
 			    "%s, Failed type lookup, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -519,7 +519,7 @@ tf_tbl_sram_set(struct tf *tfp,
 			    "%s, Set failed, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	return rc;
@@ -553,7 +553,7 @@ tf_tbl_sram_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -562,7 +562,7 @@ tf_tbl_sram_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get sram_handle from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -592,7 +592,7 @@ tf_tbl_sram_get(struct tf *tfp,
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
 			    parms->idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		rc = -ENOMEM;
 		return rc;
 	}
@@ -607,7 +607,7 @@ tf_tbl_sram_get(struct tf *tfp,
 			    "%s, Failed type lookup, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	if (parms->type == TF_TBL_TYPE_ACT_STATS_64)
@@ -626,7 +626,7 @@ tf_tbl_sram_get(struct tf *tfp,
 			    "%s, Get failed, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	return rc;
@@ -661,7 +661,7 @@ tf_tbl_sram_bulk_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tbl_db = (struct tbl_rm_db *)tbl_db_ptr;
@@ -670,7 +670,7 @@ tf_tbl_sram_bulk_get(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get sram_handle from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -703,7 +703,7 @@ tf_tbl_sram_bulk_get(struct tf *tfp,
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
 			    parms->starting_idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		rc = -ENOMEM;
 		return rc;
 	}
@@ -716,7 +716,7 @@ tf_tbl_sram_bulk_get(struct tf *tfp,
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
 			    idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		rc = -ENOMEM;
 		return rc;
 	}
@@ -730,7 +730,7 @@ tf_tbl_sram_bulk_get(struct tf *tfp,
 			    "%s, Failed type lookup, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -751,7 +751,7 @@ tf_tbl_sram_bulk_get(struct tf *tfp,
 			    "%s, Bulk get failed, type:%s, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
 			    tf_tbl_type_2_str(parms->type),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 	}
 	return rc;
 }
diff --git a/drivers/net/bnxt/tf_core/tf_tcam.c b/drivers/net/bnxt/tf_core/tf_tcam.c
index 9e0671d47b..5924c5e6c1 100644
--- a/drivers/net/bnxt/tf_core/tf_tcam.c
+++ b/drivers/net/bnxt/tf_core/tf_tcam.c
@@ -57,7 +57,7 @@ tf_tcam_bind(struct tf *tfp,
 		rc = -EOPNOTSUPP;
 		TFP_DRV_LOG(ERR,
 			    "Operation not supported, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -91,7 +91,7 @@ tf_tcam_bind(struct tf *tfp,
 	cparms.alignment = 0;
 	if (tfp_calloc(&cparms) != 0) {
 		TFP_DRV_LOG(ERR, "tcam_rm_db alloc error %s\n",
-			    strerror(ENOMEM));
+			    rte_strerror(ENOMEM));
 		return -ENOMEM;
 	}
 
@@ -301,7 +301,7 @@ tf_tcam_alloc(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -320,7 +320,7 @@ tf_tcam_alloc(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get tcam_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tcam_db = (struct tcam_rm_db *)tcam_db_ptr;
@@ -385,7 +385,7 @@ tf_tcam_free(struct tf *tfp,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -417,7 +417,7 @@ tf_tcam_free(struct tf *tfp,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tcam_db = (struct tcam_rm_db *)tcam_db_ptr;
@@ -477,7 +477,7 @@ tf_tcam_free(struct tf *tfp,
 			    tf_dir_2_str(parms->dir),
 			    tf_tcam_tbl_2_str(parms->type),
 			    parms->idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -515,7 +515,7 @@ tf_tcam_set(struct tf *tfp __rte_unused,
 		TFP_DRV_LOG(ERR,
 			    "%s: Operation not supported, rc:%s\n",
 			    tf_dir_2_str(parms->dir),
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
@@ -535,7 +535,7 @@ tf_tcam_set(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tcam_db = (struct tcam_rm_db *)tcam_db_ptr;
@@ -579,7 +579,7 @@ tf_tcam_set(struct tf *tfp __rte_unused,
 			    tf_dir_2_str(parms->dir),
 			    tf_tcam_tbl_2_str(parms->type),
 			    parms->idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	return 0;
@@ -618,7 +618,7 @@ tf_tcam_get(struct tf *tfp __rte_unused,
 	if (rc) {
 		TFP_DRV_LOG(ERR,
 			    "Failed to get em_ext_db from session, rc:%s\n",
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 	tcam_db = (struct tcam_rm_db *)tcam_db_ptr;
@@ -662,7 +662,7 @@ tf_tcam_get(struct tf *tfp __rte_unused,
 			    tf_dir_2_str(parms->dir),
 			    tf_tcam_tbl_2_str(parms->type),
 			    parms->idx,
-			    strerror(-rc));
+			    rte_strerror(-rc));
 		return rc;
 	}
 
