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

Merge branches 'pm-tools' and 'pm-docs' 

Merge power management utilities and documentation updates for 6.3-rc1:

 - Modify some power management utilities to use the canonical ftrace
   path (Ross Zwisler).

 - Correct spelling problems for Documentation/power/ as reported by
   codespell (Randy Dunlap).

* pm-tools:
  PM: tools: use canonical ftrace path

* pm-docs:
  Documentation: power: correct spelling
parents ace50298 cf3e0251 71bc571c

Documentation/power/suspend-and-interrupts.rst

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ That may involve turning on a special signal handling logic within the platform 
during system sleep so as to trigger a system wakeup when needed.  For example,

the platform may include a dedicated interrupt controller used specifically for

handling system wakeup events.  Then, if a given interrupt line is supposed to

wake up the system from sleep sates, the corresponding input of that interrupt

wake up the system from sleep states, the corresponding input of that interrupt

controller needs to be enabled to receive signals from the line in question.

After wakeup, it generally is better to disable that input to prevent the

dedicated controller from triggering interrupts unnecessarily.

tools/power/pm-graph/sleepgraph.py

+2 −2
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ class SystemValues: 
	cgexp = False

	testdir = ''

	outdir = ''

	tpath = '/sys/kernel/debug/tracing/'

	tpath = '/sys/kernel/tracing/'

	fpdtpath = '/sys/firmware/acpi/tables/FPDT'

	epath = '/sys/kernel/debug/tracing/events/power/'

	epath = '/sys/kernel/tracing/events/power/'

	pmdpath = '/sys/power/pm_debug_messages'

	s0ixpath = '/sys/module/intel_pmc_core/parameters/warn_on_s0ix_failures'

	s0ixres = '/sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us'

tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ def signal_handler(signal, frame): 
        ipt.free_trace_buffer()

        sys.exit(0)



trace_file = "/sys/kernel/debug/tracing/events/amd_cpu/enable"

trace_file = "/sys/kernel/tracing/events/amd_cpu/enable"

signal.signal(signal.SIGINT, signal_handler)



interval = ""
@@ -319,7 +319,7 @@ print(cur_version) 
cleanup_data_files()



if interval:

    file_name = "/sys/kernel/debug/tracing/trace"

    file_name = "/sys/kernel/tracing/trace"

    ipt.clear_trace_file()

    ipt.set_trace_buffer_size(memory)

    ipt.enable_trace(trace_file)

tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py

+5 −5
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ def clear_trace_file(): 
    """ Clear trace file """



    try:

        f_handle = open('/sys/kernel/debug/tracing/trace', 'w')

        f_handle = open('/sys/kernel/tracing/trace', 'w')

        f_handle.close()

    except:

        print('IO error clearing trace file ')
@@ -401,7 +401,7 @@ def set_trace_buffer_size(memory): 
    """ Set trace buffer size """



    try:

       with open('/sys/kernel/debug/tracing/buffer_size_kb', 'w') as fp:

       with open('/sys/kernel/tracing/buffer_size_kb', 'w') as fp:

          fp.write(memory)

    except:

       print('IO error setting trace buffer size ')
@@ -411,7 +411,7 @@ def free_trace_buffer(): 
    """ Free the trace buffer memory """



    try:

       open('/sys/kernel/debug/tracing/buffer_size_kb'

       open('/sys/kernel/tracing/buffer_size_kb'

                 , 'w').write("1")

    except:

        print('IO error freeing trace buffer ')
@@ -495,7 +495,7 @@ def signal_handler(signal, frame): 
        sys.exit(0)



if __name__ == "__main__":

    trace_file = "/sys/kernel/debug/tracing/events/power/pstate_sample/enable"

    trace_file = "/sys/kernel/tracing/events/power/pstate_sample/enable"

    signal.signal(signal.SIGINT, signal_handler)



    interval = ""
@@ -569,7 +569,7 @@ if __name__ == "__main__": 
    cleanup_data_files()



    if interval:

        filename = "/sys/kernel/debug/tracing/trace"

        filename = "/sys/kernel/tracing/trace"

        clear_trace_file()

        set_trace_buffer_size(memory)

        enable_trace(trace_file)