[v1,37/38] net/mvpp2: update qos defaults parameter name
Checks
Commit Message
From: Dana Vardi <danat@marvell.com>
'global_default' is only being used for 'qos'
so adding 'qos' into its name
Signed-off-by: Dana Vardi <danat@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
drivers/net/mvpp2/mrvl_ethdev.c | 2 +-
drivers/net/mvpp2/mrvl_qos.c | 12 ++++++------
drivers/net/mvpp2/mrvl_qos.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
Comments
Reviewed-by: Michael Shamis <michaelsh@marvell.com>
-----Original Message-----
From: dev <dev-bounces@dpdk.org> On Behalf Of lironh@marvell.com
Sent: Wednesday, December 2, 2020 12:12 PM
To: Jerin Jacob Kollanukkaran <jerinj@marvell.com>
Cc: dev@dpdk.org; Dana Vardi <danat@marvell.com>; Liron Himi <lironh@marvell.com>
Subject: [dpdk-dev] [PATCH v1 37/38] net/mvpp2: update qos defaults parameter name
From: Dana Vardi <danat@marvell.com>
'global_default' is only being used for 'qos'
so adding 'qos' into its name
Signed-off-by: Dana Vardi <danat@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
drivers/net/mvpp2/mrvl_ethdev.c | 2 +-
drivers/net/mvpp2/mrvl_qos.c | 12 ++++++------
drivers/net/mvpp2/mrvl_qos.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index 4b5c4f075..ca94805fb 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -902,7 +902,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
/* For default QoS config, don't start classifier. */
if (mrvl_cfg &&
- mrvl_cfg->port[dev->data->port_id].use_global_defaults == 0) {
+ mrvl_cfg->port[dev->data->port_id].use_qos_global_defaults == 0) {
ret = mrvl_start_qos_mapping(priv);
if (ret) {
MRVL_LOG(ERR, "Failed to setup QoS mapping"); diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c index f3936aec4..d9af07c3d 100644
--- a/drivers/net/mvpp2/mrvl_qos.c
+++ b/drivers/net/mvpp2/mrvl_qos.c
@@ -321,7 +321,7 @@ parse_tc_cfg(struct rte_cfgfile *file, int port, int tc,
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,
@@ -718,7 +718,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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;
/* Skip ports non-existing in configuration. */
if (rte_cfgfile_num_sections(file, sec_name, @@ -796,7 +796,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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 =
@@ -828,7 +828,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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;
@@ -867,7 +867,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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!");
@@ -984,7 +984,7 @@ mrvl_configure_rxqs(struct mrvl_priv *priv, uint16_t portid,
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.
diff --git a/drivers/net/mvpp2/mrvl_qos.h b/drivers/net/mvpp2/mrvl_qos.h index f2e341c37..763130bf1 100644
--- a/drivers/net/mvpp2/mrvl_qos.h
+++ b/drivers/net/mvpp2/mrvl_qos.h
@@ -45,7 +45,7 @@ struct mrvl_cfg {
uint16_t inqs;
uint16_t outqs;
uint8_t default_tc;
- uint8_t use_global_defaults;
+ uint8_t use_qos_global_defaults;
struct pp2_cls_plcr_params policer_params;
uint8_t setup_policer;
uint8_t forward_bad_frames;
--
2.28.0
@@ -902,7 +902,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
/* For default QoS config, don't start classifier. */
if (mrvl_cfg &&
- mrvl_cfg->port[dev->data->port_id].use_global_defaults == 0) {
+ mrvl_cfg->port[dev->data->port_id].use_qos_global_defaults == 0) {
ret = mrvl_start_qos_mapping(priv);
if (ret) {
MRVL_LOG(ERR, "Failed to setup QoS mapping");
@@ -321,7 +321,7 @@ parse_tc_cfg(struct rte_cfgfile *file, int port, int tc,
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,
@@ -718,7 +718,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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;
/* Skip ports non-existing in configuration. */
if (rte_cfgfile_num_sections(file, sec_name,
@@ -796,7 +796,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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 =
@@ -828,7 +828,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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;
@@ -867,7 +867,7 @@ mrvl_get_cfg(const char *key __rte_unused, const char *path, void *extra_args)
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!");
@@ -984,7 +984,7 @@ mrvl_configure_rxqs(struct mrvl_priv *priv, uint16_t portid,
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.
@@ -45,7 +45,7 @@ struct mrvl_cfg {
uint16_t inqs;
uint16_t outqs;
uint8_t default_tc;
- uint8_t use_global_defaults;
+ uint8_t use_qos_global_defaults;
struct pp2_cls_plcr_params policer_params;
uint8_t setup_policer;
uint8_t forward_bad_frames;