Skip to content

Commit e1bcad6

Browse files
author
Peter Zijlstra
committed
Merge branch 'tip/x86/entry'
2 parents c935cd6 + b037b09 commit e1bcad6

File tree

1,251 files changed

+11131
-6413
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,251 files changed

+11131
-6413
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ x509.genkey
143143
/allrandom.config
144144
/allyes.config
145145

146+
# Kconfig savedefconfig output
147+
/defconfig
148+
146149
# Kdevelop4
147150
*.kdev4
148151

‎Documentation/ABI/testing/dev-kmsg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ Description: The /dev/kmsg character device node provides userspace access
5656
seek after the last record available at the time
5757
the last SYSLOG_ACTION_CLEAR was issued.
5858

59-
Due to the record nature of this interface with a "read all"
60-
behavior and the specific positions each seek operation sets,
61-
SEEK_CUR is not supported, returning -ESPIPE (invalid seek) to
62-
errno whenever requested.
63-
6459
The output format consists of a prefix carrying the syslog
6560
prefix including priority and facility, the 64 bit message
6661
sequence number and the monotonic timestamp in microseconds,

‎Documentation/ABI/testing/sysfs-bus-papr-pmem

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/bus/nd/devices/nmemX/papr/flags
2+
Date: Apr, 2020
3+
KernelVersion: v5.8
4+
Contact: linuxppc-dev <[email protected]>, [email protected],
5+
Description:
6+
(RO) Report flags indicating various states of a
7+
papr-pmem NVDIMM device. Each flag maps to a one or
8+
more bits set in the dimm-health-bitmap retrieved in
9+
response to H_SCM_HEALTH hcall. The details of the bit
10+
flags returned in response to this hcall is available
11+
at 'Documentation/powerpc/papr_hcalls.rst' . Below are
12+
the flags reported in this sysfs file:
13+
14+
* "not_armed" : Indicates that NVDIMM contents will not
15+
survive a power cycle.
16+
* "flush_fail" : Indicates that NVDIMM contents
17+
couldn't be flushed during last
18+
shut-down event.
19+
* "restore_fail": Indicates that NVDIMM contents
20+
couldn't be restored during NVDIMM
21+
initialization.
22+
* "encrypted" : NVDIMM contents are encrypted.
23+
* "smart_notify": There is health event for the NVDIMM.
24+
* "scrubbed" : Indicating that contents of the
25+
NVDIMM have been scrubbed.
26+
* "locked" : Indicating that NVDIMM contents cant
27+
be modified until next power cycle.

‎Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req
22
Date: Feb 2014
3-
Contact: Li Jun <b47624@freescale.com>
3+
Contact: Li Jun <jun.li@nxp.com>
44
Description:
55
Can be set and read.
66
Set a_bus_req(A-device bus request) input to be 1 if
@@ -17,7 +17,7 @@ Description:
1717

1818
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop
1919
Date: Feb 2014
20-
Contact: Li Jun <b47624@freescale.com>
20+
Contact: Li Jun <jun.li@nxp.com>
2121
Description:
2222
Can be set and read
2323
The a_bus_drop(A-device bus drop) input is 1 when the
@@ -32,7 +32,7 @@ Description:
3232

3333
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req
3434
Date: Feb 2014
35-
Contact: Li Jun <b47624@freescale.com>
35+
Contact: Li Jun <jun.li@nxp.com>
3636
Description:
3737
Can be set and read.
3838
The b_bus_req(B-device bus request) input is 1 during the time
@@ -47,7 +47,7 @@ Description:
4747

4848
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err
4949
Date: Feb 2014
50-
Contact: Li Jun <b47624@freescale.com>
50+
Contact: Li Jun <jun.li@nxp.com>
5151
Description:
5252
Only can be set.
5353
The a_clr_err(A-device Vbus error clear) input is used to clear

‎Documentation/admin-guide/cgroup-v2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,8 +1356,8 @@ PAGE_SIZE multiple when read back.
13561356

13571357
thp_fault_alloc
13581358
Number of transparent hugepages which were allocated to satisfy
1359-
a page fault, including COW faults. This counter is not present
1360-
when CONFIG_TRANSPARENT_HUGEPAGE is not set.
1359+
a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE
1360+
is not set.
13611361

13621362
thp_collapse_alloc
13631363
Number of transparent hugepages which were allocated to allow

‎Documentation/admin-guide/device-mapper/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Device Mapper
1111
dm-clone
1212
dm-crypt
1313
dm-dust
14+
dm-ebs
1415
dm-flakey
1516
dm-init
1617
dm-integrity

