Merge branches 'acpi-tools' and 'pm-tools' (df34ca72) · Commits · 戴 / test

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,7 @@ F: Documentation/ABI/testing/sysfs-bus-acpi
		F: drivers/pci/acpi
		F: drivers/pci//acpi*
		F: drivers/pci///acpi
		F: tools/power/acpi

		ACPI COMPONENT ARCHITECTURE (ACPICA)
		M: Robert Moore <robert.moore@intel.com>
		@@ -266,6 +267,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
		S: Supported
		F: drivers/acpi/acpica/
		F: include/acpi/
		F: tools/power/acpi/

		ACPI FAN DRIVER
		M: Zhang Rui <rui.zhang@intel.com>

scripts/analyze_suspend.py

0 → 100755

+1446 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/Makefile

+13 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ include scripts/Makefile.include
		help:
		@echo 'Possible targets:'
		@echo ''
		@echo ' acpi - ACPI tools'
		@echo ' cgroup - cgroup tools'
		@echo ' cpupower - a tool for all things x86 CPU power'
		@echo ' firewire - the userspace part of nosy, an IEEE-1394 traffic sniffer'
		@@ -33,6 +34,9 @@ help:
		@echo ' the respective build directory.'
		@echo ' clean: a summary clean target to clean _all_ folders'

		acpi: FORCE
		$(call descend,power/$@)

		cpupower: FORCE
		$(call descend,power/$@)

		@@ -54,6 +58,9 @@ turbostat x86_energy_perf_policy: FORCE
		tmon: FORCE
		$(call descend,thermal/$@)

		acpi_install:
		$(call descend,power/$(@:_install=),install)

		cpupower_install:
		$(call descend,power/$(@:_install=),install)

		@@ -69,11 +76,14 @@ turbostat_install x86_energy_perf_policy_install:
		tmon_install:
		$(call descend,thermal/$(@:_install=),install)

		install: cgroup_install cpupower_install firewire_install lguest_install \
		install: acpi_install cgroup_install cpupower_install firewire_install lguest_install \
		perf_install selftests_install turbostat_install usb_install \
		virtio_install vm_install net_install x86_energy_perf_policy_install \
		tmon

		acpi_clean:
		$(call descend,power/acpi,clean)

		cpupower_clean:
		$(call descend,power/cpupower,clean)

		@@ -95,8 +105,8 @@ turbostat_clean x86_energy_perf_policy_clean:
		tmon_clean:
		$(call descend,thermal/tmon,clean)

		clean: cgroup_clean cpupower_clean firewire_clean lguest_clean perf_clean \
		selftests_clean turbostat_clean usb_clean virtio_clean \
		clean: acpi_clean cgroup_clean cpupower_clean firewire_clean lguest_clean \
		perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
		vm_clean net_clean x86_energy_perf_policy_clean tmon_clean

		.PHONY: FORCE

tools/power/acpi/Makefile

+137 −12

