Skip to content

Commit 60fc299

Browse files
committed
Merge remote-tracking branch 'regmap/for-7.1' into regmap-linus
2 parents 9108f7f + 006c66d commit 60fc299

1,903 files changed

Lines changed: 29477 additions & 14586 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
1919
Ahmad Masri <quic_amasri@quicinc.com> <amasri@codeaurora.org>
2020
Adam Oldham <oldhamca@gmail.com>
2121
Adam Radford <aradford@gmail.com>
22+
Aditya Garg <gargaditya08@proton.me> <gargaditya08@live.com>
2223
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
2324
Adrian Bunk <bunk@stusta.de>
2425
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
@@ -207,6 +208,7 @@ Claudiu Beznea <claudiu.beznea@tuxon.dev> <claudiu.beznea@microchip.com>
207208
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
208209
Corey Minyard <minyard@acm.org>
209210
Damian Hobson-Garcia <dhobsong@igel.co.jp>
211+
Dan Carpenter <error27@gmail.com> <dan.carpenter@linaro.org>
210212
Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
211213
Dan Williams <djbw@kernel.org> <dan.j.williams@intel.com>
212214
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -495,6 +497,7 @@ Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
495497
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
496498
Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
497499
Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
500+
Liam R. Howlett <liam@infradead.org> <Liam.Howlett@oracle.com>
498501
Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
499502
Linas Vepstas <linas@austin.ibm.com>
500503
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -505,6 +508,8 @@ Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
505508
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
506509
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
507510
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
511+
Li Wang <li.wang@linux.dev> <liwang@redhat.com>
512+
Li Wang <li.wang@linux.dev> <wangli.ahau@gmail.com>
508513
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
509514
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
510515
Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
@@ -579,6 +584,8 @@ Mayuresh Janorkar <mayur@ti.com>
579584
Md Sadre Alam <quic_mdalam@quicinc.com> <mdalam@codeaurora.org>
580585
Miaoqing Pan <quic_miaoqing@quicinc.com> <miaoqing@codeaurora.org>
581586
Michael Buesch <m@bues.ch>
587+
Michal Grzeschik <mgr@kernel.org> <m.grzeschik@pengutronix.de>
588+
Michal Grzeschik <mgr@kernel.org> <mgr@pengutronix.de>
582589
Michael Riesch <michael.riesch@collabora.com> <michael.riesch@wolfvision.net>
583590
Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
584591
Michel Dänzer <michel@tungstengraphics.com>
@@ -677,6 +684,7 @@ Peter A Jonsson <pj@ludd.ltu.se>
677684
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>
678685
Peter Oruba <peter.oruba@amd.com>
679686
Peter Oruba <peter@oruba.de>
687+
Peter Rosin <peda@lysator.liu.se> <peda@axentia.se>
680688
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
681689
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
682690
Pratyush Yadav <pratyush@kernel.org> <ptyadav@amazon.de>
@@ -687,6 +695,7 @@ Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
687695
Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>
688696
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
689697
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
698+
Qi Zheng <qi.zheng@linux.dev> <zhengqi.arch@bytedance.com>
690699
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
691700
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
692701
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
@@ -850,6 +859,7 @@ Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
850859
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
851860
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
852861
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
862+
Tomasz Jeznach <tomasz.jeznach@linux.dev> <tjeznach@rivosinc.com>
853863
Tony Luck <tony.luck@intel.com>
854864
Trilok Soni <quic_tsoni@quicinc.com> <tsoni@codeaurora.org>
855865
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Documentation/.renames.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,7 @@ networking/altera_tse networking/device_drivers/ethernet/altera/altera_tse
786786
networking/bpf_flow_dissector bpf/prog_flow_dissector
787787
networking/cxacru networking/device_drivers/atm/cxacru
788788
networking/defza networking/device_drivers/fddi/defza
789+
networking/device_drivers/3com/3c509 networking/device_drivers/ethernet/3com/3c509
789790
networking/device_drivers/3com/vortex networking/device_drivers/ethernet/3com/vortex
790791
networking/device_drivers/amazon/ena networking/device_drivers/ethernet/amazon/ena
791792
networking/device_drivers/aquantia/atlantic networking/device_drivers/ethernet/aquantia/atlantic
File renamed without changes.