‎Documentation/admin-guide/mm/transhuge.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ monitor how successfully the system is providing huge pages for use.
305305

306306
thp_fault_alloc
307307
is incremented every time a huge page is successfully
308-
allocated to handle a page fault. This applies to both the
309-
first time a page is faulted and for COW faults.
308+
allocated to handle a page fault.
310309

311310
thp_collapse_alloc
312311
is incremented by khugepaged when it has found

‎Documentation/arm64/silicon-errata.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ stable kernels.
147147
+----------------+-----------------+-----------------+-----------------------------+
148148
| Qualcomm Tech. | Falkor v{1,2} | E1041 | QCOM_FALKOR_ERRATUM_1041 |
149149
+----------------+-----------------+-----------------+-----------------------------+
150+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1463225 |
151+
+----------------+-----------------+-----------------+-----------------------------+
152+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1418040 |
153+
+----------------+-----------------+-----------------+-----------------------------+
154+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1530923 |
155+
+----------------+-----------------+-----------------+-----------------------------+
156+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1024718 |
157+
+----------------+-----------------+-----------------+-----------------------------+
150158
+----------------+-----------------+-----------------+-----------------------------+
151159
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
152160
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/arm64/sve.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
186186

187187
flags:
188188

189-
PR_SVE_SET_VL_INHERIT
189+
PR_SVE_VL_INHERIT
190190

