Skip to content

Commit e89d4ca

Browse files
author
Ingo Molnar
committed
Merge tag 'v5.8-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
2 parents 2ac5413 + 92ed301 commit e89d4ca

File tree

1,105 files changed

+10208
-6690
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,105 files changed

+10208
-6690
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

.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,16 @@ Frank Rowand <[email protected]> <[email protected]>
9090
Frank Zago <[email protected]>
9191
9292
93+
94+
95+
9396
Greg Kroah-Hartman <greg@echidna.(none)>
9497
Greg Kroah-Hartman <[email protected]>
9598
Greg Kroah-Hartman <[email protected]>
9699
97100
101+
102+
98103
Henk Vergonet <[email protected]>
99104
Henrik Kretzschmar <[email protected]>
100105
Henrik Rydberg <[email protected]>
@@ -193,6 +198,9 @@ Maxime Ripard <[email protected]> <[email protected]>
193198
Mayuresh Janorkar <[email protected]>
194199
Michael Buesch <[email protected]>
195200
Michel Dänzer <[email protected]>
201+
202+
203+
196204
197205
198206
Mitesh shah <[email protected]>

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ Description: Allow the root user to disable/enable in runtime the clock
1616
gating mechanism in Gaudi. Due to how Gaudi is built, the
1717
clock gating needs to be disabled in order to access the
1818
registers of the TPC and MME engines. This is sometimes needed
19-
during debug by the user and hence the user needs this option
19+
during debug by the user and hence the user needs this option.
20+
The user can supply a bitmask value, each bit represents
21+
a different engine to disable/enable its clock gating feature.
22+
The bitmask is composed of 20 bits:
23+
0 - 7 : DMA channels
24+
8 - 11 : MME engines
25+
12 - 19 : TPC engines
26+
The bit's location of a specific engine can be determined
27+
using (1 << GAUDI_ENGINE_ID_*). GAUDI_ENGINE_ID_* values
28+
are defined in uapi habanalabs.h file in enum gaudi_engine_id
2029

2130
What: /sys/kernel/debug/habanalabs/hl<n>/command_buffers
2231
Date: Jan 2019

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ Configuring the kernel
258258
Compiling the kernel
259259
--------------------
260260

261-
- Make sure you have at least gcc 4.6 available.
261+
- Make sure you have at least gcc 4.9 available.
262262
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.
263263

264264
Please note that you can still run a.out user programs with this kernel.

Documentation/arm64/cpu-feature-registers.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ infrastructure:
171171

172172

173173
3) ID_AA64PFR1_EL1 - Processor Feature Register 1
174+
174175
+------------------------------+---------+---------+
175176
| Name | bits | visible |
176177
+------------------------------+---------+---------+
@@ -181,6 +182,7 @@ infrastructure:
181182

182183

183184
4) MIDR_EL1 - Main ID Register
185+
184186
+------------------------------+---------+---------+
185187
| Name | bits | visible |
186188
+------------------------------+---------+---------+

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/block/bfq-iosched.rst

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,6 @@ set max_budget to higher values than those to which BFQ would have set
492492
it with auto-tuning. An alternative way to achieve this goal is to
493493
just increase the value of timeout_sync, leaving max_budget equal to 0.
494494

495-
weights
496-
-------
497-
498-
Read-only parameter, used to show the weights of the currently active
499-
BFQ queues.
500-
501-
502495
4. Group scheduling with BFQ
503496
============================
504497

@@ -566,7 +559,7 @@ Parameters to set
566559
For each group, there is only the following parameter to set.
567560

568561
weight (namely blkio.bfq.weight or io.bfq-weight): the weight of the
569-
group inside its parent. Available values: 1..10000 (default 100). The
562+
group inside its parent. Available values: 1..1000 (default 100). The
570563
linear mapping between ioprio and weights, described at the beginning
571564
of the tunable section, is still valid, but all weights higher than
572565
IOPRIO_BE_NR*10 are mapped to ioprio 0.

Documentation/core-api/dma-api.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,14 @@ Returns the maximum size of a mapping for the device. The size parameter
204204
of the mapping functions like dma_map_single(), dma_map_page() and
205205
others should not be larger than the returned value.
206206

207+
::
208+
209+
bool
210+
dma_need_sync(struct device *dev, dma_addr_t dma_addr);
211+
212+
Returns %true if dma_sync_single_for_{device,cpu} calls are required to
213+
transfer memory ownership. Returns %false if those calls can be skipped.
214+
207215
::
208216

209217
unsigned long

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+

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)

0 commit comments

Comments
 (0)