Documentation/admin-guide/cgroup-v1/memcg_test.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,19 @@ Please note that implementation details can be changed.
4747
Called when swp_entry's refcnt goes down to 0. A charge against swap
4848
disappears.
4949

50-
3. charge-commit-cancel
50+
3. charge-commit
5151
=======================
5252

5353
Memcg pages are charged in two steps:
5454

5555
- mem_cgroup_try_charge()
56-
- mem_cgroup_commit_charge() or mem_cgroup_cancel_charge()
56+
- commit_charge()
5757

5858
At try_charge(), there are no flags to say "this page is charged".
5959
at this point, usage += PAGE_SIZE.
6060

6161
At commit(), the page is associated with the memcg.
6262

63-
At cancel(), simply usage -= PAGE_SIZE.
64-
6563
Under below explanation, we assume CONFIG_SWAP=y.
6664

6765
4. Anonymous

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ cgroup v2 currently supports the following mount options.
220220
memory_hugetlb_accounting
221221
Count HugeTLB memory usage towards the cgroup's overall
222222
memory usage for the memory controller (for the purpose of
223-
statistics reporting and memory protetion). This is a new
223+
statistics reporting and memory protection). This is a new
224224
behavior that could regress existing setups, so it must be
225225
explicitly opted in with this mount option.
226226

Documentation/admin-guide/laptops/uniwill-laptop.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ Support for changing the platform performance mode is currently not implemented.
4343
Battery Charging Control
4444
------------------------
4545

46+
.. warning:: Some devices do not properly implement the charging threshold interface. Forcing
47+
the driver to enable access to said interface on such devices might damage the
48+
battery [1]_. Because of this the driver will not enable said feature even when
49+
using the ``force`` module parameter.
50+
4651
The ``uniwill-laptop`` driver supports controlling the battery charge limit. This happens over
4752
the standard ``charge_control_end_threshold`` power supply sysfs attribute. All values
4853
between 1 and 100 percent are supported.
@@ -70,3 +75,8 @@ The ``uniwill-laptop`` driver allows to set the configurable TGP for devices wit
7075
allow it.
7176

7277
See Documentation/ABI/testing/sysfs-driver-uniwill-laptop for details.
78+
79+
References
80+
==========
81+
82+
.. [1] https://www.reddit.com/r/XMG_gg/comments/ld9yyf/battery_limit_hidden_function_discovered_on/

Documentation/admin-guide/pm/amd-pstate.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ Dynamic energy performance profile
358358
The amd-pstate driver supports dynamically selecting the energy performance
359359
profile based on whether the machine is running on AC or DC power.
360360

361-
Whether this behavior is enabled by default depends on the kernel
362-
config option `CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`. This behavior can also be overridden
363-
at runtime by the sysfs file ``/sys/devices/system/cpu/cpufreq/policyX/dynamic_epp``.
361+
Whether this behavior is enabled by default depends on the kernel command line option
362+
``amd_dynamic_epp`` is set. This behavior can also be overridden
363+
at runtime by the sysfs file ``/sys/devices/system/cpu/amd_pstate/dynamic_epp``.
364364

365365
When set to enabled, the driver will select a different energy performance
366366
profile when the machine is running on battery or AC power. The driver will
@@ -485,9 +485,8 @@ kernel parameter ``amd_prefcore=disable``.
485485
``amd_dynamic_epp``
486486

