diff mbox series

[net-next,v4,5/6] net: ngbe: add sriov function support

Message ID 43A4981B56011827+20240604155850.51983-6-mengyuanlou@net-swift.com (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series add sriov support for wangxun NICs | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 901 this patch: 901
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers warning 4 maintainers not CCed: kuba@kernel.org pabeni@redhat.com linux@armlinux.org.uk edumazet@google.com
netdev/build_clang success Errors and warnings before: 905 this patch: 905
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 905 this patch: 905
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 207 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 8 this patch: 8
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-06-05--00-00 (tests: 1045)

Commit Message

Mengyuan Lou June 4, 2024, 3:57 p.m. UTC 
Add sriov_configure for driver ops.
Add mailbox handler wx_msg_task for ngbe in
the interrupt handler.
Add the notification flow when the vfs exist.

Signed-off-by: Mengyuan Lou <mengyuanlou@net-swift.com>
---
 drivers/net/ethernet/wangxun/libwx/wx_sriov.c | 31 ++++++++++
 drivers/net/ethernet/wangxun/libwx/wx_sriov.h |  2 +
 drivers/net/ethernet/wangxun/libwx/wx_type.h  |  2 +
 drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 58 +++++++++++++++++--
 drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 10 ++++
 drivers/net/ethernet/wangxun/ngbe/ngbe_type.h |  2 +
 6 files changed, 101 insertions(+), 4 deletions(-)

Comments

Wojciech Drewek June 5, 2024, 9:44 a.m. UTC | #1 
On 04.06.2024 17:57, Mengyuan Lou wrote:
> Add sriov_configure for driver ops.
> Add mailbox handler wx_msg_task for ngbe in
> the interrupt handler.
> Add the notification flow when the vfs exist.
> 
> Signed-off-by: Mengyuan Lou <mengyuanlou@net-swift.com>
> ---

Only one nit
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>

>  drivers/net/ethernet/wangxun/libwx/wx_sriov.c | 31 ++++++++++
>  drivers/net/ethernet/wangxun/libwx/wx_sriov.h |  2 +
>  drivers/net/ethernet/wangxun/libwx/wx_type.h  |  2 +
>  drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 58 +++++++++++++++++--
>  drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 10 ++++
>  drivers/net/ethernet/wangxun/ngbe/ngbe_type.h |  2 +
>  6 files changed, 101 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_sriov.c b/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
> index 315d51961449..6d470cd0f317 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
> @@ -944,3 +944,34 @@ void wx_msg_task(struct wx *wx)
>  	}
>  }
>  EXPORT_SYMBOL(wx_msg_task);
> +
> +void wx_disable_vf_rx_tx(struct wx *wx)
> +{
> +	wr32(wx, WX_TDM_VFTE_CLR(0), 0);
> +	wr32(wx, WX_RDM_VFRE_CLR(0), 0);
> +	if (wx->mac.type == wx_mac_sp) {
> +		wr32(wx, WX_TDM_VFTE_CLR(1), 0);
> +		wr32(wx, WX_RDM_VFRE_CLR(1), 0);
> +	}
> +}
> +EXPORT_SYMBOL(wx_disable_vf_rx_tx);
> +
> +void wx_ping_all_vfs_with_link_status(struct wx *wx, bool link_up)
> +{
> +	u32 msgbuf[2] = {0, 0};
> +	u16 i;
> +
> +	if (!wx->num_vfs)
> +		return;
> +	msgbuf[0] = WX_PF_NOFITY_VF_LINK_STATUS | WX_PF_CONTROL_MSG;
> +	if (link_up)
> +		msgbuf[1] = (wx->speed << 1) | link_up;
> +	if (wx->notify_not_runnning)
> +		msgbuf[1] |= WX_PF_NOFITY_VF_NET_NOT_RUNNING;
> +	for (i = 0 ; i < wx->num_vfs; i++) {
> +		if (wx->vfinfo[i].clear_to_send)
> +			msgbuf[0] |= WX_VT_MSGTYPE_CTS;
> +		wx_write_mbx_pf(wx, msgbuf, 2, i);
> +	}
> +}
> +EXPORT_SYMBOL(wx_ping_all_vfs_with_link_status);
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_sriov.h b/drivers/net/ethernet/wangxun/libwx/wx_sriov.h
> index f311774a2a18..7e45b3f71a7b 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_sriov.h
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_sriov.h
> @@ -7,5 +7,7 @@
>  int wx_disable_sriov(struct wx *wx);
>  int wx_pci_sriov_configure(struct pci_dev *pdev, int num_vfs);
>  void wx_msg_task(struct wx *wx);
> +void wx_disable_vf_rx_tx(struct wx *wx);
> +void wx_ping_all_vfs_with_link_status(struct wx *wx, bool link_up);
>  
>  #endif /* _WX_SRIOV_H_ */
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
> index 3a7931c2e4bc..b8f0bf93a0fb 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
> @@ -87,6 +87,7 @@
>  /************************* Port Registers ************************************/
>  /* port cfg Registers */
>  #define WX_CFG_PORT_CTL              0x14400
> +#define WX_CFG_PORT_CTL_PFRSTD       BIT(14)
>  #define WX_CFG_PORT_CTL_DRV_LOAD     BIT(3)
>  #define WX_CFG_PORT_CTL_QINQ         BIT(2)
>  #define WX_CFG_PORT_CTL_D_VLAN       BIT(0) /* double vlan*/
> @@ -1102,6 +1103,7 @@ struct wx {
>  	enum wx_reset_type reset_type;
>  
>  	/* PHY stuff */
> +	bool notify_not_runnning;

maybe notify_down?

>  	unsigned int link;
>  	int speed;
>  	int duplex;
> diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> index e894e01d030d..583e8e882f17 100644
> --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> @@ -14,6 +14,8 @@
>  #include "../libwx/wx_type.h"
>  #include "../libwx/wx_hw.h"
>  #include "../libwx/wx_lib.h"
> +#include "../libwx/wx_mbx.h"
> +#include "../libwx/wx_sriov.h"
>  #include "ngbe_type.h"
>  #include "ngbe_mdio.h"
>  #include "ngbe_hw.h"
> @@ -128,6 +130,10 @@ static int ngbe_sw_init(struct wx *wx)
>  	wx->tx_work_limit = NGBE_DEFAULT_TX_WORK;
>  	wx->rx_work_limit = NGBE_DEFAULT_RX_WORK;
>  
> +	wx->mbx.size = WX_VXMAILBOX_SIZE;
> +	wx->setup_tc = ngbe_setup_tc;
> +	set_bit(0, &wx->fwd_bitmask);
> +
>  	return 0;
>  }
>  
> @@ -197,11 +203,25 @@ static irqreturn_t ngbe_intr(int __always_unused irq, void *data)
>  
>  static irqreturn_t ngbe_msix_other(int __always_unused irq, void *data)
>  {
> -	struct wx *wx = data;
> +	struct wx_q_vector *q_vector;
> +	struct wx *wx  = data;
> +	u32 eicr;
>  
> -	/* re-enable the original interrupt state, no lsc, no queues */
> -	if (netif_running(wx->netdev))
> -		ngbe_irq_enable(wx, false);
> +	q_vector = wx->q_vector[0];
> +
> +	eicr = wx_misc_isb(wx, WX_ISB_MISC);
> +
> +	if (eicr & NGBE_PX_MISC_IC_VF_MBOX)
> +		wx_msg_task(wx);
> +
> +	if (wx->num_vfs == 7) {
> +		napi_schedule_irqoff(&q_vector->napi);
> +		ngbe_irq_enable(wx, true);
> +	} else {
> +		/* re-enable the original interrupt state, no lsc, no queues */
> +		if (netif_running(wx->netdev))
> +			ngbe_irq_enable(wx, false);
> +	}
>  
>  	return IRQ_HANDLED;
>  }
> @@ -291,6 +311,22 @@ static void ngbe_disable_device(struct wx *wx)
>  	struct net_device *netdev = wx->netdev;
>  	u32 i;
>  
> +	if (wx->num_vfs) {
> +		/* Clear EITR Select mapping */
> +		wr32(wx, WX_PX_ITRSEL, 0);
> +
> +		/* Mark all the VFs as inactive */
> +		for (i = 0 ; i < wx->num_vfs; i++)
> +			wx->vfinfo[i].clear_to_send = 0;
> +		wx->notify_not_runnning = true;
> +		/* ping all the active vfs to let them know we are going down */
> +		wx_ping_all_vfs_with_link_status(wx, false);
> +		wx->notify_not_runnning = false;
> +
> +		/* Disable all VFTE/VFRE TX/RX */
> +		wx_disable_vf_rx_tx(wx);
> +	}
> +
>  	/* disable all enabled rx queues */
>  	for (i = 0; i < wx->num_rx_queues; i++)
>  		/* this call also flushes the previous write */
> @@ -313,10 +349,17 @@ static void ngbe_disable_device(struct wx *wx)
>  	wx_update_stats(wx);
>  }
>  
> +static void ngbe_reset(struct wx *wx)
> +{
> +	wx_flush_sw_mac_table(wx);
> +	wx_mac_set_default_filter(wx, wx->mac.addr);
> +}
> +
>  void ngbe_down(struct wx *wx)
>  {
>  	phylink_stop(wx->phylink);
>  	ngbe_disable_device(wx);
> +	ngbe_reset(wx);
>  	wx_clean_all_tx_rings(wx);
>  	wx_clean_all_rx_rings(wx);
>  }
> @@ -339,6 +382,11 @@ void ngbe_up(struct wx *wx)
>  		ngbe_sfp_modules_txrx_powerctl(wx, true);
>  
>  	phylink_start(wx->phylink);
> +	/* Set PF Reset Done bit so PF/VF Mail Ops can work */
> +	wr32m(wx, WX_CFG_PORT_CTL,
> +	      WX_CFG_PORT_CTL_PFRSTD, WX_CFG_PORT_CTL_PFRSTD);
> +	if (wx->num_vfs)
> +		wx_ping_all_vfs_with_link_status(wx, false);
>  }
>  
>  /**
> @@ -723,6 +771,7 @@ static void ngbe_remove(struct pci_dev *pdev)
>  	struct net_device *netdev;
>  
>  	netdev = wx->netdev;
> +	wx_disable_sriov(wx);
>  	unregister_netdev(netdev);
>  	phylink_destroy(wx->phylink);
>  	pci_release_selected_regions(pdev,
> @@ -782,6 +831,7 @@ static struct pci_driver ngbe_driver = {
>  	.suspend  = ngbe_suspend,
>  	.resume   = ngbe_resume,
>  	.shutdown = ngbe_shutdown,
> +	.sriov_configure = wx_pci_sriov_configure,
>  };
>  
>  module_pci_driver(ngbe_driver);
> diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
> index ec54b18c5fe7..dd01aec87b02 100644
> --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
> +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
> @@ -8,6 +8,7 @@
>  
>  #include "../libwx/wx_type.h"
>  #include "../libwx/wx_hw.h"
> +#include "../libwx/wx_sriov.h"
>  #include "ngbe_type.h"
>  #include "ngbe_mdio.h"
>  
> @@ -64,6 +65,11 @@ static void ngbe_mac_config(struct phylink_config *config, unsigned int mode,
>  static void ngbe_mac_link_down(struct phylink_config *config,
>  			       unsigned int mode, phy_interface_t interface)
>  {
> +	struct wx *wx = phylink_to_wx(config);
> +
> +	wx->speed = 0;
> +	/* ping all the active vfs to let them know we are going down */
> +	wx_ping_all_vfs_with_link_status(wx, false);
>  }
>  
>  static void ngbe_mac_link_up(struct phylink_config *config,
> @@ -103,6 +109,10 @@ static void ngbe_mac_link_up(struct phylink_config *config,
>  	wr32(wx, WX_MAC_PKT_FLT, WX_MAC_PKT_FLT_PR);
>  	reg = rd32(wx, WX_MAC_WDG_TIMEOUT);
>  	wr32(wx, WX_MAC_WDG_TIMEOUT, reg);
> +
> +	wx->speed = speed;
> +	/* ping all the active vfs to let them know we are going up */
> +	wx_ping_all_vfs_with_link_status(wx, true);
>  }
>  
>  static const struct phylink_mac_ops ngbe_mac_ops = {
> diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
> index f48ed7fc1805..bb70af035c39 100644
> --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
> +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
> @@ -72,11 +72,13 @@
>  #define NGBE_PX_MISC_IEN_DEV_RST		BIT(10)
>  #define NGBE_PX_MISC_IEN_ETH_LK			BIT(18)
>  #define NGBE_PX_MISC_IEN_INT_ERR		BIT(20)
> +#define NGBE_PX_MISC_IC_VF_MBOX			BIT(23)
>  #define NGBE_PX_MISC_IEN_GPIO			BIT(26)
>  #define NGBE_PX_MISC_IEN_MASK ( \
>  				NGBE_PX_MISC_IEN_DEV_RST | \
>  				NGBE_PX_MISC_IEN_ETH_LK | \
>  				NGBE_PX_MISC_IEN_INT_ERR | \
> +				NGBE_PX_MISC_IC_VF_MBOX | \
>  				NGBE_PX_MISC_IEN_GPIO)
>  
>  #define NGBE_INTR_ALL				0x1FF
diff mbox series

Patch

diff --git a/drivers/net/ethernet/wangxun/libwx/wx_sriov.c b/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
index 315d51961449..6d470cd0f317 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_sriov.c
@@ -944,3 +944,34 @@  void wx_msg_task(struct wx *wx)
 	}
 }
 EXPORT_SYMBOL(wx_msg_task);
