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

Pull networking updates from David Miller:
 "This is a re-do of the net-next pull request for the current merge
  window.  The only difference from the one I made the other day is that
  this has Eliezer's interface renames and the timeout handling changes
  made based upon your feedback, as well as a few bug fixes that have
  trickeled in.

  Highlights:

   1) Low latency device polling, eliminating the cost of interrupt
      handling and context switches.  Allows direct polling of a network
      device from socket operations, such as recvmsg() and poll().

      Currently ixgbe, mlx4, and bnx2x support this feature.

      Full high level description, performance numbers, and design in
      commit 0a4db187a999 ("Merge branch 'll_poll'")

      From Eliezer Tamir.

   2) With the routing cache removed, ip_check_mc_rcu() gets exercised
      more than ever before in the case where we have lots of multicast
      addresses.  Use a hash table instead of a simple linked list, from
      Eric Dumazet.

   3) Add driver for Atheros CQA98xx 802.11ac wireless devices, from
      Bartosz Markowski, Janusz Dziedzic, Kalle Valo, Marek Kwaczynski,
      Marek Puzyniak, Michal Kazior, and Sujith Manoharan.

   4) Support reporting the TUN device persist flag to userspace, from
      Pavel Emelyanov.

   5) Allow controlling network device VF link state using netlink, from
      Rony Efraim.

   6) Support GRE tunneling in openvswitch, from Pravin B Shelar.

   7) Adjust SOCK_MIN_RCVBUF and SOCK_MIN_SNDBUF for modern times, from
      Daniel Borkmann and Eric Dumazet.

   8) Allow controlling of TCP quickack behavior on a per-route basis,
      from Cong Wang.

   9) Several bug fixes and improvements to vxlan from Stephen
      Hemminger, Pravin B Shelar, and Mike Rapoport.  In particular,
      support receiving on multiple UDP ports.

  10) Major cleanups, particular in the area of debugging and cookie
      lifetime handline, to the SCTP protocol code.  From Daniel
      Borkmann.

  11) Allow packets to cross network namespaces when traversing tunnel
      devices.  From Nicolas Dichtel.

  12) Allow monitoring netlink traffic via AF_PACKET sockets, in a
      manner akin to how we monitor real network traffic via ptype_all.
      From Daniel Borkmann.

  13) Several bug fixes and improvements for the new alx device driver,
      from Johannes Berg.

  14) Fix scalability issues in the netem packet scheduler's time queue,
      by using an rbtree.  From Eric Dumazet.

  15) Several bug fixes in TCP loss recovery handling, from Yuchung
      Cheng.

  16) Add support for GSO segmentation of MPLS packets, from Simon
      Horman.

  17) Make network notifiers have a real data type for the opaque
      pointer that's passed into them.  Use this to properly handle
      network device flag changes in arp_netdev_event().  From Jiri
      Pirko and Timo Teräs.

  18) Convert several drivers over to module_pci_driver(), from Peter
      Huewe.

  19) tcp_fixup_rcvbuf() can loop 500 times over loopback, just use a
      O(1) calculation instead.  From Eric Dumazet.

  20) Support setting of explicit tunnel peer addresses in ipv6, just
      like ipv4.  From Nicolas Dichtel.

  21) Protect x86 BPF JIT against spraying attacks, from Eric Dumazet.

  22) Prevent a single high rate flow from overruning an individual cpu
      during RX packet processing via selective flow shedding.  From
      Willem de Bruijn.

  23) Don't use spinlocks in TCP md5 signing fast paths, from Eric
      Dumazet.

  24) Don't just drop GSO packets which are above the TBF scheduler's
      burst limit, chop them up so they are in-bounds instead.  Also
      from Eric Dumazet.

  25) VLAN offloads are missed when configured on top of a bridge, fix
      from Vlad Yasevich.

  26) Support IPV6 in ping sockets.  From Lorenzo Colitti.

  27) Receive flow steering targets should be updated at poll() time
      too, from David Majnemer.

  28) Fix several corner case regressions in PMTU/redirect handling due
      to the routing cache removal, from Timo Teräs.

  29) We have to be mindful of ipv4 mapped ipv6 sockets in
      upd_v6_push_pending_frames().  From Hannes Frederic Sowa.

  30) Fix L2TP sequence number handling bugs, from James Chapman."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1214 commits)
  drivers/net: caif: fix wrong rtnl_is_locked() usage
  drivers/net: enic: release rtnl_lock on error-path
  vhost-net: fix use-after-free in vhost_net_flush
  net: mv643xx_eth: do not use port number as platform device id
  net: sctp: confirm route during forward progress
  virtio_net: fix race in RX VQ processing
  virtio: support unlocked queue poll
  net/cadence/macb: fix bug/typo in extracting gem_irq_read_clear bit
  Documentation: Fix references to defunct linux-net@vger.kernel.org
  net/fs: change busy poll time accounting
  net: rename low latency sockets functions to busy poll
  bridge: fix some kernel warning in multicast timer
  sfc: Fix memory leak when discarding scattered packets
  sit: fix tunnel update via netlink
  dt:net:stmmac: Add dt specific phy reset callback support.
  dt:net:stmmac: Add support to dwmac version 3.610 and 3.710
  dt:net:stmmac: Allocate platform data only if its NULL.
  net:stmmac: fix memleak in the open method
  ipv6: rt6_check_neigh should successfully verify neigh if no NUD information are available
  net: ipv6: fix wrong ping_v6_sendmsg return value
  ...

