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

Pull networking fixes from David Miller:
 "This set fixes a bunch of fallout from the changes that went in during
  this merge window, particularly:

   - Fix fsl_pq_mdio (Claudiu Manoil) and fm10k (Pranith Kumar) build
     failures.

   - Several networking drivers do atomic_set() on page counts where
     that's not exactly legal.  From Eric Dumazet.

   - Make __skb_flow_get_ports() work cleanly with unaligned data, from
     Alexander Duyck.

   - Fix some kernel-doc buglets in rfkill and netlabel, from Fabian
     Frederick.

   - Unbalanced enable_irq_wake usage in bcmgenet and systemport
     drivers, from Florian Fainelli.

   - pxa168_eth needs to depend on HAS_DMA, from Geert Uytterhoeven.

   - Multi-dequeue in the qdisc layer severely bypasses the fairness
     limits the previous code used to enforce, reintroduce in a way that
     at the same time doesn't compromise bulk dequeue opportunities.
     From Jesper Dangaard Brouer.

   - macvlan receive path unnecessarily hops through a softirq by using
     netif_rx() instead of netif_receive_skb().  From Jason Baron"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (51 commits)
  net: systemport: avoid unbalanced enable_irq_wake calls
  net: bcmgenet: avoid unbalanced enable_irq_wake calls
  net: bcmgenet: fix off-by-one in incrementing read pointer
  net: fix races in page->_count manipulation
  mlx4: fix race accessing page->_count
  ixgbe: fix race accessing page->_count
  igb: fix race accessing page->_count
  fm10k: fix race accessing page->_count
  net/phy: micrel: Add clock support for KSZ8021/KSZ8031
  flow-dissector: Fix alignment issue in __skb_flow_get_ports
  net: filter: fix the comments
  Documentation: replace __sk_run_filter with __bpf_prog_run
  macvlan: optimize the receive path
  macvlan: pass 'bool' type to macvlan_count_rx()
  drivers: net: xgene: Add 10GbE ethtool support
  drivers: net: xgene: Add 10GbE support
  drivers: net: xgene: Preparing for adding 10GbE support
  dtb: Add 10GbE node to APM X-Gene SoC device tree
  Documentation: dts: Update section header for APM X-Gene
  MAINTAINERS: Update APM X-Gene section
  ...

2 files changed, 31 insertions, 2 deletions

diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
index f64900052f4e..8eb6d94c7851 100644
--- a/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@ -40,3 +40,7 @@
 &menet {
         status = "ok";
 };
+
+&xgenet {
+        status = "ok";
+};
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index 4f6d04d52cca..87d3205e98d5 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -176,6 +176,16 @@
                                 clock-output-names = "menetclk";
                         };
 
+                        xge0clk: xge0clk@1f61c000 {
+                                compatible = "apm,xgene-device-clock";
+                                #clock-cells = <1>;
+                                clocks = <&socplldiv2 0>;
+                                reg = <0x0 0x1f61c000 0x0 0x1000>;
+                                reg-names = "csr-reg";
+                                csr-mask = <0x3>;
+                                clock-output-names = "xge0clk";
+                        };
+
                         sataphy1clk: sataphy1clk@1f21c000 {
                                 compatible = "apm,xgene-device-clock";
                                 #clock-cells = <1>;
@@ -585,7 +595,8 @@
                         interrupts = <0x0 0x3c 0x4>;
                         dma-coherent;
                         clocks = <&menetclk 0>;
-                        local-mac-address = [00 01 73 00 00 01];
+                        /* mac address will be overwritten by the bootloader */
+                        local-mac-address = [00 00 00 00 00 00];
                         phy-connection-type = "rgmii";
                         phy-handle = <&menetphy>;
                         mdio {
@@ -600,12 +611,26 @@
                         };
                 };
 
+                xgenet: ethernet@1f610000 {
+                        compatible = "apm,xgene-enet";
+                        status = "disabled";
+                        reg = <0x0 0x1f610000 0x0 0xd100>,
+                              <0x0 0x1f600000 0x0 0X400>,
+                              <0x0 0x18000000 0x0 0X200>;
+                        reg-names = "enet_csr", "ring_csr", "ring_cmd";
+                        interrupts = <0x0 0x60 0x4>;
+                        dma-coherent;
+                        clocks = <&xge0clk 0>;
+                        /* mac address will be overwritten by the bootloader */
+                        local-mac-address = [00 00 00 00 00 00];
+                        phy-connection-type = "xgmii";
+                };
+
                 rng: rng@10520000 {
                         compatible = "apm,xgene-rng";
                         reg = <0x0 0x10520000 0x0 0x100>;
                         interrupts = <0x0 0x41 0x4>;
                         clocks = <&rngpkaclk 0>;
                 };
-
         };
 };