+
+void wx_disable_vf_rx_tx(struct wx *wx)
+{
+	wr32(wx, WX_TDM_VFTE_CLR(0), 0);
+	wr32(wx, WX_RDM_VFRE_CLR(0), 0);
+	if (wx->mac.type == wx_mac_sp) {
+		wr32(wx, WX_TDM_VFTE_CLR(1), 0);
+		wr32(wx, WX_RDM_VFRE_CLR(1), 0);
+	}
+}
+EXPORT_SYMBOL(wx_disable_vf_rx_tx);
+
+void wx_ping_all_vfs_with_link_status(struct wx *wx, bool link_up)
+{
+	u32 msgbuf[2] = {0, 0};
+	u16 i;
+
+	if (!wx->num_vfs)
+		return;
+	msgbuf[0] = WX_PF_NOFITY_VF_LINK_STATUS | WX_PF_CONTROL_MSG;
+	if (link_up)
+		msgbuf[1] = (wx->speed << 1) | link_up;
+	if (wx->notify_not_runnning)
+		msgbuf[1] |= WX_PF_NOFITY_VF_NET_NOT_RUNNING;
+	for (i = 0 ; i < wx->num_vfs; i++) {
+		if (wx->vfinfo[i].clear_to_send)
+			msgbuf[0] |= WX_VT_MSGTYPE_CTS;
+		wx_write_mbx_pf(wx, msgbuf, 2, i);
+	}
+}
+EXPORT_SYMBOL(wx_ping_all_vfs_with_link_status);
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_sriov.h b/drivers/net/ethernet/wangxun/libwx/wx_sriov.h
index f311774a2a18..7e45b3f71a7b 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_sriov.h
+++ b/drivers/net/ethernet/wangxun/libwx/wx_sriov.h
@@ -7,5 +7,7 @@ 
 int wx_disable_sriov(struct wx *wx);
 int wx_pci_sriov_configure(struct pci_dev *pdev, int num_vfs);
 void wx_msg_task(struct wx *wx);
