Commit 82b6c2e7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'pm-cpuidle' 

Merge processor power management changes for v5.20-rc1:

 - Make cpufreq_show_cpus() more straightforward (Viresh Kumar).

 - Drop unnecessary CPU hotplug locking from store() used by cpufreq
   sysfs attributes (Viresh Kumar).

 - Make the ACPI cpufreq driver support the boost control interface on
   Zhaoxin/Centaur processors (Tony W Wang-oc).

 - Print a warning message on attempts to free an active cpufreq policy
   which should never happen (Viresh Kumar).

 - Fix grammar in the Kconfig help text for the loongson2 cpufreq
   driver (Randy Dunlap).

 - Use cpumask_var_t for an on-stack CPU mask in the ondemand cpufreq
   governor (Zhao Liu).

 - Add trace points for guest_halt_poll_ns grow/shrink to the haltpoll
   cpuidle driver (Eiichi Tsukata).

 - Modify intel_idle to treat C1 and C1E as independent idle states on
   Sapphire Rapids (Artem Bityutskiy).

* pm-cpufreq:
  cpufreq: ondemand: Use cpumask_var_t for on-stack cpu mask
  cpufreq: loongson2: fix Kconfig "its" grammar
  cpufreq: Warn users while freeing active policy
  cpufreq: ACPI: Add Zhaoxin/Centaur turbo boost control interface support
  cpufreq: Drop unnecessary cpus locking from store()
  cpufreq: Optimize cpufreq_show_cpus()

* pm-cpuidle:
  intel_idle: make SPR C1 and C1E be independent
  cpuidle: haltpoll: Add trace points for guest_halt_poll_ns grow/shrink
parents 3e5c04f9 f611b33a

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ S: 48287 Sawleaf 
S: Fremont, California 94539

S: USA



N: Tomas Cech

E: sleep_walker@suse.com

D: arm/palm treo support



N: Florent Chabaud

E: florent.chabaud@polytechnique.org

D: software suspend

Documentation/admin-guide/kernel-parameters.txt

+43 −0
Original line number Diff line number Diff line
@@ -5197,6 +5197,30 @@ 


	retain_initrd	[RAM] Keep initrd memory after extraction



	retbleed=	[X86] Control mitigation of RETBleed (Arbitrary

			Speculative Code Execution with Return Instructions)

			vulnerability.



			off          - no mitigation

			auto         - automatically select a migitation

			auto,nosmt   - automatically select a mitigation,

				       disabling SMT if necessary for

				       the full mitigation (only on Zen1

				       and older without STIBP).

			ibpb	     - mitigate short speculation windows on

				       basic block boundaries too. Safe, highest

				       perf impact.

			unret        - force enable untrained return thunks,

				       only effective on AMD f15h-f17h

				       based systems.

			unret,nosmt  - like unret, will disable SMT when STIBP

			               is not available.



			Selecting 'auto' will choose a mitigation method at run

			time according to the CPU.



			Not specifying this option is equivalent to retbleed=auto.



	rfkill.default_state=

		0	"airplane mode".  All wifi, bluetooth, wimax, gps, fm,

			etc. communication is blocked by default.
@@ -5568,6 +5592,7 @@ 
			eibrs		  - enhanced IBRS

			eibrs,retpoline   - enhanced IBRS + Retpolines

			eibrs,lfence      - enhanced IBRS + LFENCE

			ibrs		  - use IBRS to protect kernel



			Not specifying this option is equivalent to

			spectre_v2=auto.
@@ -5771,6 +5796,24 @@ 
			expediting.  Set to zero to disable automatic

			expediting.



	srcutree.srcu_max_nodelay [KNL]

			Specifies the number of no-delay instances

			per jiffy for which the SRCU grace period

			worker thread will be rescheduled with zero

			delay. Beyond this limit, worker thread will

			be rescheduled with a sleep delay of one jiffy.



	srcutree.srcu_max_nodelay_phase [KNL]

			Specifies the per-grace-period phase, number of

			non-sleeping polls of readers. Beyond this limit,

			grace period worker thread will be rescheduled

			with a sleep delay of one jiffy, between each

			rescan of the readers, for a grace period phase.



	srcutree.srcu_retry_check_delay [KNL]

			Specifies number of microseconds of non-sleeping

			delay between each non-sleeping poll of readers.



	srcutree.small_contention_lim [KNL]

			Specifies the number of update-side contention

			events per jiffy will be tolerated before

Documentation/core-api/kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ Module Loading 
Inter Module support

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



Refer to the file kernel/module.c for more information.

Refer to the files in kernel/module/ for more information.



Hardware Interfaces

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

Documentation/core-api/symbol-namespaces.rst

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ namespace ``USB_STORAGE``, use:: 
The corresponding ksymtab entry struct ``kernel_symbol`` will have the member

``namespace`` set accordingly. A symbol that is exported without a namespace will

refer to ``NULL``. There is no default namespace if none is defined. ``modpost``

and kernel/module.c make use the namespace at build time or module load time,

respectively.

and kernel/module/main.c make use the namespace at build time or module load

time, respectively.



2.2 Using the DEFAULT_SYMBOL_NAMESPACE define

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

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ if: 
          - allwinner,sun8i-a83t-display-engine

          - allwinner,sun8i-r40-display-engine

          - allwinner,sun9i-a80-display-engine

          - allwinner,sun20i-d1-display-engine

          - allwinner,sun50i-a64-display-engine



then: