TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice: support turning on/off the parser's double vlan mode

Browse Source 
Add API ice_parser_dvm_set() to support turning on/off the parser's double
vlan mode.

Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Co-developed-by: Ahmed Zaki <ahmed.zaki@intel.com>
Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Junfeng Guo
2024-07-25 16:08:02 -06:00
committed by Tony Nguyen
parent 9a4c07aaa0
commit b2687653fe
2 changed files with 93 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/intel/ice/ice_parser.c
+75 -3
View File
@@ -597,6 +597,32 @@ static struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw)
ice_metainit_parse_item, false);
}
/**
* ice_bst_tcam_search - find a TCAM item with specific type
* @tcam_table: the TCAM table
* @lbl_table: the lbl table to search
* @type: the type we need to match against
* @start: start searching from this index
*
* Return: a pointer to the matching BOOST TCAM item or NULL.
*/
struct ice_bst_tcam_item *
ice_bst_tcam_search(struct ice_bst_tcam_item *tcam_table,
struct ice_lbl_item *lbl_table,
enum ice_lbl_type type, u16 *start)
{
u16 i = *start;
for (; i < ICE_BST_TCAM_TABLE_SIZE; i++) {
if (lbl_table[i].type == type) {
*start = i;
return &tcam_table[lbl_table[i].idx];
}
}
return NULL;
}
/*** ICE_SID_RXPARSER_CAM, ICE_SID_RXPARSER_PG_SPILL,
* ICE_SID_RXPARSER_NOMATCH_CAM and ICE_SID_RXPARSER_NOMATCH_CAM
* sections ***/
@@ -1151,6 +1177,7 @@ static void ice_lbl_dump(struct ice_hw *hw, struct ice_lbl_item *item)
struct device *dev = ice_hw_to_dev(hw);
dev_info(dev, "index = %u\n", item->idx);
dev_info(dev, "type = %u\n", item->type);
dev_info(dev, "label = %s\n", item->label);
}
@@ -1340,12 +1367,21 @@ static struct ice_bst_tcam_item *ice_bst_tcam_table_get(struct ice_hw *hw)
}
static void ice_parse_lbl_item(struct ice_hw *hw, u16 idx, void *item,
void *data, int size)
void *data, int __maybe_unused size)
{
memcpy(item, data, size);
struct ice_lbl_item *lbl_item = item;
struct ice_lbl_item *lbl_data = data;
lbl_item->idx = lbl_data->idx;
memcpy(lbl_item->label, lbl_data->label, sizeof(lbl_item->label));
if (strstarts(lbl_item->label, ICE_LBL_BST_DVM))
lbl_item->type = ICE_LBL_BST_TYPE_DVM;
else if (strstarts(lbl_item->label, ICE_LBL_BST_SVM))
lbl_item->type = ICE_LBL_BST_TYPE_SVM;
if (hw->debug_mask & ICE_DBG_PARSER)
ice_lbl_dump(hw, (struct ice_lbl_item *)item);
ice_lbl_dump(hw, lbl_item);
}
/**
@@ -2132,3 +2168,39 @@ void ice_parser_result_dump(struct ice_hw *hw, struct ice_parser_result *rslt)
dev_info(dev, "flags_fd = 0x%04x\n", rslt->flags_fd);
dev_info(dev, "flags_rss = 0x%04x\n", rslt->flags_rss);
}
#define ICE_BT_VLD_KEY 0xFF
#define ICE_BT_INV_KEY 0xFE
static void ice_bst_dvm_set(struct ice_parser *psr, enum ice_lbl_type type,
bool on)
{
u16 i = 0;
while (true) {
struct ice_bst_tcam_item *item;
u8 key;
item = ice_bst_tcam_search(psr->bst_tcam_table,
psr->bst_lbl_table,
type, &i);
if (!item)
break;
key = on ? ICE_BT_VLD_KEY : ICE_BT_INV_KEY;
item->key[ICE_BT_VM_OFF] = key;
item->key_inv[ICE_BT_VM_OFF] = key;
i++;
}
}
/**
* ice_parser_dvm_set - configure double vlan mode for parser
* @psr: pointer to a parser instance
* @on: true to turn on; false to turn off
*/
void ice_parser_dvm_set(struct ice_parser *psr, bool on)
{
ice_bst_dvm_set(psr, ICE_LBL_BST_TYPE_DVM, on);
ice_bst_dvm_set(psr, ICE_LBL_BST_TYPE_SVM, !on);
}
drivers/net/ethernet/intel/ice/ice_parser.h
+18
View File
@@ -274,13 +274,29 @@ struct ice_bst_tcam_item {
};
#define ICE_LBL_LEN 64
#define ICE_LBL_BST_DVM "BOOST_MAC_VLAN_DVM"
#define ICE_LBL_BST_SVM "BOOST_MAC_VLAN_SVM"
enum ice_lbl_type {
ICE_LBL_BST_TYPE_UNKNOWN,
ICE_LBL_BST_TYPE_DVM,
ICE_LBL_BST_TYPE_SVM,
};
struct ice_lbl_item {
u16 idx;
char label[ICE_LBL_LEN];
/* must be at the end, not part of the DDP section */
enum ice_lbl_type type;
};
struct ice_bst_tcam_item *
ice_bst_tcam_match(struct ice_bst_tcam_item *tcam_table, u8 *pat);
struct ice_bst_tcam_item *
ice_bst_tcam_search(struct ice_bst_tcam_item *tcam_table,
struct ice_lbl_item *lbl_table,
enum ice_lbl_type type, u16 *start);
/*** ICE_SID_RXPARSER_MARKER_PTYPE section ***/
#define ICE_PTYPE_MK_TCAM_TABLE_SIZE 1024
@@ -429,6 +445,7 @@ struct ice_parser_proto_off {
#define ICE_PARSER_PROTO_OFF_PAIR_SIZE 16
#define ICE_PARSER_FLAG_PSR_SIZE 8
#define ICE_BT_VM_OFF 0
struct ice_parser_result {
u16 ptype; /* 16 bits hardware PTYPE */
@@ -477,6 +494,7 @@ struct ice_parser {
struct ice_parser *ice_parser_create(struct ice_hw *hw);
void ice_parser_destroy(struct ice_parser *psr);
void ice_parser_dvm_set(struct ice_parser *psr, bool on);
int ice_parser_run(struct ice_parser *psr, const u8 *pkt_buf,
int pkt_len, struct ice_parser_result *rslt);
void ice_parser_result_dump(struct ice_hw *hw, struct ice_parser_result *rslt);