+void wx_disable_vf_rx_tx(struct wx *wx);
+void wx_ping_all_vfs_with_link_status(struct wx *wx, bool link_up);
 
 #endif /* _WX_SRIOV_H_ */
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
index 3a7931c2e4bc..b8f0bf93a0fb 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
+++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
@@ -87,6 +87,7 @@ 
 /************************* Port Registers ************************************/
 /* port cfg Registers */
 #define WX_CFG_PORT_CTL              0x14400
+#define WX_CFG_PORT_CTL_PFRSTD       BIT(14)
 #define WX_CFG_PORT_CTL_DRV_LOAD     BIT(3)
 #define WX_CFG_PORT_CTL_QINQ         BIT(2)
 #define WX_CFG_PORT_CTL_D_VLAN       BIT(0) /* double vlan*/
@@ -1102,6 +1103,7 @@  struct wx {
 	enum wx_reset_type reset_type;
 
 	/* PHY stuff */
+	bool notify_not_runnning;
 	unsigned int link;
 	int speed;
 	int duplex;
diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
index e894e01d030d..583e8e882f17 100644
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
@@ -14,6 +14,8 @@ 
 #include "../libwx/wx_type.h"
 #include "../libwx/wx_hw.h"
 #include "../libwx/wx_lib.h"
+#include "../libwx/wx_mbx.h"
+#include "../libwx/wx_sriov.h"
 #include "ngbe_type.h"
 #include "ngbe_mdio.h"
 #include "ngbe_hw.h"
@@ -128,6 +130,10 @@  static int ngbe_sw_init(struct wx *wx)
 	wx->tx_work_limit = NGBE_DEFAULT_TX_WORK;
 	wx->rx_work_limit = NGBE_DEFAULT_RX_WORK;
 
+	wx->mbx.size = WX_VXMAILBOX_SIZE;
+	wx->setup_tc = ngbe_setup_tc;
+	set_bit(0, &wx->fwd_bitmask);
+
 	return 0;
 }
 
