Skip to content

Commit 1200b68

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller: "Highlights: 1) Support more Realtek wireless chips, from Jes Sorenson. 2) New BPF types for per-cpu hash and arrap maps, from Alexei Starovoitov. 3) Make several TCP sysctls per-namespace, from Nikolay Borisov. 4) Allow the use of SO_REUSEPORT in order to do per-thread processing of incoming TCP/UDP connections. The muxing can be done using a BPF program which hashes the incoming packet. From Craig Gallek. 5) Add a multiplexer for TCP streams, to provide a messaged based interface. BPF programs can be used to determine the message boundaries. From Tom Herbert. 6) Add 802.1AE MACSEC support, from Sabrina Dubroca. 7) Avoid factorial complexity when taking down an inetdev interface with lots of configured addresses. We were doing things like traversing the entire address less for each address removed, and flushing the entire netfilter conntrack table for every address as well. 8) Add and use SKB bulk free infrastructure, from Jesper Brouer. 9) Allow offloading u32 classifiers to hardware, and implement for ixgbe, from John Fastabend. 10) Allow configuring IRQ coalescing parameters on a per-queue basis, from Kan Liang. 11) Extend ethtool so that larger link mode masks can be supported. From David Decotigny. 12) Introduce devlink, which can be used to configure port link types (ethernet vs Infiniband, etc.), port splitting, and switch device level attributes as a whole. From Jiri Pirko. 13) Hardware offload support for flower classifiers, from Amir Vadai. 14) Add "Local Checksum Offload". Basically, for a tunneled packet the checksum of the outer header is 'constant' (because with the checksum field filled into the inner protocol header, the payload of the outer frame checksums to 'zero'), and we can take advantage of that in various ways. From Edward Cree" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1548 commits) bonding: fix bond_get_stats() net: bcmgenet: fix dma api length mismatch net/mlx4_core: Fix backward compatibility on VFs phy: mdio-thunder: Fix some Kconfig typos lan78xx: add ndo_get_stats64 lan78xx: handle statistics counter rollover RDS: TCP: Remove unused constant RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket net: smc911x: convert pxa dma to dmaengine team: remove duplicate set of flag IFF_MULTICAST bonding: remove duplicate set of flag IFF_MULTICAST net: fix a comment typo ethernet: micrel: fix some error codes ip_tunnels, bpf: define IP_TUNNEL_OPTS_MAX and use it bpf, dst: add and use dst_tclassid helper bpf: make skb->tc_classid also readable net: mvneta: bm: clarify dependencies cls_bpf: reset class and reuse major in da ldmvsw: Checkpatch sunvnet.c and sunvnet_common.c ldmvsw: Add ldmvsw.c driver code ...
2 parents 6b5f04b + fe30937 commit 1200b68

File tree

1,281 files changed

+79030
-34010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,281 files changed

+79030
-34010
lines changed

‎Documentation/ABI/obsolete/sysfs-class-rfkill

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎Documentation/ABI/removed/sysfs-class-rfkill

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
rfkill - radio frequency (RF) connector kill switch support
2+
3+
For details to this subsystem look at Documentation/rfkill.txt.
4+
5+
What: /sys/class/rfkill/rfkill[0-9]+/claim
6+
Date: 09-Jul-2007
7+
KernelVersion v2.6.22
8+
Contact: linux-wireless@vger.kernel.org
9+
Description: This file was deprecated because there no longer was a way to
10+
claim just control over a single rfkill instance.
11+
This file was scheduled to be removed in 2012, and was removed
12+
in 2016.
13+
Values: 0: Kernel handles events

‎Documentation/ABI/stable/sysfs-class-rfkill

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ rfkill - radio frequency (RF) connector kill switch support
22

33
For details to this subsystem look at Documentation/rfkill.txt.
44

