net: hinic: Add support for configuration of rx-vlan-filter by ethtool
Subsystems (3)
Cai Huoqing
maintainerPATCH 1/1 net: hinic: Add support for configuration of rx-vlan-filter by ethtool
When ethtool config rx-vlan-filter: 'ethtool -K ethx rx-vlan-filter on/off' to turn on/off the vlan filter, the driver will send control command to firmware, then set to hardware in this patch.
Signed-off-by Cai Huoqing <[email protected]>
--- .../net/ethernet/huawei/hinic/hinic_main.c | 10 ++++++ .../net/ethernet/huawei/hinic/hinic_port.c | 33 +++++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_port.h | 12 +++++++ 3 files changed, 55 insertions(+)
drivers/net/ethernet/huawei/hinic/hinic_main.c +10 -0
@@ -1092,6 +1092,16 @@ static int set_features(struct hinic_dev *nic_dev, } } +if (changed &NETIF_F_HW_VLAN_CTAG_FILTER ) { + ret =hinic_set_vlan_fliter (nic_dev, + !!(features & +NETIF_F_HW_VLAN_CTAG_FILTER )); +if (ret) { + err = ret; + failed_features |=NETIF_F_HW_VLAN_CTAG_FILTER ; + } + } +if (err) { nic_dev->netdev->features = features ^ failed_features;return -EIO ;
drivers/net/ethernet/huawei/hinic/hinic_port.c +33 -0
@@ -447,6 +447,39 @@ int hinic_set_rx_vlan_offload(struct hinic_dev *nic_dev, u8 en)return 0 ; } +int hinic_set_vlan_fliter (struct hinic_dev *nic_dev,u32 en) +{ +struct hinic_hwdev *hwdev = nic_dev->hwdev; +struct hinic_hwif *hwif = hwdev->hwif; +struct pci_dev *pdev = hwif->pdev; +struct hinic_vlan_filter vlan_filter; +u16 out_size =sizeof (vlan_filter); +int err; + +if (!hwdev) +return -EINVAL ; + + vlan_filter.func_idx =HINIC_HWIF_FUNC_IDX (hwif); + vlan_filter.enable = en; + + err =hinic_port_msg_cmd (hwdev,HINIC_PORT_CMD_SET_VLAN_FILTER , + &vlan_filter,sizeof (vlan_filter), + &vlan_filter, &out_size); +if (vlan_filter.status ==HINIC_MGMT_CMD_UNSUPPORTED ) { + err =HINIC_MGMT_CMD_UNSUPPORTED ; + }else if ((err ==HINIC_MBOX_VF_CMD_ERROR ) && +HINIC_IS_VF (hwif)) { + err =HINIC_MGMT_CMD_UNSUPPORTED ; + }else if (err || !out_size || vlan_filter.status) { +dev_err (&pdev->dev, +"Failed to set vlan fliter, err: %d, status: 0x%x, out size: 0x%x\n" , + err, vlan_filter.status, out_size); + err = -EINVAL ; + } + +return err; +} +int hinic_set_max_qnum (struct hinic_dev *nic_dev,u8 num_rqs) {struct hinic_hwdev *hwdev = nic_dev->hwdev;
drivers/net/ethernet/huawei/hinic/hinic_port.h +12 -0
@@ -351,6 +351,16 @@ struct hinic_vlan_cfg {u8 rsvd1[5 ]; }; +struct hinic_vlan_filter { +u8 status; +u8 version; +u8 rsvd0[6 ]; + +u16 func_idx; +u8 rsvd1[2 ]; +u32 enable; +}; +struct hinic_rss_template_mgmt {u8 status;u8 version;
@@ -831,6 +841,8 @@ int hinic_get_vport_stats(struct hinic_dev *nic_dev,int hinic_set_rx_vlan_offload (struct hinic_dev *nic_dev,u8 en); +int hinic_set_vlan_fliter (struct hinic_dev *nic_dev,u32 en); +int hinic_get_mgmt_version (struct hinic_dev *nic_dev,u8 *mgmt_ver); int hinic_set_link_settings(struct hinic_hwdev *hwdev,
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerQuoted 3 lines · On Mon, 31 Oct 2022 15:47:03 +0800 Cai Huoqing wrote:
When ethtool config rx-vlan-filter: 'ethtool -K ethx rx-vlan-filter on/off' to turn on/off the vlan filter, the driver will send control command to firmware, then set to hardware in this patch.
This patch depends on a definition added in your other set. Please repost once that gets merged, otherwise it doesn't build.