From: "ke1x.zhang" <ke1x.zh...@intel.com>
Add the feature that support to disable default mac which
will be used by ice driver when setting dpdk_devargs config
field.
Default mac is not disabled in default, user can
choose to disable the default mac
by setting ``devargs`` parameter ``default-mac-disable``,
for example::
-a 80:00.0,default-mac-disable=1
Signed-off-by: ke1x.zhang <ke1x.zh...@intel.com>
---
doc/guides/nics/ice.rst | 11 +++++++++++
drivers/net/ice/ice_ethdev.c | 21 ++++++++++++++++++---
drivers/net/ice/ice_ethdev.h | 1 +
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index ce075e067c..860ed1430d 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -105,6 +105,17 @@ Runtime Config Options
-a 80:00.0,pipeline-mode-support=1
+- ``Default Mac Disable`` (default ``0``)
+
+ Add the feature that support to disable default mac which will be used by
ice driver
+ when setting dpdk_devargs config field.
+
+ Default mac is not disabled in default, user can choose to disable the
default mac
+ by setting ``devargs`` parameter ``default-mac-disable``,
+ for example::
+
+ -a 80:00.0,default-mac-disable=1
+
- ``Protocol extraction for per queue``
Configure the RX queues to do protocol extraction into mbuf for protocol
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0bc739daf0..0d011bbffa 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -28,6 +28,7 @@
/* devargs */
#define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"
+#define ICE_DEFAULT_MAC_DISABLE "default-mac-disable"
#define ICE_PROTO_XTR_ARG "proto_xtr"
#define ICE_FIELD_OFFS_ARG "field_offs"
#define ICE_FIELD_NAME_ARG "field_name"
@@ -49,6 +50,7 @@ static const char * const ice_valid_args[] = {
ICE_HW_DEBUG_MASK_ARG,
ICE_ONE_PPS_OUT_ARG,
ICE_RX_LOW_LATENCY_ARG,
+ ICE_DEFAULT_MAC_DISABLE,
NULL
};
@@ -916,6 +918,7 @@ static int
ice_init_mac_address(struct rte_eth_dev *dev)
{
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ice_adapter *ad = (struct ice_adapter *)hw->back;
if (!rte_is_unicast_ether_addr
((struct rte_ether_addr *)hw->port_info[0].mac.lan_addr)) {
@@ -935,9 +938,9 @@ ice_init_mac_address(struct rte_eth_dev *dev)
return -ENOMEM;
}
/* store it to dev data */
- rte_ether_addr_copy(
- (struct rte_ether_addr *)hw->port_info[0].mac.perm_addr,
- &dev->data->mac_addrs[0]);
+ if (ad->devargs.default_mac_disable != 1)
+ rte_ether_addr_copy((struct rte_ether_addr
*)hw->port_info[0].mac.perm_addr,
+ &dev->data->mac_addrs[0]);
return 0;
}
@@ -962,8 +965,14 @@ ice_add_mac_filter(struct ice_vsi *vsi, struct
rte_ether_addr *mac_addr)
struct ice_mac_filter *f;
struct LIST_HEAD_TYPE list_head;
struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+ struct ice_adapter *ad = (struct ice_adapter *)hw->back;
int ret = 0;
+ if (ad->devargs.default_mac_disable == 1 &&
rte_is_same_ether_addr(mac_addr,
+ (struct rte_ether_addr
*)hw->port_info[0].mac.perm_addr)) {
+ PMD_DRV_LOG(ERR, "This Default MAC filter is disabled.");
+ return 0;
+ }
/* If it's added and configured, return */
f = ice_find_mac_filter(vsi, mac_addr);
if (f) {
@@ -2075,6 +2084,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
goto bail;
+ ret = rte_kvargs_process(kvlist, ICE_DEFAULT_MAC_DISABLE,
+ &parse_bool, &ad->devargs.default_mac_disable);
+ if (ret)
+ goto bail;
+
ret = rte_kvargs_process(kvlist, ICE_HW_DEBUG_MASK_ARG,
&parse_u64, &ad->hw.debug_mask);
if (ret)
@@ -6050,6 +6064,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_ice,
ICE_PROTO_XTR_ARG
"=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp|ip_offset>"
ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"
+ ICE_DEFAULT_MAC_DISABLE "=<0|1>"
ICE_RX_LOW_LATENCY_ARG "=<0|1>");
RTE_LOG_REGISTER_SUFFIX(ice_logtype_init, init, NOTICE);
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index c8311be179..9140f3af79 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -563,6 +563,7 @@ struct ice_devargs {
int safe_mode_support;
uint8_t proto_xtr_dflt;
int pipe_mode_support;
+ uint8_t default_mac_disable;
uint8_t proto_xtr[ICE_MAX_QUEUE_NUM];
uint8_t pin_idx;
uint8_t pps_out_ena;
--
2.34.1