5-
For the deprecated /sys/class/rfkill/*/state and
6-
/sys/class/rfkill/*/claim knobs of this interface look in
7-
Documentation/ABI/obsolete/sysfs-class-rfkill.
5+
For the deprecated /sys/class/rfkill/*/claim knobs of this interface look in
6+
Documentation/ABI/removed/sysfs-class-rfkill.
87

98
What: /sys/class/rfkill
109
Date: 09-Jul-2007
@@ -42,6 +41,28 @@ Values: A numeric value.
4241
1: true
4342

4443

44+
What: /sys/class/rfkill/rfkill[0-9]+/state
45+
Date: 09-Jul-2007
46+
KernelVersion v2.6.22
47+
Contact: linux-wireless@vger.kernel.org
48+
Description: Current state of the transmitter.
49+
This file was scheduled to be removed in 2014, but due to its
50+
large number of users it will be sticking around for a bit
51+
longer. Despite it being marked as stabe, the newer "hard" and
52+
"soft" interfaces should be preffered, since it is not possible
53+
to express the 'soft and hard block' state of the rfkill driver
54+
through this interface. There will likely be another attempt to
55+
remove it in the future.
56+
Values: A numeric value.
57+
0: RFKILL_STATE_SOFT_BLOCKED
58+
transmitter is turned off by software
59+
1: RFKILL_STATE_UNBLOCKED
60+
transmitter is (potentially) active
61+
2: RFKILL_STATE_HARD_BLOCKED
62+
transmitter is forced off by something outside of
63+
the driver's control.
64+
65+
4566
What: /sys/class/rfkill/rfkill[0-9]+/hard
4667
Date: 12-March-2010
4768
KernelVersion v2.6.34

‎Documentation/ABI/testing/sysfs-class-net-batman-adv

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11

2+
What: /sys/class/net/<iface>/batman-adv/throughput_override
3+
Date: Feb 2014
4+
Contact: Antonio Quartulli <antonio@meshcoding.com>
5+
description:
6+
Defines the throughput value to be used by B.A.T.M.A.N. V
7+
when estimating the link throughput using this interface.
8+
If the value is set to 0 then batman-adv will try to
9+
estimate the throughput by itself.
10+
11+
What: /sys/class/net/<iface>/batman-adv/elp_interval
12+
Date: Feb 2014
13+
Contact: Linus Lüssing <linus.luessing@web.de>
14+
Description:
15+
Defines the interval in milliseconds in which batman
16+
sends its probing packets for link quality measurements.
17+
218
What: /sys/class/net/<iface>/batman-adv/iface_status
319
Date: May 2010
420
Contact: Marek Lindner <mareklindner@neomailbox.ch>
@@ -12,4 +28,3 @@ Description:
1228
The /sys/class/net/<iface>/batman-adv/mesh_iface file
1329
displays the batman mesh interface this <iface>
1430
currently is associated with.
15-

‎Documentation/devicetree/bindings/net/arc_emac.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ Required properties:
77
- max-speed: see ethernet.txt file in the same directory.
88
- phy: see ethernet.txt file in the same directory.
99

10+
Optional properties:
11+
- phy-reset-gpios : Should specify the gpio for phy reset
12+
- phy-reset-duration : Reset duration in milliseconds. Should present
13+
only if property "phy-reset-gpios" is available. Missing the property
14+
will have the duration be 1 millisecond. Numbers greater than 1000 are
15+
invalid and 1 millisecond will be used instead.
16+
1017
Clock handling:
1118
The clock frequency is needed to calculate and set polling period of EMAC.
1219
It must be provided by one of:

‎Documentation/devicetree/bindings/net/can/ifi_canfd.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
IFI CANFD controller
2+
--------------------
3+
4+
Required properties:
5+
- compatible: Should be "ifi,canfd-1.0"
6+
- reg: Should contain CAN controller registers location and length
7+
- interrupts: Should contain IRQ line for the CAN controller
8+
9+
Example:
10+
11+
canfd0: canfd@ff220000 {
12+
compatible = "ifi,canfd-1.0";
13+
reg = <0xff220000 0x00001000>;
14+
interrupts = <0 43 0>;
15+
};

‎Documentation/devicetree/bindings/net/can/rcar_can.txt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,33 @@ Required properties:
66
"renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC.
77
"renesas,can-r8a7790" if CAN controller is a part of R8A7790 SoC.
88
"renesas,can-r8a7791" if CAN controller is a part of R8A7791 SoC.
9+
"renesas,can-r8a7792" if CAN controller is a part of R8A7792 SoC.
10+
"renesas,can-r8a7793" if CAN controller is a part of R8A7793 SoC.
11+
"renesas,can-r8a7794" if CAN controller is a part of R8A7794 SoC.
12+
"renesas,can-r8a7795" if CAN controller is a part of R8A7795 SoC.
13+
"renesas,rcar-gen1-can" for a generic R-Car Gen1 compatible device.
14+
"renesas,rcar-gen2-can" for a generic R-Car Gen2 compatible device.
15+
"renesas,rcar-gen3-can" for a generic R-Car Gen3 compatible device.
16+
When compatible with the generic version, nodes must list the
17+
SoC-specific version corresponding to the platform first
18+
followed by the generic version.
19+
920
- reg: physical base address and size of the R-Car CAN register map.
1021
- interrupts: interrupt specifier for the sole interrupt.
1122
- clocks: phandles and clock specifiers for 3 CAN clock inputs.
1223
- clock-names: 3 clock input name strings: "clkp1", "clkp2", "can_clk".
1324
- pinctrl-0: pin control group to be used for this controller.
1425
- pinctrl-names: must be "default".
1526

27+
Required properties for "renesas,can-r8a7795" compatible:
28+
In R8A7795 SoC, "clkp2" can be CANFD clock. This is a div6 clock and can be
29+
used by both CAN and CAN FD controller at the same time. It needs to be scaled
30+
to maximum frequency if any of these controllers use it. This is done using
31+
the below properties.
32+
33+
- assigned-clocks: phandle of clkp2(CANFD) clock.
34+
- assigned-clock-rates: maximum frequency of this clock.
35+
1636
Optional properties:
1737
- renesas,can-clock-select: R-Car CAN Clock Source Select. Valid values are:
1838
<0x0> (default) : Peripheral clock (clkp1)
@@ -25,7 +45,7 @@ Example
2545
SoC common .dtsi file:
2646

2747
can0: can@e6e80000 {
28-
compatible = "renesas,can-r8a7791";
48+
compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
2949
reg = <0 0xe6e80000 0 0x1000>;
3050
interrupts = <0 186 IRQ_TYPE_LEVEL_HIGH>;
3151
clocks = <&mstp9_clks R8A7791_CLK_RCAN0>,

‎Documentation/devicetree/bindings/net/can/sja1000.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Memory mapped SJA1000 CAN controller from NXP (formerly Philips)
22

33
Required properties:
44

5-
- compatible : should be "nxp,sja1000".
5+
- compatible : should be one of "nxp,sja1000", "technologic,sja1000".
66

77
- reg : should specify the chip select, address offset and size required
88
to map the registers of the SJA1000. The size is usually 0x80.
@@ -14,6 +14,7 @@ Optional properties:
1414

1515
- reg-io-width : Specify the size (in bytes) of the IO accesses that
1616
should be performed on the device. Valid value is 1, 2 or 4.
17+
This property is ignored for technologic version.
1718
Default to 1 (8 bits).
1819

1920
- nxp,external-clock-frequency : Frequency of the external oscillator

‎Documentation/devicetree/bindings/net/cavium-mdio.txt

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
* System Management Interface (SMI) / MDIO
22

33
Properties:
4-
- compatible: "cavium,octeon-3860-mdio"
4+
- compatible: One of:
55

6-
Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
6+
"cavium,octeon-3860-mdio": Compatibility with all cn3XXX, cn5XXX
7+
and cn6XXX SOCs.
8+
9+
"cavium,thunder-8890-mdio": Compatibility with all cn8XXX SOCs.
710

811
- reg: The base address of the MDIO bus controller register bank.
912

@@ -25,3 +28,57 @@ Example:
2528
reg = <0>;
2629
};
2730
};
31+
32+
33+
* System Management Interface (SMI) / MDIO Nexus
34+
35+
Several mdio buses may be gathered as children of a single PCI
36+
device, this PCI device is the nexus of the buses.
37+
38+
Properties:
39+
40+
- compatible: "cavium,thunder-8890-mdio-nexus";
41+
42+
- reg: The PCI device and function numbers of the nexus device.
43+
44+
- #address-cells: Must be <2>.
45+
46+
- #size-cells: Must be <2>.
47+
48+
- ranges: As needed for mapping of the MDIO bus device registers.
49+
50+
- assigned-addresses: As needed for mapping of the MDIO bus device registers.
51+
52+
Example:
53+
54+
mdio-nexus@1,3 {
55+
compatible = "cavium,thunder-8890-mdio-nexus";
56+
#address-cells = <2>;
57+
#size-cells = <2>;
58+
reg = <0x0b00 0 0 0 0>; /* DEVFN = 0x0b (1:3) */
59+
assigned-addresses = <0x03000000 0x87e0 0x05000000 0x0 0x800000>;
60+
ranges = <0x87e0 0x05000000 0x03000000 0x87e0 0x05000000 0x0 0x800000>;
61+
62+
mdio0@87e0,05003800 {
63+
compatible = "cavium,thunder-8890-mdio";
64+
#address-cells = <1>;
65+
#size-cells = <0>;
66+
reg = <0x87e0 0x05003800 0x0 0x30>;
67+
68+
ethernet-phy@0 {
69+
...
70+
reg = <0>;
71+
};
72+
};
73+
mdio0@87e0,05003880 {
74+
compatible = "cavium,thunder-8890-mdio";
75+
#address-cells = <1>;
76+
#size-cells = <0>;
77+
reg = <0x87e0 0x05003880 0x0 0x30>;
78+
79+
ethernet-phy@0 {
80+
...
81+
reg = <0>;
82+
};
83+
};
84+
};

