Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca321885 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 052db7ec 01d2d484

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ APM X-Gene SoC Ethernet nodes 
Ethernet nodes are defined to describe on-chip ethernet interfaces in

APM X-Gene SoC.



Required properties:

Required properties for all the ethernet interfaces:

- compatible: Should be "apm,xgene-enet"

- reg: Address and length of the register set for the device. It contains the

  information of registers in the same order as described by reg-names
@@ -15,6 +15,8 @@ Required properties: 
- clocks: Reference to the clock entry.

- local-mac-address: MAC address assigned to this device

- phy-connection-type: Interface type between ethernet device and PHY device



Required properties for ethernet interfaces that have external PHY:

- phy-handle: Reference to a PHY node connected to this device



- mdio: Device tree subnode with the following required properties:

Documentation/devicetree/bindings/net/micrel.txt

+6 −0
Original line number Diff line number Diff line
@@ -16,3 +16,9 @@ Optional properties: 
	      KSZ8051: register 0x1f, bits 5..4



              See the respective PHY datasheet for the mode values.



 - clocks, clock-names: contains clocks according to the common clock bindings.



              supported clocks:

	      - KSZ8021, KSZ8031: "rmii-ref": The RMII refence input clock. Used

		to determine the XI input clock.

Documentation/networking/filter.txt

+2 −2
Original line number Diff line number Diff line
@@ -700,11 +700,11 @@ Some core changes of the new internal format: 
    bpf_exit



  If f2 is JITed and the pointer stored to '_f2'. The calls f1 -> f2 -> f3 and

  returns will be seamless. Without JIT, __sk_run_filter() interpreter needs to

  returns will be seamless. Without JIT, __bpf_prog_run() interpreter needs to

  be used to call into f2.



  For practical reasons all eBPF programs have only one argument 'ctx' which is

  already placed into R1 (e.g. on __sk_run_filter() startup) and the programs

  already placed into R1 (e.g. on __bpf_prog_run() startup) and the programs

  can call kernel functions with up to 5 arguments. Calls with 6 or more arguments

  are currently not supported, but these restrictions can be lifted if necessary

  in the future.

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ F: net/appletalk/ 
APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER

M:	Iyappan Subramanian <isubramanian@apm.com>

M:	Keyur Chudgar <kchudgar@apm.com>

M:	Ravi Patel <rapatel@apm.com>

S:	Supported

F:	drivers/net/ethernet/apm/xgene/

F:	Documentation/devicetree/bindings/net/apm-xgene-enet.txt

arch/arm64/boot/dts/apm-mustang.dts

+4 −0
Original line number Diff line number Diff line
@@ -40,3 +40,7 @@ 
&menet {

	status = "ok";

};



&xgenet {

	status = "ok";

};