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

Pull networking fixes from David Miller:

 1) Several routines do not use netdev_features_t to hold such bitmasks,
    fixes from Patrick McHardy and Bjørn Mork.

 2) Update cpsw IRQ software state and the actual HW irq enabling in the
    correct order.  From Mugunthan V N.

 3) When sending tipc packets to multiple bearers, we have to make
    copies of the SKB rather than just giving the original SKB directly.
    Fix from Gerlando Falauto.

 4) Fix race with bridging topology change timer, from Stephen
    Hemminger.

 5) Fix TCPv6 segmentation handling in GRE and VXLAN, from Pravin B
    Shelar.

 6) Endian bug in USB pegasus driver, from Dan Carpenter.

 7) Fix crashes on MTU reduction in USB asix driver, from Holger
    Eitzenberger.

 8) Don't allow the kernel to BUG() just because the user puts some crap
    in an AF_PACKET mmap() ring descriptor.  Fix from Daniel Borkmann.

 9) Don't use variable sized arrays on the stack in xen-netback, from
    Wei Liu.

10) Fix stats reporting and an unbalanced napi_disable() in be2net
    driver.  From Somnath Kotur and Ajit Khaparde.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (25 commits)
  cxgb4: fix error recovery when t4_fw_hello returns a positive value
  sky2: Fix crash on receiving VLAN frames
  packet: tpacket_v3: do not trigger bug() on wrong header status
  asix: fix BUG in receive path when lowering MTU
  net: qmi_wwan: Add Telewell TW-LTE 4G
  usbnet: pegasus: endian bug in write_mii_word()
  vxlan: Fix TCPv6 segmentation.
  gre: Fix GREv4 TCPv6 segmentation.
  bridge: fix race with topology change timer
  tipc: pskb_copy() buffers when sending on more than one bearer
  tipc: tipc_bcbearer_send(): simplify bearer selection
  tipc: cosmetic: clean up comments and break a long line
  drivers: net: cpsw: irq not disabled in cpsw isr in particular sequence
  xen-netback: better names for thresholds
  xen-netback: avoid allocating variable size array on stack
  xen-netback: remove redundent parameter in netbk_count_requests
  be2net: Fix to fail probe if MSI-X enable fails for a VF
  be2net: avoid napi_disable() when it has not been enabled
  be2net: Fix firmware download for Lancer
  be2net: Fix to receive Multicast Packets when Promiscuous mode is enabled on certain devices
  ...

8 files changed, 65 insertions, 34 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index c59ec3ddaa66..3cd397d60434 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -5204,7 +5204,7 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)
 
         if (t4_wait_dev_ready(adap) < 0)
                 return PCI_ERS_RESULT_DISCONNECT;
-        if (t4_fw_hello(adap, adap->fn, adap->fn, MASTER_MUST, NULL))
+        if (t4_fw_hello(adap, adap->fn, adap->fn, MASTER_MUST, NULL) < 0)
                 return PCI_ERS_RESULT_DISCONNECT;
         adap->flags |= FW_OK;
         if (adap_init1(adap, &c))
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 234ce6f07544..f544b297c9ab 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -327,6 +327,7 @@ enum vf_state {
 
 #define BE_FLAGS_LINK_STATUS_INIT               1
 #define BE_FLAGS_WORKER_SCHEDULED               (1 << 3)
+#define BE_FLAGS_NAPI_ENABLED                   (1 << 9)
 #define BE_UC_PMAC_COUNT                30
 #define BE_VF_UC_PMAC_COUNT             2
 #define BE_FLAGS_QNQ_ASYNC_EVT_RCVD             (1 << 11)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 25d3290b8cac..e1e5bb9d9054 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -961,19 +961,8 @@ int be_cmd_cq_create(struct be_adapter *adapter, struct be_queue_info *cq,
                 OPCODE_COMMON_CQ_CREATE, sizeof(*req), wrb, NULL);
 
         req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
