* |WARNING| pw126405-126414 [PATCH] [v2, 11/11] net/bnxt: Avoid submitting hwrm rss request when rss mode disabled
@ 2023-04-21 19:30 dpdklab
0 siblings, 0 replies; only message in thread
From: dpdklab @ 2023-04-21 19:30 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/126405
_apply patch failure_
Submitter: Randy Schacher <stuart.schacher@broadcom.com>
Date: Friday, April 21 2023 18:11:55
Applied on: CommitID:5f34cc454df420b9b2da8deb949fb76cba058b87
Apply patch set 126405-126414 failed:
Checking patch drivers/net/bnxt/bnxt.h...
error: while searching for:
BNXT_SESSION_TYPE_LAST
};
struct bnxt {
void *bar0;
error: patch failed: drivers/net/bnxt/bnxt.h:640
Hunk #6 succeeded at 675 (offset -18 lines).
Hunk #7 succeeded at 685 (offset -18 lines).
error: while searching for:
#define BNXT_FLAGS2_PTP_ALARM_SCHEDULED BIT(1)
#define BNXT_P5_PTP_TIMESYNC_ENABLED(bp) \
((bp)->flags2 & BNXT_FLAGS2_PTP_TIMESYNC_ENABLED)
#define BNXT_FLAGS2_TESTPMD_EN BIT(3)
#define BNXT_TESTPMD_EN(bp) \
((bp)->flags2 & BNXT_FLAGS2_TESTPMD_EN)
uint16_t chip_num;
error: patch failed: drivers/net/bnxt/bnxt.h:697
Hunk #9 succeeded at 712 (offset -21 lines).
Hunk #10 succeeded at 723 (offset -21 lines).
Hunk #11 succeeded at 753 (offset -21 lines).
Hunk #12 succeeded at 867 (offset -21 lines).
Hunk #13 succeeded at 900 (offset -21 lines).
Hunk #14 succeeded at 992 (offset -21 lines).
error: while searching for:
int bnxt_dev_start_op(struct rte_eth_dev *eth_dev);
int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev);
void bnxt_handle_vf_cfg_change(void *arg);
struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum bnxt_session_type type);
#endif
error: patch failed: drivers/net/bnxt/bnxt.h:1053
Checking patch drivers/net/bnxt/bnxt_ethdev.c...
Checking patch drivers/net/bnxt/bnxt_filter.h...
Checking patch drivers/net/bnxt/bnxt_flow.c...
Checking patch drivers/net/bnxt/bnxt_hwrm.c...
Hunk #3 succeeded at 856 (offset -3 lines).
Hunk #4 succeeded at 894 (offset -3 lines).
Hunk #5 succeeded at 952 (offset -3 lines).
Hunk #6 succeeded at 1103 (offset -3 lines).
Hunk #7 succeeded at 1948 (offset -6 lines).
Hunk #8 succeeded at 2065 (offset -6 lines).
Hunk #9 succeeded at 2296 (offset -6 lines).
Hunk #10 succeeded at 2320 (offset -6 lines).
Hunk #11 succeeded at 2409 (offset -6 lines).
Hunk #12 succeeded at 2983 (offset -6 lines).
Hunk #13 succeeded at 4068 (offset -6 lines).
Checking patch drivers/net/bnxt/bnxt_hwrm.h...
Checking patch drivers/net/bnxt/bnxt_ring.c...
Checking patch drivers/net/bnxt/bnxt_rxq.c...
Checking patch drivers/net/bnxt/bnxt_rxr.c...
Checking patch drivers/net/bnxt/bnxt_txq.c...
Checking patch drivers/net/bnxt/bnxt_txr.c...
Checking patch drivers/net/bnxt/bnxt_txr.h...
Checking patch drivers/net/bnxt/bnxt_vnic.c...
Checking patch drivers/net/bnxt/bnxt_vnic.h...
Checking patch drivers/net/bnxt/meson.build...
Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c...
Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h...
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c...
Hunk #1 succeeded at 76 (offset -2 lines).
Hunk #2 succeeded at 301 (offset -39 lines).
Hunk #3 succeeded at 386 (offset -39 lines).
Hunk #4 succeeded at 931 (offset -180 lines).
error: while searching for:
}
bnxt_ulp_cntxt_num_shared_clients_set(bp->ulp_ctx, true);
/* Open the ulp session. */
rc = ulp_ctx_session_open(bp, session);
if (rc)
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:1055
error: while searching for:
tfp->session = NULL;
return rc;
}
bnxt_ulp_cntxt_tfp_set(bp->ulp_ctx, BNXT_ULP_SESSION_TYPE_DEFAULT, tfp);
return rc;
}
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:1181
Hunk #7 succeeded at 1308 (offset -207 lines).
Hunk #8 succeeded at 1372 (offset -207 lines).
Hunk #9 succeeded at 1467 (offset -207 lines).
Hunk #10 succeeded at 1482 (offset -207 lines).
Hunk #11 succeeded at 1600 (offset -207 lines).
Hunk #12 succeeded at 1626 (offset -207 lines).
Hunk #13 succeeded at 1637 (offset -207 lines).
Hunk #14 succeeded at 1711 (offset -207 lines).
Hunk #15 succeeded at 2127 (offset -225 lines).
error: while searching for:
return ulp->cfg_data->app_tun;
}
/* Function to convert ulp dev id to regular dev id. */
uint32_t
bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id)
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:2306
error: while searching for:
return type;
}
struct tf*
bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type)
{
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:2329
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h...
error: while searching for:
struct tf*
bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type);
#endif /* _BNXT_ULP_H_ */
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:386
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c...
Checking patch drivers/net/bnxt/tf_ulp/meson.build...
Checking patch drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c...
error: while searching for:
ulp_fc_mgr_alarm_cb(void *arg)
{
int rc = 0;
unsigned int j = 0;
enum tf_dir i = 0;
struct bnxt_ulp_context *ctxt;
struct bnxt_ulp_fc_info *ulp_fc_info;
struct bnxt_ulp_device_params *dparms;
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c:438
error: while searching for:
return;
}
tfp = bnxt_ulp_cntxt_tfp_get(ctxt,
ulp_fc_info->sw_acc_tbl[i][j].session_type);
if (!tfp) {
BNXT_TF_DBG(ERR, "Failed to get the truflow pointer\n");
bnxt_ulp_cntxt_entry_release();
return;
}
/*
* Take the fc_lock to ensure no flow is destroyed
* during the bulk get
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c:473
Hunk #3 succeeded at 654 (offset -5 lines).
Checking patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c...
Checking patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h...
Checking patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c...
Checking patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.h...
Checking patch drivers/net/bnxt/tf_ulp/ulp_mapper.c...
Hunk #1 succeeded at 146 (offset -3 lines).
Hunk #2 succeeded at 206 (offset -6 lines).
Hunk #3 succeeded at 436 (offset -6 lines).
Hunk #4 succeeded at 529 (offset -6 lines).
Hunk #5 succeeded at 581 (offset -6 lines).
Hunk #6 succeeded at 698 (offset -6 lines).
Hunk #7 succeeded at 876 (offset -12 lines).
Hunk #8 succeeded at 972 (offset -12 lines).
Hunk #9 succeeded at 1047 (offset -12 lines).
Hunk #10 succeeded at 1087 (offset -12 lines).
Hunk #11 succeeded at 1157 (offset -12 lines).
Hunk #12 succeeded at 1305 (offset -12 lines).
Hunk #13 succeeded at 1619 (offset -12 lines).
Hunk #14 succeeded at 1939 (offset -12 lines).
Hunk #15 succeeded at 2229 (offset -12 lines).
Hunk #16 succeeded at 2607 (offset -12 lines).
error: while searching for:
if (shared)
tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx,
tbl->session_type);
rc = tf_set_tbl_entry(tfp, &sparms);
if (rc) {
BNXT_TF_DBG(ERR,
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:2651
Hunk #18 succeeded at 2720 (offset -13 lines).
Hunk #19 succeeded at 2891 (offset -13 lines).
Hunk #20 succeeded at 3000 (offset -13 lines).
Hunk #21 succeeded at 3064 (offset -13 lines).
Hunk #22 succeeded at 3080 (offset -13 lines).
Hunk #23 succeeded at 3115 (offset -13 lines).
error: while searching for:
ulp_flow_db_shared_session_set(&fid_parms, tbl->session_type);
rc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);
if (rc)
BNXT_TF_DBG(ERR, "Fail to add gen ent flowdb %d\n", rc);
}
return rc;
}
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:3030
Hunk #25 succeeded at 3155 (offset -28 lines).
Hunk #26 succeeded at 3165 (offset -28 lines).
error: while searching for:
return rc;
}
/*
* Iterate over the shared resources assigned during tf_open_session and store
* them in the global regfile with the shared flag.
*/
static int32_t
ulp_mapper_app_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx,
struct bnxt_ulp_mapper_data *mapper_data)
{
struct bnxt_ulp_glb_resource_info *glb_res;
uint32_t num_glb_res_ids, idx, dev_id;
uint8_t app_id;
uint32_t rc = 0;
glb_res = bnxt_ulp_app_glb_resource_info_list_get(&num_glb_res_ids);
if (!glb_res || !num_glb_res_ids) {
BNXT_TF_DBG(ERR, "Invalid Arguments\n");
return -EINVAL;
}
rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
if (rc) {
BNXT_TF_DBG(ERR, "Failed to get device_id for glb init (%d)\n",
rc);
return -EINVAL;
}
rc = bnxt_ulp_cntxt_app_id_get(ulp_ctx, &app_id);
if (rc) {
BNXT_TF_DBG(ERR, "Failed to get app_id for glb init (%d)\n",
rc);
return -EINVAL;
}
/* Iterate the global resources and process each one */
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:3112
error: while searching for:
rc = ulp_mapper_resource_ident_allocate(ulp_ctx,
mapper_data,
&glb_res[idx],
false);
break;
case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE:
rc = ulp_mapper_resource_index_tbl_alloc(ulp_ctx,
mapper_data,
&glb_res[idx],
false);
break;
default:
BNXT_TF_DBG(ERR, "Global resource %x not supported\n",
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:3154
Hunk #29 succeeded at 4051 (offset -13 lines).
Hunk #30 succeeded at 4112 (offset -13 lines).
Hunk #31 succeeded at 4162 (offset -10 lines).
Hunk #32 succeeded at 4385 (offset -10 lines).
Checking patch drivers/net/bnxt/tf_ulp/ulp_mapper.h...
Checking patch drivers/net/bnxt/tf_ulp/ulp_matcher.c...
Checking patch drivers/net/bnxt/tf_ulp/ulp_port_db.c...
Checking patch drivers/net/bnxt/tf_ulp/ulp_port_db.h...
Hunk #1 succeeded at 326 (offset -2 lines).
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c...
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c...
Hunk #2 succeeded at 195 (offset 4 lines).
Hunk #3 succeeded at 232 (offset 4 lines).
Hunk #4 succeeded at 257 (offset 4 lines).
Hunk #5 succeeded at 330 (offset 4 lines).
Hunk #6 succeeded at 452 (offset 4 lines).
Hunk #7 succeeded at 583 (offset -1 lines).
Hunk #8 succeeded at 598 (offset -1 lines).
Hunk #9 succeeded at 608 (offset -1 lines).
Hunk #10 succeeded at 658 (offset -1 lines).
Hunk #11 succeeded at 705 (offset -1 lines).
Hunk #12 succeeded at 727 (offset -1 lines).
Hunk #13 succeeded at 881 (offset -1 lines).
Hunk #14 succeeded at 920 (offset -1 lines).
Hunk #15 succeeded at 949 (offset -1 lines).
Hunk #16 succeeded at 978 (offset -1 lines).
Hunk #17 succeeded at 986 (offset -1 lines).
Hunk #18 succeeded at 1022 (offset -1 lines).
Hunk #19 succeeded at 1066 (offset -1 lines).
Hunk #20 succeeded at 1087 (offset -1 lines).
Hunk #21 succeeded at 1114 (offset -1 lines).
Hunk #22 succeeded at 1145 (offset -1 lines).
Hunk #23 succeeded at 1161 (offset -1 lines).
Hunk #24 succeeded at 1199 (offset -1 lines).
Hunk #25 succeeded at 1336 (offset -1 lines).
Hunk #26 succeeded at 1442 (offset -1 lines).
Hunk #27 succeeded at 1461 (offset -1 lines).
Hunk #28 succeeded at 1501 (offset -1 lines).
Hunk #29 succeeded at 1705 (offset -1 lines).
Hunk #30 succeeded at 1722 (offset -1 lines).
Hunk #31 succeeded at 2186 (offset -1 lines).
Hunk #32 succeeded at 2361 (offset -1 lines).
Hunk #33 succeeded at 2594 (offset -1 lines).
Hunk #34 succeeded at 2671 (offset -1 lines).
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h...
Checking patch lib/cmdline/cmdline_parse_string.h...
Checking patch lib/cmdline/cmdline_private.h...
Applying patch drivers/net/bnxt/bnxt.h with 3 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Rejected hunk #5.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Rejected hunk #8.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Rejected hunk #15.
Applied patch drivers/net/bnxt/bnxt_ethdev.c cleanly.
Applied patch drivers/net/bnxt/bnxt_filter.h cleanly.
Applied patch drivers/net/bnxt/bnxt_flow.c cleanly.
Applied patch drivers/net/bnxt/bnxt_hwrm.c cleanly.
Applied patch drivers/net/bnxt/bnxt_hwrm.h cleanly.
Applied patch drivers/net/bnxt/bnxt_ring.c cleanly.
Applied patch drivers/net/bnxt/bnxt_rxq.c cleanly.
Applied patch drivers/net/bnxt/bnxt_rxr.c cleanly.
Applied patch drivers/net/bnxt/bnxt_txq.c cleanly.
Applied patch drivers/net/bnxt/bnxt_txr.c cleanly.
Applied patch drivers/net/bnxt/bnxt_txr.h cleanly.
Applied patch drivers/net/bnxt/bnxt_vnic.c cleanly.
Applied patch drivers/net/bnxt/bnxt_vnic.h cleanly.
Applied patch drivers/net/bnxt/meson.build cleanly.
Applied patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h cleanly.
Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c with 4 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Rejected hunk #5.
Rejected hunk #6.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Rejected hunk #16.
Rejected hunk #17.
Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 1 reject...
Rejected hunk #1.
Applied patch drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/meson.build cleanly.
Applying patch drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.h cleanly.
Applying patch drivers/net/bnxt/tf_ulp/ulp_mapper.c with 4 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Rejected hunk #17.
Hunk #18 applied cleanly.
Hunk #19 applied cleanly.
Hunk #20 applied cleanly.
Hunk #21 applied cleanly.
Hunk #22 applied cleanly.
Hunk #23 applied cleanly.
Rejected hunk #24.
Hunk #25 applied cleanly.
Hunk #26 applied cleanly.
Rejected hunk #27.
Rejected hunk #28.
Hunk #29 applied cleanly.
Hunk #30 applied cleanly.
Hunk #31 applied cleanly.
Hunk #32 applied cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_mapper.h cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_matcher.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_port_db.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_port_db.h cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c cleanly.
Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h cleanly.
Applied patch lib/cmdline/cmdline_parse_string.h cleanly.
Applied patch lib/cmdline/cmdline_private.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h (rejected hunks)
@@ -640,6 +643,17 @@ enum bnxt_session_type {
BNXT_SESSION_TYPE_LAST
};
+#define VFR_NAMESZ 32
+
+/* Virtual Interface (VIF) Info */
+struct bnxt_vif_info {
+ char vf_rep_name[VFR_NAMESZ];
+ struct rte_eth_dev *eth_dev;
+ pthread_mutex_t vif_lock;
+ pthread_mutex_t vif_start_lock;
+ bool conduit_valid;
+};
+
struct bnxt {
void *bar0;
@@ -697,8 +711,8 @@ struct bnxt {
#define BNXT_FLAGS2_PTP_ALARM_SCHEDULED BIT(1)
#define BNXT_P5_PTP_TIMESYNC_ENABLED(bp) \
((bp)->flags2 & BNXT_FLAGS2_PTP_TIMESYNC_ENABLED)
-#define BNXT_FLAGS2_TESTPMD_EN BIT(3)
-#define BNXT_TESTPMD_EN(bp) \
+#define BNXT_FLAGS2_TESTPMD_EN BIT(3)
+#define BNXT_TESTPMD_EN(bp) \
((bp)->flags2 & BNXT_FLAGS2_TESTPMD_EN)
uint16_t chip_num;
@@ -1053,5 +1076,6 @@ int bnxt_flow_ops_get_op(struct rte_eth_dev *dev,
int bnxt_dev_start_op(struct rte_eth_dev *eth_dev);
int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev);
void bnxt_handle_vf_cfg_change(void *arg);
+struct bnxt_vnic_info *bnxt_get_default_vnic(struct bnxt *bp);
struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum bnxt_session_type type);
#endif
diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c (rejected hunks)
@@ -1055,7 +1144,6 @@ ulp_ctx_init(struct bnxt *bp,
}
bnxt_ulp_cntxt_num_shared_clients_set(bp->ulp_ctx, true);
-
/* Open the ulp session. */
rc = ulp_ctx_session_open(bp, session);
if (rc)
@@ -1181,7 +1269,7 @@ ulp_ctx_attach(struct bnxt *bp,
tfp->session = NULL;
return rc;
}
-
+ tfp = bnxt_ulp_bp_tfp_get(bp, BNXT_ULP_SESSION_TYPE_DEFAULT);
bnxt_ulp_cntxt_tfp_set(bp->ulp_ctx, BNXT_ULP_SESSION_TYPE_DEFAULT, tfp);
return rc;
}
@@ -2306,6 +2496,13 @@ bnxt_ulp_cntxt_ptr2_app_tun_list_get(struct bnxt_ulp_context *ulp)
return ulp->cfg_data->app_tun;
}
+/* Function to get the truflow app id. This defined in the build file */
+uint32_t
+bnxt_ulp_default_app_id_get(void)
+{
+ return BNXT_TF_APP_ID;
+}
+
/* Function to convert ulp dev id to regular dev id. */
uint32_t
bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id)
@@ -2329,6 +2526,53 @@ bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id)
return type;
}
+/* This function sets the IF table index for the
+ * Application to poll to get the hot upgrade state and count details from
+ * the firmware.
+ */
+int32_t
+bnxt_ulp_ha_reg_set(struct bnxt_ulp_context *ulp_ctx,
+ uint8_t state, uint8_t cnt)
+{
+ if (!ulp_ctx || !ulp_ctx->cfg_data)
+ return -EINVAL;
+
+ if (ULP_MULTI_SHARED_IS_SUPPORTED(ulp_ctx)) {
+ ulp_ctx->cfg_data->hu_reg_state = state;
+ ulp_ctx->cfg_data->hu_reg_cnt = cnt;
+ } else {
+ ulp_ctx->cfg_data->hu_reg_state = ULP_HA_IF_TBL_IDX;
+ ulp_ctx->cfg_data->hu_reg_cnt = ULP_HA_CLIENT_CNT_IF_TBL_IDX;
+ }
+ return 0;
+}
+
+/* This function gets the IF table index for the
+ * application to poll to get the application hot upgrade state from
+ * the firmware.
+ */
+uint32_t
+bnxt_ulp_ha_reg_state_get(struct bnxt_ulp_context *ulp_ctx)
+{
+ if (!ulp_ctx || !ulp_ctx->cfg_data)
+ return 0;
+
+ return (uint32_t)ulp_ctx->cfg_data->hu_reg_state;
+}
+
+/* This function gets the IF table index for the
+ * Application to poll to get the application count from
+ * the firmware.
+ */
+uint32_t
+bnxt_ulp_ha_reg_cnt_get(struct bnxt_ulp_context *ulp_ctx)
+{
+ if (!ulp_ctx || !ulp_ctx->cfg_data)
+ return 0;
+
+ return (uint32_t)ulp_ctx->cfg_data->hu_reg_cnt;
+}
+
struct tf*
bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type)
{
diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks)
@@ -386,4 +386,5 @@ bnxt_ulp_ha_reg_cnt_get(struct bnxt_ulp_context *ulp_ctx);
struct tf*
bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type);
+
#endif /* _BNXT_ULP_H_ */
diff a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c (rejected hunks)
@@ -438,8 +438,8 @@ void
ulp_fc_mgr_alarm_cb(void *arg)
{
int rc = 0;
- unsigned int j = 0;
- enum tf_dir i = 0;
+ unsigned int j;
+ enum tf_dir i;
struct bnxt_ulp_context *ctxt;
struct bnxt_ulp_fc_info *ulp_fc_info;
struct bnxt_ulp_device_params *dparms;
@@ -473,14 +473,6 @@ ulp_fc_mgr_alarm_cb(void *arg)
return;
}
- tfp = bnxt_ulp_cntxt_tfp_get(ctxt,
- ulp_fc_info->sw_acc_tbl[i][j].session_type);
- if (!tfp) {
- BNXT_TF_DBG(ERR, "Failed to get the truflow pointer\n");
- bnxt_ulp_cntxt_entry_release();
- return;
- }
-
/*
* Take the fc_lock to ensure no flow is destroyed
* during the bulk get
diff a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c (rejected hunks)
@@ -2651,7 +2724,6 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,
if (shared)
tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx,
tbl->session_type);
-
rc = tf_set_tbl_entry(tfp, &sparms);
if (rc) {
BNXT_TF_DBG(ERR,
@@ -3030,9 +3157,24 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms,
ulp_flow_db_shared_session_set(&fid_parms, tbl->session_type);
rc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);
- if (rc)
+ if (rc) {
BNXT_TF_DBG(ERR, "Fail to add gen ent flowdb %d\n", rc);
+ return rc;
+ }
+
+ /* Reset the in-flight RID when generic table is written and the
+ * rid has been pushed into a handle (rid or fid). Once it has
+ * been written, we have persistent accounting of the resources.
+ */
+ if (tbl->tbl_opcode == BNXT_ULP_GENERIC_TBL_OPC_WRITE &&
+ (tbl->fdb_opcode == BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE ||
+ tbl->fdb_opcode == BNXT_ULP_FDB_OPC_PUSH_FID))
+ parms->rid = 0;
+
+ rc = ulp_mapper_gen_tbl_ref_cnt_process(parms, tbl,
+ &gen_tbl_ent);
}
+
return rc;
}
@@ -3112,36 +3453,33 @@ ulp_mapper_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx,
return rc;
}
-/*
- * Iterate over the shared resources assigned during tf_open_session and store
- * them in the global regfile with the shared flag.
- */
static int32_t
ulp_mapper_app_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx,
- struct bnxt_ulp_mapper_data *mapper_data)
+ struct bnxt_ulp_mapper_data *mapper_data)
{
struct bnxt_ulp_glb_resource_info *glb_res;
uint32_t num_glb_res_ids, idx, dev_id;
uint8_t app_id;
- uint32_t rc = 0;
+ int32_t rc = 0;
glb_res = bnxt_ulp_app_glb_resource_info_list_get(&num_glb_res_ids);
if (!glb_res || !num_glb_res_ids) {
BNXT_TF_DBG(ERR, "Invalid Arguments\n");
return -EINVAL;
}
+
rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
if (rc) {
- BNXT_TF_DBG(ERR, "Failed to get device_id for glb init (%d)\n",
+ BNXT_TF_DBG(ERR, "Failed to get device id for glb init (%d)\n",
rc);
- return -EINVAL;
+ return rc;
}
rc = bnxt_ulp_cntxt_app_id_get(ulp_ctx, &app_id);
if (rc) {
- BNXT_TF_DBG(ERR, "Failed to get app_id for glb init (%d)\n",
+ BNXT_TF_DBG(ERR, "Failed to get app id for glb init (%d)\n",
rc);
- return -EINVAL;
+ return rc;
}
/* Iterate the global resources and process each one */
@@ -3154,13 +3492,13 @@ ulp_mapper_app_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx,
rc = ulp_mapper_resource_ident_allocate(ulp_ctx,
mapper_data,
&glb_res[idx],
- false);
+ true);
break;
case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE:
rc = ulp_mapper_resource_index_tbl_alloc(ulp_ctx,
mapper_data,
&glb_res[idx],
- false);
+ true);
break;
default:
BNXT_TF_DBG(ERR, "Global resource %x not supported\n",
Checking patch drivers/net/bnxt/bnxt.h...
error: drivers/net/bnxt/bnxt.h: does not match index
Checking patch drivers/net/bnxt/bnxt_ethdev.c...
error: drivers/net/bnxt/bnxt_ethdev.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c...
error: drivers/net/bnxt/tf_ulp/bnxt_ulp.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h...
error: while searching for:
unsigned int
bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx);
uint32_t
bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id);
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:371
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c...
Checking patch drivers/net/bnxt/tf_ulp/meson.build...
error: drivers/net/bnxt/tf_ulp/meson.build: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c...
error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c...
error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h...
error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.h: does not match index
Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 1 reject...
Rejected hunk #1.
Applied patch drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks)
@@ -371,6 +371,9 @@ bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx,
unsigned int
bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx);
+int32_t
+bnxt_flow_meter_init(struct bnxt *bp);
+
uint32_t
bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id);
Checking patch drivers/net/bnxt/bnxt.h...
error: drivers/net/bnxt/bnxt.h: does not match index
Checking patch drivers/net/bnxt/bnxt_ethdev.c...
error: drivers/net/bnxt/bnxt_ethdev.c: does not match index
Checking patch drivers/net/bnxt/bnxt_hwrm.c...
error: drivers/net/bnxt/bnxt_hwrm.c: does not match index
Checking patch drivers/net/bnxt/bnxt_ring.c...
error: drivers/net/bnxt/bnxt_ring.c: does not match index
Checking patch drivers/net/bnxt/bnxt_rxr.c...
error: drivers/net/bnxt/bnxt_rxr.c: does not match index
Checking patch drivers/net/bnxt/bnxt_txq.c...
error: drivers/net/bnxt/bnxt_txq.c: does not match index
Checking patch drivers/net/bnxt/bnxt_txr.c...
error: drivers/net/bnxt/bnxt_txr.c: does not match index
Checking patch drivers/net/bnxt/bnxt_txr.h...
error: drivers/net/bnxt/bnxt_txr.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch drivers/net/bnxt/bnxt.h...
error: drivers/net/bnxt/bnxt.h: does not match index
Checking patch drivers/net/bnxt/bnxt_hwrm.c...
error: drivers/net/bnxt/bnxt_hwrm.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c...
error: drivers/net/bnxt/tf_ulp/bnxt_ulp.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h...
error: while searching for:
uint8_t bus;
};
struct bnxt_ulp_session_state {
STAILQ_ENTRY(bnxt_ulp_session_state) next;
bool bnxt_ulp_init;
pthread_mutex_t bnxt_ulp_mutex;
struct bnxt_ulp_pci_info pci_info;
struct bnxt_ulp_data *cfg_data;
struct tf *g_tfp[BNXT_ULP_SESSION_MAX];
uint32_t session_opened[BNXT_ULP_SESSION_MAX];
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:131
Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks)
@@ -131,11 +131,13 @@ struct bnxt_ulp_pci_info {
uint8_t bus;
};
+#define BNXT_ULP_DEVICE_SERIAL_NUM_SIZE 8
struct bnxt_ulp_session_state {
STAILQ_ENTRY(bnxt_ulp_session_state) next;
bool bnxt_ulp_init;
pthread_mutex_t bnxt_ulp_mutex;
struct bnxt_ulp_pci_info pci_info;
+ uint8_t dsn[BNXT_ULP_DEVICE_SERIAL_NUM_SIZE];
struct bnxt_ulp_data *cfg_data;
struct tf *g_tfp[BNXT_ULP_SESSION_MAX];
uint32_t session_opened[BNXT_ULP_SESSION_MAX];
Checking patch drivers/net/bnxt/bnxt.h...
error: drivers/net/bnxt/bnxt.h: does not match index
Checking patch drivers/net/bnxt/bnxt_ethdev.c...
error: drivers/net/bnxt/bnxt_ethdev.c: does not match index
Checking patch drivers/net/bnxt/bnxt_hwrm.c...
error: drivers/net/bnxt/bnxt_hwrm.c: does not match index
Checking patch drivers/net/bnxt/bnxt_txr.c...
error: drivers/net/bnxt/bnxt_txr.c: does not match index
Checking patch drivers/net/bnxt/bnxt_vnic.c...
error: drivers/net/bnxt/bnxt_vnic.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c...
error: drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h...
error: drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c...
error: drivers/net/bnxt/tf_ulp/bnxt_ulp.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h...
error: while searching for:
struct bnxt_flow_app_tun_ent app_tun[BNXT_ULP_MAX_TUN_CACHE_ENTRIES];
uint32_t vxlan_port;
uint32_t vxlan_ip_port;
uint8_t hu_reg_state;
uint8_t hu_reg_cnt;
uint32_t hu_session_type;
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:113
error: while searching for:
uint32_t vxlan_port);
unsigned int
bnxt_ulp_vxlan_port_get(struct bnxt_ulp_context *ulp_ctx);
int
bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx,
uint32_t vxlan_ip_port);
unsigned int
bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx);
int32_t
bnxt_flow_meter_init(struct bnxt *bp);
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:367
error: while searching for:
struct tf*
bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type);
#endif /* _BNXT_ULP_H_ */
error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:391
Checking patch drivers/net/bnxt/tf_ulp/ulp_mapper.c...
error: drivers/net/bnxt/tf_ulp/ulp_mapper.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c...
error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c...
error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.c: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h...
error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.h: does not match index
Checking patch drivers/net/bnxt/tf_ulp/ulp_template_struct.h...
error: while searching for:
uint8_t app_id;
uint32_t vxlan_port;
uint32_t vxlan_ip_port;
enum bnxt_ulp_device_id device_id;
uint32_t upgrade_fw_update;
uint8_t ha_pool_id;
error: patch failed: drivers/net/bnxt/tf_ulp/ulp_template_struct.h:364
Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Applying patch drivers/net/bnxt/tf_ulp/ulp_template_struct.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks)
@@ -113,6 +113,7 @@ struct bnxt_ulp_data {
struct bnxt_flow_app_tun_ent app_tun[BNXT_ULP_MAX_TUN_CACHE_ENTRIES];
uint32_t vxlan_port;
uint32_t vxlan_ip_port;
+ uint32_t ecpri_udp_port;
uint8_t hu_reg_state;
uint8_t hu_reg_cnt;
uint32_t hu_session_type;
@@ -367,12 +368,19 @@ bnxt_ulp_vxlan_port_set(struct bnxt_ulp_context *ulp_ctx,
uint32_t vxlan_port);
unsigned int
bnxt_ulp_vxlan_port_get(struct bnxt_ulp_context *ulp_ctx);
+
int
bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx,
uint32_t vxlan_ip_port);
unsigned int
bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx);
+int
+bnxt_ulp_ecpri_udp_port_set(struct bnxt_ulp_context *ulp_ctx,
+ uint32_t ecpri_udp_port);
+unsigned int
+bnxt_ulp_ecpri_udp_port_get(struct bnxt_ulp_context *ulp_ctx);
+
int32_t
bnxt_flow_meter_init(struct bnxt *bp);
@@ -391,5 +399,4 @@ bnxt_ulp_ha_reg_cnt_get(struct bnxt_ulp_context *ulp_ctx);
struct tf*
bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type);
-
#endif /* _BNXT_ULP_H_ */
diff a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h (rejected hunks)
@@ -364,6 +365,7 @@ struct bnxt_ulp_app_capabilities_info {
uint8_t app_id;
uint32_t vxlan_port;
uint32_t vxlan_ip_port;
+ uint32_t ecpri_udp_port;
enum bnxt_ulp_device_id device_id;
uint32_t upgrade_fw_update;
uint8_t ha_pool_id;
Checking patch drivers/net/bnxt/bnxt_hwrm.c...
error: drivers/net/bnxt/bnxt_hwrm.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
https://lab.dpdk.org/results/dashboard/patchsets/26087/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-21 19:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-21 19:30 |WARNING| pw126405-126414 [PATCH] [v2, 11/11] net/bnxt: Avoid submitting hwrm rss request when rss mode disabled dpdklab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).