Skip to content

Commit 48423dd

Browse files
author
Jakub Kicinski
committed
Merge branch 'hns3-next' into net-next
Huazhong Tan says: ==================== This patch-set includes some new features for the HNS3 ethernet controller driver. [patch 01/06] adds support for configuring VF link status on the host. [patch 02/06] adds support for configuring VF spoof check. [patch 03/06] adds support for configuring VF trust. [patch 04/06] adds support for configuring VF bandwidth on the host. [patch 05/06] adds support for configuring VF MAC on the host. [patch 06/06] adds support for tx-scatter-gather-fraglist. ==================== Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
2 parents 11fc7d5 + 8ae10cf commit 48423dd

File tree

14 files changed

+986
-153
lines changed

14 files changed

+986
-153
lines changed

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ enum HCLGE_MBX_OPCODE {
4545
HCLGE_MBX_GET_LINK_MODE, /* (VF -> PF) get the link mode of pf */
4646
HCLGE_MBX_PUSH_VLAN_INFO, /* (PF -> VF) push port base vlan */
4747
HCLGE_MBX_GET_MEDIA_TYPE, /* (VF -> PF) get media type */
48+
HCLGE_MBX_PUSH_PROMISC_INFO, /* (PF -> VF) push vf promisc info */
4849

4950
HCLGE_MBX_GET_VF_FLR_STATUS = 200, /* (M7 -> PF) get vf reset status */
5051
HCLGE_MBX_PUSH_LINK_STATUS, /* (M7 -> PF) get port link status */

drivers/net/ethernet/hisilicon/hns3/hnae3.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,19 @@ struct hnae3_ae_dev {
364364
* Enable/disable HW GRO
365365
* add_arfs_entry
366366
* Check the 5-tuples of flow, and create flow director rule
367+
* get_vf_config
368+
* Get the VF configuration setting by the host
369+
* set_vf_link_state
370+
* Set VF link status
371+
* set_vf_spoofchk
372+
* Enable/disable spoof check for specified vf
373+
* set_vf_trust
374+
* Enable/disable trust for specified vf, if the vf being trusted, then
375+
* it can enable promisc mode
376+
* set_vf_rate
377+
* Set the max tx rate of specified vf.
378+
* set_vf_mac
379+
* Configure the default MAC for specified VF
367380
*/
368381
struct hnae3_ae_ops {
369382
int (*init_ae_dev)(struct hnae3_ae_dev *ae_dev);
@@ -529,6 +542,16 @@ struct hnae3_ae_ops {
529542
int (*mac_connect_phy)(struct hnae3_handle *handle);
530543
void (*mac_disconnect_phy)(struct hnae3_handle *handle);
531544
void (*restore_vlan_table)(struct hnae3_handle *handle);
545+
int (*get_vf_config)(struct hnae3_handle *handle, int vf,
546+
struct ifla_vf_info *ivf);
547+
int (*set_vf_link_state)(struct hnae3_handle *handle, int vf,
548+
int link_state);
549+
int (*set_vf_spoofchk)(struct hnae3_handle *handle, int vf,
550+
bool enable);
551+
int (*set_vf_trust)(struct hnae3_handle *handle, int vf, bool enable);
552+
int (*set_vf_rate)(struct hnae3_handle *handle, int vf,
553+
int min_tx_rate, int max_tx_rate, bool force);
554+
int (*set_vf_mac)(struct hnae3_handle *handle, int vf, u8 *p);
532555
};
533556

534557
struct hnae3_dcb_ops {

0 commit comments

Comments
 (0)