-        if (lancer_chip(adapter)) {
-                req->hdr.version = 2;
-                req->page_size = 1; /* 1 for 4K */
-                AMAP_SET_BITS(struct amap_cq_context_lancer, nodelay, ctxt,
-                                                                no_delay);
-                AMAP_SET_BITS(struct amap_cq_context_lancer, count, ctxt,
-                                                __ilog2_u32(cq->len/256));
-                AMAP_SET_BITS(struct amap_cq_context_lancer, valid, ctxt, 1);
-                AMAP_SET_BITS(struct amap_cq_context_lancer, eventable,
-                                                                ctxt, 1);
-                AMAP_SET_BITS(struct amap_cq_context_lancer, eqid,
-                                                                ctxt, eq->id);
-        } else {
+
+        if (BEx_chip(adapter)) {
                 AMAP_SET_BITS(struct amap_cq_context_be, coalescwm, ctxt,
                                                                 coalesce_wm);
                 AMAP_SET_BITS(struct amap_cq_context_be, nodelay,
@@ -983,6 +972,18 @@ int be_cmd_cq_create(struct be_adapter *adapter, struct be_queue_info *cq,
                 AMAP_SET_BITS(struct amap_cq_context_be, valid, ctxt, 1);
                 AMAP_SET_BITS(struct amap_cq_context_be, eventable, ctxt, 1);
                 AMAP_SET_BITS(struct amap_cq_context_be, eqid, ctxt, eq->id);
+        } else {
+                req->hdr.version = 2;
+                req->page_size = 1; /* 1 for 4K */
+                AMAP_SET_BITS(struct amap_cq_context_v2, nodelay, ctxt,
+                                                                no_delay);
+                AMAP_SET_BITS(struct amap_cq_context_v2, count, ctxt,
+                                                __ilog2_u32(cq->len/256));
+                AMAP_SET_BITS(struct amap_cq_context_v2, valid, ctxt, 1);
+                AMAP_SET_BITS(struct amap_cq_context_v2, eventable,
+                                                                ctxt, 1);
+                AMAP_SET_BITS(struct amap_cq_context_v2, eqid,
+                                                                ctxt, eq->id);
         }
 
         be_dws_cpu_to_le(ctxt, sizeof(req->context));
@@ -1763,10 +1764,12 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
         req->if_id = cpu_to_le32(adapter->if_handle);
         if (flags & IFF_PROMISC) {
                 req->if_flags_mask = cpu_to_le32(BE_IF_FLAGS_PROMISCUOUS |
-                                        BE_IF_FLAGS_VLAN_PROMISCUOUS);
+                                        BE_IF_FLAGS_VLAN_PROMISCUOUS |
+                                        BE_IF_FLAGS_MCAST_PROMISCUOUS);
                 if (value == ON)
                         req->if_flags = cpu_to_le32(BE_IF_FLAGS_PROMISCUOUS |
-                                                BE_IF_FLAGS_VLAN_PROMISCUOUS);
+                                                BE_IF_FLAGS_VLAN_PROMISCUOUS |
+                                                BE_IF_FLAGS_MCAST_PROMISCUOUS);
         } else if (flags & IFF_ALLMULTI) {
                 req->if_flags_mask = req->if_flags =
                                 cpu_to_le32(BE_IF_FLAGS_MCAST_PROMISCUOUS);
@@ -2084,7 +2087,7 @@ int lancer_cmd_write_object(struct be_adapter *adapter, struct be_dma_mem *cmd,
         spin_unlock_bh(&adapter->mcc_lock);
 
         if (!wait_for_completion_timeout(&adapter->flash_compl,
-                                         msecs_to_jiffies(30000)))
+                                         msecs_to_jiffies(60000)))
                 status = -1;
         else
                 status = adapter->flash_status;
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index a855668e0cc5..025bdb0d1764 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -381,7 +381,7 @@ struct amap_cq_context_be {
         u8 rsvd5[32];           /* dword 3*/
 } __packed;
 
-struct amap_cq_context_lancer {
+struct amap_cq_context_v2 {
         u8 rsvd0[12];           /* dword 0*/
         u8 coalescwm[2];        /* dword 0*/
         u8 nodelay;             /* dword 0*/
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 5733cde88e2c..3d4461adb3b4 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -85,6 +85,7 @@ static const struct be_ethtool_stat et_stats[] = {
         {DRVSTAT_INFO(tx_pauseframes)},
         {DRVSTAT_INFO(tx_controlframes)},
         {DRVSTAT_INFO(rx_priority_pause_frames)},
+        {DRVSTAT_INFO(tx_priority_pauseframes)},
         /* Received packets dropped when an internal fifo going into
          * main packet buffer tank (PMEM) overflows.
          */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 4babc8a4a543..6c52a60dcdb7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -410,6 +410,7 @@ static void populate_be_v1_stats(struct be_adapter *adapter)
         drvs->rxpp_fifo_overflow_drop = port_stats->rxpp_fifo_overflow_drop;
         drvs->tx_pauseframes = port_stats->tx_pauseframes;
         drvs->tx_controlframes = port_stats->tx_controlframes;
+        drvs->tx_priority_pauseframes = port_stats->tx_priority_pauseframes;
         drvs->jabber_events = port_stats->jabber_events;
         drvs->rx_drops_no_pbuf = rxf_stats->rx_drops_no_pbuf;
         drvs->rx_drops_no_erx_descr = rxf_stats->rx_drops_no_erx_descr;
@@ -471,11 +472,26 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
         ACCESS_ONCE(*acc) = newacc;
 }
 
+void populate_erx_stats(struct be_adapter *adapter,
+                        struct be_rx_obj *rxo,
+                        u32 erx_stat)
+{
+        if (!BEx_chip(adapter))
+                rx_stats(rxo)->rx_drops_no_frags = erx_stat;
+        else
+                /* below erx HW counter can actually wrap around after
+                 * 65535. Driver accumulates a 32-bit value
+                 */
+                accumulate_16bit_val(&rx_stats(rxo)->rx_drops_no_frags,
+                                     (u16)erx_stat);
+}
+
 void be_parse_stats(struct be_adapter *adapter)
 {
         struct be_erx_stats_v1 *erx = be_erx_stats_from_cmd(adapter);
         struct be_rx_obj *rxo;
         int i;
+        u32 erx_stat;
 
         if (lancer_chip(adapter)) {
                 populate_lancer_stats(adapter);
@@ -488,12 +504,8 @@ void be_parse_stats(struct be_adapter *adapter)
 
                 /* as erx_v1 is longer than v0, ok to use v1 for v0 access */
                 for_all_rx_queues(adapter, rxo, i) {
-                        /* below erx HW counter can actually wrap around after
-                         * 65535. Driver accumulates a 32-bit value
-                         */
-                        accumulate_16bit_val(&rx_stats(rxo)->rx_drops_no_frags,
-                                             (u16)erx->rx_drops_no_fragments \
-                                             [rxo->q.id]);
+                        erx_stat = erx->rx_drops_no_fragments[rxo->q.id];
+                        populate_erx_stats(adapter, rxo, erx_stat);
                 }
         }
 }
@@ -2378,7 +2390,7 @@ static uint be_num_rss_want(struct be_adapter *adapter)
         return num;
 }
 
-static void be_msix_enable(struct be_adapter *adapter)
+static int be_msix_enable(struct be_adapter *adapter)
 {
 #define BE_MIN_MSIX_VECTORS             1
         int i, status, num_vec, num_roce_vec = 0;
@@ -2403,13 +2415,17 @@ static void be_msix_enable(struct be_adapter *adapter)
                 goto done;
         } else if (status >= BE_MIN_MSIX_VECTORS) {
                 num_vec = status;
-                if (pci_enable_msix(adapter->pdev, adapter->msix_entries,
-                                num_vec) == 0)
+                status = pci_enable_msix(adapter->pdev, adapter->msix_entries,
+                                         num_vec);
+                if (!status)
                         goto done;
         }
 
         dev_warn(dev, "MSIx enable failed\n");
-        return;
+        /* INTx is not supported in VFs, so fail probe if enable_msix fails */
+        if (!be_physfn(adapter))
+                return status;
+        return 0;
 done:
         if (be_roce_supported(adapter)) {
                 if (num_vec > num_roce_vec) {
@@ -2423,7 +2439,7 @@ done:
         } else
                 adapter->num_msix_vec = num_vec;
         dev_info(dev, "enabled %d MSI-x vector(s)\n", adapter->num_msix_vec);
-        return;
+        return 0;
 }
 
 static inline int be_msix_vec_get(struct be_adapter *adapter,
@@ -2536,8 +2552,11 @@ static int be_close(struct net_device *netdev)
 
         be_roce_dev_close(adapter);
 
-        for_all_evt_queues(adapter, eqo, i)
-                napi_disable(&eqo->napi);
+        if (adapter->flags & BE_FLAGS_NAPI_ENABLED) {
+                for_all_evt_queues(adapter, eqo, i)
+                        napi_disable(&eqo->napi);
+                adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
+        }
 
         be_async_mcc_disable(adapter);
 
@@ -2631,7 +2650,9 @@ static int be_open(struct net_device *netdev)
         if (status)
                 goto err;
 
-        be_irq_register(adapter);
+        status = be_irq_register(adapter);
+        if (status)
+                goto err;
 
         for_all_rx_queues(adapter, rxo, i)
                 be_cq_notify(adapter, rxo->cq.id, true, 0);
@@ -2645,6 +2666,7 @@ static int be_open(struct net_device *netdev)
                 napi_enable(&eqo->napi);
                 be_eq_notify(adapter, eqo->q.id, true, false, 0);
         }
+        adapter->flags |= BE_FLAGS_NAPI_ENABLED;
 
         status = be_cmd_link_status_query(adapter, NULL, &link_status, 0);
         if (!status)
@@ -3100,7 +3122,9 @@ static int be_setup(struct be_adapter *adapter)
         if (status)
                 goto err;
 
-        be_msix_enable(adapter);
+        status = be_msix_enable(adapter);
+        if (status)
+                goto err;
 
         status = be_evt_queues_create(adapter);
         if (status)
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 256ae789c143..d175bbd3ffd3 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -2496,10 +2496,12 @@ static struct sk_buff *receive_copy(struct sky2_port *sky2,
                 skb->ip_summed = re->skb->ip_summed;
                 skb->csum = re->skb->csum;
                 skb->rxhash = re->skb->rxhash;
+                skb->vlan_proto = re->skb->vlan_proto;
                 skb->vlan_tci = re->skb->vlan_tci;
 
                 pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr,
                                                length, PCI_DMA_FROMDEVICE);
+                re->skb->vlan_proto = 0;
                 re->skb->vlan_tci = 0;
                 re->skb->rxhash = 0;
                 re->skb->ip_summed = CHECKSUM_NONE;
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 59c43918883e..21a5b291b4b3 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -555,8 +555,8 @@ static int cpsw_poll(struct napi_struct *napi, int budget)
                 cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX);
                 prim_cpsw = cpsw_get_slave_priv(priv, 0);
                 if (prim_cpsw->irq_enabled == false) {
-                        cpsw_enable_irq(priv);
                         prim_cpsw->irq_enabled = true;
+                        cpsw_enable_irq(priv);
                 }
         }