#include "tf_device_p58.h"
#include "tfp.h"
#include "tf_em.h"
+#include "tf_rm.h"
+#ifdef TF_TCAM_SHARED
+#include "tf_tcam_shared.h"
+#include "tf_tbl_sram.h"
+#endif /* TF_TCAM_SHARED */
struct tf;
+/* Number of slices per row for WC TCAM */
+uint16_t g_wc_num_slices_per_row = TF_WC_TCAM_1_SLICE_PER_ROW;
+
/* Forward declarations */
static int tf_dev_unbind_p4(struct tf *tfp);
static int tf_dev_unbind_p58(struct tf *tfp);
/**
* Resource Reservation Check function
*
- * [in] tfp
- * Pointer to TF handle
+ * [in] count
+ * Number of module subtypes
*
* [in] cfg
* Pointer to rm element config
* Pointer to resource reservation array
*
* Returns
- * - (n) number of tables that have non-zero reservation count.
+ * - (n) number of tables in module that have non-zero reservation count.
*/
static int
-tf_dev_reservation_check(struct tf *tfp __rte_unused,
- uint16_t count,
+tf_dev_reservation_check(uint16_t count,
struct tf_rm_element_cfg *cfg,
uint16_t *reservations)
{
rm_num = (uint16_t *)reservations + i * count;
for (j = 0; j < count; j++) {
if ((cfg[j].cfg_type == TF_RM_ELEM_CFG_HCAPI ||
- cfg[j].cfg_type == TF_RM_ELEM_CFG_HCAPI_BA) &&
+ cfg[j].cfg_type == TF_RM_ELEM_CFG_HCAPI_BA ||
+ cfg[j].cfg_type ==
+ TF_RM_ELEM_CFG_HCAPI_BA_PARENT ||
+ cfg[j].cfg_type ==
+ TF_RM_ELEM_CFG_HCAPI_BA_CHILD) &&
rm_num[j] > 0)
cnt++;
}
tf_dev_bind_p4(struct tf *tfp,
bool shadow_copy,
struct tf_session_resources *resources,
- struct tf_dev_info *dev_handle)
+ struct tf_dev_info *dev_handle,
+ enum tf_wc_num_slice wc_num_slices)
{
int rc;
int frc;
struct tf_em_cfg_parms em_cfg;
struct tf_if_tbl_cfg_parms if_tbl_cfg;
struct tf_global_cfg_cfg_parms global_cfg;
+ struct tf_session *tfs;
+
+ /* Retrieve the session information */
+ rc = tf_session_get_session_internal(tfp, &tfs);
+ if (rc)
+ return rc;
/* Initial function initialization */
dev_handle->ops = &tf_dev_ops_p4_init;
/* Initialize the modules */
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_IDENT_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_IDENT_TYPE_MAX,
tf_ident_p4,
(uint16_t *)resources->ident_cnt);
if (rsv_cnt) {
no_rsv_flag = false;
}
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_TBL_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_TBL_TYPE_MAX,
tf_tbl_p4,
(uint16_t *)resources->tbl_cnt);
if (rsv_cnt) {
tbl_cfg.num_elements = TF_TBL_TYPE_MAX;
tbl_cfg.cfg = tf_tbl_p4;
- tbl_cfg.shadow_copy = shadow_copy;
tbl_cfg.resources = resources;
rc = tf_tbl_bind(tfp, &tbl_cfg);
if (rc) {
no_rsv_flag = false;
}
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_TCAM_TBL_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_TCAM_TBL_TYPE_MAX,
tf_tcam_p4,
(uint16_t *)resources->tcam_cnt);
if (rsv_cnt) {
tcam_cfg.cfg = tf_tcam_p4;
tcam_cfg.shadow_copy = shadow_copy;
tcam_cfg.resources = resources;
+ tcam_cfg.wc_num_slices = wc_num_slices;
+#ifdef TF_TCAM_SHARED
+ rc = tf_tcam_shared_bind(tfp, &tcam_cfg);
+#else /* !TF_TCAM_SHARED */
rc = tf_tcam_bind(tfp, &tcam_cfg);
+#endif
if (rc) {
TFP_DRV_LOG(ERR,
"TCAM initialization failure\n");
/*
* EEM
*/
- if (dev_handle->type == TF_DEVICE_TYPE_WH)
- em_cfg.cfg = tf_em_ext_p4;
- else
- em_cfg.cfg = tf_em_ext_p45;
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_EM_TBL_TYPE_MAX,
+ em_cfg.cfg = tf_em_ext_p4;
+ rsv_cnt = tf_dev_reservation_check(TF_EM_TBL_TYPE_MAX,
em_cfg.cfg,
(uint16_t *)resources->em_cnt);
if (rsv_cnt) {
/*
* EM
*/
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_EM_TBL_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_EM_TBL_TYPE_MAX,
tf_em_int_p4,
(uint16_t *)resources->em_cnt);
if (rsv_cnt) {
goto fail;
}
- /*
- * GLOBAL_CFG
- */
- global_cfg.num_elements = TF_GLOBAL_CFG_TYPE_MAX;
- global_cfg.cfg = tf_global_cfg_p4;
- rc = tf_global_cfg_bind(tfp, &global_cfg);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "Global Cfg initialization failure\n");
- goto fail;
+ if (!tf_session_is_shared_session(tfs)) {
+ /*
+ * GLOBAL_CFG
+ */
+ global_cfg.num_elements = TF_GLOBAL_CFG_TYPE_MAX;
+ global_cfg.cfg = tf_global_cfg_p4;
+ rc = tf_global_cfg_bind(tfp, &global_cfg);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "Global Cfg initialization failure\n");
+ goto fail;
+ }
}
-
/* Final function initialization */
dev_handle->ops = &tf_dev_ops_p4;
{
int rc = 0;
bool fail = false;
+ struct tf_session *tfs;
+
+ /* Retrieve the session information */
+ rc = tf_session_get_session_internal(tfp, &tfs);
+ if (rc)
+ return rc;
/* Unbind all the support modules. As this is only done on
* close we only report errors as everything has to be cleaned
* In case of residuals TCAMs are cleaned up first as to
* invalidate the pipeline in a clean manner.
*/
+#ifdef TF_TCAM_SHARED
+ rc = tf_tcam_shared_unbind(tfp);
+#else /* !TF_TCAM_SHARED */
rc = tf_tcam_unbind(tfp);
+#endif /* TF_TCAM_SHARED */
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, TCAM\n");
fail = true;
}
rc = tf_ident_unbind(tfp);
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, Identifier\n");
fail = true;
}
rc = tf_tbl_unbind(tfp);
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, Table Type\n");
fail = true;
}
rc = tf_em_ext_common_unbind(tfp);
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, EEM\n");
fail = true;
}
rc = tf_em_int_unbind(tfp);
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, EM\n");
fail = true;
}
- rc = tf_if_tbl_unbind(tfp);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "Device unbind failed, IF Table Type\n");
- fail = true;
- }
+ if (!tf_session_is_shared_session(tfs)) {
+ rc = tf_if_tbl_unbind(tfp);
+ if (rc) {
+ TFP_DRV_LOG(INFO,
+ "Device unbind failed, IF Table Type\n");
+ fail = true;
+ }
- rc = tf_global_cfg_unbind(tfp);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "Device unbind failed, Global Cfg Type\n");
- fail = true;
+ rc = tf_global_cfg_unbind(tfp);
+ if (rc) {
+ TFP_DRV_LOG(INFO,
+ "Device unbind failed, Global Cfg Type\n");
+ fail = true;
+ }
}
if (fail)
tf_dev_bind_p58(struct tf *tfp,
bool shadow_copy,
struct tf_session_resources *resources,
- struct tf_dev_info *dev_handle)
+ struct tf_dev_info *dev_handle,
+ enum tf_wc_num_slice wc_num_slices)
{
int rc;
int frc;
struct tf_em_cfg_parms em_cfg;
struct tf_if_tbl_cfg_parms if_tbl_cfg;
struct tf_global_cfg_cfg_parms global_cfg;
+ struct tf_session *tfs;
/* Initial function initialization */
dev_handle->ops = &tf_dev_ops_p58_init;
- /* Initialize the modules */
+ /* Retrieve the session information */
+ rc = tf_session_get_session_internal(tfp, &tfs);
+ if (rc)
+ return rc;
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_IDENT_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_IDENT_TYPE_MAX,
tf_ident_p58,
(uint16_t *)resources->ident_cnt);
if (rsv_cnt) {
no_rsv_flag = false;
}
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_TBL_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_TBL_TYPE_MAX,
tf_tbl_p58,
(uint16_t *)resources->tbl_cnt);
if (rsv_cnt) {
tbl_cfg.num_elements = TF_TBL_TYPE_MAX;
tbl_cfg.cfg = tf_tbl_p58;
- tbl_cfg.shadow_copy = shadow_copy;
tbl_cfg.resources = resources;
rc = tf_tbl_bind(tfp, &tbl_cfg);
if (rc) {
goto fail;
}
no_rsv_flag = false;
+
+ rc = tf_tbl_sram_bind(tfp);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "SRAM table initialization failure\n");
+ goto fail;
+ }
}
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_TCAM_TBL_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_TCAM_TBL_TYPE_MAX,
tf_tcam_p58,
(uint16_t *)resources->tcam_cnt);
if (rsv_cnt) {
tcam_cfg.cfg = tf_tcam_p58;
tcam_cfg.shadow_copy = shadow_copy;
tcam_cfg.resources = resources;
+ tcam_cfg.wc_num_slices = wc_num_slices;
+#ifdef TF_TCAM_SHARED
+ rc = tf_tcam_shared_bind(tfp, &tcam_cfg);
+#else /* !TF_TCAM_SHARED */
rc = tf_tcam_bind(tfp, &tcam_cfg);
+#endif
if (rc) {
TFP_DRV_LOG(ERR,
"TCAM initialization failure\n");
/*
* EM
*/
- rsv_cnt = tf_dev_reservation_check(tfp,
- TF_EM_TBL_TYPE_MAX,
+ rsv_cnt = tf_dev_reservation_check(TF_EM_TBL_TYPE_MAX,
tf_em_int_p58,
(uint16_t *)resources->em_cnt);
if (rsv_cnt) {
goto fail;
}
- /*
- * GLOBAL_CFG
- */
- global_cfg.num_elements = TF_GLOBAL_CFG_TYPE_MAX;
- global_cfg.cfg = tf_global_cfg_p58;
- rc = tf_global_cfg_bind(tfp, &global_cfg);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "Global Cfg initialization failure\n");
- goto fail;
+ if (!tf_session_is_shared_session(tfs)) {
+ /*
+ * GLOBAL_CFG
+ */
+ global_cfg.num_elements = TF_GLOBAL_CFG_TYPE_MAX;
+ global_cfg.cfg = tf_global_cfg_p58;
+ rc = tf_global_cfg_bind(tfp, &global_cfg);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "Global Cfg initialization failure\n");
+ goto fail;
+ }
}
/* Final function initialization */
* - (-EINVAL) on failure.
*/
static int
- tf_dev_unbind_p58(struct tf *tfp)
+tf_dev_unbind_p58(struct tf *tfp)
{
int rc = 0;
bool fail = false;
+ struct tf_session *tfs;
+
+ /* Retrieve the session information */
+ rc = tf_session_get_session_internal(tfp, &tfs);
+ if (rc)
+ return rc;
/* Unbind all the support modules. As this is only done on
* close we only report errors as everything has to be cleaned
* In case of residuals TCAMs are cleaned up first as to
* invalidate the pipeline in a clean manner.
*/
+#ifdef TF_TCAM_SHARED
+ rc = tf_tcam_shared_unbind(tfp);
+#else /* !TF_TCAM_SHARED */
rc = tf_tcam_unbind(tfp);
+#endif /* TF_TCAM_SHARED */
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, TCAM\n");
fail = true;
}
rc = tf_ident_unbind(tfp);
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, Identifier\n");
fail = true;
}
- rc = tf_tbl_unbind(tfp);
+ /* Unbind the SRAM table prior to table as the table manager
+ * owns and frees the table DB while the SRAM table manager owns
+ * and manages it's internal data structures. SRAM table manager
+ * relies on the table rm_db to exist.
+ */
+ rc = tf_tbl_sram_unbind(tfp);
if (rc) {
TFP_DRV_LOG(ERR,
+ "Device unbind failed, SRAM table\n");
+ fail = true;
+ }
+
+ rc = tf_tbl_unbind(tfp);
+ if (rc) {
+ TFP_DRV_LOG(INFO,
"Device unbind failed, Table Type\n");
fail = true;
}
rc = tf_em_int_unbind(tfp);
if (rc) {
- TFP_DRV_LOG(ERR,
+ TFP_DRV_LOG(INFO,
"Device unbind failed, EM\n");
fail = true;
}
fail = true;
}
- rc = tf_global_cfg_unbind(tfp);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "Device unbind failed, Global Cfg Type\n");
- fail = true;
+ if (!tf_session_is_shared_session(tfs)) {
+ rc = tf_global_cfg_unbind(tfp);
+ if (rc) {
+ TFP_DRV_LOG(ERR,
+ "Device unbind failed, Global Cfg Type\n");
+ fail = true;
+ }
}
if (fail)
enum tf_device_type type,
bool shadow_copy,
struct tf_session_resources *resources,
+ uint16_t wc_num_slices,
struct tf_dev_info *dev_handle)
{
switch (type) {
return tf_dev_bind_p4(tfp,
shadow_copy,
resources,
- dev_handle);
+ dev_handle,
+ wc_num_slices);
case TF_DEVICE_TYPE_THOR:
dev_handle->type = type;
return tf_dev_bind_p58(tfp,
shadow_copy,
resources,
- dev_handle);
+ dev_handle,
+ wc_num_slices);
default:
TFP_DRV_LOG(ERR,
"No such device\n");
switch (type) {
case TF_DEVICE_TYPE_WH:
case TF_DEVICE_TYPE_SR:
- dev_handle->ops = &tf_dev_ops_p4;
+ dev_handle->ops = &tf_dev_ops_p4_init;
break;
case TF_DEVICE_TYPE_THOR:
- dev_handle->ops = &tf_dev_ops_p58;
+ dev_handle->ops = &tf_dev_ops_p58_init;
break;
default:
TFP_DRV_LOG(ERR,
git.droids-corp.org / dpdk.git / blobdiff