Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 29fb41e801ce0c50fa292091442fd6a18d4927ed..5e4ee29cf393035f78bd87f12dcf5e6105fd5c0d 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5114,6 +5114,17 @@
                        rcupdate.rcu_cpu_stall_timeout to be used (after
                        conversion from seconds to milliseconds).
 
+       rcupdate.rcu_cpu_stall_cputime= [KNL]
+                       Provide statistics on the cputime and count of
+                       interrupts and tasks during the sampling period. For
+                       multiple continuous RCU stalls, all sampling periods
+                       begin at half of the first RCU stall timeout.
+
+       rcupdate.rcu_exp_stall_task_details= [KNL]
+                       Print stack dumps of any tasks blocking the
+                       current expedited RCU grace period during an
+                       expedited RCU CPU stall warning.
+
        rcupdate.rcu_expedited= [KNL]
                        Use expedited grace-period primitives, for
                        example, synchronize_rcu_expedited() instead
@@ -5222,7 +5233,7 @@
        rdt=            [HW,X86,RDT]
                        Turn on/off individual RDT features. List is:
                        cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,
-                       mba.
+                       mba, smba, bmec.
                        E.g. to turn on cmt and turn off mba use:
                                rdt=cmt,!mba
 
@@ -5730,9 +5741,9 @@
                        retpoline,generic - Retpolines
                        retpoline,lfence  - LFENCE; indirect branch
                        retpoline,amd     - alias for retpoline,lfence
-                       eibrs             - enhanced IBRS
-                       eibrs,retpoline   - enhanced IBRS + Retpolines
-                       eibrs,lfence      - enhanced IBRS + LFENCE
+                       eibrs             - Enhanced/Auto IBRS
+                       eibrs,retpoline   - Enhanced/Auto IBRS + Retpolines
+                       eibrs,lfence      - Enhanced/Auto IBRS + LFENCE
                        ibrs              - use IBRS to protect kernel
 
                        Not specifying this option is equivalent to
@@ -6370,6 +6381,16 @@
                        in situations with strict latency requirements (where
                        interruptions from clocksource watchdog are not
                        acceptable).
+                       [x86] recalibrate: force recalibration against a HW timer
+                       (HPET or PM timer) on systems whose TSC frequency was
+                       obtained from HW or FW using either an MSR or CPUID(0x15).
+                       Warn if the difference is more than 500 ppm.
+                       [x86] watchdog: Use TSC as the watchdog clocksource with
+                       which to check other HW timers (HPET or PM timer), but
+                       only on systems where TSC has been deemed trustworthy.
+                       This will be suppressed by an earlier tsc=nowatchdog and
+                       can be overridden by a later tsc=nowatchdog.  A console
+                       message will flag any such suppression or overriding.
 
        tsc_early_khz=  [X86] Skip early TSC calibration and use the given
                        value instead. Useful when the early TSC frequency discovery
@@ -7021,3 +7042,10 @@
                          management firmware translates the requests into actual
                          hardware states (core frequency, data fabric and memory
                          clocks etc.)
+                       active
+                         Use amd_pstate_epp driver instance as the scaling driver,
+                         driver provides a hint to the hardware if software wants
+                         to bias toward performance (0x0) or energy efficiency (0xff)
+                         to the CPPC firmware. then CPPC power algorithm will
+                         calculate the runtime workload and adjust the realtime cores
+                         frequency.