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

Commit 8d65b08d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking updates from David Millar:
 "Here are some highlights from the 2065 networking commits that
  happened this development cycle:

   1) XDP support for IXGBE (John Fastabend) and thunderx (Sunil Kowuri)

   2) Add a generic XDP driver, so that anyone can test XDP even if they
      lack a networking device whose driver has explicit XDP support
      (me).

   3) Sparc64 now has an eBPF JIT too (me)

   4) Add a BPF program testing framework via BPF_PROG_TEST_RUN (Alexei
      Starovoitov)

   5) Make netfitler network namespace teardown less expensive (Florian
      Westphal)

   6) Add symmetric hashing support to nft_hash (Laura Garcia Liebana)

   7) Implement NAPI and GRO in netvsc driver (Stephen Hemminger)

   8) Support TC flower offload statistics in mlxsw (Arkadi Sharshevsky)

   9) Multiqueue support in stmmac driver (Joao Pinto)

  10) Remove TCP timewait recycling, it never really could possibly work
      well in the real world and timestamp randomization really zaps any
      hint of usability this feature had (Soheil Hassas Yeganeh)

  11) Support level3 vs level4 ECMP route hashing in ipv4 (Nikolay
      Aleksandrov)

  12) Add socket busy poll support to epoll (Sridhar Samudrala)

  13) Netlink extended ACK support (Johannes Berg, Pablo Neira Ayuso,
      and several others)

  14) IPSEC hw offload infrastructure (Steffen Klassert)"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2065 commits)
  tipc: refactor function tipc_sk_recv_stream()
  tipc: refactor function tipc_sk_recvmsg()
  net: thunderx: Optimize page recycling for XDP
  net: thunderx: Support for XDP header adjustment
  net: thunderx: Add support for XDP_TX
  net: thunderx: Add support for XDP_DROP
  net: thunderx: Add basic XDP support
  net: thunderx: Cleanup receive buffer allocation
  net: thunderx: Optimize CQE_TX handling
  net: thunderx: Optimize RBDR descriptor handling
  net: thunderx: Support for page recycling
  ipx: call ipxitf_put() in ioctl error path
  net: sched: add helpers to handle extended actions
  qed*: Fix issues in the ptp filter config implementation.
  qede: Fix concurrency issue in PTP Tx path processing.
  stmmac: Add support for SIMATIC IOT2000 platform
  net: hns: fix ethtool_get_strings overflow in hns driver
  tcp: fix wraparound issue in tcp_lp
  bpf, arm64: fix jit branch offset related to ldimm64
  bpf, arm64: implement jiting of BPF_XADD
  ...
parents 5a0387a8 5d15af67

Documentation/ABI/testing/sysfs-class-net-qmi

+27 −0
Original line number Diff line number Diff line
@@ -21,3 +21,30 @@ Description: 
		is responsible for coordination of driver and firmware

		link framing mode, changing this setting to 'Y' if the

		firmware is configured for 'raw-ip' mode.



What:		/sys/class/net/<iface>/qmi/add_mux

Date:		March 2017

KernelVersion:	4.11

Contact:	Bjørn Mork <bjorn@mork.no>

Description:

		Unsigned integer.



		Write a number ranging from 1 to 127 to add a qmap mux

		based network device, supported by recent Qualcomm based

		modems.



		The network device will be called qmimux.



		Userspace is in charge of managing the qmux network device

		activation and data stream setup on the modem side by

		using the proper QMI protocol requests.



What:		/sys/class/net/<iface>/qmi/del_mux

Date:		March 2017

KernelVersion:	4.11

Contact:	Bjørn Mork <bjorn@mork.no>

Description:

		Unsigned integer.



		Write a number ranging from 1 to 127 to delete a previously

		created qmap mux based network device.

Documentation/devicetree/bindings/net/brcm,bcmgenet.txt

+11 −8
Original line number Diff line number Diff line
@@ -2,11 +2,14 @@ 


Required properties:

- compatible: should contain one of "brcm,genet-v1", "brcm,genet-v2",

  "brcm,genet-v3", "brcm,genet-v4".

  "brcm,genet-v3", "brcm,genet-v4", "brcm,genet-v5".

- reg: address and length of the register set for the device

