/* Parsing tokens. Defined conveniently, so that any correction is easy. */
#define MRVL_TOK_DEFAULT "default"
#define MRVL_TOK_DSA_MODE "dsa_mode"
-#define MRVL_TOK_DSA_MODE_NONE "none"
-#define MRVL_TOK_DSA_MODE_DSA "dsa"
-#define MRVL_TOK_DSA_MODE_EXT_DSA "ext_dsa"
+#define MRVL_TOK_START_HDR "start_hdr"
+#define MRVL_TOK_START_HDR_NONE "none"
+#define MRVL_TOK_START_HDR_DSA "dsa"
+#define MRVL_TOK_START_HDR_CUSTOM "custom"
+#define MRVL_TOK_START_HDR_EXT_DSA "ext_dsa"
#define MRVL_TOK_DEFAULT_TC "default_tc"
#define MRVL_TOK_DSCP "dscp"
#define MRVL_TOK_MAPPING_PRIORITY "mapping_priority"
#define MRVL_TOK_PARSER_UDF_PROTO_UDP "udp"
#define MRVL_TOK_PARSER_UDF_FIELD_UDP_DPORT "dport"
+/* parser forward bad frames tokens */
+#define MRVL_TOK_FWD_BAD_FRAMES "forward_bad_frames"
+
+/* parse fill bpool buffers tokens */
+#define MRVL_TOK_FILL_BPOOL_BUFFS "fill_bpool_buffs"
/** Number of tokens in range a-b = 2. */
#define MAX_RNG_TOKENS 2
if (rte_cfgfile_num_sections(file, sec_name, strlen(sec_name)) <= 0)
return 0;
- cfg->port[port].use_global_defaults = 0;
+ cfg->port[port].use_qos_global_defaults = 0;
entry = rte_cfgfile_get_entry(file, sec_name, MRVL_TOK_RXQ);
if (entry) {
n = get_entry_values(entry,
MRVL_TOK_PORT, n, MRVL_TOK_DEFAULT);
/* Use global defaults, unless an override occurs */
- (*cfg)->port[n].use_global_defaults = 1;
+ (*cfg)->port[n].use_qos_global_defaults = 1;
+
+ /* Set non-zero defaults before the decision to continue to next
+ * port or to parse the port section in config file
+ */
+ (*cfg)->port[n].fill_bpool_buffs = MRVL_BURST_SIZE;
/* Skip ports non-existing in configuration. */
if (rte_cfgfile_num_sections(file, sec_name,
continue;
}
+ /* MRVL_TOK_START_HDR replaces MRVL_TOK_DSA_MODE parameter.
+ * MRVL_TOK_DSA_MODE will be supported for backward
+ * compatibillity.
+ */
entry = rte_cfgfile_get_entry(file, sec_name,
+ MRVL_TOK_START_HDR);
+ /* if start_hsr is missing, check if dsa_mode exist instead */
+ if (entry == NULL)
+ entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_DSA_MODE);
if (entry) {
- if (!strncmp(entry, MRVL_TOK_DSA_MODE_NONE,
- sizeof(MRVL_TOK_DSA_MODE_NONE)))
+ if (!strncmp(entry, MRVL_TOK_START_HDR_NONE,
+ sizeof(MRVL_TOK_START_HDR_NONE)))
(*cfg)->port[n].eth_start_hdr =
PP2_PPIO_HDR_ETH;
- else if (!strncmp(entry, MRVL_TOK_DSA_MODE_DSA,
- sizeof(MRVL_TOK_DSA_MODE_DSA)))
+ else if (!strncmp(entry, MRVL_TOK_START_HDR_DSA,
+ sizeof(MRVL_TOK_START_HDR_DSA)))
(*cfg)->port[n].eth_start_hdr =
PP2_PPIO_HDR_ETH_DSA;
- else if (!strncmp(entry, MRVL_TOK_DSA_MODE_EXT_DSA,
- sizeof(MRVL_TOK_DSA_MODE_EXT_DSA))) {
+ else if (!strncmp(entry, MRVL_TOK_START_HDR_CUSTOM,
+ sizeof(MRVL_TOK_START_HDR_CUSTOM)))
+ (*cfg)->port[n].eth_start_hdr =
+ PP2_PPIO_HDR_ETH_CUSTOM;
+ else if (!strncmp(entry, MRVL_TOK_START_HDR_EXT_DSA,
+ sizeof(MRVL_TOK_START_HDR_EXT_DSA))) {
(*cfg)->port[n].eth_start_hdr =
PP2_PPIO_HDR_ETH_EXT_DSA;
} else {
MRVL_LOG(ERR,
"Error in parsing %s value (%s)!\n",
- MRVL_TOK_DSA_MODE, entry);
+ MRVL_TOK_START_HDR, entry);
return -1;
}
} else {
entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_MAPPING_PRIORITY);
if (entry) {
- (*cfg)->port[n].use_global_defaults = 0;
+ (*cfg)->port[n].use_qos_global_defaults = 0;
if (!strncmp(entry, MRVL_TOK_VLAN_IP,
sizeof(MRVL_TOK_VLAN_IP)))
(*cfg)->port[n].mapping_priority =
entry = rte_cfgfile_get_entry(file, sec_name,
MRVL_TOK_PLCR_DEFAULT);
if (entry) {
- (*cfg)->port[n].use_global_defaults = 0;
+ (*cfg)->port[n].use_qos_global_defaults = 0;
if (get_val_securely(entry, &val) < 0)
return -1;
return -1;
(*cfg)->port[n].default_tc = (uint8_t)val;
} else {
- if ((*cfg)->port[n].use_global_defaults == 0) {
+ if ((*cfg)->port[n].use_qos_global_defaults == 0) {
MRVL_LOG(ERR,
"Default Traffic Class required in "
"custom configuration!");
return -1;
}
}
+
+ /* Parse forward bad frames option */
+ entry = rte_cfgfile_get_entry(file, sec_name,
+ MRVL_TOK_FWD_BAD_FRAMES);
+ if (entry) {
+ if (get_val_securely(entry, &val) < 0) {
+ MRVL_LOG(ERR,
+ "Error in parsing %s value (%s)!\n",
+ MRVL_TOK_FWD_BAD_FRAMES, entry);
+ return -1;
+ }
+ (*cfg)->port[n].forward_bad_frames = (uint8_t)val;
+ } else {
+ (*cfg)->port[n].forward_bad_frames = 0;
+ }
+
+ /* Parse fill bpool buffs option */
+ entry = rte_cfgfile_get_entry(file, sec_name,
+ MRVL_TOK_FILL_BPOOL_BUFFS);
+ if (entry) {
+ if (get_val_securely(entry, &val) < 0) {
+ MRVL_LOG(ERR,
+ "Error in parsing %s value (%s)!\n",
+ MRVL_TOK_FILL_BPOOL_BUFFS, entry);
+ return -1;
+ }
+ (*cfg)->port[n].fill_bpool_buffs = val;
+ }
}
return 0;
param->pkt_offset = MRVL_PKT_OFFS;
param->pools[0][0] = bpool;
+ param->pools[0][1] = dummy_pool[bpool->pp2_id];
param->default_color = color;
inq_params = rte_zmalloc_socket("inq_params",
size_t i, tc;
if (mrvl_cfg == NULL ||
- mrvl_cfg->port[portid].use_global_defaults) {
+ mrvl_cfg->port[portid].use_qos_global_defaults) {
/*
* No port configuration, use default: 1 TC, no QoS,
* TC color set to green.