1 files changed, 67 insertions, 7 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 62348fc60e53..58c665b7513d 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -73,6 +73,8 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_BACKPLANE), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SFP), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 },
@@ -1654,7 +1656,7 @@ void igb_reset(struct igb_adapter *adapter)
         if (adapter->vfs_allocated_count) {
                 int i;
                 for (i = 0 ; i < adapter->vfs_allocated_count; i++)
-                        adapter->vf_data[i].flags = 0;
+                        adapter->vf_data[i].flags &= IGB_VF_FLAG_PF_SET_MAC;
 
                 /* ping all the active vfs to let them know we are going down */
                 igb_ping_all_vfs(adapter);
@@ -3364,6 +3366,45 @@ static void igb_set_rx_mode(struct net_device *netdev)
         igb_restore_vf_multicasts(adapter);
 }
 
+static void igb_check_wvbr(struct igb_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        u32 wvbr = 0;
+
+        switch (hw->mac.type) {
+        case e1000_82576:
+        case e1000_i350:
+                if (!(wvbr = rd32(E1000_WVBR)))
+                        return;
+                break;
+        default:
+                break;
+        }
+
+        adapter->wvbr |= wvbr;
+}
+
+#define IGB_STAGGERED_QUEUE_OFFSET 8
+
+static void igb_spoof_check(struct igb_adapter *adapter)
+{
+        int j;
+
+        if (!adapter->wvbr)
+                return;
+
+        for(j = 0; j < adapter->vfs_allocated_count; j++) {
+                if (adapter->wvbr & (1 << j) ||
+                    adapter->wvbr & (1 << (j + IGB_STAGGERED_QUEUE_OFFSET))) {
+                        dev_warn(&adapter->pdev->dev,
+                                "Spoof event(s) detected on VF %d\n", j);
+                        adapter->wvbr &=
+                                ~((1 << j) |
+                                  (1 << (j + IGB_STAGGERED_QUEUE_OFFSET)));
+                }
+        }
+}
+
 /* Need to wait a few seconds after link up to get diagnostic information from
  * the phy */
 static void igb_update_phy_info(unsigned long data)
@@ -3523,6 +3564,8 @@ static void igb_watchdog_task(struct work_struct *work)
                 wr32(E1000_ICS, E1000_ICS_RXDMT0);
         }
 
+        igb_spoof_check(adapter);
+
         /* Reset the timer */
         if (!test_bit(__IGB_DOWN, &adapter->state))
                 mod_timer(&adapter->watchdog_timer,
@@ -4519,6 +4562,10 @@ static irqreturn_t igb_msix_other(int irq, void *data)
         if (icr & E1000_ICR_DOUTSYNC) {
                 /* HW is reporting DMA is out of sync */
                 adapter->stats.doosync++;
+                /* The DMA Out of Sync is also indication of a spoof event
+                 * in IOV mode. Check the Wrong VM Behavior register to
+                 * see if it is really a spoof event. */
+                igb_check_wvbr(adapter);
         }
 
         /* Check for a mailbox event */
@@ -4971,8 +5018,8 @@ static int igb_set_vf_vlan(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)
 
 static inline void igb_vf_reset(struct igb_adapter *adapter, u32 vf)
 {
-        /* clear flags */
-        adapter->vf_data[vf].flags &= ~(IGB_VF_FLAG_PF_SET_MAC);
+        /* clear flags - except flag that indicates PF has set the MAC */
+        adapter->vf_data[vf].flags &= IGB_VF_FLAG_PF_SET_MAC;
         adapter->vf_data[vf].last_nack = jiffies;
 
         /* reset offloads to defaults */
@@ -5026,7 +5073,7 @@ static void igb_vf_reset_msg(struct igb_adapter *adapter, u32 vf)
         reg = rd32(E1000_VFRE);
         wr32(E1000_VFRE, reg | (1 << vf));
 
-        adapter->vf_data[vf].flags = IGB_VF_FLAG_CTS;
+        adapter->vf_data[vf].flags |= IGB_VF_FLAG_CTS;
 
         /* reply to reset with ack and vf mac address */
         msgbuf[0] = E1000_VF_RESET | E1000_VT_MSGTYPE_ACK;
@@ -5105,7 +5152,14 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
 
         switch ((msgbuf[0] & 0xFFFF)) {
         case E1000_VF_SET_MAC_ADDR:
-                retval = igb_set_vf_mac_addr(adapter, msgbuf, vf);
+                retval = -EINVAL;
+                if (!(vf_data->flags & IGB_VF_FLAG_PF_SET_MAC))
+                        retval = igb_set_vf_mac_addr(adapter, msgbuf, vf);
+                else
+                        dev_warn(&pdev->dev,
+                                 "VF %d attempted to override administratively "
+                                 "set MAC address\nReload the VF driver to "
+                                 "resume operations\n", vf);
                 break;
         case E1000_VF_SET_PROMISC:
                 retval = igb_set_vf_promisc(adapter, msgbuf, vf);
@@ -5117,8 +5171,12 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf)
                 retval = igb_set_vf_rlpml(adapter, msgbuf[1], vf);
                 break;
         case E1000_VF_SET_VLAN:
-                if (adapter->vf_data[vf].pf_vlan)
-                        retval = -1;
+                retval = -1;
+                if (vf_data->pf_vlan)
+                        dev_warn(&pdev->dev,
+                                 "VF %d attempted to override administratively "
+                                 "set VLAN tag\nReload the VF driver to "
+                                 "resume operations\n", vf);
                 else
                         retval = igb_set_vf_vlan(adapter, msgbuf, vf);
                 break;
@@ -6582,6 +6640,8 @@ static void igb_vmm_control(struct igb_adapter *adapter)
         if (adapter->vfs_allocated_count) {
                 igb_vmdq_set_loopback_pf(hw, true);
                 igb_vmdq_set_replication_pf(hw, true);
+                igb_vmdq_set_anti_spoofing_pf(hw, true,
+                                                adapter->vfs_allocated_count);
         } else {
                 igb_vmdq_set_loopback_pf(hw, false);
                 igb_vmdq_set_replication_pf(hw, false);