@@ -197,11 +203,25 @@  static irqreturn_t ngbe_intr(int __always_unused irq, void *data)
 
 static irqreturn_t ngbe_msix_other(int __always_unused irq, void *data)
 {
-	struct wx *wx = data;
+	struct wx_q_vector *q_vector;
+	struct wx *wx  = data;
+	u32 eicr;
 
-	/* re-enable the original interrupt state, no lsc, no queues */
-	if (netif_running(wx->netdev))
-		ngbe_irq_enable(wx, false);
+	q_vector = wx->q_vector[0];
+
+	eicr = wx_misc_isb(wx, WX_ISB_MISC);
+
+	if (eicr & NGBE_PX_MISC_IC_VF_MBOX)
+		wx_msg_task(wx);
+
+	if (wx->num_vfs == 7) {
+		napi_schedule_irqoff(&q_vector->napi);
+		ngbe_irq_enable(wx, true);
+	} else {
+		/* re-enable the original interrupt state, no lsc, no queues */
+		if (netif_running(wx->netdev))
+			ngbe_irq_enable(wx, false);
+	}
 
 	return IRQ_HANDLED;
 }
@@ -291,6 +311,22 @@  static void ngbe_disable_device(struct wx *wx)
 	struct net_device *netdev = wx->netdev;
 	u32 i;
 