191191
Inherit the current vector length across execve(). Otherwise, the
192192
vector length is reset to the system default at execve(). (See
@@ -247,7 +247,7 @@ prctl(PR_SVE_GET_VL)
247247

248248
The following flag may be OR-ed into the result:
249249

250-
PR_SVE_SET_VL_INHERIT
250+
PR_SVE_VL_INHERIT
251251

252252
Vector length will be inherited across execve().
253253

@@ -393,7 +393,7 @@ The regset data starts with struct user_sve_header, containing:
393393
* At every execve() call, the new vector length of the new process is set to
394394
the system default vector length, unless
395395

396-
* PR_SVE_SET_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the
396+
* PR_SVE_VL_INHERIT (or equivalently SVE_PT_VL_INHERIT) is set for the
397397
calling thread, or
398398

399399
* a deferred vector length change is pending, established via the

‎Documentation/bpf/prog_cgroup_sockopt.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,20 @@ then the next program in the chain (A) will see those changes,
8686
*not* the original input ``setsockopt`` arguments. The potentially
8787
modified values will be then passed down to the kernel.
8888

89+
Large optval
90+
============
91+
When the ``optval`` is greater than the ``PAGE_SIZE``, the BPF program
92+
can access only the first ``PAGE_SIZE`` of that data. So it has to options:
93+
94+
* Set ``optlen`` to zero, which indicates that the kernel should
95+
use the original buffer from the userspace. Any modifications
96+
done by the BPF program to the ``optval`` are ignored.
97+
* Set ``optlen`` to the value less than ``PAGE_SIZE``, which
98+
indicates that the kernel should use BPF's trimmed ``optval``.
99+
100+
When the BPF program returns with the ``optlen`` greater than
101+
``PAGE_SIZE``, the userspace will receive ``EFAULT`` errno.
102+
89103
Example
90104
=======
91105

‎Documentation/core-api/pin_user_pages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ all combinations of get*(), pin*(), FOLL_LONGTERM, and more. Also, the
3333
pin_user_pages*() APIs are clearly distinct from the get_user_pages*() APIs, so
3434
that's a natural dividing line, and a good point to make separate wrapper calls.
3535
In other words, use pin_user_pages*() for DMA-pinned pages, and
36-
get_user_pages*() for other cases. There are four cases described later on in
36+
get_user_pages*() for other cases. There are five cases described later on in
3737
this document, to further clarify that concept.
3838

3939
FOLL_PIN and FOLL_GET are mutually exclusive for a given gup call. However,

‎Documentation/dev-tools/kcsan.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ the below options are available:
114114
To dynamically limit for which functions to generate reports, see the
115115
`DebugFS interface`_ blacklist/whitelist feature.
116116

117-
For ``__always_inline`` functions, replace ``__always_inline`` with
118-
``__no_kcsan_or_inline`` (which implies ``__always_inline``)::
119-
120-
static __no_kcsan_or_inline void foo(void) {
121-
...
122-
123117
* To disable data race detection for a particular compilation unit, add to the
124118
``Makefile``::
125119

‎Documentation/dev-tools/kunit/faq.rst

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,43 @@ test, or an end-to-end test.
6161
kernel by installing a production configuration of the kernel on production
6262
hardware with a production userspace and then trying to exercise some behavior
6363
that depends on interactions between the hardware, the kernel, and userspace.
64+
65+
KUnit isn't working, what should I do?
66+
======================================
67+
68+
Unfortunately, there are a number of things which can break, but here are some
69+
things to try.
70+
71+
1. Try running ``./tools/testing/kunit/kunit.py run`` with the ``--raw_output``
72+
parameter. This might show details or error messages hidden by the kunit_tool
73+
parser.
74+
2. Instead of running ``kunit.py run``, try running ``kunit.py config``,
75+
``kunit.py build``, and ``kunit.py exec`` independently. This can help track
76+
down where an issue is occurring. (If you think the parser is at fault, you
77+
can run it manually against stdin or a file with ``kunit.py parse``.)
78+
3. Running the UML kernel directly can often reveal issues or error messages
79+
kunit_tool ignores. This should be as simple as running ``./vmlinux`` after
80+
building the UML kernel (e.g., by using ``kunit.py build``). Note that UML
81+
has some unusual requirements (such as the host having a tmpfs filesystem
82+
mounted), and has had issues in the past when built statically and the host
83+
has KASLR enabled. (On older host kernels, you may need to run ``setarch
84+
`uname -m` -R ./vmlinux`` to disable KASLR.)
85+
4. Make sure the kernel .config has ``CONFIG_KUNIT=y`` and at least one test
86+
(e.g. ``CONFIG_KUNIT_EXAMPLE_TEST=y``). kunit_tool will keep its .config
87+
around, so you can see what config was used after running ``kunit.py run``.
88+
It also preserves any config changes you might make, so you can
89+
enable/disable things with ``make ARCH=um menuconfig`` or similar, and then
90+
re-run kunit_tool.
91+
5. Try to run ``make ARCH=um defconfig`` before running ``kunit.py run``. This
92+
may help clean up any residual config items which could be causing problems.
93+
6. Finally, try running KUnit outside UML. KUnit and KUnit tests can run be
94+
built into any kernel, or can be built as a module and loaded at runtime.
95+
Doing so should allow you to determine if UML is causing the issue you're
96+
seeing. When tests are built-in, they will execute when the kernel boots, and
97+
modules will automatically execute associated tests when loaded. Test results
98+
can be collected from ``/sys/kernel/debug/kunit/<test suite>/results``, and
99+
can be parsed with ``kunit.py parse``. For more details, see "KUnit on
100+
non-UML architectures" in :doc:`usage`.
101+
102+
If none of the above tricks help, you are always welcome to email any issues to
103+
[email protected].

‎Documentation/devicetree/bindings/Makefile

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
DT_DOC_CHECKER ?= dt-doc-validate
33
DT_EXTRACT_EX ?= dt-extract-example
44
DT_MK_SCHEMA ?= dt-mk-schema
5-
DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)
65

76
DT_SCHEMA_MIN_VERSION = 2020.5
87

@@ -35,21 +34,40 @@ quiet_cmd_mk_schema = SCHEMA $@
3534

3635
DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
3736

38-
DT_SCHEMA_FILES ?= $(DT_DOCS)
39-
40-
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
41-
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
42-
extra-$(CHECK_DT_BINDING) += processed-schema-examples.yaml
43-
4437
override DTC_FLAGS := \
4538
-Wno-avoid_unnecessary_addr_size \
46-
-Wno-graph_child_address
39+
-Wno-graph_child_address \
40+
-Wno-interrupt_provider
4741

4842
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) check_dtschema_version FORCE
4943
$(call if_changed,mk_schema)
5044

51-
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)
45+
ifeq ($(DT_SCHEMA_FILES),)
46+
47+
# Unless DT_SCHEMA_FILES is specified, use the full schema for dtbs_check too.
48+
# Just copy processed-schema-examples.yaml
49+
50+
$(obj)/processed-schema.yaml: $(obj)/processed-schema-examples.yaml FORCE
51+
$(call if_changed,copy)
52+
53+
DT_SCHEMA_FILES = $(DT_DOCS)
54+
55+
else
56+
57+
# If DT_SCHEMA_FILES is specified, use it for processed-schema.yaml
58+
59+
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u
5260
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) check_dtschema_version FORCE
5361
$(call if_changed,mk_schema)
5462