‎Documentation/devicetree/bindings/net/emac_rockchip.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
* ARC EMAC 10/100 Ethernet platform driver for Rockchip Rk3066/RK3188 SoCs
1+
* ARC EMAC 10/100 Ethernet platform driver for Rockchip RK3036/RK3066/RK3188 SoCs
22

33
Required properties:
4-
- compatible: Should be "rockchip,rk3066-emac" or "rockchip,rk3188-emac"
5-
according to the target SoC.
4+
- compatible: should be "rockchip,<name>-emac"
5+
"rockchip,rk3036-emac": found on RK3036 SoCs
6+
"rockchip,rk3066-emac": found on RK3066 SoCs
7+
"rockchip,rk3188-emac": found on RK3188 SoCs
68
- reg: Address and length of the register set for the device
79
- interrupts: Should contain the EMAC interrupts
810
- rockchip,grf: phandle to the syscon grf used to control speed and mode

‎Documentation/devicetree/bindings/net/fsl-fec.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Optional properties:
1212
only if property "phy-reset-gpios" is available. Missing the property
1313
will have the duration be 1 millisecond. Numbers greater than 1000 are
1414
invalid and 1 millisecond will be used instead.
15+
- phy-reset-active-high : If present then the reset sequence using the GPIO
16+
specified in the "phy-reset-gpios" property is reversed (H=reset state,
17+
L=operation state).
1518
- phy-supply : regulator that powers the Ethernet PHY.
1619
- phy-handle : phandle to the PHY device connected to this device.
1720
- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.

