igb: fix handling of mailbox collisions between PF/VF
Subsystems (2)
PATCH 1/2 igb: fix handling of mailbox collisions between PF/VF
From: Alexander Duyck <[email protected]>
This patch changes the handling of collisions between the use of the PF/VF sides of the mailbox.
---
drivers/net/igb/igb_main.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)
drivers/net/igb/igb_main.c +13 -9
@@ -4608,8 +4608,14 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf) retval =igb_read_mbx (hw, msgbuf,E1000_VFMAILBOX_SIZE , vf); -if (retval) +if (retval) { +/* if receive failed revoke VF CTS stats and restart init */ dev_err (&pdev->dev,"Error receiving message from VF\n" ); + vf_data->flags &= ~IGB_VF_FLAG_CTS ; +if (!time_after (jiffies, vf_data->last_nack + (2 *HZ ))) +return ; + goto out; + }/* this is a message we already processed, do nothing */ if (msgbuf[0 ] & (E1000_VT_MSGTYPE_ACK |E1000_VT_MSGTYPE_NACK ))
@@ -4626,12 +4632,10 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf) }if (!(vf_data->flags &IGB_VF_FLAG_CTS )) { - msgbuf[0 ] =E1000_VT_MSGTYPE_NACK ; -if (time_after (jiffies, vf_data->last_nack + (2 *HZ ))) { -igb_write_mbx (hw, msgbuf,1 , vf); - vf_data->last_nack = jiffies; - } -return ; +if (!time_after (jiffies, vf_data->last_nack + (2 *HZ ))) +return ; + retval =-1 ; + goto out; }switch ((msgbuf[0 ] &0xFFFF )) {
@@ -4656,14 +4660,14 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)break ; } + msgbuf[0 ] |=E1000_VT_MSGTYPE_CTS ; +out:/* notify the VF of the results of what it sent us */ if (retval) msgbuf[0 ] |=E1000_VT_MSGTYPE_NACK ;else msgbuf[0 ] |=E1000_VT_MSGTYPE_ACK ; - msgbuf[0 ] |=E1000_VT_MSGTYPE_CTS ; -igb_write_mbx (hw, msgbuf,1 , vf); }
PATCH 2/2 igbvf: avoid reset storms due to mailbox issues
From: Alexander Duyck <[email protected]>
This change makes it so that reset/interrupt storms can be avoided when there are mailbox issues. The new behavior is to only allow the device to trigger mailbox related resets only once every 10 seconds.
---
drivers/net/igbvf/igbvf.h | 1 + drivers/net/igbvf/netdev.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-)
drivers/net/igbvf/igbvf.h +1 -0
@@ -276,6 +276,7 @@ struct igbvf_adapter {unsigned long led_status;unsigned int flags; +unsigned long last_reset; };struct igbvf_info {
drivers/net/igbvf/netdev.c +7 -1
@@ -1469,6 +1469,8 @@ static void igbvf_reset(struct igbvf_adapter *adapter)memcpy (netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); } + + adapter->last_reset = jiffies; }int igbvf_up (struct igbvf_adapter *adapter)
@@ -1812,11 +1814,15 @@ static bool igbvf_has_link(struct igbvf_adapter *adapter)s32 ret_val =E1000_SUCCESS ;bool link_active; +/* If interface is down, stay link down */ +if (test_bit (__IGBVF_DOWN, &adapter->state)) +return false; + ret_val = hw->mac.ops.check_for_link (hw); link_active = !hw->mac.get_link_status;/* if check for link returns error we will need to reset */ -if (ret_val) +if (ret_val &&time_after (jiffies, adapter->last_reset + (10 *HZ )))schedule_work (&adapter->reset_task);return link_active;
Re: [net-2.6 PATCH 2/2] igbvf: avoid reset storms due to mailbox issues
From: Jeff Kirsher <[email protected]>
Date: Fri, 11 Dec 2009 19:41:16 -0800
Quoted 8 lines
From: Alexander Duyck <[email protected]>
This change makes it so that reset/interrupt storms can be avoided when there are mailbox issues. The new behavior is to only allow the device to trigger mailbox related resets only once every 10 seconds.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Fri, 11 Dec 2009 19:40:57 -0800
Quoted 7 lines
From: Alexander Duyck <[email protected]>
This patch changes the handling of collisions between the use of the PF/VF sides of the mailbox.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.