487487
When AMD pstate is in auto mode, dynamic EPP will control whether the kernel
488-
autonomously changes the EPP mode. The default is configured by
489-
``CONFIG_X86_AMD_PSTATE_DYNAMIC_EPP`` but can be explicitly enabled with
490-
``amd_dynamic_epp=enable`` or disabled with ``amd_dynamic_epp=disable``.
488+
autonomously changes the EPP mode. The default is disabled. It can be enabled
489+
with the kernel parameter ``amd_dynamic_epp=enable``.
491490

492491
User Space Interface in ``sysfs`` - General
493492
===========================================

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,11 +355,12 @@ HyperThreading (HT) in the context of Intel processors, is enabled on at least
355355
one core, ``intel_pstate`` assigns performance-based priorities to CPUs. Namely,
356356
the priority of a given CPU reflects its highest HWP performance level which
357357
causes the CPU scheduler to generally prefer more performant CPUs, so the less
358-
performant CPUs are used when the other ones are fully loaded. However, SMT
359-
siblings (that is, logical CPUs sharing one physical core) are treated in a
360-
special way such that if one of them is in use, the effective priority of the
361-
other ones is lowered below the priorities of the CPUs located in the other
362-
physical cores.
358+
performant CPUs are used when the other ones are fully loaded. SMT siblings
359+
(that is, logical CPUs sharing one physical core) are given the same priority.
360+
The scheduler can pull tasks from lower-priority cores and place them on any
361+
sibling. Since the scheduler spreads tasks among physical cores, tasks will be
362+
placed on the SMT siblings of physical cores only after all physical cores are
363+
busy.
363364

364365
This approach maximizes performance in the majority of cases, but unfortunately
365366
it also leads to excessive energy usage in some important scenarios, like video

Documentation/arch/riscv/cmodx.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ call at each patchable function entry, and patches it dynamically at runtime to
2121
enable or disable the redirection. In the case of RISC-V, 2 instructions,
2222
AUIPC + JALR, are required to compose a function call. However, it is impossible
2323
to patch 2 instructions and expect that a concurrent read-side executes them
24-
without a race condition. This series makes atmoic code patching possible in
24+
without a race condition. This series makes atomic code patching possible in
2525
RISC-V ftrace. Kernel preemption makes things even worse as it allows the old
2626
state to persist across the patching process with stop_machine().
2727

2828
In order to get rid of stop_machine() and run dynamic ftrace with full kernel
2929
preemption, we partially initialize each patchable function entry at boot-time,
30-
setting the first instruction to AUIPC, and the second to NOP. Now, atmoic
30+
setting the first instruction to AUIPC, and the second to NOP. Now, atomic
3131
patching is possible because the kernel only has to update one instruction.
3232
According to Ziccif, as long as an instruction is naturally aligned, the ISA
3333
guarantee an atomic update.
@@ -36,8 +36,8 @@ By fixing down the first instruction, AUIPC, the range of the ftrace trampoline
3636
is limited to +-2K from the predetermined target, ftrace_caller, due to the lack
3737
of immediate encoding space in RISC-V. To address the issue, we introduce
3838
CALL_OPS, where an 8B naturally align metadata is added in front of each
39-
pacthable function. The metadata is resolved at the first trampoline, then the
40-
execution can be derect to another custom trampoline.
39+
patchable function. The metadata is resolved at the first trampoline, then the
40+
execution can be directed to another custom trampoline.
4141

4242
CMODX in the User Space
4343
-----------------------

Documentation/arch/riscv/zicfilp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ the program.
7878

7979
Per-task indirect branch tracking state can be monitored and
8080
controlled via the :c:macro:`PR_GET_CFI` and :c:macro:`PR_SET_CFI`
81-
``prctl()` arguments (respectively), by supplying
81+
``prctl()`` arguments (respectively), by supplying
8282
:c:macro:`PR_CFI_BRANCH_LANDING_PADS` as the second argument. These
8383
are architecture-agnostic, and will return -EINVAL if the underlying
8484
functionality is not supported.

0 commit comments

Comments
 (0)