6 files changed, 46 insertions, 94 deletions

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index da4415d9dee6..05a1674e204f 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1555,6 +1555,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                 if (mac_addr)
                         memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
 
+                slave_data->phy_if = of_get_phy_mode(slave_node);
+
                 if (data->dual_emac) {
                         if (of_property_read_u32(slave_node, "dual_emac_res_vlan",
                                                  &prop)) {
@@ -1702,10 +1704,10 @@ static int cpsw_probe(struct platform_device *pdev)
 
         if (is_valid_ether_addr(data->slave_data[0].mac_addr)) {
                 memcpy(priv->mac_addr, data->slave_data[0].mac_addr, ETH_ALEN);
-                pr_info("Detected MACID = %pM", priv->mac_addr);
+                pr_info("Detected MACID = %pM\n", priv->mac_addr);
         } else {
                 eth_random_addr(priv->mac_addr);
-                pr_info("Random MACID = %pM", priv->mac_addr);
+                pr_info("Random MACID = %pM\n", priv->mac_addr);
         }
 
         memcpy(ndev->dev_addr, priv->mac_addr, ETH_ALEN);
@@ -1944,7 +1946,6 @@ static int cpsw_remove(struct platform_device *pdev)
         struct cpsw_priv *priv = netdev_priv(ndev);
         int i;
 
-        platform_set_drvdata(pdev, NULL);
         if (priv->data.dual_emac)
                 unregister_netdev(cpsw_get_slave_ndev(priv, 1));
         unregister_netdev(ndev);
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 053c84fd0853..031ebc81b50c 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -64,6 +64,7 @@
 #define CPDMA_DESC_TO_PORT_EN   BIT(20)
 #define CPDMA_TO_PORT_SHIFT     16
 #define CPDMA_DESC_PORT_MASK    (BIT(18) | BIT(17) | BIT(16))
+#define CPDMA_DESC_CRC_LEN      4
 
 #define CPDMA_TEARDOWN_VALUE    0xfffffffc
 
@@ -805,6 +806,10 @@ static int __cpdma_chan_process(struct cpdma_chan *chan)
                 status = -EBUSY;
                 goto unlock_ret;
         }
+
+        if (status & CPDMA_DESC_PASS_CRC)
+                outlen -= CPDMA_DESC_CRC_LEN;
+
         status  = status & (CPDMA_DESC_EOQ | CPDMA_DESC_TD_COMPLETE |
                             CPDMA_DESC_PORT_MASK);
 
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 860e15ddfbcb..07b176bcf929 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1532,7 +1532,7 @@ static int emac_dev_open(struct net_device *ndev)
         struct device *emac_dev = &ndev->dev;
         u32 cnt;
         struct resource *res;
-        int q, m, ret;
+        int ret;
         int i = 0;
         int k = 0;
         struct emac_priv *priv = netdev_priv(ndev);
@@ -1567,8 +1567,9 @@ static int emac_dev_open(struct net_device *ndev)
 
         while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k))) {
                 for (i = res->start; i <= res->end; i++) {
-                        if (request_irq(i, emac_irq, IRQF_DISABLED,
-                                        ndev->name, ndev))
+                        if (devm_request_irq(&priv->pdev->dev, i, emac_irq,
+                                             IRQF_DISABLED,
+                                             ndev->name, ndev))
                                 goto rollback;
                 }
                 k++;
@@ -1641,15 +1642,7 @@ static int emac_dev_open(struct net_device *ndev)
 
 rollback:
 
-        dev_err(emac_dev, "DaVinci EMAC: request_irq() failed");
-
-        for (q = k; k >= 0; k--) {
-                for (m = i; m >= res->start; m--)
-                        free_irq(m, ndev);
-                res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k-1);
-                m = res->end;
-        }
-
+        dev_err(emac_dev, "DaVinci EMAC: devm_request_irq() failed");
         ret = -EBUSY;
 err:
         pm_runtime_put(&priv->pdev->dev);
