Skip to content

Commit c21ac93

Browse files
author
Ingo Molnar
committed
Merge tag 'v5.2-rc6' into x86/asm, to refresh the branch
Signed-off-by: Ingo Molnar <[email protected]>
2 parents 8dbec27 + 4b972a0 commit c21ac93

File tree

5,474 files changed

+9922
-27189
lines changed

Some content is hidden

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

5,474 files changed

+9922
-27189
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)>
8181
Greg Kroah-Hartman <[email protected]>
8282
Greg Kroah-Hartman <[email protected]>
8383
84+
8485
Henk Vergonet <[email protected]>
8586
Henrik Kretzschmar <[email protected]>
8687
Henrik Rydberg <[email protected]>
@@ -238,6 +239,7 @@ Vlad Dogaru <[email protected]> <[email protected]>
238239
239240
240241
Takashi YOSHII <[email protected]>
242+
241243
242244
Yusuke Goda <[email protected]>
243245
Gustavo Padovan <[email protected]>
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/bus/siox/devices/siox-X/active
22
KernelVersion: 4.16
3-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
3+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
44
Description:
55
On reading represents the current state of the bus. If it
66
contains a "0" the bus is stopped and connected devices are
@@ -12,7 +12,7 @@ Description:
1212

1313
What: /sys/bus/siox/devices/siox-X/device_add
1414
KernelVersion: 4.16
15-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
15+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
1616
Description:
1717
Write-only file. Write
1818

@@ -27,61 +27,61 @@ Description:
2727

2828
What: /sys/bus/siox/devices/siox-X/device_remove
2929
KernelVersion: 4.16
30-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
30+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
3131
Description:
3232
Write-only file. A single write removes the last device in the siox chain.
3333

3434
What: /sys/bus/siox/devices/siox-X/poll_interval_ns
3535
KernelVersion: 4.16
36-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
36+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
3737
Description:
3838
Defines the interval between two poll cycles in nano seconds.
3939
Note this is rounded to jiffies on writing. On reading the current value
4040
is returned.
4141

4242
What: /sys/bus/siox/devices/siox-X-Y/connected
4343
KernelVersion: 4.16
44-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
44+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
4545
Description:
4646
Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.
4747
communication with it is not ensured. "1" signals a working connection.
4848

4949
What: /sys/bus/siox/devices/siox-X-Y/inbytes
5050
KernelVersion: 4.16
51-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
51+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
5252
Description:
5353
Read-only value reporting the inbytes value provided to siox-X/device_add
5454

5555
What: /sys/bus/siox/devices/siox-X-Y/status_errors
5656
KernelVersion: 4.16
57-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
57+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
5858
Description:
5959
Counts the number of time intervals when the read status byte doesn't yield the
6060
expected value.
6161

6262
What: /sys/bus/siox/devices/siox-X-Y/type
6363
KernelVersion: 4.16
64-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
64+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
6565
Description:
6666
Read-only value reporting the type value provided to siox-X/device_add.
6767

6868
What: /sys/bus/siox/devices/siox-X-Y/watchdog
6969
KernelVersion: 4.16
70-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
70+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
7171
Description:
7272
Read-only value reporting if the watchdog of the siox device is
7373
active. "0" means the watchdog is not active and the device is expected to
7474
be operational. "1" means the watchdog keeps the device in reset.
7575

7676
What: /sys/bus/siox/devices/siox-X-Y/watchdog_errors
7777
KernelVersion: 4.16
78-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
78+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
7979
Description:
8080
Read-only value reporting the number to time intervals when the
8181
watchdog was active.
8282

8383
What: /sys/bus/siox/devices/siox-X-Y/outbytes
8484
KernelVersion: 4.16
85-
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
85+
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
8686
Description:
8787
Read-only value reporting the outbytes value provided to siox-X/device_add.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <[email protected]>
2929
Description:
3030
Unsigned integer.
3131

32-
Write a number ranging from 1 to 127 to add a qmap mux
32+
Write a number ranging from 1 to 254 to add a qmap mux
3333
based network device, supported by recent Qualcomm based
3434
modems.
3535

@@ -46,5 +46,5 @@ Contact: Bjørn Mork <[email protected]>
4646
Description:
4747
Unsigned integer.
4848

