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
  ...

diff --combined MAINTAINERS
index 1e53b32fa07bc0554a5ca7791db6f4491fff11f7,1a85af84332623edfc4a302dd3588f9d4a47f193..d6964389f028f3adf502cc500bbfd7cebc51f4d2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -734,7 -734,6 +734,6 @@@ F: net/appletalk
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
  M:    Iyappan Subramanian <[email protected]>
  M:    Keyur Chudgar <[email protected]>
- M:    Ravi Patel <[email protected]>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene/
  F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
@@@ -2761,18 -2760,6 +2760,18 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
 +CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 +M:    Ian Munsie <[email protected]>
 +M:    Michael Neuling <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/misc/cxl/
 +F:    include/misc/cxl.h
 +F:    include/uapi/misc/cxl.h
 +F:    Documentation/powerpc/cxl.txt
 +F:    Documentation/powerpc/cxl.txt
 +F:    Documentation/ABI/testing/sysfs-class-cxl
 +
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <[email protected]>
  L:    [email protected]
@@@ -4245,16 -4232,6 +4244,16 @@@ L:    [email protected]
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
 +HACKRF MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/hackrf/
 +
  HARDWARE MONITORING
  M:    Jean Delvare <[email protected]>
  M:    Guenter Roeck <[email protected]>
@@@ -5067,7 -5044,6 +5066,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  T:    git git://git.infradead.org/users/jcooper/linux.git irqchip/core
 +F:    Documentation/devicetree/bindings/interrupt-controller/
  F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@@ -5153,7 -5129,7 +5152,7 @@@ W:      http://palosaari.fi/linux
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/media/tuners/tuner_it913x*
 +F:    drivers/media/tuners/it913x*
  
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
@@@ -6628,9 -6604,10 +6627,9 @@@ S:     Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
 -M:    Balaji T K <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
@@@ -6960,14 -6937,6 +6959,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR APPLIEDMICRO XGENE
 +M:    Tanmay Inamdar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
 +F:    drivers/pci/host/pci-xgene.c
 +
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <[email protected]>
  M:    Lucas Stach <[email protected]>
