net/i40e: enable VF to program MAC address
PATCH 1/1 net/i40e: enable VF to program MAC address
Due to the restriction of the flag I40E_FLAG_VF_MAC_BY_PF, VF cannot program the MAC address.
In order to solve this inflexibility, the use of I40E_FLAG_VF_MAC_BY_PF has been deleted in the code implementation to ensure that VF can flexibly program the MAC address.
--- drivers/net/i40e/i40e_ethdev.h | 4 +--- drivers/net/i40e/i40e_ethdev_vf.c | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/net/i40e/i40e_ethdev.h +1 -3
@@ -124,7 +124,6 @@ enum i40e_flxpld_layer_idx {#define I40E_FLAG_FDIR (1ULL << 6)#define I40E_FLAG_VXLAN (1ULL << 7)#define I40E_FLAG_RSS_AQ_CAPABLE (1ULL << 8) -#define I40E_FLAG_VF_MAC_BY_PF (1ULL << 9)#define I40E_FLAG_ALL (I40E_FLAG_RSS | \ I40E_FLAG_DCB | \ I40E_FLAG_VMDQ | \
@@ -133,8 +132,7 @@ enum i40e_flxpld_layer_idx { I40E_FLAG_HEADER_SPLIT_ENABLED | \ I40E_FLAG_FDIR | \ I40E_FLAG_VXLAN | \ - I40E_FLAG_RSS_AQ_CAPABLE | \ - I40E_FLAG_VF_MAC_BY_PF) + I40E_FLAG_RSS_AQ_CAPABLE)#define I40E_RSS_OFFLOAD_ALL ( \ ETH_RSS_FRAG_IPV4 | \
drivers/net/i40e/i40e_ethdev_vf.c +1 -7
@@ -1309,10 +1309,8 @@ i40evf_init_vf(struct rte_eth_dev *dev) vf->vsi.adapter =I40E_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Store the MAC address configured by host, or generate random one */ -if (rte_is_valid_assigned_ether_addr ( +if (!rte_is_valid_assigned_ether_addr ( (struct rte_ether_addr *)hw->mac.addr)) - vf->flags |=I40E_FLAG_VF_MAC_BY_PF ; -else rte_eth_random_addr (hw->mac.addr);/* Generate a random one */ I40E_WRITE_REG(hw, I40E_VFINT_DYN_CTL01,
@@ -2780,7 +2778,6 @@ static int i40evf_set_default_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { - struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);if (!rte_is_valid_assigned_ether_addr (mac_addr)) {
@@ -2788,9 +2785,6 @@ i40evf_set_default_mac_addr(struct rte_eth_dev *dev,return -EINVAL ; } -if (vf->flags &I40E_FLAG_VF_MAC_BY_PF ) -return -EPERM ; -i40evf_del_mac_addr_by_addr (dev, (struct rte_ether_addr *)hw->mac.addr);if (i40evf_add_mac_addr (dev, mac_addr,0 ,0 ) !=0 )
Signature · 1 line
2.17.1
Quoted 10 lines
-----Original Message-----
From: Sun, GuinanX <[email protected]>
Sent: Tuesday, March 24, 2020 12:37 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Sun, GuinanX <[email protected]>
Subject: [PATCH] net/i40e: enable VF to program MAC address
Quoted 8 lines
Due to the restriction of the flag
I40E_FLAG_VF_MAC_BY_PF, VF cannot program the MAC address.
In order to solve this inflexibility, the use ofI40E_FLAG_VF_MAC_BY_PFhas been deleted in the code implementation to ensure that VF can flexibly program the MAC address.Signed-off-by Guinan Sun <[email protected]>---
Quoted 71 lines · Guinan Sun
Due to the restriction of the flag
I40E_FLAG_VF_MAC_BY_PF, VF cannot program the MAC address.
In order to solve this inflexibility, the use ofI40E_FLAG_VF_MAC_BY_PFhas been deleted in the code implementation to ensure that VF can flexibly program the MAC address.Signed-off-by Guinan Sun <[email protected]>---
drivers/net/i40e/i40e_ethdev.h| 4 +---drivers/net/i40e/i40e_ethdev_vf.c| 8 +-------2 files changed, 2 insertions(+), 10 deletions(-)drivers/net/i40e/i40e_ethdev.h +1
-3@@ -124,7 +124,6 @@ enum i40e_flxpld_layer_idx {#define I40E_FLAG_FDIR (1ULL << 6)#define I40E_FLAG_VXLAN (1ULL << 7)#define I40E_FLAG_RSS_AQ_CAPABLE (1ULL << 8) -#define I40E_FLAG_VF_MAC_BY_PF (1ULL << 9)#define I40E_FLAG_ALL (I40E_FLAG_RSS | \ I40E_FLAG_DCB | \ I40E_FLAG_VMDQ | \@@ -133,8 +132,7 @@ enum i40e_flxpld_layer_idx { I40E_FLAG_HEADER_SPLIT_ENABLED | \ I40E_FLAG_FDIR | \ I40E_FLAG_VXLAN | \ - I40E_FLAG_RSS_AQ_CAPABLE | \ - I40E_FLAG_VF_MAC_BY_PF) + I40E_FLAG_RSS_AQ_CAPABLE)#define I40E_RSS_OFFLOAD_ALL ( \ ETH_RSS_FRAG_IPV4 | \drivers/net/i40e/i40e_ethdev_vf.c +1
-7@@ -1309,10 +1309,8 @@ i40evf_init_vf(struct rte_eth_dev *dev) vf->vsi.adapter =I40E_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Store the MAC address configured by host, or generate random one */ -if (rte_is_valid_assigned_ether_addr ( +if (!rte_is_valid_assigned_ether_addr ( (struct rte_ether_addr *)hw->mac.addr)) - vf->flags |=I40E_FLAG_VF_MAC_BY_PF ; -else rte_eth_random_addr (hw->mac.addr);/* Generate a random one */ I40E_WRITE_REG(hw, I40E_VFINT_DYN_CTL01,@@ -2780,7 +2778,6 @@ static int i40evf_set_default_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { - struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);if (!rte_is_valid_assigned_ether_addr (mac_addr)) {@@ -2788,9 +2785,6 @@ i40evf_set_default_mac_addr(struct rte_eth_dev *dev,return -EINVAL ; } -if (vf->flags &I40E_FLAG_VF_MAC_BY_PF ) -return -EPERM ; -i40evf_del_mac_addr_by_addr (dev, (struct rte_ether_addr *)hw->mac.addr);if (i40evf_add_mac_addr (dev, mac_addr,0 ,0 ) !=0 )Signature · 1 line
2.17.1
Applied to dpdk-next-net-intel, Thanks.