49-
Write a number ranging from 1 to 127 to delete a previously
49+
Write a number ranging from 1 to 254 to delete a previously
5050
created qmap mux based network device.

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Required properties:
44
- compatible: Should be one of the following:
55
- "microchip,mcp2510" for MCP2510.
66
- "microchip,mcp2515" for MCP2515.
7+
- "microchip,mcp25625" for MCP25625.
78
- reg: SPI chip select.
89
- clocks: The clock feeding the CAN controller.
910
- interrupts: Should contain IRQ line for the CAN controller.
Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/riscv/cpus.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: RISC-V bindings for 'cpus' DT nodes
8+
9+
maintainers:
10+
- Paul Walmsley <[email protected]>
11+
- Palmer Dabbelt <[email protected]>
12+
13+
allOf:
14+
- $ref: /schemas/cpus.yaml#
15+
16+
properties:
17+
$nodename:
18+
const: cpus
19+
description: Container of cpu nodes
20+
21+
'#address-cells':
22+
const: 1
23+
description: |
24+
A single unsigned 32-bit integer uniquely identifies each RISC-V
25+
hart in a system. (See the "reg" node under the "cpu" node,
26+
below).
27+
28+
'#size-cells':
29+
const: 0
30+
31+
patternProperties:
32+
'^cpu@[0-9a-f]+$':
33+
properties:
34+
compatible:
35+
type: array
36+
items:
37+
- enum:
38+
- sifive,rocket0
39+
- sifive,e5
40+
- sifive,e51
41+
- sifive,u54-mc
42+
- sifive,u54
43+
- sifive,u5
44+
- const: riscv
45+
description:
46+
Identifies that the hart uses the RISC-V instruction set
47+
and identifies the type of the hart.
48+
49+
mmu-type:
50+
allOf:
51+
- $ref: "/schemas/types.yaml#/definitions/string"
52+
- enum:
53+
- riscv,sv32
54+
- riscv,sv39
55+
- riscv,sv48
56+
description:
57+
Identifies the MMU address translation mode used on this
58+
hart. These values originate from the RISC-V Privileged
59+
Specification document, available from
60+
https://riscv.org/specifications/
61+
62+
riscv,isa:
63+
allOf:
64+
- $ref: "/schemas/types.yaml#/definitions/string"
65+
- enum:
66+
- rv64imac
67+
- rv64imafdc
68+
description:
69+
Identifies the specific RISC-V instruction set architecture
70+
supported by the hart. These are documented in the RISC-V
71+
User-Level ISA document, available from
72+
https://riscv.org/specifications/
73+
74+
timebase-frequency:
75+
type: integer
76+
minimum: 1
77+
description:
78+
Specifies the clock frequency of the system timer in Hz.
79+
This value is common to all harts on a single system image.
80+
81+
interrupt-controller:
82+
type: object
83+
description: Describes the CPU's local interrupt controller
84+
85+
properties:
86+
'#interrupt-cells':
87+
const: 1
88+
89+
compatible:
90+
const: riscv,cpu-intc
91+
92+
interrupt-controller: true
93+
94+
required:
95+
- '#interrupt-cells'
96+
- compatible
97+
- interrupt-controller
98+
99+
required:
100+
- riscv,isa
101+
- timebase-frequency
102+
- interrupt-controller
103+
104+
examples:
105+
- |
106+
// Example 1: SiFive Freedom U540G Development Kit
107+
cpus {
108+
#address-cells = <1>;
109+
#size-cells = <0>;
110+
timebase-frequency = <1000000>;
111+
cpu@0 {
112+
clock-frequency = <0>;
113+
compatible = "sifive,rocket0", "riscv";
114+
device_type = "cpu";
115+
i-cache-block-size = <64>;
116+
i-cache-sets = <128>;
117+
i-cache-size = <16384>;
118+
reg = <0>;
119+
riscv,isa = "rv64imac";
120+
cpu_intc0: interrupt-controller {
121+
#interrupt-cells = <1>;
122+
compatible = "riscv,cpu-intc";
123+
interrupt-controller;
124+
};
125+
};
126+
cpu@1 {
127+
clock-frequency = <0>;
128+
compatible = "sifive,rocket0", "riscv";
129+
d-cache-block-size = <64>;
130+
d-cache-sets = <64>;
131+
d-cache-size = <32768>;
132+
d-tlb-sets = <1>;
133+
d-tlb-size = <32>;
134+
device_type = "cpu";
135+
i-cache-block-size = <64>;
136+
i-cache-sets = <64>;
137+
i-cache-size = <32768>;
138+
i-tlb-sets = <1>;
139+
i-tlb-size = <32>;
140+
mmu-type = "riscv,sv39";
141+
reg = <1>;
142+
riscv,isa = "rv64imafdc";
143+
tlb-split;
144+
cpu_intc1: interrupt-controller {
145+
#interrupt-cells = <1>;
146+
compatible = "riscv,cpu-intc";
147+
interrupt-controller;
148+
};
149+
};
150+
};
151+
152+
- |
153+
// Example 2: Spike ISA Simulator with 1 Hart
154+
cpus {
155+
cpu@0 {
156+
device_type = "cpu";
157+
reg = <0>;
158+
compatible = "riscv";
159+
riscv,isa = "rv64imafdc";
160+
mmu-type = "riscv,sv48";
161+
interrupt-controller {
162+
#interrupt-cells = <1>;
163+
interrupt-controller;
164+
compatible = "riscv,cpu-intc";
165+
};
166+
};
167+
};
168+
...
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/riscv/sifive.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: SiFive SoC-based boards
8+
9+
maintainers:
10+
- Paul Walmsley <[email protected]>
11+
- Palmer Dabbelt <[email protected]>
12+
13+
description:
14+
SiFive SoC-based boards
15+
16+
properties:
17+
$nodename:
18+
const: '/'
19+
compatible:
20+
items:
21+
- enum:
22+
- sifive,freedom-unleashed-a00
23+
- const: sifive,fu540-c000
24+
- const: sifive,fu540
25+
...

