d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/bnxt: support two table scopes

Browse Source 
Need to remap the table scope ids allocated from HCAPI RM from high
to low value because for legacy devices a table scope is a set of base
addresses.  The PCIe addresses must map to a PCIe PF which exists in
the hardware.

Signed-off-by: Farah Smith <farah.smith@broadcom.com>
Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Randy Schacher <stuart.schacher@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
This commit is contained in:
Farah Smith 2020-07-15 19:20:32 +05:30 committed by Ferruh Yigit
parent 1ff85c97f4
commit a222e22be7
4 changed files with 136 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
drivers/net/bnxt/tf_core/tf_em_common.c
View File

@ -44,6 +44,28 @@ static enum tf_mem_type mem_type;
/** Table scope array */
struct tf_tbl_scope_cb tbl_scopes[TF_NUM_TBL_SCOPE];
/** Table scope reversal table
*
* Table scope are allocated from 15 to 0 within HCAPI RM. Because of the
* association between PFs and legacy table scopes, reverse table scope ids.
* 15 indicates 0, 14 indicates 1, etc... The application will only see the 0
* based number. The firmware will only use the 0 based number. Only HCAPI RM
* and Truflow RM believe the number is 15. When HCAPI RM support allocation
* from low to high is supported, this adjust function can be removed.
*/
const uint32_t tbl_scope_reverse[TF_NUM_TBL_SCOPE] = {
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
static uint32_t
tf_tbl_scope_adjust(uint32_t tbl_scope_id)
{
if (tbl_scope_id < TF_NUM_TBL_SCOPE)
return tbl_scope_reverse[tbl_scope_id];
else
return TF_TBL_SCOPE_INVALID;
};
/* API defined in tf_em.h */
struct tf_tbl_scope_cb *
tbl_scope_cb_find(uint32_t tbl_scope_id)
@ -51,11 +73,17 @@ tbl_scope_cb_find(uint32_t tbl_scope_id)
int i;
struct tf_rm_is_allocated_parms parms;
int allocated;
uint32_t rm_tbl_scope_id;
rm_tbl_scope_id = tf_tbl_scope_adjust(tbl_scope_id);
if (rm_tbl_scope_id == TF_TBL_SCOPE_INVALID)
return NULL;
/* Check that id is valid */
parms.rm_db = eem_db[TF_DIR_RX];
parms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
parms.index = tbl_scope_id;
parms.index = rm_tbl_scope_id;
parms.allocated = &allocated;
i = tf_rm_is_allocated(&parms);
@ -71,6 +99,61 @@ tbl_scope_cb_find(uint32_t tbl_scope_id)
return NULL;
}
int tf_tbl_scope_alloc(uint32_t *tbl_scope_id)
{
int rc;
struct tf_rm_allocate_parms parms = { 0 };
uint32_t rm_tbl_scope_id;
uint32_t usr_tbl_scope_id = TF_TBL_SCOPE_INVALID;
/* Get Table Scope control block from the session pool */
parms.rm_db = eem_db[TF_DIR_RX];
parms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
parms.index = &rm_tbl_scope_id;
rc = tf_rm_allocate(&parms);
if (rc) {
TFP_DRV_LOG(ERR,
"Failed to allocate table scope rc:%s\n",
strerror(-rc));
return rc;
}
usr_tbl_scope_id = tf_tbl_scope_adjust(rm_tbl_scope_id);
if (usr_tbl_scope_id == TF_TBL_SCOPE_INVALID) {
TFP_DRV_LOG(ERR,
"Invalid table scope allocated id:%d\n",
(int)rm_tbl_scope_id);
return -EINVAL;
}
*tbl_scope_id = usr_tbl_scope_id;
return 0;
};
int tf_tbl_scope_free(uint32_t tbl_scope_id)
{
struct tf_rm_free_parms parms = { 0 };
uint32_t rm_tbl_scope_id;
uint32_t rc;
rm_tbl_scope_id = tf_tbl_scope_adjust(tbl_scope_id);
if (rm_tbl_scope_id == TF_TBL_SCOPE_INVALID) {
TFP_DRV_LOG(ERR,
"Invalid table scope allocated id:%d\n",
(int)tbl_scope_id);
return -EINVAL;
}
parms.rm_db = eem_db[TF_DIR_RX];
parms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
parms.index = rm_tbl_scope_id;
rc = tf_rm_free(&parms);
return rc;
};
int
tf_create_tbl_pool_external(enum tf_dir dir,
struct tf_tbl_scope_cb *tbl_scope_cb,
@ -706,9 +789,17 @@ tf_insert_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,
if (rc) {
struct tf_rm_free_parms fparms = { 0 };
uint32_t rm_tbl_scope_id;
TFP_DRV_LOG(ERR,
"System alloc mmap failed\n");
rm_tbl_scope_id =
tf_tbl_scope_adjust(parms->tbl_scope_id);
if (rm_tbl_scope_id == TF_TBL_SCOPE_INVALID)
return -EINVAL;
/* Free Table control block */
fparms.rm_db = eem_db[TF_DIR_RX];
fparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
@ -1043,13 +1134,24 @@ int tf_tbl_ext_common_set(struct tf *tfp,
if (rc) {
struct tf_rm_free_parms fparms = { 0 };
uint32_t rm_tbl_scope_id;
/* TODO: support allocation of table scope from
* min in HCAPI RM. For now call adjust function
* on value obtained from RM.
*/
rm_tbl_scope_id =
tf_tbl_scope_adjust(parms->tbl_scope_id);
if (rm_tbl_scope_id == TF_TBL_SCOPE_INVALID)
return -EINVAL;
TFP_DRV_LOG(ERR,
"System alloc mmap failed\n");
/* Free Table control block */
fparms.rm_db = eem_db[TF_DIR_RX];
fparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
fparms.index = parms->tbl_scope_id;
fparms.index = rm_tbl_scope_id;
tf_rm_free(&fparms);
return -EINVAL;
}

27
drivers/net/bnxt/tf_core/tf_em_common.h
View File

@ -9,7 +9,6 @@
#include "tf_core.h"
#include "tf_session.h"
/**
* Function to search for table scope control block structure
* with specified table scope ID.
@ -23,6 +22,32 @@
*/
struct tf_tbl_scope_cb *tbl_scope_cb_find(uint32_t tbl_scope_id);
/**
* Table Scope Allocate
*
* Allocate a table scope
*
* [in/out] pointer to tbl_scope_id
*
* Returns:
* 0 - success
* -EINVAL - error
*/
int tf_tbl_scope_alloc(uint32_t *tbl_scope_id);
/**
* Table Scope Free
*
* Free a table scope
*
* [in] tbl_scope_id to free
*
* Returns:
* 0 - success
* -EINVAL - error
*/
int tf_tbl_scope_free(uint32_t tbl_scope_id);
/**
* Create and initialize a stack to use for action entries
*

21
drivers/net/bnxt/tf_core/tf_em_host.c
View File

@ -374,14 +374,8 @@ tf_em_ext_alloc(struct tf *tfp, struct tf_alloc_tbl_scope_parms *parms)
struct tf_tbl_scope_cb *tbl_scope_cb;
struct hcapi_cfa_em_table *em_tables;
struct tf_free_tbl_scope_parms free_parms;
struct tf_rm_allocate_parms aparms = { 0 };
struct tf_rm_free_parms fparms = { 0 };
/* Get Table Scope control block from the session pool */
aparms.rm_db = eem_db[TF_DIR_RX];
aparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
aparms.index = (uint32_t *)&parms->tbl_scope_id;
rc = tf_rm_allocate(&aparms);
rc = tf_tbl_scope_alloc(&parms->tbl_scope_id);
if (rc) {
TFP_DRV_LOG(ERR,
"Failed to allocate table scope\n");
@ -478,11 +472,7 @@ tf_em_ext_alloc(struct tf *tfp, struct tf_alloc_tbl_scope_parms *parms)
return -EINVAL;
cleanup:
/* Free Table control block */
fparms.rm_db = eem_db[TF_DIR_RX];
fparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
fparms.index = parms->tbl_scope_id;
tf_rm_free(&fparms);
tf_tbl_scope_free(parms->tbl_scope_id);
return -EINVAL;
}
@ -493,7 +483,6 @@ tf_em_ext_free(struct tf *tfp,
int rc = 0;
enum tf_dir dir;
struct tf_tbl_scope_cb *tbl_scope_cb;
struct tf_rm_free_parms aparms = { 0 };
tbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);
@ -502,11 +491,7 @@ tf_em_ext_free(struct tf *tfp,
return -EINVAL;
}
/* Free Table control block */
aparms.rm_db = eem_db[TF_DIR_RX];
aparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
aparms.index = parms->tbl_scope_id;
rc = tf_rm_free(&aparms);
rc = tf_tbl_scope_free(parms->tbl_scope_id);
if (rc) {
TFP_DRV_LOG(ERR,
"Failed to free table scope\n");

19
drivers/net/bnxt/tf_core/tf_em_system.c
View File

@ -364,9 +364,7 @@ tf_em_ext_alloc(struct tf *tfp,
int rc;
struct tf_session *tfs;
struct tf_tbl_scope_cb *tbl_scope_cb;
struct tf_rm_allocate_parms aparms = { 0 };
struct tf_free_tbl_scope_parms free_parms;
struct tf_rm_free_parms fparms = { 0 };
int dir;
int i;
struct hcapi_cfa_em_table *em_tables;
@ -382,10 +380,7 @@ tf_em_ext_alloc(struct tf *tfp,
return rc;
}
aparms.rm_db = eem_db[TF_DIR_RX];
aparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
aparms.index = (uint32_t *)&parms->tbl_scope_id;
rc = tf_rm_allocate(&aparms);
rc = tf_tbl_scope_alloc(&parms->tbl_scope_id);
if (rc) {
TFP_DRV_LOG(ERR,
"Failed to allocate table scope\n");
@ -473,10 +468,7 @@ tf_em_ext_alloc(struct tf *tfp,
cleanup:
/* Free Table control block */
fparms.rm_db = eem_db[TF_DIR_RX];
fparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
fparms.index = parms->tbl_scope_id;
tf_rm_free(&fparms);
tf_tbl_scope_free(parms->tbl_scope_id);
return -EINVAL;
}
@ -488,7 +480,6 @@ tf_em_ext_free(struct tf *tfp,
struct tf_session *tfs;
struct tf_tbl_scope_cb *tbl_scope_cb;
int dir;
struct tf_rm_free_parms aparms = { 0 };
TF_CHECK_PARMS2(tfp, parms);
@ -503,11 +494,7 @@ tf_em_ext_free(struct tf *tfp,
tbl_scope_cb = &tbl_scopes[parms->tbl_scope_id];
/* Free Table control block */
aparms.rm_db = eem_db[TF_DIR_RX];
aparms.db_index = TF_EM_TBL_TYPE_TBL_SCOPE;
aparms.index = parms->tbl_scope_id;
rc = tf_rm_free(&aparms);
rc = tf_tbl_scope_free(parms->tbl_scope_id);
if (rc) {
TFP_DRV_LOG(ERR,
"Failed to free table scope\n");