Skip to content

Commit

Permalink
Merge 6.9-rc5 into driver-core-next
Browse files Browse the repository at this point in the history
We want the kernfs fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
gregkh committed Apr 23, 2024
2 parents 66bc1a1 + ed30a4a commit e5019b1
Show file tree
Hide file tree
Showing 1,346 changed files with 20,038 additions and 9,260 deletions.
15 changes: 12 additions & 3 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Adam Oldham <[email protected]>
Adam Radford <[email protected]>
Adriana Reus <[email protected]> <[email protected]>
Adrian Bunk <[email protected]>
Ajay Kaher <[email protected]> <[email protected]>
Akhil P Oommen <[email protected]> <[email protected]>
Alan Cox <[email protected]>
Alan Cox <[email protected]>
Expand All @@ -36,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexey Makhalov <[email protected]> <[email protected]>
Alex Hung <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Alex Shi <[email protected]> <[email protected]>
Expand Down Expand Up @@ -110,6 +112,7 @@ Brendan Higgins <[email protected]> <[email protected]>
Brian Avery <[email protected]>
Brian King <[email protected]>
Brian Silverman <[email protected]> <[email protected]>
Bryan Tan <[email protected]> <[email protected]>
Cai Huoqing <[email protected]> <[email protected]>
Can Guo <[email protected]> <[email protected]>
Carl Huang <[email protected]> <[email protected]>
Expand Down Expand Up @@ -340,7 +343,8 @@ Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
Leonard Crestez <[email protected]> <[email protected]>
Leonard Crestez <[email protected]> <[email protected]>
Leonardo Bras <[email protected]> <[email protected]>
Leonard Göhrs <[email protected]>
Leonid I Ananiev <[email protected]>
Expand Down Expand Up @@ -442,7 +446,8 @@ Mythri P K <[email protected]>
Nadav Amit <[email protected]> <[email protected]>
Nadav Amit <[email protected]> <[email protected]>
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
Naoya Horiguchi <[email protected]> <[email protected]>
Naoya Horiguchi <[email protected]> <[email protected]>
Naoya Horiguchi <[email protected]> <[email protected]>
Nathan Chancellor <[email protected]> <[email protected]>
Neeraj Upadhyay <[email protected]> <[email protected]>
Neil Armstrong <[email protected]> <[email protected]>
Expand Down Expand Up @@ -497,7 +502,8 @@ Prasad Sodagudi <[email protected]> <[email protected]>
Punit Agrawal <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Monnet <[email protected]> <[email protected]>
Quentin Perret <[email protected]> <[email protected]>
Rafael J. Wysocki <[email protected]> <[email protected]>
Rajeev Nandan <[email protected]> <[email protected]>
Expand All @@ -519,6 +525,7 @@ Rémi Denis-Courmont <[email protected]>
Ricardo Ribalda <[email protected]> <[email protected]>
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
Ricardo Ribalda <[email protected]> <[email protected]>
Richard Genoud <[email protected]> <[email protected]>
Richard Leitner <[email protected]> <[email protected]>
Richard Leitner <[email protected]> <[email protected]>
Richard Leitner <[email protected]> <[email protected]>
Expand All @@ -527,6 +534,7 @@ Rocky Liao <[email protected]> <[email protected]>
Roman Gushchin <[email protected]> <[email protected]>
Roman Gushchin <[email protected]> <[email protected]>
Roman Gushchin <[email protected]> <[email protected]>
Ronak Doshi <[email protected]> <[email protected]>
Muchun Song <[email protected]> <[email protected]>
Muchun Song <[email protected]> <[email protected]>
Ross Zwisler <[email protected]> <[email protected]>
Expand Down Expand Up @@ -649,6 +657,7 @@ Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Viresh Kumar <[email protected]> <[email protected]>
Vishnu Dasa <[email protected]> <[email protected]>
Vivek Aknurwar <[email protected]> <[email protected]>
Vivien Didelot <[email protected]> <[email protected]>
Vlad Dogaru <[email protected]> <[email protected]>
Expand Down
4 changes: 4 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -3146,6 +3146,10 @@ S: Triftstra=DFe 55
S: 13353 Berlin
S: Germany

N: Gustavo Pimental
E: [email protected]
D: PCI driver for Synopsys DesignWare

N: Emanuel Pirker
E: [email protected]
D: AIC5800 IEEE 1394, RAW I/O on 1394
Expand Down
44 changes: 38 additions & 6 deletions Documentation/admin-guide/hw-vuln/spectre.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,10 @@ associated with the source address of the indirect branch. Specifically,
the BHB might be shared across privilege levels even in the presence of
Enhanced IBRS.

