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

Pull networking updates from David Miller:

 1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.

 2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
    Benniston.

 3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
    Mork.

 4) BPF now has a "random" opcode, from Chema Gonzalez.

 5) Add more BPF documentation and improve test framework, from Daniel
    Borkmann.

 6) Support TCP fastopen over ipv6, from Daniel Lee.

 7) Add software TSO helper functions and use them to support software
    TSO in mvneta and mv643xx_eth drivers.  From Ezequiel Garcia.

 8) Support software TSO in fec driver too, from Nimrod Andy.

 9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.

10) Handle broadcasts more gracefully over macvlan when there are large
    numbers of interfaces configured, from Herbert Xu.

11) Allow more control over fwmark used for non-socket based responses,
    from Lorenzo Colitti.

12) Do TCP congestion window limiting based upon measurements, from Neal
    Cardwell.

13) Support busy polling in SCTP, from Neal Horman.

14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.

15) Bridge promisc mode handling improvements from Vlad Yasevich.

16) Don't use inetpeer entries to implement ID generation any more, it
    performs poorly, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
  rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
  tcp: fixing TLP's FIN recovery
  net: fec: Add software TSO support
  net: fec: Add Scatter/gather support
  net: fec: Increase buffer descriptor entry number
  net: fec: Factorize feature setting
  net: fec: Enable IP header hardware checksum
  net: fec: Factorize the .xmit transmit function
  bridge: fix compile error when compiling without IPv6 support
  bridge: fix smatch warning / potential null pointer dereference
  via-rhine: fix full-duplex with autoneg disable
  bnx2x: Enlarge the dorq threshold for VFs
  bnx2x: Check for UNDI in uncommon branch
  bnx2x: Fix 1G-baseT link
  bnx2x: Fix link for KR with swapped polarity lane
  sctp: Fix sk_ack_backlog wrap-around problem
  net/core: Add VF link state control policy
  net/fsl: xgmac_mdio is dependent on OF_MDIO
  net/fsl: Make xgmac_mdio read error message useful
  net_sched: drr: warn when qdisc is not work conserving
  ...

1 files changed, 29 insertions, 18 deletions

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6a9509ccd33b..7622213beef1 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -307,6 +307,27 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
 };
 
 static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [EDMR]          = 0x0000,
+        [EDTRR]         = 0x0004,
+        [EDRRR]         = 0x0008,
+        [TDLAR]         = 0x000c,
+        [RDLAR]         = 0x0010,
+        [EESR]          = 0x0014,
+        [EESIPR]        = 0x0018,
+        [TRSCER]        = 0x001c,
+        [RMFCR]         = 0x0020,
+        [TFTR]          = 0x0024,
+        [FDR]           = 0x0028,
+        [RMCR]          = 0x002c,
+        [EDOCR]         = 0x0030,
+        [FCFTR]         = 0x0034,
+        [RPADIR]        = 0x0038,
+        [TRIMD]         = 0x003c,
+        [RBWAR]         = 0x0040,
+        [RDFAR]         = 0x0044,
+        [TBRAR]         = 0x004c,
+        [TDFAR]         = 0x0050,
+
         [ECMR]          = 0x0160,
         [ECSR]          = 0x0164,
         [ECSIPR]        = 0x0168,
@@ -546,7 +567,6 @@ static struct sh_eth_cpu_data sh7757_data = {
         .register_type  = SH_ETH_REG_FAST_SH4,
 
         .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
-        .rmcr_value     = RMCR_RNC,
 
         .tx_check       = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO,
         .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE |
@@ -624,7 +644,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
                           EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
                           EESR_TDE | EESR_ECI,
         .fdr_value      = 0x0000072f,
-        .rmcr_value     = RMCR_RNC,
 
         .irq_flags      = IRQF_SHARED,
         .apr            = 1,
@@ -752,7 +771,6 @@ static struct sh_eth_cpu_data r8a7740_data = {
                           EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
                           EESR_TDE | EESR_ECI,
         .fdr_value      = 0x0000070f,
-        .rmcr_value     = RMCR_RNC,
 
         .apr            = 1,
         .mpr            = 1,
@@ -784,7 +802,6 @@ static struct sh_eth_cpu_data r7s72100_data = {
                           EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
                           EESR_TDE | EESR_ECI,
         .fdr_value      = 0x0000070f,
-        .rmcr_value     = RMCR_RNC,
 
         .no_psr         = 1,
         .apr            = 1,
@@ -833,9 +850,6 @@ static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd)
         if (!cd->fdr_value)
                 cd->fdr_value = DEFAULT_FDR_INIT;
 
-        if (!cd->rmcr_value)
-                cd->rmcr_value = DEFAULT_RMCR_VALUE;
-
         if (!cd->tx_check)
                 cd->tx_check = DEFAULT_TX_CHECK;
 
@@ -1287,8 +1301,8 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
         sh_eth_write(ndev, mdp->cd->fdr_value, FDR);
         sh_eth_write(ndev, 0, TFTR);
 
-        /* Frame recv control */
-        sh_eth_write(ndev, mdp->cd->rmcr_value, RMCR);
+        /* Frame recv control (enable multiple-packets per rx irq) */
+        sh_eth_write(ndev, RMCR_RNC, RMCR);
 
         sh_eth_write(ndev, DESC_I_RINT8 | DESC_I_RINT5 | DESC_I_TINT2, TRSCER);
 
@@ -1385,7 +1399,6 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
         int entry = mdp->cur_rx % mdp->num_rx_ring;
         int boguscnt = (mdp->dirty_rx + mdp->num_rx_ring) - mdp->cur_rx;
         struct sk_buff *skb;
-        int exceeded = 0;
         u16 pkt_len = 0;
         u32 desc_status;
 
@@ -1397,10 +1410,9 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
                 if (--boguscnt < 0)
                         break;
 
-                if (*quota <= 0) {
-                        exceeded = 1;
+                if (*quota <= 0)
                         break;
-                }
+
                 (*quota)--;
 
                 if (!(desc_status & RDFEND))
@@ -1448,7 +1460,6 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
                         ndev->stats.rx_packets++;
                         ndev->stats.rx_bytes += pkt_len;
                 }
-                rxdesc->status |= cpu_to_edmac(mdp, RD_RACT);
                 entry = (++mdp->cur_rx) % mdp->num_rx_ring;
                 rxdesc = &mdp->rx_ring[entry];
         }
@@ -1494,7 +1505,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
                 sh_eth_write(ndev, EDRRR_R, EDRRR);
         }
 
-        return exceeded;
+        return *quota <= 0;
 }
 
 static void sh_eth_rcv_snd_disable(struct net_device *ndev)
@@ -2627,8 +2638,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
                  pdev->name, pdev->id);
 
         /* PHY IRQ */
-        mdp->mii_bus->irq = devm_kzalloc(dev, sizeof(int) * PHY_MAX_ADDR,
-                                         GFP_KERNEL);
+        mdp->mii_bus->irq = devm_kmalloc_array(dev, PHY_MAX_ADDR, sizeof(int),
+                                               GFP_KERNEL);
         if (!mdp->mii_bus->irq) {
                 ret = -ENOMEM;
                 goto out_free_bus;
@@ -2843,7 +2854,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
                 ndev->netdev_ops = &sh_eth_netdev_ops_tsu;
         else
                 ndev->netdev_ops = &sh_eth_netdev_ops;
-        SET_ETHTOOL_OPS(ndev, &sh_eth_ethtool_ops);
+        ndev->ethtool_ops = &sh_eth_ethtool_ops;
         ndev->watchdog_timeo = TX_TIMEOUT;
 
         /* debug message level */