+	if (wx->num_vfs) {
+		/* Clear EITR Select mapping */
+		wr32(wx, WX_PX_ITRSEL, 0);
+
+		/* Mark all the VFs as inactive */
+		for (i = 0 ; i < wx->num_vfs; i++)
+			wx->vfinfo[i].clear_to_send = 0;
+		wx->notify_not_runnning = true;
+		/* ping all the active vfs to let them know we are going down */
+		wx_ping_all_vfs_with_link_status(wx, false);
+		wx->notify_not_runnning = false;
+
+		/* Disable all VFTE/VFRE TX/RX */
+		wx_disable_vf_rx_tx(wx);
+	}
+
 	/* disable all enabled rx queues */
 	for (i = 0; i < wx->num_rx_queues; i++)
 		/* this call also flushes the previous write */
@@ -313,10 +349,17 @@  static void ngbe_disable_device(struct wx *wx)
 	wx_update_stats(wx);
 }
 
+static void ngbe_reset(struct wx *wx)
+{
+	wx_flush_sw_mac_table(wx);
+	wx_mac_set_default_filter(wx, wx->mac.addr);
+}
+
 void ngbe_down(struct wx *wx)
 {
 	phylink_stop(wx->phylink);
 	ngbe_disable_device(wx);
+	ngbe_reset(wx);
 	wx_clean_all_tx_rings(wx);
 	wx_clean_all_rx_rings(wx);
 }