Currently the only known real-world BHB attack vector is via
unprivileged eBPF. Therefore, it's highly recommended to not enable
unprivileged eBPF, especially when eIBRS is used (without retpolines).
For a full mitigation against BHB attacks, it's recommended to use
retpolines (or eIBRS combined with retpolines).
Previously the only known real-world BHB attack vector was via unprivileged
eBPF. Further research has found attacks that don't require unprivileged eBPF.
For a full mitigation against BHB attacks it is recommended to set BHI_DIS_S or
use the BHB clearing sequence.

Attack scenarios
----------------
Expand Down Expand Up @@ -430,6 +429,23 @@ The possible values in this file are:
'PBRSB-eIBRS: Not affected' CPU is not affected by PBRSB
=========================== =======================================================

- Branch History Injection (BHI) protection status:

.. list-table::

* - BHI: Not affected
- System is not affected
* - BHI: Retpoline
- System is protected by retpoline
* - BHI: BHI_DIS_S
- System is protected by BHI_DIS_S
* - BHI: SW loop, KVM SW loop
- System is protected by software clearing sequence
* - BHI: Vulnerable
- System is vulnerable to BHI
* - BHI: Vulnerable, KVM: SW loop
- System is vulnerable; KVM is protected by software clearing sequence

Full mitigation might require a microcode update from the CPU
vendor. When the necessary microcode is not available, the kernel will
report vulnerability.
Expand Down Expand Up @@ -484,7 +500,11 @@ Spectre variant 2

Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at
boot, by setting the IBRS bit, and they're automatically protected against
Spectre v2 variant attacks.
some Spectre v2 variant attacks. The BHB can still influence the choice of
indirect branch predictor entry, and although branch predictor entries are
isolated between modes when eIBRS is enabled, the BHB itself is not isolated
between modes. Systems which support BHI_DIS_S will set it to protect against
BHI attacks.

On Intel's enhanced IBRS systems, this includes cross-thread branch target
injections on SMT systems (STIBP). In other words, Intel eIBRS enables
Expand Down Expand Up @@ -638,6 +658,18 @@ kernel command line.
spectre_v2=off. Spectre variant 1 mitigations
cannot be disabled.

spectre_bhi=

[X86] Control mitigation of Branch History Injection
(BHI) vulnerability. This setting affects the deployment
of the HW BHI control and the SW BHB clearing sequence.

on
(default) Enable the HW or SW mitigation as
needed.
off
Disable the mitigation.

For spectre_v2_user see Documentation/admin-guide/kernel-parameters.txt

Mitigation selection guide
Expand Down
12 changes: 11 additions & 1 deletion Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3444,6 +3444,7 @@
retbleed=off [X86]
spec_rstack_overflow=off [X86]
spec_store_bypass_disable=off [X86,PPC]
spectre_bhi=off [X86]
spectre_v2_user=off [X86]
srbds=off [X86,INTEL]
ssbd=force-off [ARM64]
Expand Down Expand Up @@ -6063,6 +6064,15 @@
sonypi.*= [HW] Sony Programmable I/O Control Device driver
See Documentation/admin-guide/laptops/sonypi.rst

spectre_bhi= [X86] Control mitigation of Branch History Injection
(BHI) vulnerability. This setting affects the
deployment of the HW BHI control and the SW BHB
clearing sequence.

on - (default) Enable the HW or SW mitigation
as needed.
off - Disable the mitigation.

spectre_v2= [X86,EARLY] Control mitigation of Spectre variant 2
(indirect branch speculation) vulnerability.
The default operation protects the kernel from
Expand Down Expand Up @@ -6599,7 +6609,7 @@
To turn off having tracepoints sent to printk,
echo 0 > /proc/sys/kernel/tracepoint_printk
Note, echoing 1 into this file without the
tracepoint_printk kernel cmdline option has no effect.
tp_printk kernel cmdline option has no effect.

The tp_printk_stop_on_boot (see below) can also be used
to stop the printing of events to console at
Expand Down
4 changes: 2 additions & 2 deletions Documentation/admin-guide/mm/zswap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis.

Some users cannot tolerate the swapping that comes with zswap store failures
and zswap writebacks. Swapping can be disabled entirely (without disabling
zswap itself) on a cgroup-basis as follows:
zswap itself) on a cgroup-basis as follows::

echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback

