Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Here is my initial pull request for the networking subsystem during
  this merge window:

   1) Support for ESN in AH (RFC 4302) from Fan Du.

   2) Add full kernel doc for ethtool command structures, from Ben
      Hutchings.

   3) Add BCM7xxx PHY driver, from Florian Fainelli.

   4) Export computed TCP rate information in netlink socket dumps, from
      Eric Dumazet.

   5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
      Dichtel.

   6) Convert many drivers to pci_enable_msix_range(), from Alexander
      Gordeev.

   7) Record SKB timestamps more efficiently, from Eric Dumazet.

   8) Switch to microsecond resolution for TCP round trip times, also
      from Eric Dumazet.

   9) Clean up and fix 6lowpan fragmentation handling by making use of
      the existing inet_frag api for it's implementation.

  10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

  11) Auto size SKB lengths when composing netlink messages based upon
      past message sizes used, from Eric Dumazet.

  12) qdisc dumps can take a long time, add a cond_resched(), From Eric
      Dumazet.

  13) Sanitize netpoll core and drivers wrt.  SKB handling semantics.
      Get rid of never-used-in-tree netpoll RX handling.  From Eric W
      Biederman.

  14) Support inter-address-family and namespace changing in VTI tunnel
      driver(s).  From Steffen Klassert.

  15) Add Altera TSE driver, from Vince Bridgers.

  16) Optimizing csum_replace2() so that it doesn't adjust the checksum
      by checksumming the entire header, from Eric Dumazet.

  17) Expand BPF internal implementation for faster interpreting, more
      direct translations into JIT'd code, and much cleaner uses of BPF
      filtering in non-socket ocntexts.  From Daniel Borkmann and Alexei
      Starovoitov"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
  netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
  net: Add a test to see if a skb is freeable in irq context
  qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
  net: ptp: move PTP classifier in its own file
  net: sxgbe: make "core_ops" static
  net: sxgbe: fix logical vs bitwise operation
  net: sxgbe: sxgbe_mdio_register() frees the bus
  Call efx_set_channels() before efx->type->dimension_resources()
  xen-netback: disable rogue vif in kthread context
  net/mlx4: Set proper build dependancy with vxlan
  be2net: fix build dependency on VxLAN
  mac802154: make csma/cca parameters per-wpan
  mac802154: allow only one WPAN to be up at any given time
  net: filter: minor: fix kdoc in __sk_run_filter
  netlink: don't compare the nul-termination in nla_strcmp
  can: c_can: Avoid led toggling for every packet.
  can: c_can: Simplify TX interrupt cleanup
  can: c_can: Store dlc private
  can: c_can: Reduce register access
  can: c_can: Make the code readable
  ...

9 files changed, 697 insertions, 174 deletions

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
index f7cea1bca38d..97662b6bd98a 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
@@ -1229,7 +1229,7 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_NGE                 2
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_IP                  3
 
-        __le32 tenant_id ;
+        __le32 tenant_id;
         u8     reserved[4];
         __le16 queue_number;
 #define I40E_AQC_ADD_CLOUD_QUEUE_SHIFT                  0
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index 7b13953b28c4..ae084378faab 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -160,6 +160,372 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
 }
 
 