@@ -1667,9 +1660,6 @@ err:
  */
 static int emac_dev_stop(struct net_device *ndev)
 {
-        struct resource *res;
-        int i = 0;
-        int irq_num;
         struct emac_priv *priv = netdev_priv(ndev);
         struct device *emac_dev = &ndev->dev;
 
@@ -1685,13 +1675,6 @@ static int emac_dev_stop(struct net_device *ndev)
         if (priv->phydev)
                 phy_disconnect(priv->phydev);
 
-        /* Free IRQ */
-        while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, i))) {
-                for (irq_num = res->start; irq_num <= res->end; irq_num++)
-                        free_irq(irq_num, priv->ndev);
-                i++;
-        }
-
         if (netif_msg_drv(priv))
                 dev_notice(emac_dev, "DaVinci EMAC: %s stopped\n", ndev->name);
 
@@ -1771,29 +1754,22 @@ static const struct net_device_ops emac_netdev_ops = {
 #endif
 };
 
-#ifdef CONFIG_OF
-static struct emac_platform_data
-        *davinci_emac_of_get_pdata(struct platform_device *pdev,
-        struct emac_priv *priv)
+static struct emac_platform_data *
+davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv)
 {
         struct device_node *np;
         struct emac_platform_data *pdata = NULL;
         const u8 *mac_addr;
-        u32 data;
-        int ret;
 
-        pdata = pdev->dev.platform_data;
-        if (!pdata) {
-                pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-                if (!pdata)
-                        goto nodata;
-        }
+        if (!IS_ENABLED(CONFIG_OF) || !pdev->dev.of_node)
+                return pdev->dev.platform_data;
+
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return NULL;
 
         np = pdev->dev.of_node;
-        if (!np)
-                goto nodata;
-        else
-                pdata->version = EMAC_VERSION_2;
+        pdata->version = EMAC_VERSION_2;
 
         if (!is_valid_ether_addr(pdata->mac_addr)) {
                 mac_addr = of_get_mac_address(np);
@@ -1801,47 +1777,31 @@ static struct emac_platform_data
                         memcpy(pdata->mac_addr, mac_addr, ETH_ALEN);
         }
 
-        ret = of_property_read_u32(np, "ti,davinci-ctrl-reg-offset", &data);
-        if (!ret)
-                pdata->ctrl_reg_offset = data;
+        of_property_read_u32(np, "ti,davinci-ctrl-reg-offset",
+                             &pdata->ctrl_reg_offset);
 
-        ret = of_property_read_u32(np, "ti,davinci-ctrl-mod-reg-offset",
-                &data);
-        if (!ret)
-                pdata->ctrl_mod_reg_offset = data;
+        of_property_read_u32(np, "ti,davinci-ctrl-mod-reg-offset",
+                             &pdata->ctrl_mod_reg_offset);
 
-        ret = of_property_read_u32(np, "ti,davinci-ctrl-ram-offset", &data);
-        if (!ret)
-                pdata->ctrl_ram_offset = data;
+        of_property_read_u32(np, "ti,davinci-ctrl-ram-offset",
+                             &pdata->ctrl_ram_offset);
 
-        ret = of_property_read_u32(np, "ti,davinci-ctrl-ram-size", &data);
-        if (!ret)
-                pdata->ctrl_ram_size = data;
+        of_property_read_u32(np, "ti,davinci-ctrl-ram-size",
+                             &pdata->ctrl_ram_size);
 
-        ret = of_property_read_u32(np, "ti,davinci-rmii-en", &data);
-        if (!ret)
-                pdata->rmii_en = data;
+        of_property_read_u8(np, "ti,davinci-rmii-en", &pdata->rmii_en);
 
-        ret = of_property_read_u32(np, "ti,davinci-no-bd-ram", &data);
-        if (!ret)
-                pdata->no_bd_ram = data;
+        pdata->no_bd_ram = of_property_read_bool(np, "ti,davinci-no-bd-ram");
 
         priv->phy_node = of_parse_phandle(np, "phy-handle", 0);
         if (!priv->phy_node)
                 pdata->phy_id = "";
 
         pdev->dev.platform_data = pdata;
-nodata:
+
         return  pdata;
 }