Expand All @@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again).
When there is a sizable amount of cold memory residing in the zswap pool, it
can be advantageous to proactively write these cold pages to swap and reclaim
the memory for other use cases. By default, the zswap shrinker is disabled.
User can enable it as follows:
User can enable it as follows::

echo Y > /sys/module/zswap/parameters/shrinker_enabled

Expand Down
2 changes: 1 addition & 1 deletion Documentation/arch/x86/resctrl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ Memory b/w domain is L3 cache.
MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;...

Memory bandwidth Allocation specified in MiBps
---------------------------------------------
----------------------------------------------

Memory bandwidth domain is L3 cache.
::
Expand Down
2 changes: 2 additions & 0 deletions Documentation/dev-tools/testing-overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ Some of these tools are listed below:
KASAN and can be used in production. See Documentation/dev-tools/kfence.rst
* lockdep is a locking correctness validator. See
Documentation/locking/lockdep-design.rst
* Runtime Verification (RV) supports checking specific behaviours for a given
subsystem. See Documentation/trace/rv/runtime-verification.rst
* There are several other pieces of debug instrumentation in the kernel, many
of which can be found in lib/Kconfig.debug

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/keystone-gate.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Status: Unstable - ABI compatibility may be broken in the future

Binding for Keystone gate control driver which uses PSC controller IP.

This binding uses the common clock binding[1].
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/keystone-pll.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Status: Unstable - ABI compatibility may be broken in the future

Binding for keystone PLLs. The main PLL IP typically has a multiplier,
a divider and a post divider. The additional PLL IPs like ARMPLL, DDRPLL
and PAPLL are controlled by the memory mapped register where as the Main
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/adpll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments ADPLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped ADPLL with two to three selectable input clocks
and three to four children.
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/apll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments APLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped APLL with usually two selectable input clocks
(reference clock and bypass clock), with analog phase locked
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/autoidle.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments autoidle clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a register mapped
clock which can be put to idle automatically by hardware based on the usage
and a configuration bit setting. Autoidle clock is never an individual
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/clockdomain.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments clockdomain.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1] in consumer role.
Every clock on TI SoC belongs to one clockdomain, but software
only needs this information for specific clocks which require
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/composite.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI composite clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped composite clock with multiple different sub-types;

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/divider.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI divider clock

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped adjustable clock rate divider that does not gate and has
only one input clock or parent. By default the value programmed into
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/dpll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments DPLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped DPLL with usually two selectable input clocks
(reference clock and bypass clock), with digital phase locked
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/fapll.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments FAPLL clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped FAPLL with usually two selectable input clocks
(reference clock and bypass clock), and one or more child
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI fixed factor rate clock sources.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1], and also uses the autoidle
support from TI autoidle clock [2].

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/gate.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments gate clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. This clock is
quite much similar to the basic gate-clock [2], however,
it supports a number of additional features. If no register
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/interface.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for Texas Instruments interface clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. This clock is
quite much similar to the basic gate-clock [2], however,
it supports a number of additional features, including
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/clock/ti/mux.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Binding for TI mux clock.

Binding status: Unstable - ABI compatibility may be broken in the future

This binding uses the common clock binding[1]. It assumes a
register-mapped multiplexer with multiple input clock signals or
parents, one of which can be selected as output. This clock does not
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ patternProperties:
compatible:
const: qcom,sm8150-dpu

"^displayport-controller@[0-9a-f]+$":
type: object
additionalProperties: true

properties:
compatible:
contains:
const: qcom,sm8150-dp

"^dsi@[0-9a-f]+$":
type: object
additionalProperties: true
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/dts-coding-style.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ Example::
#dma-cells = <1>;
clocks = <&clock_controller 0>, <&clock_controller 1>;
clock-names = "bus", "host";
#address-cells = <1>;
#size-cells = <1>;
vendor,custom-property = <2>;
status = "disabled";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ properties:

local-bd-address: true

qcom,local-bd-address-broken:
type: boolean
description:
boot firmware is incorrectly passing the address in big-endian order

required:
- compatible
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ properties:
- const: main
- const: mm

power-domains:
maxItems: 1

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
TI Davinci DSP devices
=======================

Binding status: Unstable - Subject to changes for DT representation of clocks
and resets

The TI Davinci family of SoCs usually contains a TI DSP Core sub-system that
is used to offload some of the processor-intensive tasks or algorithms, for
achieving various system level goals.
Expand Down
Loading

0 comments on commit e5019b1

Please sign in to comment.