Commit 2519003d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v7.1-rc4' of... 

Merge tag 'asoc-fix-v7.1-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v7.1

A bigger batch of fixes than usual due to -next not happeing last week,
this is mostly stuff for laptops - a lot of quirks and small fixes,
mainly for x86 and SoundWire.  Nothing too big or exciting individually,
just two week's worth.
parents 60a1969f 09e8f9a9

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ Peter A Jonsson <pj@ludd.ltu.se> 
Peter Hilber <peter.hilber@oss.qualcomm.com> <quic_philber@quicinc.com>

Peter Oruba <peter.oruba@amd.com>

Peter Oruba <peter@oruba.de>

Peter Rosin <peda@lysator.liu.se> <peda@axentia.se>

Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Pratyush Yadav <pratyush@kernel.org> <ptyadav@amazon.de>
@@ -856,6 +857,7 @@ Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch> 
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>

Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Tomasz Jeznach <tomasz.jeznach@linux.dev> <tjeznach@rivosinc.com>

Tony Luck <tony.luck@intel.com>

Trilok Soni <quic_tsoni@quicinc.com> <tsoni@codeaurora.org>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

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

+2 −4
Original line number Diff line number Diff line
@@ -47,21 +47,19 @@ Please note that implementation details can be changed. 
	  Called when swp_entry's refcnt goes down to 0. A charge against swap

	  disappears.



3. charge-commit-cancel

3. charge-commit

=======================



	Memcg pages are charged in two steps:



		- mem_cgroup_try_charge()

		- mem_cgroup_commit_charge() or mem_cgroup_cancel_charge()

		- commit_charge()



	At try_charge(), there are no flags to say "this page is charged".

	at this point, usage += PAGE_SIZE.



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



	At cancel(), simply usage -= PAGE_SIZE.



Under below explanation, we assume CONFIG_SWAP=y.



4. Anonymous

Documentation/arch/riscv/cmodx.rst

+4 −4
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ call at each patchable function entry, and patches it dynamically at runtime to 
enable or disable the redirection. In the case of RISC-V, 2 instructions,

AUIPC + JALR, are required to compose a function call. However, it is impossible

to patch 2 instructions and expect that a concurrent read-side executes them

without a race condition. This series makes atmoic code patching possible in

without a race condition. This series makes atomic code patching possible in

RISC-V ftrace. Kernel preemption makes things even worse as it allows the old

state to persist across the patching process with stop_machine().



In order to get rid of stop_machine() and run dynamic ftrace with full kernel

preemption, we partially initialize each patchable function entry at boot-time,

setting the first instruction to AUIPC, and the second to NOP. Now, atmoic

setting the first instruction to AUIPC, and the second to NOP. Now, atomic

patching is possible because the kernel only has to update one instruction.

According to Ziccif, as long as an instruction is naturally aligned, the ISA

guarantee an  atomic update.
@@ -36,8 +36,8 @@ By fixing down the first instruction, AUIPC, the range of the ftrace trampoline 
is limited to +-2K from the predetermined target, ftrace_caller, due to the lack

of immediate encoding space in RISC-V. To address the issue, we introduce

CALL_OPS, where an 8B naturally align metadata is added in front of each

pacthable function. The metadata is resolved at the first trampoline, then the

execution can be derect to another custom trampoline.

patchable function. The metadata is resolved at the first trampoline, then the

execution can be directed to another custom trampoline.



CMODX in the User Space

-----------------------

Documentation/arch/riscv/zicfilp.rst

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ the program. 


Per-task indirect branch tracking state can be monitored and

controlled via the :c:macro:`PR_GET_CFI` and :c:macro:`PR_SET_CFI`

``prctl()` arguments (respectively), by supplying

``prctl()`` arguments (respectively), by supplying

:c:macro:`PR_CFI_BRANCH_LANDING_PADS` as the second argument.  These

are architecture-agnostic, and will return -EINVAL if the underlying

functionality is not supported.