@@@ -6976,13 -6945,6 +6975,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/pci/host/*imx6*
  
 +PCI DRIVER FOR TI KEYSTONE
 +M:    Murali Karicheri <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*keystone*
 +
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <[email protected]>
  M:    Jason Cooper <[email protected]>
@@@ -7385,14 -7347,6 +7384,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/pwc/*
  
 +PWM FAN DRIVER
 +M:    Kamil Debski <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 +F:    Documentation/hwmon/pwm-fan
 +F:    drivers/hwmon/pwm-fan.c
 +
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
@@@ -8519,11 -8473,11 +8518,11 @@@ S:   Maintaine
  F:    Documentation/security/Smack.txt
  F:    security/smack/
  
 -SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 +DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
  M:    Kevin Hilman <[email protected]>
  M:    Nishanth Menon <[email protected]>
  S:    Maintained
 -F:    drivers/power/avs/smartreflex.c
 +F:    drivers/power/avs/
  F:    include/linux/power/smartreflex.h
  L:    [email protected]
  
@@@ -8693,14 -8647,6 +8692,14 @@@ F:    include/sound/dmaengine_pcm.
  F:    sound/core/pcm_dmaengine.c
  F:    sound/soc/soc-generic-dmaengine-pcm.c
  
 +SP2 MEDIA DRIVER
 +M:    Olli Salonen <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/sp2*
 +
  SPARC + UltraSPARC (sparc/sparc64)
  M:    "David S. Miller" <[email protected]>
  L:    [email protected]
@@@ -9404,14 -9350,6 +9403,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Odd fixes
  F:    drivers/media/usb/tm6000/
  
 +TW68 VIDEO4LINUX DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/pci/tw68/
 +
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
  M:    Ashley Lai <[email protected]>
@@@ -10280,15 -10218,6 +10279,15 @@@ S: Supporte
  F:    drivers/block/xen-blkback/*
  F:    drivers/block/xen*
  
 +XEN PVSCSI DRIVERS
 +M:    Juergen Gross <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/xen-scsifront.c
 +F:    drivers/xen/xen-scsiback.c
 +F:    include/xen/interface/io/vscsiif.h
 +
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)

diff --combined arch/arm64/boot/dts/apm-mustang.dts
index f64900052f4ec1c60bb3e70a385f779254ee4fae,2ae782bbdf0f8a2a279d47c9632eb07c52001be8..8eb6d94c785154cb3c29dba770cde5fed6eaec50
--- 1/arch/arm64/boot/dts/apm-mustang.dts
--- 2/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@@ -25,14 -25,6 +25,14 @@@
        };
  };
  
 +&pcie0clk {
 +      status = "ok";
 +};
 +
 +&pcie0 {
 +      status = "ok";
 +};
 +
  &serial0 {
        status = "ok";
  };
@@@ -40,3 -32,7 +40,7 @@@
  &menet {
        status = "ok";
  };
+ 
+ &xgenet {
+       status = "ok";
+ };

diff --combined arch/arm64/boot/dts/apm-storm.dtsi
index 4f6d04d52cca604fe5040f6f7de514b25768f88b,d16cc03b7c5d6aaea59876f8fbec89310da2a478..87d3205e98d545fefb72d17f84ba51efef35a5b5
--- 1/arch/arm64/boot/dts/apm-storm.dtsi
--- 2/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@@ -176,6 -176,16 +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>;
@@@ -282,171 -292,6 +292,171 @@@
                                enable-mask = <0x10>;
                                clock-output-names = "rngpkaclk";
                        };
 +
 +                      pcie0clk: pcie0clk@1f2bc000 {
 +                              status = "disabled";
 +                              compatible = "apm,xgene-device-clock";
 +                              #clock-cells = <1>;
 +                              clocks = <&socplldiv2 0>;
 +                              reg = <0x0 0x1f2bc000 0x0 0x1000>;
 +                              reg-names = "csr-reg";
 +                              clock-output-names = "pcie0clk";
 +                      };
 +
 +                      pcie1clk: pcie1clk@1f2cc000 {
 +                              status = "disabled";
 +                              compatible = "apm,xgene-device-clock";
 +                              #clock-cells = <1>;
 +                              clocks = <&socplldiv2 0>;
 +                              reg = <0x0 0x1f2cc000 0x0 0x1000>;
 +                              reg-names = "csr-reg";
 +                              clock-output-names = "pcie1clk";
 +                      };
 +
 +                      pcie2clk: pcie2clk@1f2dc000 {
 +                              status = "disabled";
 +                              compatible = "apm,xgene-device-clock";
 +                              #clock-cells = <1>;
 +                              clocks = <&socplldiv2 0>;
 +                              reg = <0x0 0x1f2dc000 0x0 0x1000>;
 +                              reg-names = "csr-reg";
 +                              clock-output-names = "pcie2clk";
 +                      };
 +
 +                      pcie3clk: pcie3clk@1f50c000 {
 +                              status = "disabled";
 +                              compatible = "apm,xgene-device-clock";
 +                              #clock-cells = <1>;
 +                              clocks = <&socplldiv2 0>;
 +                              reg = <0x0 0x1f50c000 0x0 0x1000>;
 +                              reg-names = "csr-reg";
 +                              clock-output-names = "pcie3clk";
 +                      };
 +
 +                      pcie4clk: pcie4clk@1f51c000 {
 +                              status = "disabled";
 +                              compatible = "apm,xgene-device-clock";
 +                              #clock-cells = <1>;
 +                              clocks = <&socplldiv2 0>;
 +                              reg = <0x0 0x1f51c000 0x0 0x1000>;
 +                              reg-names = "csr-reg";
 +                              clock-output-names = "pcie4clk";
 +                      };
 +              };
 +
 +              pcie0: pcie@1f2b0000 {
 +                      status = "disabled";
 +                      device_type = "pci";
 +                      compatible = "apm,xgene-storm-pcie", "apm,xgene-pcie";
 +                      #interrupt-cells = <1>;
 +                      #size-cells = <2>;
 +                      #address-cells = <3>;
 +                      reg = < 0x00 0x1f2b0000 0x0 0x00010000   /* Controller registers */
 +                              0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */
 +                      reg-names = "csr", "cfg";
 +                      ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000   /* io */
 +                                0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */
 +                      dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
 +                                    0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
 +                      interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 +                      interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc2 0x1
 +                                       0x0 0x0 0x0 0x2 &gic 0x0 0xc3 0x1
 +                                       0x0 0x0 0x0 0x3 &gic 0x0 0xc4 0x1
 +                                       0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x1>;
 +                      dma-coherent;
 +                      clocks = <&pcie0clk 0>;
 +              };
 +
 +              pcie1: pcie@1f2c0000 {
 +                      status = "disabled";
 +                      device_type = "pci";
 +                      compatible = "apm,xgene-storm-pcie", "apm,xgene-pcie";
 +                      #interrupt-cells = <1>;
 +                      #size-cells = <2>;
 +                      #address-cells = <3>;
 +                      reg = < 0x00 0x1f2c0000 0x0 0x00010000   /* Controller registers */
 +                              0xd0 0xd0000000 0x0 0x00040000>; /* PCI config space */
 +                      reg-names = "csr", "cfg";
 +                      ranges = <0x01000000 0x0 0x00000000 0xd0 0x10000000 0x00 0x00010000   /* io  */
 +                                0x02000000 0x0 0x80000000 0xd1 0x80000000 0x00 0x80000000>; /* mem */
 +                      dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
 +                                    0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
 +                      interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 +                      interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc8 0x1
 +                                       0x0 0x0 0x0 0x2 &gic 0x0 0xc9 0x1
 +                                       0x0 0x0 0x0 0x3 &gic 0x0 0xca 0x1
 +                                       0x0 0x0 0x0 0x4 &gic 0x0 0xcb 0x1>;
 +                      dma-coherent;
 +                      clocks = <&pcie1clk 0>;
 +              };
 +
 +              pcie2: pcie@1f2d0000 {
 +                      status = "disabled";
 +                      device_type = "pci";
 +                      compatible = "apm,xgene-storm-pcie", "apm,xgene-pcie";
 +                      #interrupt-cells = <1>;
 +                      #size-cells = <2>;
 +                      #address-cells = <3>;
 +                      reg =  < 0x00 0x1f2d0000 0x0 0x00010000   /* Controller registers */
 +                               0x90 0xd0000000 0x0 0x00040000>; /* PCI config space */
 +                      reg-names = "csr", "cfg";
 +                      ranges = <0x01000000 0x0 0x00000000 0x90 0x10000000 0x0 0x00010000   /* io  */
 +                                0x02000000 0x0 0x80000000 0x91 0x80000000 0x0 0x80000000>; /* mem */
 +                      dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
 +                                    0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
 +                      interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 +                      interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xce 0x1
 +                                       0x0 0x0 0x0 0x2 &gic 0x0 0xcf 0x1
 +                                       0x0 0x0 0x0 0x3 &gic 0x0 0xd0 0x1
 +                                       0x0 0x0 0x0 0x4 &gic 0x0 0xd1 0x1>;
 +                      dma-coherent;
 +                      clocks = <&pcie2clk 0>;
 +              };
 +
 +              pcie3: pcie@1f500000 {
 +                      status = "disabled";
 +                      device_type = "pci";
 +                      compatible = "apm,xgene-storm-pcie", "apm,xgene-pcie";
 +                      #interrupt-cells = <1>;
 +                      #size-cells = <2>;
 +                      #address-cells = <3>;
 +                      reg = < 0x00 0x1f500000 0x0 0x00010000   /* Controller registers */
 +                              0xa0 0xd0000000 0x0 0x00040000>; /* PCI config space */
 +                      reg-names = "csr", "cfg";
 +                      ranges = <0x01000000 0x0 0x00000000 0xa0 0x10000000 0x0 0x00010000   /* io   */
 +                                0x02000000 0x0 0x80000000 0xa1 0x80000000 0x0 0x80000000>; /* mem  */
 +                      dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
 +                                    0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
 +                      interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 +                      interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xd4 0x1
 +                                       0x0 0x0 0x0 0x2 &gic 0x0 0xd5 0x1
 +                                       0x0 0x0 0x0 0x3 &gic 0x0 0xd6 0x1
 +                                       0x0 0x0 0x0 0x4 &gic 0x0 0xd7 0x1>;
 +                      dma-coherent;
 +                      clocks = <&pcie3clk 0>;
 +              };
 +
 +              pcie4: pcie@1f510000 {
 +                      status = "disabled";
 +                      device_type = "pci";
 +                      compatible = "apm,xgene-storm-pcie", "apm,xgene-pcie";
 +                      #interrupt-cells = <1>;
 +                      #size-cells = <2>;
 +                      #address-cells = <3>;
 +                      reg = < 0x00 0x1f510000 0x0 0x00010000   /* Controller registers */
 +                              0xc0 0xd0000000 0x0 0x00200000>; /* PCI config space */
 +                      reg-names = "csr", "cfg";
 +                      ranges = <0x01000000 0x0 0x00000000 0xc0 0x10000000 0x0 0x00010000   /* io  */
 +                                0x02000000 0x0 0x80000000 0xc1 0x80000000 0x0 0x80000000>; /* mem */
 +                      dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
 +                                    0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
 +                      interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 +                      interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xda 0x1
 +                                       0x0 0x0 0x0 0x2 &gic 0x0 0xdb 0x1
 +                                       0x0 0x0 0x0 0x3 &gic 0x0 0xdc 0x1
 +                                       0x0 0x0 0x0 0x4 &gic 0x0 0xdd 0x1>;
 +                      dma-coherent;
 +                      clocks = <&pcie4clk 0>;
                };
  
                serial0: serial@1c020000 {
@@@ -585,7 -430,8 +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 -446,26 +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>;
                };
- 
        };
  };