Original line number	Diff line number	Diff line
		PROG= acpidump
		SRCS= acpidump.c
		# tools/power/acpi/Makefile - ACPI tool Makefile
		#
		# Copyright (c) 2013, Intel Corporation
		# Author: Lv Zheng <lv.zheng@intel.com>
		#
		# This program is free software; you can redistribute it and/or
		# modify it under the terms of the GNU General Public License
		# as published by the Free Software Foundation; version 2
		# of the License.

		OUTPUT=./
		ifeq ("$(origin O)", "command line")
		OUTPUT := $(O)/
		endif

		ifneq ($(OUTPUT),)
		# check that the output directory actually exists
		OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
		$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
		endif

		# --- CONFIGURATION BEGIN ---

		# Set the following to `true' to make a unstripped, unoptimized
		# binary. Leave this set to `false' for production use.
		DEBUG ?= true

		# make the build silent. Set this to something else to make it noisy again.
		V ?= false

		# Prefix to the directories we're installing to
		DESTDIR ?=

		# --- CONFIGURATION END ---

		# Directory definitions. These are default and most probably
		# do not need to be changed. Please note that DESTDIR is
		# added in front of any of them

		bindir ?= /usr/bin
		sbindir ?= /usr/sbin
		mandir ?= /usr/man

		# Toolchain: what tools do we use, and what options do they need:

		INSTALL = /usr/bin/install -c
		INSTALL_PROGRAM = ${INSTALL}
		INSTALL_DATA = ${INSTALL} -m 644
		INSTALL_SCRIPT = ${INSTALL_PROGRAM}

		# If you are running a cross compiler, you may want to set this
		# to something more interesting, like "arm-linux-". If you want
		# to compile vs uClibc, that can be done here as well.
		CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
		CC = $(CROSS)gcc
		LD = $(CROSS)gcc
		STRIP = $(CROSS)strip
		HOSTCC = gcc

		# check if compiler option is supported
		cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}

		# use '-Os' optimization if available, else use -O2
		OPTIMIZATION := $(call cc-supports,-Os,-O2)

		WARNINGS := -Wall
		WARNINGS += $(call cc-supports,-Wstrict-prototypes)
		WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)

		KERNEL_INCLUDE := ../../../include
		CFLAGS += -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Os -s -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
		CFLAGS += -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
		CFLAGS += $(WARNINGS)

		ifeq ($(strip $(V)),false)
		QUIET=@
		ECHO=@echo
		else
		QUIET=
		ECHO=@\#
		endif
		export QUIET ECHO

		# if DEBUG is enabled, then we do not strip or optimize
		ifeq ($(strip $(DEBUG)),true)
		CFLAGS += -O1 -g -DDEBUG
		STRIPCMD = /bin/true -Since_we_are_debugging
		else
		CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
		STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
		endif

		# if DEBUG is enabled, then we do not strip or optimize
		ifeq ($(strip $(DEBUG)),true)
		CFLAGS += -O1 -g -DDEBUG
		STRIPCMD = /bin/true -Since_we_are_debugging
		else
		CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
		STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
		endif

		# --- ACPIDUMP BEGIN ---

		vpath %.c \
		tools/acpidump

		all: acpidump
		$(PROG) : $(SRCS)
		$(CC) $(CFLAGS) $(SRCS) -o $(PROG)
		DUMP_OBJS = \
		acpidump.o

		CLEANFILES= $(PROG)
		DUMP_OBJS := $(addprefix $(OUTPUT)tools/acpidump/,$(DUMP_OBJS))

		$(OUTPUT)acpidump: $(DUMP_OBJS)
		$(ECHO) " LD " $@
		$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(DUMP_OBJS) -L$(OUTPUT) -o $@
		$(QUIET) $(STRIPCMD) $@

		$(OUTPUT)tools/acpidump/%.o: %.c
		$(ECHO) " CC " $@
		$(QUIET) $(CC) -c $(CFLAGS) -o $@ $<

		# --- ACPIDUMP END ---

		all: $(OUTPUT)acpidump
		echo $(OUTPUT)

		clean:
		rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS)) *~
		-find $(OUTPUT) $ -not -type d $ -and $ -name '~' -o -name '.[oas]' $ -type f -print \
		\| xargs rm -f
		-rm -f $(OUTPUT)acpidump

		install-tools:
		$(INSTALL) -d $(DESTDIR)${bindir}
		$(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}

		install-man:
		$(INSTALL_DATA) -D man/acpidump.8 $(DESTDIR)${mandir}/man8/acpidump.8

		install: all install-tools install-man

		install :
		install acpidump /usr/sbin/acpidump
		install acpidump.8 /usr/share/man/man8
		uninstall:
		- rm -f $(DESTDIR)${sbindir}/acpidump
		- rm -f $(DESTDIR)${mandir}/man8/acpidump.8

		.PHONY: all utils install-tools install-man install uninstall clean

tools/power/acpi/acpidump.8→tools/power/acpi/man/acpidump.8

+0 −0

File moved.

View file

Admin message