55-
extra-y += processed-schema.yaml
63+
endif
64+
65+
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
66+
extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
67+
extra-$(CHECK_DT_BINDING) += processed-schema-examples.yaml
68+
extra-$(CHECK_DTBS) += processed-schema.yaml
69+
70+
# Hack: avoid 'Argument list too long' error for 'make clean'. Remove most of
71+
# build artifacts here before they are processed by scripts/Makefile.clean
72+
clean-files = $(shell find $(obj) \( -name '*.example.dts' -o \
73+
-name '*.example.dt.yaml' \) -delete 2>/dev/null)

‎Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Required properties:
4747
&lsio_mu1 1 2
4848
&lsio_mu1 1 3
4949
&lsio_mu1 3 3>;
50-
See Documentation/devicetree/bindings/mailbox/fsl,mu.txt
50+
See Documentation/devicetree/bindings/mailbox/fsl,mu.yaml
5151
for detailed mailbox binding.
5252

5353
Note: Each mu which supports general interrupt should have an alias correctly

‎Documentation/devicetree/bindings/bus/socionext,uniphier-system-bus.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ examples:
8080
ranges = <1 0x00000000 0x42000000 0x02000000>,
8181
<5 0x00000000 0x46000000 0x01000000>;
8282
83-
ethernet@1,01f00000 {
83+
ethernet@1,1f00000 {
8484
compatible = "smsc,lan9115";
8585
reg = <1 0x01f00000 0x1000>;
8686
interrupts = <0 48 4>;
8787
phy-mode = "mii";
8888
};
8989
90-
uart@5,00200000 {
90+
serial@5,200000 {
9191
compatible = "ns16550a";
9292
reg = <5 0x00200000 0x20>;
9393
interrupts = <0 49 4>;

‎Documentation/devicetree/bindings/clock/imx27-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Clock bindings for Freescale i.MX27
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@freescale.com>
10+
- Fabio Estevam <fabio.estevam@nxp.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

‎Documentation/devicetree/bindings/clock/imx31-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Clock bindings for Freescale i.MX31
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@freescale.com>
10+
- Fabio Estevam <fabio.estevam@nxp.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

‎Documentation/devicetree/bindings/clock/imx5-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Clock bindings for Freescale i.MX5
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@freescale.com>
10+
- Fabio Estevam <fabio.estevam@nxp.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

‎Documentation/devicetree/bindings/display/bridge/sii902x.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Optional properties:
3737
simple-card or audio-graph-card binding. See their binding
3838
documents on how to describe the way the sii902x device is
3939
connected to the rest of the audio system:
40-
Documentation/devicetree/bindings/sound/simple-card.txt
40+
Documentation/devicetree/bindings/sound/simple-card.yaml
4141
Documentation/devicetree/bindings/sound/audio-graph-card.txt
4242
Note: In case of the audio-graph-card binding the used port
4343
index should be 3.

‎Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Required properties:
6868
datasheet
6969
- clocks : phandle to the PRE axi clock input, as described
7070
in Documentation/devicetree/bindings/clock/clock-bindings.txt and
71-
Documentation/devicetree/bindings/clock/imx6q-clock.txt.
71+
Documentation/devicetree/bindings/clock/imx6q-clock.yaml.
7272
- clock-names: should be "axi"
7373
- interrupts: should contain the PRE interrupt
7474
- fsl,iram: phandle pointing to the mmio-sram device node, that should be
@@ -94,7 +94,7 @@ Required properties:
9494
datasheet
9595
- clocks : phandles to the PRG ipg and axi clock inputs, as described
9696
in Documentation/devicetree/bindings/clock/clock-bindings.txt and
97-
Documentation/devicetree/bindings/clock/imx6q-clock.txt.
97+
Documentation/devicetree/bindings/clock/imx6q-clock.yaml.
9898
- clock-names: should be "ipg" and "axi"
9999
- fsl,pres: phandles to the PRE units attached to this PRG, with the fixed
100100
PRE as the first entry and the muxable PREs following.

‎Documentation/devicetree/bindings/display/imx/ldb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Required properties:
3030
"di2_sel" - IPU2 DI0 mux
3131
"di3_sel" - IPU2 DI1 mux
3232
The needed clock numbers for each are documented in
33-
Documentation/devicetree/bindings/clock/imx5-clock.txt, and in
34-
Documentation/devicetree/bindings/clock/imx6q-clock.txt.
33+
Documentation/devicetree/bindings/clock/imx5-clock.yaml, and in
34+
Documentation/devicetree/bindings/clock/imx6q-clock.yaml.
3535

3636
Optional properties:
3737
- pinctrl-names : should be "default" on i.MX53, not used on i.MX6q

0 commit comments

Comments
 (0)