- interrupts: must be two cells, the first cell is the general purpose

  interrupt line, while the second cell is the interrupt for the ring

  RX and TX queues operating in ring mode

- interrupts and/or interrupts-extended: must be two cells, the first cell

  is the general purpose interrupt line, while the second cell is the

  interrupt for the ring RX and TX queues operating in ring mode.  An

  optional third interrupt cell for Wake-on-LAN can be specified.

  See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

  for information on the property specifics.

- phy-mode: see ethernet.txt file in the same directory

- #address-cells: should be 1

- #size-cells: should be 1
@@ -29,15 +32,15 @@ Optional properties: 


Required child nodes:



- mdio bus node: this node should always be present regarless of the PHY

- mdio bus node: this node should always be present regardless of the PHY

  configuration of the GENET instance



MDIO bus node required properties:



- compatible: should contain one of "brcm,genet-mdio-v1", "brcm,genet-mdio-v2"

  "brcm,genet-mdio-v3", "brcm,genet-mdio-v4", the version has to match the

  parent node compatible property (e.g: brcm,genet-v4 pairs with

  brcm,genet-mdio-v4)

  "brcm,genet-mdio-v3", "brcm,genet-mdio-v4", "brcm,genet-mdio-v5", the version

  has to match the parent node compatible property (e.g: brcm,genet-v4 pairs

  with brcm,genet-mdio-v4)

- reg: address and length relative to the parent node base register address

- #address-cells: address cell for MDIO bus addressing, should be 1

- #size-cells: size of the cells for MDIO bus addressing, should be 0

Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt

+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 


Required properties:

- compatible: should one from "brcm,genet-mdio-v1", "brcm,genet-mdio-v2",

  "brcm,genet-mdio-v3", "brcm,genet-mdio-v4" or "brcm,unimac-mdio"

- reg: address and length of the regsiter set for the device, first one is the

  "brcm,genet-mdio-v3", "brcm,genet-mdio-v4", "brcm,genet-mdio-v5" or

  "brcm,unimac-mdio"

- reg: address and length of the register set for the device, first one is the

  base register, and the second one is optional and for indirect accesses to

  larger than 16-bits MDIO transactions

- reg-names: name(s) of the register must be "mdio" and optional "mdio_indir_rw"

Documentation/devicetree/bindings/net/can/holt_hi311x.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
* Holt HI-311X stand-alone CAN controller device tree bindings



Required properties:

 - compatible: Should be one of the following:

   - "holt,hi3110" for HI-3110

 - reg: SPI chip select.

 - clocks: The clock feeding the CAN controller.

 - interrupt-parent: The parent interrupt controller.

 - interrupts: Should contain IRQ line for the CAN controller.



Optional properties:

 - vdd-supply: Regulator that powers the CAN controller.

 - xceiver-supply: Regulator that powers the CAN transceiver.



Example:

	can0: can@1 {

		compatible = "holt,hi3110";

		reg = <1>;

		clocks = <&clk32m>;

		interrupt-parent = <&gpio4>;

		interrupts = <13 IRQ_TYPE_EDGE_RISING>;

		vdd-supply = <&reg5v0>;

		xceiver-supply = <&reg5v0>;

	};

Documentation/devicetree/bindings/net/can/ti_hecc.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
Texas Instruments High End CAN Controller (HECC)

================================================



This file provides information, what the device node

for the hecc interface contains.



Required properties:

- compatible: "ti,am3517-hecc"

- reg: addresses and lengths of the register spaces for 'hecc', 'hecc-ram'

       and 'mbx'

- reg-names :"hecc", "hecc-ram", "mbx"

- interrupts: interrupt mapping for the hecc interrupts sources

- clocks: clock phandles (see clock bindings for details)



Optional properties:

- ti,use-hecc1int: if provided configures HECC to produce all interrupts

		   on HECC1INT interrupt line. By default HECC0INT interrupt

		   line will be used.

- xceiver-supply: regulator that powers the CAN transceiver



Example:



For am3517evm board:

	hecc: can@5c050000 {

		compatible = "ti,am3517-hecc";

		reg = <0x5c050000 0x80>,

		      <0x5c053000 0x180>,

		      <0x5c052000 0x200>;

		reg-names = "hecc", "hecc-ram", "mbx";

		interrupts = <24>;

		clocks = <&hecc_ck>;

	};