+/* The i40evf_ptype_lookup table is used to convert from the 8-bit ptype in the
+ * hardware to a bit-field that can be used by SW to more easily determine the
+ * packet type.
+ *
+ * Macros are used to shorten the table lines and make this table human
+ * readable.
+ *
+ * We store the PTYPE in the top byte of the bit field - this is just so that
+ * we can check that the table doesn't have a row missing, as the index into
+ * the table should be the PTYPE.
+ *
+ * Typical work flow:
+ *
+ * IF NOT i40evf_ptype_lookup[ptype].known
+ * THEN
+ *      Packet is unknown
+ * ELSE IF i40evf_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP
+ *      Use the rest of the fields to look at the tunnels, inner protocols, etc
+ * ELSE
+ *      Use the enum i40e_rx_l2_ptype to decode the packet type
+ * ENDIF
+ */
+
+/* macro to make the table lines short */
+#define I40E_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\
+        {       PTYPE, \
+                1, \
+                I40E_RX_PTYPE_OUTER_##OUTER_IP, \
+                I40E_RX_PTYPE_OUTER_##OUTER_IP_VER, \
+                I40E_RX_PTYPE_##OUTER_FRAG, \
+                I40E_RX_PTYPE_TUNNEL_##T, \
+                I40E_RX_PTYPE_TUNNEL_END_##TE, \
+                I40E_RX_PTYPE_##TEF, \
+                I40E_RX_PTYPE_INNER_PROT_##I, \
+                I40E_RX_PTYPE_PAYLOAD_LAYER_##PL }
+
+#define I40E_PTT_UNUSED_ENTRY(PTYPE) \
+                { PTYPE, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+
+/* shorter macros makes the table fit but are terse */
+#define I40E_RX_PTYPE_NOF               I40E_RX_PTYPE_NOT_FRAG
+#define I40E_RX_PTYPE_FRG               I40E_RX_PTYPE_FRAG
+#define I40E_RX_PTYPE_INNER_PROT_TS     I40E_RX_PTYPE_INNER_PROT_TIMESYNC
+
+/* Lookup table mapping the HW PTYPE to the bit field for decoding */
+struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = {
+        /* L2 Packet types */
+        I40E_PTT_UNUSED_ENTRY(0),
+        I40E_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
+        I40E_PTT(2,  L2, NONE, NOF, NONE, NONE, NOF, TS,   PAY2),
+        I40E_PTT(3,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
+        I40E_PTT_UNUSED_ENTRY(4),
+        I40E_PTT_UNUSED_ENTRY(5),
+        I40E_PTT(6,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
+        I40E_PTT(7,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
+        I40E_PTT_UNUSED_ENTRY(8),
+        I40E_PTT_UNUSED_ENTRY(9),
+        I40E_PTT(10, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
+        I40E_PTT(11, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),
+        I40E_PTT(12, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(13, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(14, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(15, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(16, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(17, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(18, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(19, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(20, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(21, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),
+
+        /* Non Tunneled IPv4 */
+        I40E_PTT(22, IP, IPV4, FRG, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(23, IP, IPV4, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(24, IP, IPV4, NOF, NONE, NONE, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(25),
+        I40E_PTT(26, IP, IPV4, NOF, NONE, NONE, NOF, TCP,  PAY4),
+        I40E_PTT(27, IP, IPV4, NOF, NONE, NONE, NOF, SCTP, PAY4),
+        I40E_PTT(28, IP, IPV4, NOF, NONE, NONE, NOF, ICMP, PAY4),
+
+        /* IPv4 --> IPv4 */
+        I40E_PTT(29, IP, IPV4, NOF, IP_IP, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(30, IP, IPV4, NOF, IP_IP, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(31, IP, IPV4, NOF, IP_IP, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(32),
+        I40E_PTT(33, IP, IPV4, NOF, IP_IP, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(34, IP, IPV4, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(35, IP, IPV4, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv4 --> IPv6 */
+        I40E_PTT(36, IP, IPV4, NOF, IP_IP, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(37, IP, IPV4, NOF, IP_IP, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(38, IP, IPV4, NOF, IP_IP, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(39),
+        I40E_PTT(40, IP, IPV4, NOF, IP_IP, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(41, IP, IPV4, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(42, IP, IPV4, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),
+
+        /* IPv4 --> GRE/NAT */
+        I40E_PTT(43, IP, IPV4, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),
+
+        /* IPv4 --> GRE/NAT --> IPv4 */
+        I40E_PTT(44, IP, IPV4, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(45, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(46, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(47),
+        I40E_PTT(48, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(49, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(50, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv4 --> GRE/NAT --> IPv6 */
+        I40E_PTT(51, IP, IPV4, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(52, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(53, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(54),
+        I40E_PTT(55, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(56, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(57, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),
+
+        /* IPv4 --> GRE/NAT --> MAC */
+        I40E_PTT(58, IP, IPV4, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),
+
+        /* IPv4 --> GRE/NAT --> MAC --> IPv4 */
+        I40E_PTT(59, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(60, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(61, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(62),
+        I40E_PTT(63, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(64, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(65, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv4 --> GRE/NAT -> MAC --> IPv6 */
+        I40E_PTT(66, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(67, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(68, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(69),
+        I40E_PTT(70, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(71, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(72, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),
+
+        /* IPv4 --> GRE/NAT --> MAC/VLAN */
+        I40E_PTT(73, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),
+
+        /* IPv4 ---> GRE/NAT -> MAC/VLAN --> IPv4 */
+        I40E_PTT(74, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(75, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(76, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(77),
+        I40E_PTT(78, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(79, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(80, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv4 -> GRE/NAT -> MAC/VLAN --> IPv6 */
+        I40E_PTT(81, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(82, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(83, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(84),
+        I40E_PTT(85, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(86, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(87, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
+
+        /* Non Tunneled IPv6 */
+        I40E_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3),
+        I40E_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP,  PAY3),
+        I40E_PTT_UNUSED_ENTRY(91),
+        I40E_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP,  PAY4),
+        I40E_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),
+        I40E_PTT(94, IP, IPV6, NOF, NONE, NONE, NOF, ICMP, PAY4),
+
+        /* IPv6 --> IPv4 */
+        I40E_PTT(95,  IP, IPV6, NOF, IP_IP, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(96,  IP, IPV6, NOF, IP_IP, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(97,  IP, IPV6, NOF, IP_IP, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(98),
+        I40E_PTT(99,  IP, IPV6, NOF, IP_IP, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(100, IP, IPV6, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(101, IP, IPV6, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv6 --> IPv6 */
+        I40E_PTT(102, IP, IPV6, NOF, IP_IP, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(103, IP, IPV6, NOF, IP_IP, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(104, IP, IPV6, NOF, IP_IP, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(105),
+        I40E_PTT(106, IP, IPV6, NOF, IP_IP, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(107, IP, IPV6, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(108, IP, IPV6, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),
+
+        /* IPv6 --> GRE/NAT */
+        I40E_PTT(109, IP, IPV6, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),
+
+        /* IPv6 --> GRE/NAT -> IPv4 */
+        I40E_PTT(110, IP, IPV6, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(111, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(112, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(113),
+        I40E_PTT(114, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(115, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(116, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv6 --> GRE/NAT -> IPv6 */
+        I40E_PTT(117, IP, IPV6, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(118, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(119, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(120),
+        I40E_PTT(121, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(122, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(123, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),
+
+        /* IPv6 --> GRE/NAT -> MAC */
+        I40E_PTT(124, IP, IPV6, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),
+
+        /* IPv6 --> GRE/NAT -> MAC -> IPv4 */
+        I40E_PTT(125, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(126, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(127, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(128),
+        I40E_PTT(129, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(130, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(131, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv6 --> GRE/NAT -> MAC -> IPv6 */
+        I40E_PTT(132, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(133, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(134, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(135),
+        I40E_PTT(136, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(137, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(138, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),
+
+        /* IPv6 --> GRE/NAT -> MAC/VLAN */
+        I40E_PTT(139, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),
+
+        /* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv4 */
+        I40E_PTT(140, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),
+        I40E_PTT(141, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),
+        I40E_PTT(142, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(143),
+        I40E_PTT(144, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP,  PAY4),
+        I40E_PTT(145, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),
+        I40E_PTT(146, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),
+
+        /* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv6 */
+        I40E_PTT(147, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),
+        I40E_PTT(148, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),
+        I40E_PTT(149, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP,  PAY4),
+        I40E_PTT_UNUSED_ENTRY(150),
+        I40E_PTT(151, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP,  PAY4),
+        I40E_PTT(152, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),
+        I40E_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),
+
+        /* unused entries */
+        I40E_PTT_UNUSED_ENTRY(154),
+        I40E_PTT_UNUSED_ENTRY(155),
+        I40E_PTT_UNUSED_ENTRY(156),
+        I40E_PTT_UNUSED_ENTRY(157),
+        I40E_PTT_UNUSED_ENTRY(158),
+        I40E_PTT_UNUSED_ENTRY(159),
+
+        I40E_PTT_UNUSED_ENTRY(160),
+        I40E_PTT_UNUSED_ENTRY(161),
+        I40E_PTT_UNUSED_ENTRY(162),
+        I40E_PTT_UNUSED_ENTRY(163),
+        I40E_PTT_UNUSED_ENTRY(164),
+        I40E_PTT_UNUSED_ENTRY(165),
+        I40E_PTT_UNUSED_ENTRY(166),
+        I40E_PTT_UNUSED_ENTRY(167),
+        I40E_PTT_UNUSED_ENTRY(168),
+        I40E_PTT_UNUSED_ENTRY(169),
+
+        I40E_PTT_UNUSED_ENTRY(170),
+        I40E_PTT_UNUSED_ENTRY(171),
+        I40E_PTT_UNUSED_ENTRY(172),
+        I40E_PTT_UNUSED_ENTRY(173),
+        I40E_PTT_UNUSED_ENTRY(174),
+        I40E_PTT_UNUSED_ENTRY(175),
+        I40E_PTT_UNUSED_ENTRY(176),
+        I40E_PTT_UNUSED_ENTRY(177),
+        I40E_PTT_UNUSED_ENTRY(178),
+        I40E_PTT_UNUSED_ENTRY(179),
+
+        I40E_PTT_UNUSED_ENTRY(180),
+        I40E_PTT_UNUSED_ENTRY(181),
+        I40E_PTT_UNUSED_ENTRY(182),
+        I40E_PTT_UNUSED_ENTRY(183),
+        I40E_PTT_UNUSED_ENTRY(184),
+        I40E_PTT_UNUSED_ENTRY(185),
+        I40E_PTT_UNUSED_ENTRY(186),
+        I40E_PTT_UNUSED_ENTRY(187),
+        I40E_PTT_UNUSED_ENTRY(188),
+        I40E_PTT_UNUSED_ENTRY(189),
+
+        I40E_PTT_UNUSED_ENTRY(190),
+        I40E_PTT_UNUSED_ENTRY(191),
+        I40E_PTT_UNUSED_ENTRY(192),
+        I40E_PTT_UNUSED_ENTRY(193),
+        I40E_PTT_UNUSED_ENTRY(194),
+        I40E_PTT_UNUSED_ENTRY(195),
+        I40E_PTT_UNUSED_ENTRY(196),
+        I40E_PTT_UNUSED_ENTRY(197),
+        I40E_PTT_UNUSED_ENTRY(198),
+        I40E_PTT_UNUSED_ENTRY(199),
+
+        I40E_PTT_UNUSED_ENTRY(200),
+        I40E_PTT_UNUSED_ENTRY(201),
+        I40E_PTT_UNUSED_ENTRY(202),
+        I40E_PTT_UNUSED_ENTRY(203),
+        I40E_PTT_UNUSED_ENTRY(204),
+        I40E_PTT_UNUSED_ENTRY(205),
+        I40E_PTT_UNUSED_ENTRY(206),
+        I40E_PTT_UNUSED_ENTRY(207),
+        I40E_PTT_UNUSED_ENTRY(208),
+        I40E_PTT_UNUSED_ENTRY(209),
+
+        I40E_PTT_UNUSED_ENTRY(210),
+        I40E_PTT_UNUSED_ENTRY(211),
+        I40E_PTT_UNUSED_ENTRY(212),
+        I40E_PTT_UNUSED_ENTRY(213),
+        I40E_PTT_UNUSED_ENTRY(214),
+        I40E_PTT_UNUSED_ENTRY(215),
+        I40E_PTT_UNUSED_ENTRY(216),
+        I40E_PTT_UNUSED_ENTRY(217),
+        I40E_PTT_UNUSED_ENTRY(218),
+        I40E_PTT_UNUSED_ENTRY(219),
+
+        I40E_PTT_UNUSED_ENTRY(220),
+        I40E_PTT_UNUSED_ENTRY(221),
+        I40E_PTT_UNUSED_ENTRY(222),
+        I40E_PTT_UNUSED_ENTRY(223),
+        I40E_PTT_UNUSED_ENTRY(224),
+        I40E_PTT_UNUSED_ENTRY(225),
+        I40E_PTT_UNUSED_ENTRY(226),
+        I40E_PTT_UNUSED_ENTRY(227),
+        I40E_PTT_UNUSED_ENTRY(228),
+        I40E_PTT_UNUSED_ENTRY(229),
+
+        I40E_PTT_UNUSED_ENTRY(230),
+        I40E_PTT_UNUSED_ENTRY(231),
+        I40E_PTT_UNUSED_ENTRY(232),
+        I40E_PTT_UNUSED_ENTRY(233),
+        I40E_PTT_UNUSED_ENTRY(234),
+        I40E_PTT_UNUSED_ENTRY(235),
+        I40E_PTT_UNUSED_ENTRY(236),
+        I40E_PTT_UNUSED_ENTRY(237),
+        I40E_PTT_UNUSED_ENTRY(238),
+        I40E_PTT_UNUSED_ENTRY(239),
+
+        I40E_PTT_UNUSED_ENTRY(240),
+        I40E_PTT_UNUSED_ENTRY(241),
+        I40E_PTT_UNUSED_ENTRY(242),
+        I40E_PTT_UNUSED_ENTRY(243),
+        I40E_PTT_UNUSED_ENTRY(244),
+        I40E_PTT_UNUSED_ENTRY(245),
+        I40E_PTT_UNUSED_ENTRY(246),
+        I40E_PTT_UNUSED_ENTRY(247),
+        I40E_PTT_UNUSED_ENTRY(248),
+        I40E_PTT_UNUSED_ENTRY(249),
+
+        I40E_PTT_UNUSED_ENTRY(250),
+        I40E_PTT_UNUSED_ENTRY(251),
+        I40E_PTT_UNUSED_ENTRY(252),
+        I40E_PTT_UNUSED_ENTRY(253),
+        I40E_PTT_UNUSED_ENTRY(254),
+        I40E_PTT_UNUSED_ENTRY(255)
+};
+
+
 /**
  * i40e_aq_send_msg_to_pf
  * @hw: pointer to the hardware structure
@@ -199,8 +565,7 @@ i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw,
                 details.async = true;
                 cmd_details = &details;
         }
-        status = i40evf_asq_send_command(hw, (struct i40e_aq_desc *)&desc, msg,
-                                       msglen, cmd_details);
+        status = i40evf_asq_send_command(hw, &desc, msg, msglen, cmd_details);
         return status;
 }
 
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
index 7841573a58c9..97ab8c2b76f8 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_prototype.h
@@ -63,6 +63,13 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw,
 
 i40e_status i40e_set_mac_type(struct i40e_hw *hw);
 
+extern struct i40e_rx_ptype_decoded i40evf_ptype_lookup[];
+
+static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
+{
+        return i40evf_ptype_lookup[ptype];
+}
+
 /* prototype for functions used for SW locks */
 
 /* i40e_common for VF drivers*/
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index ffdb01d853db..53be5f44d015 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -24,6 +24,7 @@
 #include <linux/prefetch.h>
 
 #include "i40evf.h"
+#include "i40e_prototype.h"
 
 static inline __le64 build_ctob(u32 td_cmd, u32 td_offset, unsigned int size,
                                 u32 td_tag)
@@ -169,6 +170,20 @@ static bool i40e_check_tx_hang(struct i40e_ring *tx_ring)
 }
 
 /**
+ * i40e_get_head - Retrieve head from head writeback
+ * @tx_ring:  tx ring to fetch head of
+ *
+ * Returns value of Tx ring head based on value stored
+ * in head write-back location
+ **/
+static inline u32 i40e_get_head(struct i40e_ring *tx_ring)
+{
+        void *head = (struct i40e_tx_desc *)tx_ring->desc + tx_ring->count;
+
+        return le32_to_cpu(*(volatile __le32 *)head);
+}
+
+/**
  * i40e_clean_tx_irq - Reclaim resources after transmit completes
  * @tx_ring:  tx ring to clean
  * @budget:   how many cleans we're allowed
@@ -179,6 +194,7 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget)
 {
         u16 i = tx_ring->next_to_clean;
         struct i40e_tx_buffer *tx_buf;
+        struct i40e_tx_desc *tx_head;
         struct i40e_tx_desc *tx_desc;
         unsigned int total_packets = 0;
         unsigned int total_bytes = 0;
@@ -187,6 +203,8 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget)
         tx_desc = I40E_TX_DESC(tx_ring, i);
         i -= tx_ring->count;
 
+        tx_head = I40E_TX_DESC(tx_ring, i40e_get_head(tx_ring));
+
         do {
                 struct i40e_tx_desc *eop_desc = tx_buf->next_to_watch;
 
@@ -197,9 +215,8 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget)
                 /* prevent any other reads prior to eop_desc */
                 read_barrier_depends();
 
-                /* if the descriptor isn't done, no work yet to do */
-                if (!(eop_desc->cmd_type_offset_bsz &
-                      cpu_to_le64(I40E_TX_DESC_DTYPE_DESC_DONE)))
+                /* we have caught up to head, no work left to do */
+                if (tx_head == tx_desc)
                         break;
 
                 /* clear next_to_watch to prevent false hangs */
@@ -431,6 +448,10 @@ int i40evf_setup_tx_descriptors(struct i40e_ring *tx_ring)
 
         /* round up to nearest 4K */
         tx_ring->size = tx_ring->count * sizeof(struct i40e_tx_desc);
+        /* add u32 for head writeback, align after this takes care of
+         * guaranteeing this is at least one cache line in size
+         */
+        tx_ring->size += sizeof(u32);
         tx_ring->size = ALIGN(tx_ring->size, 4096);
         tx_ring->desc = dma_alloc_coherent(dev, tx_ring->size,
                                            &tx_ring->dma, GFP_KERNEL);
@@ -722,7 +743,7 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
               rx_status & (1 << I40E_RX_DESC_STATUS_L3L4P_SHIFT)))
                 return;
 
-        /* likely incorrect csum if alternate IP extention headers found */
+        /* likely incorrect csum if alternate IP extension headers found */
         if (rx_status & (1 << I40E_RX_DESC_STATUS_IPV6EXADD_SHIFT))
                 return;
 
@@ -786,6 +807,29 @@ static inline u32 i40e_rx_hash(struct i40e_ring *ring,
 }
 
 /**
+ * i40e_ptype_to_hash - get a hash type
+ * @ptype: the ptype value from the descriptor
+ *
+ * Returns a hash type to be used by skb_set_hash
+ **/
+static inline enum pkt_hash_types i40e_ptype_to_hash(u8 ptype)
+{
+        struct i40e_rx_ptype_decoded decoded = decode_rx_desc_ptype(ptype);
+
+        if (!decoded.known)
+                return PKT_HASH_TYPE_NONE;
+
+        if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&
+            decoded.payload_layer == I40E_RX_PTYPE_PAYLOAD_LAYER_PAY4)
+                return PKT_HASH_TYPE_L4;
+        else if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&
+                 decoded.payload_layer == I40E_RX_PTYPE_PAYLOAD_LAYER_PAY3)
+                return PKT_HASH_TYPE_L3;
+        else
+                return PKT_HASH_TYPE_L2;
+}
+
+/**
  * i40e_clean_rx_irq - Reclaim resources after receive completes
  * @rx_ring:  rx ring to clean
  * @budget:   how many cleans we're allowed
@@ -802,13 +846,13 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
         u16 i = rx_ring->next_to_clean;
         union i40e_rx_desc *rx_desc;
         u32 rx_error, rx_status;
+        u8 rx_ptype;
         u64 qword;
-        u16 rx_ptype;
 
         rx_desc = I40E_RX_DESC(rx_ring, i);
         qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
-        rx_status = (qword & I40E_RXD_QW1_STATUS_MASK)
-                                >> I40E_RXD_QW1_STATUS_SHIFT;
+        rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
+                    I40E_RXD_QW1_STATUS_SHIFT;
 
         while (rx_status & (1 << I40E_RX_DESC_STATUS_DD_SHIFT)) {
                 union i40e_rx_desc *next_rxd;
@@ -912,7 +956,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
                         goto next_desc;
                 }
 
-                skb->rxhash = i40e_rx_hash(rx_ring, rx_desc);
+                skb_set_hash(skb, i40e_rx_hash(rx_ring, rx_desc),
+                             i40e_ptype_to_hash(rx_ptype));
                 /* probably a little skewed due to removing CRC */
                 total_rx_bytes += skb->len;
                 total_rx_packets++;
@@ -1241,7 +1286,8 @@ static void i40e_create_tx_ctx(struct i40e_ring *tx_ring,
         struct i40e_tx_context_desc *context_desc;
         int i = tx_ring->next_to_use;
 
-        if (!cd_type_cmd_tso_mss && !cd_tunneling && !cd_l2tag2)
+        if ((cd_type_cmd_tso_mss == I40E_TX_DESC_DTYPE_CONTEXT) &&
+            !cd_tunneling && !cd_l2tag2)
                 return;
 
         /* grab the next descriptor */
@@ -1352,9 +1398,23 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,
                 tx_bi = &tx_ring->tx_bi[i];
         }
 
-        tx_desc->cmd_type_offset_bsz =
-                build_ctob(td_cmd, td_offset, size, td_tag) |
-                cpu_to_le64((u64)I40E_TXD_CMD << I40E_TXD_QW1_CMD_SHIFT);
+        /* Place RS bit on last descriptor of any packet that spans across the
+         * 4th descriptor (WB_STRIDE aka 0x3) in a 64B cacheline.
+         */
+#define WB_STRIDE 0x3
+        if (((i & WB_STRIDE) != WB_STRIDE) &&
+            (first <= &tx_ring->tx_bi[i]) &&
+            (first >= &tx_ring->tx_bi[i & ~WB_STRIDE])) {
+                tx_desc->cmd_type_offset_bsz =
+                        build_ctob(td_cmd, td_offset, size, td_tag) |
+                        cpu_to_le64((u64)I40E_TX_DESC_CMD_EOP <<
+                                         I40E_TXD_QW1_CMD_SHIFT);
+        } else {
+                tx_desc->cmd_type_offset_bsz =
+                        build_ctob(td_cmd, td_offset, size, td_tag) |
+                        cpu_to_le64((u64)I40E_TXD_CMD <<
+                                         I40E_TXD_QW1_CMD_SHIFT);
+        }
 
         netdev_tx_sent_queue(netdev_get_tx_queue(tx_ring->netdev,
                                                  tx_ring->queue_index),
@@ -1457,7 +1517,7 @@ static int i40e_xmit_descriptor_count(struct sk_buff *skb,
 
         /* need: 1 descriptor per page * PAGE_SIZE/I40E_MAX_DATA_PER_TXD,
          *       + 1 desc for skb_head_len/I40E_MAX_DATA_PER_TXD,
-         *       + 2 desc gap to keep tail from touching head,
+         *       + 4 desc gap to avoid the cache line where head is,
          *       + 1 desc for context descriptor,
          * otherwise try next time
          */
@@ -1468,7 +1528,7 @@ static int i40e_xmit_descriptor_count(struct sk_buff *skb,
         count += skb_shinfo(skb)->nr_frags;
 #endif
         count += TXD_USE_COUNT(skb_headlen(skb));
-        if (i40e_maybe_stop_tx(tx_ring, count + 3)) {
+        if (i40e_maybe_stop_tx(tx_ring, count + 4 + 1)) {
                 tx_ring->tx_stats.tx_busy++;
                 return 0;
         }
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index 3bffac06592f..4673b3381edd 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -64,8 +64,6 @@
 struct i40e_hw;
 typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
 
-#define ETH_ALEN        6
-
 /* Data type manipulation macros. */
 
 #define I40E_DESC_UNUSED(R)     \
@@ -90,6 +88,7 @@ enum i40e_debug_mask {
         I40E_DEBUG_FLOW                 = 0x00000200,
         I40E_DEBUG_DCB                  = 0x00000400,
         I40E_DEBUG_DIAG                 = 0x00000800,
+        I40E_DEBUG_FD                   = 0x00001000,
 
         I40E_DEBUG_AQ_MESSAGE           = 0x01000000,
         I40E_DEBUG_AQ_DESCRIPTOR        = 0x02000000,
@@ -466,6 +465,10 @@ union i40e_32byte_rx_desc {
                         union {
                                 __le32 rss; /* RSS Hash */
                                 __le32 fcoe_param; /* FCoE DDP Context id */
+                                /* Flow director filter id in case of
+                                 * Programming status desc WB
+                                 */
+                                __le32 fd_id;
                         } hi_dword;
                 } qword0;
                 struct {
@@ -706,7 +709,7 @@ enum i40e_rx_prog_status_desc_prog_id_masks {
 enum i40e_rx_prog_status_desc_error_bits {
         /* Note: These are predefined bit offsets */
         I40E_RX_PROG_STATUS_DESC_FD_TBL_FULL_SHIFT      = 0,
-        I40E_RX_PROG_STATUS_DESC_NO_FD_QUOTA_SHIFT      = 1,
+        I40E_RX_PROG_STATUS_DESC_NO_FD_ENTRY_SHIFT      = 1,
         I40E_RX_PROG_STATUS_DESC_FCOE_TBL_FULL_SHIFT    = 2,
         I40E_RX_PROG_STATUS_DESC_FCOE_CONFLICT_SHIFT    = 3
 };
@@ -1018,6 +1021,11 @@ struct i40e_hw_port_stats {
         u64 tx_size_big;                /* ptc9522 */
         u64 mac_short_packet_dropped;   /* mspdc */
         u64 checksum_error;             /* xec */
+        /* EEE LPI */
+        bool tx_lpi_status;
+        bool rx_lpi_status;
+        u64 tx_lpi_count;               /* etlpic */
+        u64 rx_lpi_count;               /* erlpic */
 };
 
 /* Checksum and Shadow RAM pointers */
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h
index ff6529b288a1..807807d62387 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf.h
+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -38,8 +38,6 @@
 #include <linux/ipv6.h>
 #include <net/ip6_checksum.h>
 #include <net/udp.h>
-#include <linux/sctp.h>
-
 
 #include "i40e_type.h"
 #include "i40e_virtchnl.h"
@@ -164,15 +162,14 @@ struct i40evf_vlan_filter {
 /* Driver state. The order of these is important! */
 enum i40evf_state_t {
         __I40EVF_STARTUP,               /* driver loaded, probe complete */
-        __I40EVF_FAILED,                /* PF communication failed. Fatal. */
         __I40EVF_REMOVE,                /* driver is being unloaded */
         __I40EVF_INIT_VERSION_CHECK,    /* aq msg sent, awaiting reply */
         __I40EVF_INIT_GET_RESOURCES,    /* aq msg sent, awaiting reply */
         __I40EVF_INIT_SW,               /* got resources, setting up structs */
+        __I40EVF_RESETTING,             /* in reset */
         /* Below here, watchdog is running */
         __I40EVF_DOWN,                  /* ready, can be opened */
         __I40EVF_TESTING,               /* in ethtool self-test */
-        __I40EVF_RESETTING,             /* in reset */
         __I40EVF_RUNNING,               /* opened, working */
 };
 
@@ -185,47 +182,25 @@ enum i40evf_critical_section_t {
 /* board specific private data structure */
 struct i40evf_adapter {
         struct timer_list watchdog_timer;
-        struct vlan_group *vlgrp;
         struct work_struct reset_task;
         struct work_struct adminq_task;
         struct delayed_work init_task;
         struct i40e_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
         struct list_head vlan_filter_list;
-        char name[MAX_MSIX_COUNT][IFNAMSIZ + 9];
-
-        /* Interrupt Throttle Rate */
-        u32 itr_setting;
-        u16 eitr_low;
-        u16 eitr_high;
+        char misc_vector_name[IFNAMSIZ + 9];
 
         /* TX */
         struct i40e_ring *tx_rings[I40E_MAX_VSI_QP];
-        u64 restart_queue;
-        u64 hw_csum_tx_good;
-        u64 lsc_int;
-        u64 hw_tso_ctxt;
-        u64 hw_tso6_ctxt;
         u32 tx_timeout_count;
         struct list_head mac_filter_list;
-#ifdef DEBUG
-        bool detect_tx_hung;
-#endif /* DEBUG */
 
         /* RX */
         struct i40e_ring *rx_rings[I40E_MAX_VSI_QP];
-        int txd_count;
-        int rxd_count;
         u64 hw_csum_rx_error;
-        u64 hw_rx_no_dma_resources;
-        u64 hw_csum_rx_good;
-        u64 non_eop_descs;
         int num_msix_vectors;
         struct msix_entry *msix_entries;
 
-        u64 rx_hdr_split;
-
-        u32 init_state;
-        volatile unsigned long flags;
+        u32 flags;
 #define I40EVF_FLAG_RX_CSUM_ENABLED              (u32)(1)
 #define I40EVF_FLAG_RX_1BUF_CAPABLE              (u32)(1 << 1)
 #define I40EVF_FLAG_RX_PS_CAPABLE                (u32)(1 << 2)
@@ -234,6 +209,9 @@ struct i40evf_adapter {
 #define I40EVF_FLAG_IMIR_ENABLED                 (u32)(1 << 5)
 #define I40EVF_FLAG_MQ_CAPABLE                   (u32)(1 << 6)
 #define I40EVF_FLAG_NEED_LINK_UPDATE             (u32)(1 << 7)
+#define I40EVF_FLAG_PF_COMMS_FAILED              (u32)(1 << 8)
+#define I40EVF_FLAG_RESET_PENDING                (u32)(1 << 9)
+#define I40EVF_FLAG_RESET_NEEDED                 (u32)(1 << 10)
 /* duplcates for common code */
 #define I40E_FLAG_FDIR_ATR_ENABLED               0
 #define I40E_FLAG_DCB_ENABLED                    0
@@ -251,21 +229,19 @@ struct i40evf_adapter {
 #define I40EVF_FLAG_AQ_CONFIGURE_QUEUES         (u32)(1 << 6)
 #define I40EVF_FLAG_AQ_MAP_VECTORS              (u32)(1 << 7)
 #define I40EVF_FLAG_AQ_HANDLE_RESET             (u32)(1 << 8)
+
         /* OS defined structs */
         struct net_device *netdev;
         struct pci_dev *pdev;
         struct net_device_stats net_stats;
 
-        /* structs defined in i40e_vf.h */
-        struct i40e_hw hw;
+        struct i40e_hw hw; /* defined in i40e_type.h */
 
         enum i40evf_state_t state;
         volatile unsigned long crit_section;
-        u64 tx_busy;
 
         struct work_struct watchdog_task;
         bool netdev_registered;
-        bool dev_closed;
         bool link_up;
         enum i40e_virtchnl_ops current_op;
         struct i40e_virtchnl_vf_resource *vf_res; /* incl. all VSIs */
@@ -276,11 +252,6 @@ struct i40evf_adapter {
         u32 aq_wait_count;
 };
 
-struct i40evf_info {
-        enum i40e_mac_type      mac;
-        unsigned int            flags;
-};
-
 
 /* needed by i40evf_ethtool.c */
 extern char i40evf_driver_name[];
@@ -315,6 +286,7 @@ void i40evf_add_vlans(struct i40evf_adapter *adapter);
 void i40evf_del_vlans(struct i40evf_adapter *adapter);
 void i40evf_set_promiscuous(struct i40evf_adapter *adapter, int flags);
 void i40evf_request_stats(struct i40evf_adapter *adapter);
+void i40evf_request_reset(struct i40evf_adapter *adapter);
 void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                                 enum i40e_virtchnl_ops v_opcode,
                                 i40e_status v_retval, u8 *msg, u16 msglen);
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
index b0b1f4bf5ac0..8b0db1ce179c 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -241,6 +241,7 @@ static int i40evf_set_ringparam(struct net_device *netdev,
 {
         struct i40evf_adapter *adapter = netdev_priv(netdev);
         u32 new_rx_count, new_tx_count;
+        int i;
 
         if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
@@ -256,12 +257,14 @@ static int i40evf_set_ringparam(struct net_device *netdev,
         new_rx_count = ALIGN(new_rx_count, I40EVF_REQ_DESCRIPTOR_MULTIPLE);
 
         /* if nothing to do return success */
-        if ((new_tx_count == adapter->txd_count) &&
-            (new_rx_count == adapter->rxd_count))
+        if ((new_tx_count == adapter->tx_rings[0]->count) &&
+            (new_rx_count == adapter->rx_rings[0]->count))
                 return 0;
 
-        adapter->txd_count = new_tx_count;
-        adapter->rxd_count = new_rx_count;
+        for (i = 0; i < adapter->vsi_res->num_queue_pairs; i++) {
+                adapter->tx_rings[0]->count = new_tx_count;
+                adapter->rx_rings[0]->count = new_rx_count;
+        }
 
         if (netif_running(netdev))
                 i40evf_reinit_locked(adapter);
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index f5caf4419243..e35e66ffa782 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -31,10 +31,10 @@ char i40evf_driver_name[] = "i40evf";
 static const char i40evf_driver_string[] =
         "Intel(R) XL710 X710 Virtual Function Network Driver";
 
-#define DRV_VERSION "0.9.11"
+#define DRV_VERSION "0.9.16"
 const char i40evf_driver_version[] = DRV_VERSION;
 static const char i40evf_copyright[] =
-        "Copyright (c) 2013 Intel Corporation.";
+        "Copyright (c) 2013 - 2014 Intel Corporation.";
 
 /* i40evf_pci_tbl - PCI Device ID Table
  *
@@ -167,9 +167,11 @@ static void i40evf_tx_timeout(struct net_device *netdev)
         struct i40evf_adapter *adapter = netdev_priv(netdev);
 
         adapter->tx_timeout_count++;
-
-        /* Do the reset outside of interrupt context */
-        schedule_work(&adapter->reset_task);
+        dev_info(&adapter->pdev->dev, "TX timeout detected.\n");
+        if (!(adapter->flags & I40EVF_FLAG_RESET_PENDING)) {
+                adapter->flags |= I40EVF_FLAG_RESET_NEEDED;
+                schedule_work(&adapter->reset_task);
+        }
 }
 
 /**
@@ -211,6 +213,9 @@ static void i40evf_irq_disable(struct i40evf_adapter *adapter)
         int i;
         struct i40e_hw *hw = &adapter->hw;
 
+        if (!adapter->msix_entries)
+                return;
+
         for (i = 1; i < adapter->num_msix_vectors; i++) {
                 wr32(hw, I40E_VFINT_DYN_CTLN1(i - 1), 0);
                 synchronize_irq(adapter->msix_entries[i].vector);
@@ -511,12 +516,14 @@ static int i40evf_request_misc_irq(struct i40evf_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         int err;
 
-        sprintf(adapter->name[0], "i40evf:mbx");
+        sprintf(adapter->misc_vector_name, "i40evf:mbx");
         err = request_irq(adapter->msix_entries[0].vector,
-                          &i40evf_msix_aq, 0, adapter->name[0], netdev);
+                          &i40evf_msix_aq, 0,
+                          adapter->misc_vector_name, netdev);
         if (err) {
                 dev_err(&adapter->pdev->dev,
-                        "request_irq for msix_aq failed: %d\n", err);
+                        "request_irq for %s failed: %d\n",
+                        adapter->misc_vector_name, err);
                 free_irq(adapter->msix_entries[0].vector, netdev);
         }
         return err;
@@ -963,16 +970,23 @@ void i40evf_down(struct i40evf_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         struct i40evf_mac_filter *f;
 
-        /* remove all MAC filters from the VSI */
+        /* remove all MAC filters */
         list_for_each_entry(f, &adapter->mac_filter_list, list) {
                 f->remove = true;
         }
-        adapter->aq_required |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;
-        /* disable receives */
-        adapter->aq_required |= I40EVF_FLAG_AQ_DISABLE_QUEUES;
-        mod_timer_pending(&adapter->watchdog_timer, jiffies + 1);
-        msleep(20);
-
+        /* remove all VLAN filters */
+        list_for_each_entry(f, &adapter->vlan_filter_list, list) {
+                f->remove = true;
+        }
+        if (!(adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED) &&
+            adapter->state != __I40EVF_RESETTING) {
+                adapter->aq_required |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;
+                adapter->aq_required |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;
+                /* disable receives */
+                adapter->aq_required |= I40EVF_FLAG_AQ_DISABLE_QUEUES;
+                mod_timer_pending(&adapter->watchdog_timer, jiffies + 1);
+                msleep(20);
+        }
         netif_tx_disable(netdev);
 
         netif_tx_stop_all_queues(netdev);
@@ -1124,8 +1138,8 @@ static int i40evf_set_interrupt_capability(struct i40evf_adapter *adapter)
          * than CPU's.  So let's be conservative and only ask for
          * (roughly) twice the number of vectors as there are CPU's.
          */
-        v_budget = min(pairs, (int)(num_online_cpus() * 2)) + NONQ_VECS;
-        v_budget = min(v_budget, (int)adapter->vf_res->max_vectors + 1);
+        v_budget = min_t(int, pairs, (int)(num_online_cpus() * 2)) + NONQ_VECS;
+        v_budget = min_t(int, v_budget, (int)adapter->vf_res->max_vectors);
 
         /* A failure in MSI-X entry allocation isn't fatal, but it does
          * mean we disable MSI-X capabilities of the adapter.
@@ -1291,19 +1305,47 @@ static void i40evf_watchdog_task(struct work_struct *work)
                                           watchdog_task);
         struct i40e_hw *hw = &adapter->hw;
 
-        if (adapter->state < __I40EVF_DOWN)
+        if (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section))
+                goto restart_watchdog;
+
+        if (adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED) {
+                dev_info(&adapter->pdev->dev, "Checking for redemption\n");
+                if ((rd32(hw, I40E_VFGEN_RSTAT) & 0x3) == I40E_VFR_VFACTIVE) {
+                        /* A chance for redemption! */
+                        dev_err(&adapter->pdev->dev, "Hardware came out of reset. Attempting reinit.\n");
+                        adapter->state = __I40EVF_STARTUP;
+                        adapter->flags &= ~I40EVF_FLAG_PF_COMMS_FAILED;
+                        schedule_delayed_work(&adapter->init_task, 10);
+                        clear_bit(__I40EVF_IN_CRITICAL_TASK,
+                                  &adapter->crit_section);
+                        /* Don't reschedule the watchdog, since we've restarted
+                         * the init task. When init_task contacts the PF and
+                         * gets everything set up again, it'll restart the
+                         * watchdog for us. Down, boy. Sit. Stay. Woof.
+                         */
+                        return;
+                }
+                adapter->aq_pending = 0;
+                adapter->aq_required = 0;
+                adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
                 goto watchdog_done;
+        }
 
-        if (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section))
+        if ((adapter->state < __I40EVF_DOWN) ||
+            (adapter->flags & I40EVF_FLAG_RESET_PENDING))
                 goto watchdog_done;
 
-        /* check for unannounced reset */
-        if ((adapter->state != __I40EVF_RESETTING) &&
+        /* check for reset */
+        if (!(adapter->flags & I40EVF_FLAG_RESET_PENDING) &&
             (rd32(hw, I40E_VFGEN_RSTAT) & 0x3) != I40E_VFR_VFACTIVE) {
                 adapter->state = __I40EVF_RESETTING;
+                adapter->flags |= I40EVF_FLAG_RESET_PENDING;
+                dev_err(&adapter->pdev->dev, "Hardware reset detected.\n");
+                dev_info(&adapter->pdev->dev, "Scheduling reset task\n");
                 schedule_work(&adapter->reset_task);
-                dev_info(&adapter->pdev->dev, "%s: hardware reset detected\n",
-                         __func__);
+                adapter->aq_pending = 0;
+                adapter->aq_required = 0;
+                adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
                 goto watchdog_done;
         }
 
@@ -1358,16 +1400,25 @@ static void i40evf_watchdog_task(struct work_struct *work)
 
         i40evf_irq_enable(adapter, true);
         i40evf_fire_sw_int(adapter, 0xFF);
+
 watchdog_done:
+        clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section);
+restart_watchdog:
         if (adapter->aq_required)
                 mod_timer(&adapter->watchdog_timer,
                           jiffies + msecs_to_jiffies(20));
         else
                 mod_timer(&adapter->watchdog_timer, jiffies + (HZ * 2));
-        clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section);
         schedule_work(&adapter->adminq_task);
 }
 
+static int next_queue(struct i40evf_adapter *adapter, int j)
+{
+        j += 1;
+
+        return j >= adapter->vsi_res->num_queue_pairs ? 0 : j;
+}
+
 /**
  * i40evf_configure_rss - Prepare for RSS if used
  * @adapter: board private structure
@@ -1398,19 +1449,19 @@ static void i40evf_configure_rss(struct i40evf_adapter *adapter)
         wr32(hw, I40E_VFQF_HENA(1), (u32)(hena >> 32));
 
         /* Populate the LUT with max no. of queues in round robin fashion */
-        for (i = 0, j = 0; i < I40E_VFQF_HLUT_MAX_INDEX; i++, j++) {
-                if (j == adapter->vsi_res->num_queue_pairs)
-                        j = 0;
-                /* lut = 4-byte sliding window of 4 lut entries */
-                lut = (lut << 8) | (j &
-                         ((0x1 << 8) - 1));
-                /* On i = 3, we have 4 entries in lut; write to the register */
-                if ((i & 3) == 3)
-                        wr32(hw, I40E_VFQF_HLUT(i >> 2), lut);
+        j = adapter->vsi_res->num_queue_pairs;
+        for (i = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++) {
+                lut = next_queue(adapter, j);
+                lut |= next_queue(adapter, j) << 8;
+                lut |= next_queue(adapter, j) << 16;
+                lut |= next_queue(adapter, j) << 24;
+                wr32(hw, I40E_VFQF_HLUT(i), lut);
         }
         i40e_flush(hw);
 }
 
+#define I40EVF_RESET_WAIT_MS 100
+#define I40EVF_RESET_WAIT_COUNT 200
 /**
  * i40evf_reset_task - Call-back task to handle hardware reset
  * @work: pointer to work_struct
@@ -1421,8 +1472,9 @@ static void i40evf_configure_rss(struct i40evf_adapter *adapter)
  **/
 static void i40evf_reset_task(struct work_struct *work)
 {
-        struct i40evf_adapter *adapter =
-                        container_of(work, struct i40evf_adapter, reset_task);
+        struct i40evf_adapter *adapter = container_of(work,
+                                                      struct i40evf_adapter,
+                                                      reset_task);
         struct i40e_hw *hw = &adapter->hw;
         int i = 0, err;
         uint32_t rstat_val;
@@ -1431,21 +1483,61 @@ static void i40evf_reset_task(struct work_struct *work)
                                 &adapter->crit_section))
                 udelay(500);
 
-        /* wait until the reset is complete */
-        for (i = 0; i < 20; i++) {
+        if (adapter->flags & I40EVF_FLAG_RESET_NEEDED) {
+                dev_info(&adapter->pdev->dev, "Requesting reset from PF\n");
+                i40evf_request_reset(adapter);
+        }
+
+        /* poll until we see the reset actually happen */
+        for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
                 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
                             I40E_VFGEN_RSTAT_VFR_STATE_MASK;
-                if (rstat_val == I40E_VFR_COMPLETED)
+                if (rstat_val != I40E_VFR_VFACTIVE) {
+                        dev_info(&adapter->pdev->dev, "Reset now occurring\n");
                         break;
-                else
-                        mdelay(100);
+                } else {
+                        msleep(I40EVF_RESET_WAIT_MS);
+                }
+        }
+        if (i == I40EVF_RESET_WAIT_COUNT) {
+                dev_err(&adapter->pdev->dev, "Reset was not detected\n");
+                adapter->flags &= ~I40EVF_FLAG_RESET_PENDING;
+                goto continue_reset; /* act like the reset happened */
+        }
+
+        /* wait until the reset is complete and the PF is responding to us */
+        for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
+                rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
+                            I40E_VFGEN_RSTAT_VFR_STATE_MASK;
+                if (rstat_val == I40E_VFR_VFACTIVE) {
+                        dev_info(&adapter->pdev->dev, "Reset is complete. Reinitializing.\n");
+                        break;
+                } else {
+                        msleep(I40EVF_RESET_WAIT_MS);
+                }
         }
-        if (i == 20) {
+        if (i == I40EVF_RESET_WAIT_COUNT) {
                 /* reset never finished */
-                dev_info(&adapter->pdev->dev, "%s: reset never finished: %x\n",
-                        __func__, rstat_val);
-                /* carry on anyway */
+                dev_err(&adapter->pdev->dev, "Reset never finished (%x). PF driver is dead, and so am I.\n",
+                        rstat_val);
+                adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED;
+
+                if (netif_running(adapter->netdev))
+                        i40evf_close(adapter->netdev);
+
+                i40evf_free_misc_irq(adapter);
+                i40evf_reset_interrupt_capability(adapter);
+                i40evf_free_queues(adapter);
+                kfree(adapter->vf_res);
+                i40evf_shutdown_adminq(hw);
+                adapter->netdev->flags &= ~IFF_UP;
+                clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section);
+                return; /* Do not attempt to reinit. It's dead, Jim. */
         }
+
+continue_reset:
+        adapter->flags &= ~I40EVF_FLAG_RESET_PENDING;
+
         i40evf_down(adapter);
         adapter->state = __I40EVF_RESETTING;
 
@@ -1505,6 +1597,9 @@ static void i40evf_adminq_task(struct work_struct *work)
         i40e_status ret;
         u16 pending;
 
+        if (adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED)
+                return;
+
         event.msg_size = I40EVF_MAX_AQ_BUF_SIZE;
         event.msg_buf = kzalloc(event.msg_size, GFP_KERNEL);
         if (!event.msg_buf) {
@@ -1636,6 +1731,10 @@ static int i40evf_open(struct net_device *netdev)
         struct i40evf_adapter *adapter = netdev_priv(netdev);
         int err;
 
+        if (adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED) {
+                dev_err(&adapter->pdev->dev, "Unable to open device due to PF driver failure.\n");
+                return -EIO;
+        }
         if (adapter->state != __I40EVF_DOWN)
                 return -EBUSY;
 
@@ -1690,8 +1789,12 @@ static int i40evf_close(struct net_device *netdev)
 {
         struct i40evf_adapter *adapter = netdev_priv(netdev);
 
+        if (adapter->state <= __I40EVF_DOWN)
+                return 0;
+
         /* signal that we are down to the interrupt handler */
         adapter->state = __I40EVF_DOWN;
+
         set_bit(__I40E_DOWN, &adapter->vsi.state);
 
         i40evf_down(adapter);
@@ -1842,16 +1945,18 @@ static void i40evf_init_task(struct work_struct *work)
         switch (adapter->state) {
         case __I40EVF_STARTUP:
                 /* driver loaded, probe complete */
+                adapter->flags &= ~I40EVF_FLAG_PF_COMMS_FAILED;
+                adapter->flags &= ~I40EVF_FLAG_RESET_PENDING;
                 err = i40e_set_mac_type(hw);
                 if (err) {
-                        dev_info(&pdev->dev, "%s: set_mac_type failed: %d\n",
-                                __func__, err);
+                        dev_err(&pdev->dev, "Failed to set MAC type (%d)\n",
+                                err);
                 goto err;
                 }
                 err = i40evf_check_reset_complete(hw);
                 if (err) {
-                        dev_info(&pdev->dev, "%s: device is still in reset (%d).\n",
-                                __func__, err);
+                        dev_err(&pdev->dev, "Device is still in reset (%d)\n",
+                                err);
                         goto err;
                 }
                 hw->aq.num_arq_entries = I40EVF_AQ_LEN;
@@ -1861,14 +1966,13 @@ static void i40evf_init_task(struct work_struct *work)
 
                 err = i40evf_init_adminq(hw);
                 if (err) {
-                        dev_info(&pdev->dev, "%s: init_adminq failed: %d\n",
-                                __func__, err);
+                        dev_err(&pdev->dev, "Failed to init Admin Queue (%d)\n",
+                                err);
                         goto err;
                 }
                 err = i40evf_send_api_ver(adapter);
                 if (err) {
-                        dev_info(&pdev->dev, "%s: unable to send to PF (%d)\n",
-                                __func__, err);
+                        dev_err(&pdev->dev, "Unable to send to PF (%d)\n", err);
                         i40evf_shutdown_adminq(hw);
                         goto err;
                 }
@@ -1876,19 +1980,21 @@ static void i40evf_init_task(struct work_struct *work)
                 goto restart;
                 break;
         case __I40EVF_INIT_VERSION_CHECK:
-                if (!i40evf_asq_done(hw))
+                if (!i40evf_asq_done(hw)) {
+                        dev_err(&pdev->dev, "Admin queue command never completed.\n");
                         goto err;
+                }
 
                 /* aq msg sent, awaiting reply */
                 err = i40evf_verify_api_ver(adapter);
                 if (err) {
-                        dev_err(&pdev->dev, "Unable to verify API version, error %d\n",
+                        dev_err(&pdev->dev, "Unable to verify API version (%d)\n",
                                 err);
                         goto err;
                 }
                 err = i40evf_send_vf_config_msg(adapter);
                 if (err) {
-                        dev_err(&pdev->dev, "Unable send config request, error %d\n",
+                        dev_err(&pdev->dev, "Unable send config request (%d)\n",
                                 err);
                         goto err;
                 }
@@ -1902,18 +2008,15 @@ static void i40evf_init_task(struct work_struct *work)
                                 (I40E_MAX_VF_VSI *
                                  sizeof(struct i40e_virtchnl_vsi_resource));
                         adapter->vf_res = kzalloc(bufsz, GFP_KERNEL);
-                        if (!adapter->vf_res) {
-                                dev_err(&pdev->dev, "%s: unable to allocate memory\n",
-                                        __func__);
+                        if (!adapter->vf_res)
                                 goto err;
-                        }
                 }
                 err = i40evf_get_vf_config(adapter);
                 if (err == I40E_ERR_ADMIN_QUEUE_NO_WORK)
                         goto restart;
                 if (err) {
-                        dev_info(&pdev->dev, "%s: unable to get VF config (%d)\n",
-                                __func__, err);
+                        dev_err(&pdev->dev, "Unable to get VF config (%d)\n",
+                                err);
                         goto err_alloc;
                 }
                 adapter->state = __I40EVF_INIT_SW;
@@ -1927,25 +2030,23 @@ static void i40evf_init_task(struct work_struct *work)
                         adapter->vsi_res = &adapter->vf_res->vsi_res[i];
         }
         if (!adapter->vsi_res) {
-                dev_info(&pdev->dev, "%s: no LAN VSI found\n", __func__);
+                dev_err(&pdev->dev, "No LAN VSI found\n");
                 goto err_alloc;
         }
 
         adapter->flags |= I40EVF_FLAG_RX_CSUM_ENABLED;
 
-        adapter->txd_count = I40EVF_DEFAULT_TXD;
-        adapter->rxd_count = I40EVF_DEFAULT_RXD;
-
         netdev->netdev_ops = &i40evf_netdev_ops;
         i40evf_set_ethtool_ops(netdev);
         netdev->watchdog_timeo = 5 * HZ;
-
-        netdev->features |= NETIF_F_SG |
+        netdev->features |= NETIF_F_HIGHDMA |
+                            NETIF_F_SG |
                             NETIF_F_IP_CSUM |
                             NETIF_F_SCTP_CSUM |
                             NETIF_F_IPV6_CSUM |
                             NETIF_F_TSO |
                             NETIF_F_TSO6 |
+                            NETIF_F_RXCSUM |
                             NETIF_F_GRO;
 
         if (adapter->vf_res->vf_offload_flags
@@ -1956,11 +2057,13 @@ static void i40evf_init_task(struct work_struct *work)
                                     NETIF_F_HW_VLAN_CTAG_FILTER;
         }
 
-        /* The HW MAC address was set and/or determined in sw_init */
+        /* copy netdev features into list of user selectable features */
+        netdev->hw_features |= netdev->features;
+        netdev->hw_features &= ~NETIF_F_RXCSUM;
+
         if (!is_valid_ether_addr(adapter->hw.mac.addr)) {
-                dev_info(&pdev->dev,
-                        "Invalid MAC address %pMAC, using random\n",
-                        adapter->hw.mac.addr);
+                dev_info(&pdev->dev, "Invalid MAC address %pMAC, using random\n",
+                         adapter->hw.mac.addr);
                 random_ether_addr(adapter->hw.mac.addr);
         }
         memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
@@ -1994,8 +2097,6 @@ static void i40evf_init_task(struct work_struct *work)
 
         netif_carrier_off(netdev);
 
-        strcpy(netdev->name, "eth%d");
-
         adapter->vsi.id = adapter->vsi_res->vsi_id;
         adapter->vsi.seid = adapter->vsi_res->vsi_id; /* dummy */
         adapter->vsi.back = adapter;
@@ -2005,9 +2106,11 @@ static void i40evf_init_task(struct work_struct *work)
         adapter->vsi.tx_itr_setting = I40E_ITR_DYNAMIC;
         adapter->vsi.netdev = adapter->netdev;
 
-        err = register_netdev(netdev);
-        if (err)
-                goto err_register;
+        if (!adapter->netdev_registered) {
+                err = register_netdev(netdev);
+                if (err)
+                        goto err_register;
+        }
 
         adapter->netdev_registered = true;
 
@@ -2031,7 +2134,6 @@ err_register:
         i40evf_free_misc_irq(adapter);
 err_sw_init:
         i40evf_reset_interrupt_capability(adapter);
-        adapter->state = __I40EVF_FAILED;
 err_alloc:
         kfree(adapter->vf_res);
         adapter->vf_res = NULL;
@@ -2039,9 +2141,7 @@ err:
         /* Things went into the weeds, so try again later */
         if (++adapter->aq_wait_count > I40EVF_AQ_MAX_ERR) {
                 dev_err(&pdev->dev, "Failed to communicate with PF; giving up.\n");
-                if (hw->aq.asq.count)
-                        i40evf_shutdown_adminq(hw); /* ignore error */
-                adapter->state = __I40EVF_FAILED;
+                adapter->flags |= I40EVF_FLAG_PF_COMMS_FAILED;
                 return; /* do not reschedule */
         }
         schedule_delayed_work(&adapter->init_task, HZ * 3);
@@ -2084,26 +2184,20 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct net_device *netdev;
         struct i40evf_adapter *adapter = NULL;
         struct i40e_hw *hw = NULL;
-        int err, pci_using_dac;
+        int err;
 
         err = pci_enable_device(pdev);
         if (err)
                 return err;
 
-        if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-                pci_using_dac = true;
-                /* coherent mask for the same size will always succeed if
-                 * dma_set_mask does
-                 */
-                dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-        } else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
-                pci_using_dac = false;
-                dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-        } else {
-                dev_err(&pdev->dev, "%s: DMA configuration failed: %d\n",
-                         __func__, err);
-                err = -EIO;
-                goto err_dma;
+        err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+        if (err) {
+                err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+                if (err) {
+                        dev_err(&pdev->dev,
+                                "DMA configuration failed: 0x%x\n", err);
+                        goto err_dma;
+                }
         }
 
         err = pci_request_regions(pdev, i40evf_driver_name);
@@ -2128,8 +2222,6 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, netdev);
         adapter = netdev_priv(netdev);
-        if (pci_using_dac)
-                netdev->features |= NETIF_F_HIGHDMA;
 
         adapter->netdev = netdev;
         adapter->pdev = pdev;
@@ -2271,6 +2363,7 @@ static void i40evf_remove(struct pci_dev *pdev)
         struct i40e_hw *hw = &adapter->hw;
 
         cancel_delayed_work_sync(&adapter->init_task);
+        cancel_work_sync(&adapter->reset_task);
 
         if (adapter->netdev_registered) {
                 unregister_netdev(netdev);
@@ -2278,17 +2371,15 @@ static void i40evf_remove(struct pci_dev *pdev)
         }
         adapter->state = __I40EVF_REMOVE;
 
-        if (adapter->num_msix_vectors) {
+        if (adapter->msix_entries) {
                 i40evf_misc_irq_disable(adapter);
-                del_timer_sync(&adapter->watchdog_timer);
-
-                flush_scheduled_work();
-
                 i40evf_free_misc_irq(adapter);
-
                 i40evf_reset_interrupt_capability(adapter);
         }
 
+        del_timer_sync(&adapter->watchdog_timer);
+        flush_scheduled_work();
+
         if (hw->aq.asq.count)
                 i40evf_shutdown_adminq(hw);
 
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index e6978d79e62b..e294f012647d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 Intel Corporation.
+ * Copyright(c) 2013 - 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -43,6 +43,9 @@ static int i40evf_send_pf_msg(struct i40evf_adapter *adapter,
         struct i40e_hw *hw = &adapter->hw;
         i40e_status err;
 
+        if (adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED)
+                return 0; /* nothing to see here, move along */
+
         err = i40e_aq_send_msg_to_pf(hw, op, 0, msg, len, NULL);
         if (err)
                 dev_err(&adapter->pdev->dev, "Unable to send opcode %d to PF, error %d, aq status %d\n",
@@ -651,6 +654,18 @@ void i40evf_request_stats(struct i40evf_adapter *adapter)
                 /* if the request failed, don't lock out others */
                 adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
 }
+/**
+ * i40evf_request_reset
+ * @adapter: adapter structure
+ *
+ * Request that the PF reset this VF. No response is expected.
+ **/
+void i40evf_request_reset(struct i40evf_adapter *adapter)
+{
+        /* Don't check CURRENT_OP - this is always higher priority */
+        i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_RESET_VF, NULL, 0);
+        adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
+}
 
 /**
  * i40evf_virtchnl_completion
@@ -689,10 +704,12 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                         }
                         break;
                 case I40E_VIRTCHNL_EVENT_RESET_IMPENDING:
-                        adapter->state = __I40EVF_RESETTING;
-                        schedule_work(&adapter->reset_task);
-                        dev_info(&adapter->pdev->dev,
-                                 "%s: hardware reset pending\n", __func__);
+                        dev_info(&adapter->pdev->dev, "PF reset warning received\n");
+                        if (!(adapter->flags & I40EVF_FLAG_RESET_PENDING)) {
+                                adapter->flags |= I40EVF_FLAG_RESET_PENDING;
+                                dev_info(&adapter->pdev->dev, "Scheduling reset task\n");
+                                schedule_work(&adapter->reset_task);
+                        }
                         break;
                 default:
                         dev_err(&adapter->pdev->dev,