Documentation/driver-api/uio-howto.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ fields of ``struct uio_mem``:
276276
- ``int memtype``: Required if the mapping is used. Set this to
277277
``UIO_MEM_PHYS`` if you you have physical memory on your card to be
278278
mapped. Use ``UIO_MEM_LOGICAL`` for logical memory (e.g. allocated
279-
with :c:func:`kmalloc()`). There's also ``UIO_MEM_VIRTUAL`` for
280-
virtual memory.
279+
with :c:func:`__get_free_pages()` but not kmalloc()). There's also
280+
``UIO_MEM_VIRTUAL`` for virtual memory.
281281

282282
- ``phys_addr_t addr``: Required if the mapping is used. Fill in the
283283
address of your memory block. This address is the one that appears in

Documentation/fb/fbcon.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ C. Boot options
7979

8080
Select the initial font to use. The value 'name' can be any of the
8181
compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6,
82-
PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, VGA8x16, VGA8x8.
82+
PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.
8383

8484
Note, not all drivers can handle font with widths not divisible by 8,
8585
such as vga16fb.

Documentation/networking/af_xdp.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,16 +316,16 @@ A: When a netdev of a physical NIC is initialized, Linux usually
316316
all the traffic, you can force the netdev to only have 1 queue, queue
317317
id 0, and then bind to queue 0. You can use ethtool to do this::
318318

319-
sudo ethtool -L <interface> combined 1
319+
sudo ethtool -L <interface> combined 1
320320

321321
If you want to only see part of the traffic, you can program the
322322
NIC through ethtool to filter out your traffic to a single queue id
323323
that you can bind your XDP socket to. Here is one example in which
324324
UDP traffic to and from port 4242 are sent to queue 2::
325325

326-
sudo ethtool -N <interface> rx-flow-hash udp4 fn
327-
sudo ethtool -N <interface> flow-type udp4 src-port 4242 dst-port \
328-
4242 action 2
326+
sudo ethtool -N <interface> rx-flow-hash udp4 fn
327+
sudo ethtool -N <interface> flow-type udp4 src-port 4242 dst-port \
328+
4242 action 2
329329

330330
A number of other ways are possible all up to the capabilitites of
331331
the NIC you have.

Documentation/networking/ip-sysctl.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,14 @@ tcp_base_mss - INTEGER
255255
Path MTU discovery (MTU probing). If MTU probing is enabled,
256256
this is the initial MSS used by the connection.
257257

258+
tcp_min_snd_mss - INTEGER
259+
TCP SYN and SYNACK messages usually advertise an ADVMSS option,
260+
as described in RFC 1122 and RFC 6691.
261+
If this ADVMSS option is smaller than tcp_min_snd_mss,
262+
it is silently capped to tcp_min_snd_mss.
263+
264+
Default : 48 (at least 8 bytes of payload per segment)
265+
258266
tcp_congestion_control - STRING
259267
Set the congestion control algorithm to be used for new
260268
connections. The algorithm "reno" is always available, but
@@ -772,6 +780,14 @@ tcp_challenge_ack_limit - INTEGER
772780
in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)
773781
Default: 100
774782

783+
tcp_rx_skb_cache - BOOLEAN
784+
Controls a per TCP socket cache of one skb, that might help
785+
performance of some workloads. This might be dangerous
786+
on systems with a lot of TCP sockets, since it increases
787+
memory usage.
788+
789+
Default: 0 (disabled)
790+
775791
UDP variables:
776792

777793
udp_l3mdev_accept - BOOLEAN

0 commit comments

Comments
 (0)