@@ -339,6 +382,11 @@  void ngbe_up(struct wx *wx)
 		ngbe_sfp_modules_txrx_powerctl(wx, true);
 
 	phylink_start(wx->phylink);
+	/* Set PF Reset Done bit so PF/VF Mail Ops can work */
+	wr32m(wx, WX_CFG_PORT_CTL,
+	      WX_CFG_PORT_CTL_PFRSTD, WX_CFG_PORT_CTL_PFRSTD);
+	if (wx->num_vfs)
+		wx_ping_all_vfs_with_link_status(wx, false);
 }
 
 /**
@@ -723,6 +771,7 @@  static void ngbe_remove(struct pci_dev *pdev)
 	struct net_device *netdev;
 
 	netdev = wx->netdev;
+	wx_disable_sriov(wx);
 	unregister_netdev(netdev);
 	phylink_destroy(wx->phylink);
 	pci_release_selected_regions(pdev,
@@ -782,6 +831,7 @@  static struct pci_driver ngbe_driver = {
 	.suspend  = ngbe_suspend,
 	.resume   = ngbe_resume,
 	.shutdown = ngbe_shutdown,
+	.sriov_configure = wx_pci_sriov_configure,
 };
 
 module_pci_driver(ngbe_driver);
diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
index ec54b18c5fe7..dd01aec87b02 100644
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
@@ -8,6 +8,7 @@ 
 
 #include "../libwx/wx_type.h"
 #include "../libwx/wx_hw.h"
+#include "../libwx/wx_sriov.h"
 #include "ngbe_type.h"
 #include "ngbe_mdio.h"
 
@@ -64,6 +65,11 @@  static void ngbe_mac_config(struct phylink_config *config, unsigned int mode,
 static void ngbe_mac_link_down(struct phylink_config *config,
 			       unsigned int mode, phy_interface_t interface)
 {
+	struct wx *wx = phylink_to_wx(config);
+
+	wx->speed = 0;
+	/* ping all the active vfs to let them know we are going down */
+	wx_ping_all_vfs_with_link_status(wx, false);
 }
 
 static void ngbe_mac_link_up(struct phylink_config *config,
@@ -103,6 +109,10 @@  static void ngbe_mac_link_up(struct phylink_config *config,
 	wr32(wx, WX_MAC_PKT_FLT, WX_MAC_PKT_FLT_PR);
 	reg = rd32(wx, WX_MAC_WDG_TIMEOUT);
 	wr32(wx, WX_MAC_WDG_TIMEOUT, reg);
+
+	wx->speed = speed;
+	/* ping all the active vfs to let them know we are going up */
+	wx_ping_all_vfs_with_link_status(wx, true);
 }
 
 static const struct phylink_mac_ops ngbe_mac_ops = {
diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
index f48ed7fc1805..bb70af035c39 100644
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
@@ -72,11 +72,13 @@ 
 #define NGBE_PX_MISC_IEN_DEV_RST		BIT(10)
 #define NGBE_PX_MISC_IEN_ETH_LK			BIT(18)
 #define NGBE_PX_MISC_IEN_INT_ERR		BIT(20)
+#define NGBE_PX_MISC_IC_VF_MBOX			BIT(23)
 #define NGBE_PX_MISC_IEN_GPIO			BIT(26)
 #define NGBE_PX_MISC_IEN_MASK ( \
 				NGBE_PX_MISC_IEN_DEV_RST | \
 				NGBE_PX_MISC_IEN_ETH_LK | \
 				NGBE_PX_MISC_IEN_INT_ERR | \
+				NGBE_PX_MISC_IC_VF_MBOX | \
 				NGBE_PX_MISC_IEN_GPIO)
 
 #define NGBE_INTR_ALL				0x1FF