‎Documentation/devicetree/bindings/net/macb.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Required properties:
2525

2626
Optional properties for PHY child node:
2727
- reset-gpios : Should specify the gpio for phy reset
28+
- magic-packet : If present, indicates that the hardware supports waking
29+
up via magic packet.
2830

2931
Examples:
3032

‎Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,30 @@ Optional properties:
1818
"core" for core clock and "bus" for the optional bus clock.
1919

2020

21+
Optional properties (valid only for Armada XP/38x):
22+
23+
- buffer-manager: a phandle to a buffer manager node. Please refer to
24+
Documentation/devicetree/bindings/net/marvell-neta-bm.txt
25+
- bm,pool-long: ID of a pool, that will accept all packets of a size
26+
higher than 'short' pool's threshold (if set) and up to MTU value.
27+
Obligatory, when the port is supposed to use hardware
28+
buffer management.
29+
- bm,pool-short: ID of a pool, that will be used for accepting
30+
packets of a size lower than given threshold. If not set, the port
31+
will use a single 'long' pool for all packets, as defined above.
32+
2133
Example:
2234

23-
ethernet@d0070000 {
35+
ethernet@70000 {
2436
compatible = "marvell,armada-370-neta";
25-
reg = <0xd0070000 0x2500>;
37+
reg = <0x70000 0x2500>;
2638
interrupts = <8>;
2739
clocks = <&gate_clk 4>;
2840
tx-csum-limit = <9800>
2941
status = "okay";
3042
phy = <&phy0>;
3143
phy-mode = "rgmii-id";
44+
buffer-manager = <&bm>;
45+
bm,pool-long = <0>;
46+
bm,pool-short = <1>;
3247
};

‎Documentation/devicetree/bindings/net/marvell-neta-bm.txt

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
* Marvell Armada 380/XP Buffer Manager driver (BM)
2+
3+
Required properties:
4+
5+
- compatible: should be "marvell,armada-380-neta-bm".
6+
- reg: address and length of the register set for the device.
7+
- clocks: a pointer to the reference clock for this device.
8+
- internal-mem: a phandle to BM internal SRAM definition.
9+
10+
Optional properties (port):
11+
12+
- pool<0 : 3>,capacity: size of external buffer pointers' ring maintained
13+
in DRAM. Can be set for each pool (id 0 : 3) separately. The value has
14+
to be chosen between 128 and 16352 and it also has to be aligned to 32.
15+
Otherwise the driver would adjust a given number or choose default if
16+
not set.
17+
- pool<0 : 3>,pkt-size: maximum size of a packet accepted by a given buffer
18+
pointers' pool (id 0 : 3). It will be taken into consideration only when pool
19+
type is 'short'. For 'long' ones it would be overridden by port's MTU.
20+
If not set a driver will choose a default value.
21+
22+
In order to see how to hook the BM to a given ethernet port, please
23+
refer to Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt.
24+
25+
Example:
26+
27+
- main node:
28+
29+
bm: bm@c8000 {
30+
compatible = "marvell,armada-380-neta-bm";
31+
reg = <0xc8000 0xac>;
32+
clocks = <&gateclk 13>;
33+
internal-mem = <&bm_bppi>;
34+
status = "okay";
35+
pool2,capacity = <4096>;
36+
pool1,pkt-size = <512>;
37+
};
38+
39+
- internal SRAM node:
40+
41+
bm_bppi: bm-bppi {
42+
compatible = "mmio-sram";
43+
reg = <MBUS_ID(0x0c, 0x04) 0 0x100000>;
44+
ranges = <0 MBUS_ID(0x0c, 0x04) 0 0x100000>;
45+
#address-cells = <1>;
46+
#size-cells = <1>;
47+
clocks = <&gateclk 13>;
48+
status = "okay";
49+
};

0 commit comments

Comments
 (0)