-#else
-static struct emac_platform_data
-        *davinci_emac_of_get_pdata(struct platform_device *pdev,
-        struct emac_priv *priv)
-{
-        return  pdev->dev.platform_data;
-}
-#endif
+
 /**
  * davinci_emac_probe - EMAC device probe
  * @pdev: The DaVinci EMAC device that we are removing
@@ -1856,7 +1816,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
         struct resource *res;
         struct net_device *ndev;
         struct emac_priv *priv;
-        unsigned long size, hw_ram_addr;
+        unsigned long hw_ram_addr;
         struct emac_platform_data *pdata;
         struct device *emac_dev;
         struct cpdma_params dma_params;
@@ -1907,25 +1867,10 @@ static int davinci_emac_probe(struct platform_device *pdev)
         emac_dev = &ndev->dev;
         /* Get EMAC platform data */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev,"error getting res\n");
-                rc = -ENOENT;
-                goto no_pdata;
-        }
-
         priv->emac_base_phys = res->start + pdata->ctrl_reg_offset;
-        size = resource_size(res);
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     size, ndev->name)) {
-                dev_err(&pdev->dev, "failed request_mem_region() for regs\n");
-                rc = -ENXIO;
-                goto no_pdata;
-        }
-
-        priv->remap_addr = devm_ioremap(&pdev->dev, res->start, size);
-        if (!priv->remap_addr) {
-                dev_err(&pdev->dev, "unable to map IO\n");
-                rc = -ENOMEM;
+        priv->remap_addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(priv->remap_addr)) {
+                rc = PTR_ERR(priv->remap_addr);
                 goto no_pdata;
         }
         priv->emac_base = priv->remap_addr + pdata->ctrl_reg_offset;
@@ -2037,8 +1982,6 @@ static int davinci_emac_remove(struct platform_device *pdev)
 
         dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
 
-        platform_set_drvdata(pdev, NULL);
-
         if (priv->txchan)
                 cpdma_chan_destroy(priv->txchan);
         if (priv->rxchan)
@@ -2078,11 +2021,13 @@ static const struct dev_pm_ops davinci_emac_pm_ops = {
         .resume         = davinci_emac_resume,
 };
 
+#if IS_ENABLED(CONFIG_OF)
 static const struct of_device_id davinci_emac_of_match[] = {
         {.compatible = "ti,davinci-dm6467-emac", },
         {},
 };
 MODULE_DEVICE_TABLE(of, davinci_emac_of_match);
+#endif
 
 /* davinci_emac_driver: EMAC platform driver structure */
 static struct platform_driver davinci_emac_driver = {
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index ce7c4991e41c..16ddfc348062 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -292,6 +292,7 @@ static int davinci_mdio_write(struct mii_bus *bus, int phy_id,
         return 0;
 }
 
+#if IS_ENABLED(CONFIG_OF)
 static int davinci_mdio_probe_dt(struct mdio_platform_data *data,
                          struct platform_device *pdev)
 {
@@ -309,7 +310,7 @@ static int davinci_mdio_probe_dt(struct mdio_platform_data *data,
 
         return 0;
 }
-
+#endif
 
 static int davinci_mdio_probe(struct platform_device *pdev)
 {
@@ -487,11 +488,13 @@ static const struct dev_pm_ops davinci_mdio_pm_ops = {
         .resume_early   = davinci_mdio_resume,
 };
 
+#if IS_ENABLED(CONFIG_OF)
 static const struct of_device_id davinci_mdio_of_mtable[] = {
         { .compatible = "ti,davinci_mdio", },
         { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, davinci_mdio_of_mtable);
+#endif
 
 static struct platform_driver davinci_mdio_driver = {
         .driver = {
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 60c400f6d01f..591437e59b90 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -372,7 +372,7 @@ static int tlan_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
-        pci_enable_wake(pdev, 0, 0);
+        pci_enable_wake(pdev, PCI_D0, 0);
         netif_device_attach(dev);
 
         if (netif_running(dev))
@@ -533,7 +533,6 @@ static int tlan_probe1(struct pci_dev *pdev, long ioaddr, int irq, int rev,
                 /* This is a hack. We need to know which board structure
                  * is suited for this adapter */
                 device_id = inw(ioaddr + EISA_ID2);
-                priv->is_eisa = 1;
                 if (device_id == 0x20F1) {
                         priv->adapter = &board_info[13]; /* NetFlex-3/E */
                         priv->adapter_rev = 23;         /* TLAN 2.3 */
diff --git a/drivers/net/ethernet/ti/tlan.h b/drivers/net/ethernet/ti/tlan.h
index 5fc98a8e4889..2eb33a250788 100644
--- a/drivers/net/ethernet/ti/tlan.h
+++ b/drivers/net/ethernet/ti/tlan.h
@@ -207,7 +207,6 @@ struct tlan_priv {
         u8                      tlan_full_duplex;
         spinlock_t              lock;
         u8                      link;
-        u8                      is_eisa;
         struct work_struct                      tlan_tqueue;
         u8                      neg_be_verbose;
 };