License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifndef __ACPI_PROCESSOR_H
|
|
|
|
#define __ACPI_PROCESSOR_H
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
2005-12-15 04:05:00 +08:00
|
|
|
#include <linux/cpu.h>
|
2008-01-17 15:51:23 +08:00
|
|
|
#include <linux/thermal.h>
|
2005-04-16 03:07:10 +08:00
|
|
|
#include <asm/acpi.h>
|
|
|
|
|
ACPI / processor: Use common hotplug infrastructure
Split the ACPI processor driver into two parts, one that is
non-modular, resides in the ACPI core and handles the enumeration
and hotplug of processors and one that implements the rest of the
existing processor driver functionality.
The non-modular part uses an ACPI scan handler object to enumerate
processors on the basis of information provided by the ACPI namespace
and to hook up with the common ACPI hotplug infrastructure. It also
populates the ACPI handle of each processor device having a
corresponding object in the ACPI namespace, which allows the driver
proper to bind to those devices, and makes the driver bind to them
if it is readily available (i.e. loaded) when the scan handler's
.attach() routine is running.
There are a few reasons to make this change.
First, switching the ACPI processor driver to using the common ACPI
hotplug infrastructure reduces code duplication and size considerably,
even though a new file is created along with a header comment etc.
Second, since the common hotplug code attempts to offline devices
before starting the (non-reversible) removal procedure, it will abort
(and possibly roll back) hot-remove operations involving processors
if cpu_down() returns an error code for one of them instead of
continuing them blindly (if /sys/firmware/acpi/hotplug/force_remove
is unset). That is a more desirable behavior than what the current
code does.
Finally, the separation of the scan/hotplug part from the driver
proper makes it possible to simplify the driver's .remove() routine,
because it doesn't need to worry about the possible cleanup related
to processor removal any more (the scan/hotplug part is responsible
for that now) and can handle device removal and driver removal
symmetricaly (i.e. as appropriate).
Some user-visible changes in sysfs are made (for example, the
'sysdev' link from the ACPI device node to the processor device's
directory is gone and a 'physical_node' link is present instead
and a corresponding 'firmware_node' is present in the processor
device's directory, the processor driver is now visible under
/sys/bus/cpu/drivers/ and bound to the processor device), but
that shouldn't affect the functionality that users care about
(frequency scaling, C-states and thermal management).
Tested on my venerable Toshiba Portege R500.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
2013-05-03 06:26:22 +08:00
|
|
|
#define ACPI_PROCESSOR_CLASS "processor"
|
|
|
|
#define ACPI_PROCESSOR_DEVICE_NAME "Processor"
|
|
|
|
#define ACPI_PROCESSOR_DEVICE_HID "ACPI0007"
|
2016-02-17 19:54:19 +08:00
|
|
|
#define ACPI_PROCESSOR_CONTAINER_HID "ACPI0010"
|
ACPI / processor: Use common hotplug infrastructure
Split the ACPI processor driver into two parts, one that is
non-modular, resides in the ACPI core and handles the enumeration
and hotplug of processors and one that implements the rest of the
existing processor driver functionality.
The non-modular part uses an ACPI scan handler object to enumerate
processors on the basis of information provided by the ACPI namespace
and to hook up with the common ACPI hotplug infrastructure. It also
populates the ACPI handle of each processor device having a
corresponding object in the ACPI namespace, which allows the driver
proper to bind to those devices, and makes the driver bind to them
if it is readily available (i.e. loaded) when the scan handler's
.attach() routine is running.
There are a few reasons to make this change.
First, switching the ACPI processor driver to using the common ACPI
hotplug infrastructure reduces code duplication and size considerably,
even though a new file is created along with a header comment etc.
Second, since the common hotplug code attempts to offline devices
before starting the (non-reversible) removal procedure, it will abort
(and possibly roll back) hot-remove operations involving processors
if cpu_down() returns an error code for one of them instead of
continuing them blindly (if /sys/firmware/acpi/hotplug/force_remove
is unset). That is a more desirable behavior than what the current
code does.
Finally, the separation of the scan/hotplug part from the driver
proper makes it possible to simplify the driver's .remove() routine,
because it doesn't need to worry about the possible cleanup related
to processor removal any more (the scan/hotplug part is responsible
for that now) and can handle device removal and driver removal
symmetricaly (i.e. as appropriate).
Some user-visible changes in sysfs are made (for example, the
'sysdev' link from the ACPI device node to the processor device's
directory is gone and a 'physical_node' link is present instead
and a corresponding 'firmware_node' is present in the processor
device's directory, the processor driver is now visible under
/sys/bus/cpu/drivers/ and bound to the processor device), but
that shouldn't affect the functionality that users care about
(frequency scaling, C-states and thermal management).
Tested on my venerable Toshiba Portege R500.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
2013-05-03 06:26:22 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#define ACPI_PROCESSOR_BUSY_METRIC 10
|
|
|
|
|
|
|
|
#define ACPI_PROCESSOR_MAX_POWER 8
|
|
|
|
#define ACPI_PROCESSOR_MAX_C2_LATENCY 100
|
|
|
|
#define ACPI_PROCESSOR_MAX_C3_LATENCY 1000
|
|
|
|
|
|
|
|
#define ACPI_PROCESSOR_MAX_THROTTLING 16
|
|
|
|
#define ACPI_PROCESSOR_MAX_THROTTLE 250 /* 25% */
|
|
|
|
#define ACPI_PROCESSOR_MAX_DUTY_WIDTH 4
|
|
|
|
|
2005-04-16 03:07:10 +08:00
|
|
|
#define ACPI_PDC_REVISION_ID 0x1
|
|
|
|
|
2007-05-10 11:34:35 +08:00
|
|
|
#define ACPI_PSD_REV0_REVISION 0 /* Support for _PSD as in ACPI 3.0 */
|
2005-12-15 04:05:00 +08:00
|
|
|
#define ACPI_PSD_REV0_ENTRIES 5
|
|
|
|
|
2007-05-26 22:49:58 +08:00
|
|
|
#define ACPI_TSD_REV0_REVISION 0 /* Support for _PSD as in ACPI 3.0 */
|
|
|
|
#define ACPI_TSD_REV0_ENTRIES 5
|
2005-12-15 04:05:00 +08:00
|
|
|
/*
|
|
|
|
* Types of coordination defined in ACPI 3.0. Same macros can be used across
|
|
|
|
* P, C and T states
|
|
|
|
*/
|
|
|
|
#define DOMAIN_COORD_TYPE_SW_ALL 0xfc
|
|
|
|
#define DOMAIN_COORD_TYPE_SW_ANY 0xfd
|
|
|
|
#define DOMAIN_COORD_TYPE_HW_ALL 0xfe
|
|
|
|
|
2008-02-12 09:46:31 +08:00
|
|
|
#define ACPI_CSTATE_SYSTEMIO 0
|
|
|
|
#define ACPI_CSTATE_FFH 1
|
|
|
|
#define ACPI_CSTATE_HALT 2
|
2016-07-22 00:18:07 +08:00
|
|
|
#define ACPI_CSTATE_INTEGER 3
|
2008-02-12 09:46:31 +08:00
|
|
|
|
|
|
|
#define ACPI_CX_DESC_LEN 32
|
2006-09-26 07:28:13 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Power Management */
|
|
|
|
|
|
|
|
struct acpi_processor_cx;
|
|
|
|
|
|
|
|
struct acpi_power_register {
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 descriptor;
|
|
|
|
u16 length;
|
|
|
|
u8 space_id;
|
|
|
|
u8 bit_width;
|
|
|
|
u8 bit_offset;
|
2010-07-23 04:54:27 +08:00
|
|
|
u8 access_size;
|
2005-08-05 12:44:28 +08:00
|
|
|
u64 address;
|
2014-06-02 01:16:17 +08:00
|
|
|
} __packed;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
struct acpi_processor_cx {
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 valid;
|
|
|
|
u8 type;
|
|
|
|
u32 address;
|
2008-02-01 09:35:04 +08:00
|
|
|
u8 entry_method;
|
2006-09-26 07:28:13 +08:00
|
|
|
u8 index;
|
2005-08-05 12:44:28 +08:00
|
|
|
u32 latency;
|
2010-07-23 04:54:27 +08:00
|
|
|
u8 bm_sts_skip;
|
2008-02-12 09:46:31 +08:00
|
|
|
char desc[ACPI_CX_DESC_LEN];
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2016-07-22 00:18:07 +08:00
|
|
|
struct acpi_lpi_state {
|
|
|
|
u32 min_residency;
|
|
|
|
u32 wake_latency; /* worst case */
|
|
|
|
u32 flags;
|
|
|
|
u32 arch_flags;
|
|
|
|
u32 res_cnt_freq;
|
|
|
|
u32 enable_parent_state;
|
|
|
|
u64 address;
|
|
|
|
u8 index;
|
|
|
|
u8 entry_method;
|
|
|
|
char desc[ACPI_CX_DESC_LEN];
|
|
|
|
};
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_power {
|
2005-08-05 12:44:28 +08:00
|
|
|
int count;
|
2016-07-22 00:18:07 +08:00
|
|
|
union {
|
|
|
|
struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER];
|
|
|
|
struct acpi_lpi_state lpi_states[ACPI_PROCESSOR_MAX_POWER];
|
|
|
|
};
|
2007-02-16 17:27:55 +08:00
|
|
|
int timer_broadcast_on_state;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Performance Management */
|
|
|
|
|
2005-12-15 04:05:00 +08:00
|
|
|
struct acpi_psd_package {
|
2010-01-28 10:53:19 +08:00
|
|
|
u64 num_entries;
|
|
|
|
u64 revision;
|
|
|
|
u64 domain;
|
|
|
|
u64 coord_type;
|
|
|
|
u64 num_processors;
|
2014-06-02 01:16:17 +08:00
|
|
|
} __packed;
|
2005-12-15 04:05:00 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_pct_register {
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 descriptor;
|
|
|
|
u16 length;
|
|
|
|
u8 space_id;
|
|
|
|
u8 bit_width;
|
|
|
|
u8 bit_offset;
|
|
|
|
u8 reserved;
|
|
|
|
u64 address;
|
2014-06-02 01:16:17 +08:00
|
|
|
} __packed;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
struct acpi_processor_px {
|
2010-01-28 10:53:19 +08:00
|
|
|
u64 core_frequency; /* megahertz */
|
|
|
|
u64 power; /* milliWatts */
|
|
|
|
u64 transition_latency; /* microseconds */
|
|
|
|
u64 bus_master_latency; /* microseconds */
|
|
|
|
u64 control; /* control value */
|
|
|
|
u64 status; /* success indicator */
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct acpi_processor_performance {
|
2005-08-05 12:44:28 +08:00
|
|
|
unsigned int state;
|
|
|
|
unsigned int platform_limit;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_pct_register control_register;
|
|
|
|
struct acpi_pct_register status_register;
|
2005-08-05 12:44:28 +08:00
|
|
|
unsigned int state_count;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_px *states;
|
2005-12-15 04:05:00 +08:00
|
|
|
struct acpi_psd_package domain_info;
|
2009-01-01 10:08:47 +08:00
|
|
|
cpumask_var_t shared_cpu_map;
|
2005-12-15 04:05:00 +08:00
|
|
|
unsigned int shared_type;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Throttling Control */
|
|
|
|
|
2007-05-26 22:49:58 +08:00
|
|
|
struct acpi_tsd_package {
|
2010-01-28 10:53:19 +08:00
|
|
|
u64 num_entries;
|
|
|
|
u64 revision;
|
|
|
|
u64 domain;
|
|
|
|
u64 coord_type;
|
|
|
|
u64 num_processors;
|
2014-06-02 01:16:17 +08:00
|
|
|
} __packed;
|
2007-05-26 22:49:58 +08:00
|
|
|
|
|
|
|
struct acpi_ptc_register {
|
|
|
|
u8 descriptor;
|
|
|
|
u16 length;
|
|
|
|
u8 space_id;
|
|
|
|
u8 bit_width;
|
|
|
|
u8 bit_offset;
|
|
|
|
u8 reserved;
|
|
|
|
u64 address;
|
2014-06-02 01:16:17 +08:00
|
|
|
} __packed;
|
2007-05-26 22:49:58 +08:00
|
|
|
|
|
|
|
struct acpi_processor_tx_tss {
|
2010-01-28 10:53:19 +08:00
|
|
|
u64 freqpercentage; /* */
|
|
|
|
u64 power; /* milliWatts */
|
|
|
|
u64 transition_latency; /* microseconds */
|
|
|
|
u64 control; /* control value */
|
|
|
|
u64 status; /* success indicator */
|
2007-05-26 22:49:58 +08:00
|
|
|
};
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_tx {
|
2005-08-05 12:44:28 +08:00
|
|
|
u16 power;
|
|
|
|
u16 performance;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2007-05-26 22:49:58 +08:00
|
|
|
struct acpi_processor;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_throttling {
|
2007-05-26 22:49:58 +08:00
|
|
|
unsigned int state;
|
|
|
|
unsigned int platform_limit;
|
|
|
|
struct acpi_pct_register control_register;
|
|
|
|
struct acpi_pct_register status_register;
|
|
|
|
unsigned int state_count;
|
|
|
|
struct acpi_processor_tx_tss *states_tss;
|
|
|
|
struct acpi_tsd_package domain_info;
|
2009-01-01 10:08:47 +08:00
|
|
|
cpumask_var_t shared_cpu_map;
|
2007-06-02 12:15:25 +08:00
|
|
|
int (*acpi_processor_get_throttling) (struct acpi_processor * pr);
|
|
|
|
int (*acpi_processor_set_throttling) (struct acpi_processor * pr,
|
2009-08-27 05:29:29 +08:00
|
|
|
int state, bool force);
|
2007-05-26 22:49:58 +08:00
|
|
|
|
2005-08-05 12:44:28 +08:00
|
|
|
u32 address;
|
|
|
|
u8 duty_offset;
|
|
|
|
u8 duty_width;
|
2008-01-28 13:53:42 +08:00
|
|
|
u8 tsd_valid_flag;
|
|
|
|
unsigned int shared_type;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_tx states[ACPI_PROCESSOR_MAX_THROTTLING];
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Limit Interface */
|
|
|
|
|
|
|
|
struct acpi_processor_lx {
|
2008-02-03 23:07:16 +08:00
|
|
|
int px; /* performance state */
|
2005-08-05 12:44:28 +08:00
|
|
|
int tx; /* throttle level */
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct acpi_processor_limit {
|
2005-08-05 12:44:28 +08:00
|
|
|
struct acpi_processor_lx state; /* current limit */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_lx thermal; /* thermal limit */
|
2005-08-05 12:44:28 +08:00
|
|
|
struct acpi_processor_lx user; /* user limit */
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct acpi_processor_flags {
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 power:1;
|
|
|
|
u8 performance:1;
|
|
|
|
u8 throttling:1;
|
|
|
|
u8 limit:1;
|
|
|
|
u8 bm_control:1;
|
|
|
|
u8 bm_check:1;
|
|
|
|
u8 has_cst:1;
|
2016-07-22 00:18:07 +08:00
|
|
|
u8 has_lpi:1;
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 power_setup_done:1;
|
cpuidle: consolidate 2.6.22 cpuidle branch into one patch
commit e5a16b1f9eec0af7cfa0830304b41c1c0833cf9f
Author: Len Brown <len.brown@intel.com>
Date: Tue Oct 2 23:44:44 2007 -0400
cpuidle: shrink diff
processor_idle.c | 440 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 429 insertions(+), 11 deletions(-)
Signed-off-by: Len Brown <len.brown@intel.com>
commit dfbb9d5aedfb18848a3e0d6f6e3e4969febb209c
Author: Len Brown <len.brown@intel.com>
Date: Wed Sep 26 02:17:55 2007 -0400
cpuidle: reduce diff size
Reduces the cpuidle processor_idle.c diff vs 2.6.22 from this
processor_idle.c | 2006 ++++++++++++++++++++++++++-----------------
1 file changed, 1219 insertions(+), 787 deletions(-)
to this:
processor_idle.c | 502 +++++++++++++++++++++++++++++++++++++++----
1 file changed, 458 insertions(+), 44 deletions(-)
...for the purpose of making the cpuilde patch less invasive
and easier to review.
no functional changes. build tested only.
Signed-off-by: Len Brown <len.brown@intel.com>
commit 889172fc915f5a7fe20f35b133cbd205ce69bf6c
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu Sep 13 13:40:05 2007 -0700
cpuidle: Retain old ACPI policy for !CONFIG_CPU_IDLE
Retain the old policy in processor_idle, so that when CPU_IDLE is not
configured, old C-state policy will still be used. This provides a
clean gradual migration path from old ACPI policy to new cpuidle
based policy.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 9544a8181edc7ecc33b3bfd69271571f98ed08bc
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu Sep 13 13:39:17 2007 -0700
cpuidle: Configure governors by default
Quoting Len "Do not give an option to users to shoot themselves in the foot".
Remove the configurability of ladder and menu governors as they are
needed for default policy of cpuidle. That way users will not be able to
have cpuidle without any policy loosing all C-state power savings.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 8975059a2c1e56cfe83d1bcf031bcf4cb39be743
Author: Adam Belay <abelay@novell.com>
Date: Tue Aug 21 18:27:07 2007 -0400
CPUIDLE: load ACPI properly when CPUIDLE is disabled
Change the registration return codes for when CPUIDLE
support is not compiled into the kernel. As a result, the ACPI
processor driver will load properly even if CPUIDLE is unavailable.
However, it may be possible to cleanup the ACPI processor driver further
and eliminate some dead code paths.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit e0322e2b58dd1b12ec669bf84693efe0dc2414a8
Author: Adam Belay <abelay@novell.com>
Date: Tue Aug 21 18:26:06 2007 -0400
CPUIDLE: remove cpuidle_get_bm_activity()
Remove cpuidle_get_bm_activity() and updates governors
accordingly.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 18a6e770d5c82ba26653e53d240caa617e09e9ab
Author: Adam Belay <abelay@novell.com>
Date: Tue Aug 21 18:25:58 2007 -0400
CPUIDLE: max_cstate fix
Currently max_cstate is limited to 0, resulting in no idle processor
power management on ACPI platforms. This patch restores the value to
the array size.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 1fdc0887286179b40ce24bcdbde663172e205ef0
Author: Adam Belay <abelay@novell.com>
Date: Tue Aug 21 18:25:40 2007 -0400
CPUIDLE: handle BM detection inside the ACPI Processor driver
Update the ACPI processor driver to detect BM activity and
limit state entry depth internally, rather than exposing such
requirements to CPUIDLE. As a result, CPUIDLE can drop this
ACPI-specific interface and become more platform independent. BM
activity is now handled much more aggressively than it was in the
original implementation, so some testing coverage may be needed to
verify that this doesn't introduce any DMA buffer under-run issues.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 0ef38840db666f48e3cdd2b769da676c57228dd9
Author: Adam Belay <abelay@novell.com>
Date: Tue Aug 21 18:25:14 2007 -0400
CPUIDLE: menu governor updates
Tweak the menu governor to more effectively handle non-timer
break events. Non-timer break events are detected by comparing the
actual sleep time to the expected sleep time. In future revisions, it
may be more reliable to use the timer data structures directly.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit bb4d74fca63fa96cf3ace644b15ae0f12b7df5a1
Author: Adam Belay <abelay@novell.com>
Date: Tue Aug 21 18:24:40 2007 -0400
CPUIDLE: fix 'current_governor' sysfs entry
Allow the "current_governor" sysfs entry to properly handle
input terminated with '\n'.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit df3c71559bb69b125f1a48971bf0d17f78bbdf47
Author: Len Brown <len.brown@intel.com>
Date: Sun Aug 12 02:00:45 2007 -0400
cpuidle: fix IA64 build (again)
Signed-off-by: Len Brown <len.brown@intel.com>
commit a02064579e3f9530fd31baae16b1fc46b5a7bca8
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Sun Aug 12 01:39:27 2007 -0400
cpuidle: Remove support for runtime changing of max_cstate
Remove support for runtime changeability of max_cstate. Drivers can use
use latency APIs.
max_cstate can still be used as a boot time option and dmi override.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 0912a44b13adf22f5e3f607d263aed23b4910d7e
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Sun Aug 12 01:39:16 2007 -0400
cpuidle: Remove ACPI cstate_limit calls from ipw2100
ipw2100 already has code to use accetable_latency interfaces to limit the
C-state. Remove the calls to acpi_set_cstate_limit and acpi_get_cstate_limit
as they are redundant.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit c649a76e76be6bff1fd770d0a775798813a3f6e0
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Sun Aug 12 01:35:39 2007 -0400
cpuidle: compile fix for pause and resume functions
Fix the compilation failure when cpuidle is not compiled in.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Acked-by: Adam Belay <adam.belay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 2305a5920fb8ee6ccec1c62ade05aa8351091d71
Author: Adam Belay <abelay@novell.com>
Date: Thu Jul 19 00:49:00 2007 -0400
cpuidle: re-write
Some portions have been rewritten to make the code cleaner and lighter
weight. The following is a list of changes:
1.) the state name is now included in the sysfs interface
2.) detection, hotplug, and available state modifications are handled by
CPUIDLE drivers directly
3.) the CPUIDLE idle handler is only ever installed when at least one
cpuidle_device is enabled and ready
4.) the menu governor BM code no longer overflows
5.) the sysfs attributes are now printed as unsigned integers, avoiding
negative values
6.) a variety of other small cleanups
Also, Idle drivers are no longer swappable during runtime through the
CPUIDLE sysfs inteface. On i386 and x86_64 most idle handlers (e.g.
poll, mwait, halt, etc.) don't benefit from an infrastructure that
supports multiple states, so I think using a more general case idle
handler selection mechanism would be cleaner.
Signed-off-by: Adam Belay <abelay@novell.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit df25b6b56955714e6e24b574d88d1fd11f0c3ee5
Author: Len Brown <len.brown@intel.com>
Date: Tue Jul 24 17:08:21 2007 -0400
cpuidle: fix IA64 buid
Signed-off-by: Len Brown <len.brown@intel.com>
commit fd6ada4c14488755ff7068860078c437431fbccd
Author: Adrian Bunk <bunk@stusta.de>
Date: Mon Jul 9 11:33:13 2007 -0700
cpuidle: static
make cpuidle_replace_governor() static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit c1d4a2cebcadf2429c0c72e1d29aa2a9684c32e0
Author: Adrian Bunk <bunk@stusta.de>
Date: Tue Jul 3 00:54:40 2007 -0400
cpuidle: static
This patch makes the needlessly global struct menu_governor static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit dbf8780c6e8d572c2c273da97ed1cca7608fd999
Author: Andrew Morton <akpm@linux-foundation.org>
Date: Tue Jul 3 00:49:14 2007 -0400
export symbol tick_nohz_get_sleep_length
ERROR: "tick_nohz_get_sleep_length" [drivers/cpuidle/governors/menu.ko] undefined!
ERROR: "tick_nohz_get_idle_jiffies" [drivers/cpuidle/governors/menu.ko] undefined!
And please be sure to get your changes to core kernel suitably reviewed.
Cc: Adam Belay <abelay@novell.com>
Cc: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 29f0e248e7017be15f99febf9143a2cef00b2961
Author: Andrew Morton <akpm@linux-foundation.org>
Date: Tue Jul 3 00:43:04 2007 -0400
tick.h needs hrtimer.h
It uses hrtimers.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit e40cede7d63a029e92712a3fe02faee60cc38fb4
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:40:34 2007 -0400
cpuidle: first round of documentation updates
Documentation changes based on Pavel's feedback.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 83b42be2efece386976507555c29e7773a0dfcd1
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:39:25 2007 -0400
cpuidle: add rating to the governors and pick the one with highest rating by default
Introduce a governor rating scheme to pick the right governor by default.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit d2a74b8c5e8f22def4709330d4bfc4a29209b71c
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:38:08 2007 -0400
cpuidle: make cpuidle sysfs driver governor switch off by default
Make default cpuidle sysfs to show current_governor and current_driver in
read-only mode. More elaborate available_governors and available_drivers with
writeable current_governor and current_driver interface only appear with
"cpuidle_sysfs_switch" boot parameter.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 1f60a0e80bf83cf6b55c8845bbe5596ed8f6307b
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:37:00 2007 -0400
cpuidle: menu governor: change the early break condition
Change the C-state early break out algorithm in menu governor.
We only look at early breakouts that result in wakeups shorter than idle
state's target_residency. If such a breakout is frequent enough, eliminate
the particular idle state upto a timeout period.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 45a42095cf64b003b4a69be3ce7f434f97d7af51
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:35:38 2007 -0400
cpuidle: fix uninitialized variable in sysfs routine
Fix the uninitialized usage of ret.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 80dca7cdba3e6ee13eae277660873ab9584eb3be
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:34:16 2007 -0400
cpuidle: reenable /proc/acpi//power interface for the time being
Keep /proc/acpi/processor/CPU*/power around for a while as powertop depends
on it. It will be marked deprecated and removed in future. powertop can use
cpuidle interfaces instead.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 589c37c2646c5e3813a51255a5ee1159cb4c33fc
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Jul 3 00:32:37 2007 -0400
cpuidle: menu governor and hrtimer compile fix
Compile fix for menu governor.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 0ba80bd9ab3ed304cb4f19b722e4cc6740588b5e
Author: Len Brown <len.brown@intel.com>
Date: Thu May 31 22:51:43 2007 -0400
cpuidle: build fix - cpuidle vs ipw2100 module
ERROR: "acpi_set_cstate_limit" [drivers/net/wireless/ipw2100.ko] undefined!
Signed-off-by: Len Brown <len.brown@intel.com>
commit d7d8fa7f96a7f7682be7c6cc0cc53fa7a18c3b58
Author: Adam Belay <abelay@novell.com>
Date: Sat Mar 24 03:47:07 2007 -0400
cpuidle: add the 'menu' governor
Here is my first take at implementing an idle PM governor that takes
full advantage of NO_HZ. I call it the 'menu' governor because it
considers the full list of idle states before each entry.
I've kept the implementation fairly simple. It attempts to guess the
next residency time and then chooses a state that would meet at least
the break-even point between power savings and entry cost. To this end,
it selects the deepest idle state that satisfies the following
constraints:
1. If the idle time elapsed since bus master activity was detected
is below a threshold (currently 20 ms), then limit the selection
to C2-type or above.
2. Do not choose a state with a break-even residency that exceeds
the expected time remaining until the next timer interrupt.
3. Do not choose a state with a break-even residency that exceeds
the elapsed time between the last pair of break events,
excluding timer interrupts.
This governor has an advantage over "ladder" governor because it
proactively checks how much time remains until the next timer interrupt
using the tick infrastructure. Also, it handles device interrupt
activity more intelligently by not including timer interrupts in break
event calculations. Finally, it doesn't make policy decisions using the
number of state entries, which can have variable residency times (NO_HZ
makes these potentially very large), and instead only considers sleep
time deltas.
The menu governor can be selected during runtime using the cpuidle sysfs
interface like so:
"echo "menu" > /sys/devices/system/cpu/cpuidle/current_governor"
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit a4bec7e65aa3b7488b879d971651cc99a6c410fe
Author: Adam Belay <abelay@novell.com>
Date: Sat Mar 24 03:47:03 2007 -0400
cpuidle: export time until next timer interrupt using NO_HZ
Expose information about the time remaining until the next
timer interrupt expires by utilizing the dynticks infrastructure.
Also modify the main idle loop to allow dynticks to handle
non-interrupt break events (e.g. DMA). Finally, expose sleep ticks
information to external code. Thomas Gleixner is responsible for much
of the code in this patch. However, I've made some additional changes,
so I'm probably responsible if there are any bugs or oversights :)
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 2929d8996fbc77f41a5ff86bb67cdde3ca7d2d72
Author: Adam Belay <abelay@novell.com>
Date: Sat Mar 24 03:46:58 2007 -0400
cpuidle: governor API changes
This patch prepares cpuidle for the menu governor. It adds an optional
stage after idle state entry to give the governor an opportunity to
check why the state was exited. Also it makes sure the idle loop
returns after each state entry, allowing the appropriate dynticks code
to run.
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 3a7fd42f9825c3b03e364ca59baa751bb350775f
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu Apr 26 00:03:59 2007 -0700
cpuidle: hang fix
Prevent hang on x86-64, when ACPI processor driver is added as a module on
a system that does not support C-states.
x86-64 expects all idle handlers to enable interrupts before returning from
idle handler. This is due to enter_idle(), exit_idle() races. Make
cpuidle_idle_call() confirm to this when there is no pm_idle_old.
Also, cpuidle look at the return values of attch_driver() and set
current_driver to NULL if attach fails on all CPUs.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 4893339a142afbd5b7c01ffadfd53d14746e858e
Author: Shaohua Li <shaohua.li@intel.com>
Date: Thu Apr 26 10:40:09 2007 +0800
cpuidle: add support for max_cstate limit
With CPUIDLE framework, the max_cstate (to limit max cpu c-state)
parameter is ingored. Some systems require it to ignore C2/C3
and some drivers like ipw require it too.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 43bbbbe1cb998cbd2df656f55bb3bfe30f30e7d1
Author: Shaohua Li <shaohua.li@intel.com>
Date: Thu Apr 26 10:40:13 2007 +0800
cpuidle: add cpuidle_fore_redetect_devices API
add cpuidle_force_redetect_devices API,
which forces all CPU redetect idle states.
Next patch will use it.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit d1edadd608f24836def5ec483d2edccfb37b1d19
Author: Shaohua Li <shaohua.li@intel.com>
Date: Thu Apr 26 10:40:01 2007 +0800
cpuidle: fix sysfs related issue
Fix the cpuidle sysfs issue.
a. make kobject dynamicaly allocated
b. fixed sysfs init issue to avoid suspend/resume issue
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 7169a5cc0d67b263978859672e86c13c23a5570d
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed Mar 28 22:52:53 2007 -0400
cpuidle: 1-bit field must be unsigned
A 1-bit bitfield has no room for a sign bit.
drivers/cpuidle/governors/ladder.c:54:16: error: dubious bitfield without explicit `signed' or `unsigned'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 4658620158dc2fbd9e4bcb213c5b6fb5d05ba7d4
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Wed Mar 28 22:52:41 2007 -0400
cpuidle: fix boot hang
Patch for cpuidle boot hang reported by Larry Finger here.
http://www.ussg.iu.edu/hypermail/linux/kernel/0703.2/2025.html
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Larry Finger <larry.finger@lwfinger.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit c17e168aa6e5fe3851baaae8df2fbc1cf11443a9
Author: Len Brown <len.brown@intel.com>
Date: Wed Mar 7 04:37:53 2007 -0500
cpuidle: ladder does not depend on ACPI
build fix for CONFIG_ACPI=n
In file included from drivers/cpuidle/governors/ladder.c:21:
include/acpi/processor.h:88: error: expected specifier-qualifier-list before âacpi_integerâ
include/acpi/processor.h:106: error: expected specifier-qualifier-list before âacpi_integerâ
include/acpi/processor.h:168: error: expected specifier-qualifier-list before âacpi_handleâ
Signed-off-by: Len Brown <len.brown@intel.com>
commit 8c91d958246bde68db0c3f0c57b535962ce861cb
Author: Adrian Bunk <bunk@stusta.de>
Date: Tue Mar 6 02:29:40 2007 -0800
cpuidle: make code static
This patch makes the following needlessly global code static:
- driver.c: __cpuidle_find_driver()
- governor.c: __cpuidle_find_governor()
- ladder.c: struct ladder_governor
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Adam Belay <abelay@novell.com>
Cc: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 0c39dc3187094c72c33ab65a64d2017b21f372d2
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Wed Mar 7 02:38:22 2007 -0500
cpu_idle: fix build break
This patch fixes a build breakage with !CONFIG_HOTPLUG_CPU and
CONFIG_CPU_IDLE.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 8112e3b115659b07df340ef170515799c0105f82
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Tue Mar 6 02:29:39 2007 -0800
cpuidle: build fix for !CPU_IDLE
Fix the compile issues when CPU_IDLE is not configured.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Adam Belay <abelay@novell.com>
Cc: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 1eb4431e9599cd25e0d9872f3c2c8986821839dd
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu Feb 22 13:54:57 2007 -0800
cpuidle take2: Basic documentation for cpuidle
Documentation for cpuidle infrastructure
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit ef5f15a8b79123a047285ec2e3899108661df779
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu Feb 22 13:54:03 2007 -0800
cpuidle take2: Hookup ACPI C-states driver with cpuidle
Hookup ACPI C-states onto generic cpuidle infrastructure.
drivers/acpi/procesor_idle.c is now a ACPI C-states driver that registers as
a driver in cpuidle infrastructure and the policy part is removed from
drivers/acpi/processor_idle.c. We use governor in cpuidle instead.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 987196fa82d4db52c407e8c9d5dec884ba602183
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date: Thu Feb 22 13:52:57 2007 -0800
cpuidle take2: Core cpuidle infrastructure
Announcing 'cpuidle', a new CPU power management infrastructure to manage
idle CPUs in a clean and efficient manner.
cpuidle separates out the drivers that can provide support for multiple types
of idle states and policy governors that decide on what idle state to use
at run time.
A cpuidle driver can support multiple idle states based on parameters like
varying power consumption, wakeup latency, etc (ACPI C-states for example).
A cpuidle governor can be usage model specific (laptop, server,
laptop on battery etc).
Main advantage of the infrastructure being, it allows independent development
of drivers and governors and allows for better CPU power management.
A huge thanks to Adam Belay and Shaohua Li who were part of this mini-project
since its beginning and are greatly responsible for this patchset.
This patch:
Core cpuidle infrastructure.
Introduces a new abstraction layer for cpuidle:
* which manages drivers that can support multiple idles states. Drivers
can be generic or particular to specific hardware/platform
* allows pluging in multiple policy governors that can take idle state policy
decision
* The core also has a set of sysfs interfaces with which administrato can know
about supported drivers and governors and switch them at run time.
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2007-10-04 06:58:00 +08:00
|
|
|
u8 bm_rld_set:1;
|
2012-01-20 01:18:43 +08:00
|
|
|
u8 need_hotplug_init:1;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct acpi_processor {
|
2005-08-05 12:44:28 +08:00
|
|
|
acpi_handle handle;
|
|
|
|
u32 acpi_id;
|
2015-03-24 22:02:46 +08:00
|
|
|
phys_cpuid_t phys_id; /* CPU hardware ID such as APIC ID for x86 */
|
ACPI / processor: Convert apic_id to phys_id to make it arch agnostic
apic_id in MADT table is the CPU hardware id which identify
it self in the system for x86 and ia64, OSPM will use it for
SMP init to map APIC ID to logical cpu number in the early
boot, when the DSDT/SSDT (ACPI namespace) is scanned later, the
ACPI processor driver is probed and the driver will use acpi_id
in DSDT to get the apic_id, then map to the logical cpu number
which is needed by the processor driver.
Before ACPI 5.0, only x86 and ia64 were supported in ACPI spec,
so apic_id is used both in arch code and ACPI core which is
pretty fine. Since ACPI 5.0, ARM is supported by ACPI and
APIC is not available on ARM, this will confuse people when
apic_id is both used by x86 and ARM in one function.
So convert apic_id to phys_id (which is the original meaning)
in ACPI processor dirver to make it arch agnostic, but leave the
arch dependent code unchanged, no functional change.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2015-01-04 18:55:02 +08:00
|
|
|
u32 id; /* CPU logical ID allocated by OS */
|
2005-08-05 12:44:28 +08:00
|
|
|
u32 pblk;
|
|
|
|
int performance_platform_limit;
|
2007-05-26 22:49:58 +08:00
|
|
|
int throttling_platform_limit;
|
2007-06-02 12:15:25 +08:00
|
|
|
/* 0 - states 0..n-th state available */
|
2007-05-26 22:49:58 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_processor_flags flags;
|
|
|
|
struct acpi_processor_power power;
|
|
|
|
struct acpi_processor_performance *performance;
|
|
|
|
struct acpi_processor_throttling throttling;
|
|
|
|
struct acpi_processor_limit limit;
|
2008-01-17 15:51:23 +08:00
|
|
|
struct thermal_cooling_device *cdev;
|
ACPI / processor: Use common hotplug infrastructure
Split the ACPI processor driver into two parts, one that is
non-modular, resides in the ACPI core and handles the enumeration
and hotplug of processors and one that implements the rest of the
existing processor driver functionality.
The non-modular part uses an ACPI scan handler object to enumerate
processors on the basis of information provided by the ACPI namespace
and to hook up with the common ACPI hotplug infrastructure. It also
populates the ACPI handle of each processor device having a
corresponding object in the ACPI namespace, which allows the driver
proper to bind to those devices, and makes the driver bind to them
if it is readily available (i.e. loaded) when the scan handler's
.attach() routine is running.
There are a few reasons to make this change.
First, switching the ACPI processor driver to using the common ACPI
hotplug infrastructure reduces code duplication and size considerably,
even though a new file is created along with a header comment etc.
Second, since the common hotplug code attempts to offline devices
before starting the (non-reversible) removal procedure, it will abort
(and possibly roll back) hot-remove operations involving processors
if cpu_down() returns an error code for one of them instead of
continuing them blindly (if /sys/firmware/acpi/hotplug/force_remove
is unset). That is a more desirable behavior than what the current
code does.
Finally, the separation of the scan/hotplug part from the driver
proper makes it possible to simplify the driver's .remove() routine,
because it doesn't need to worry about the possible cleanup related
to processor removal any more (the scan/hotplug part is responsible
for that now) and can handle device removal and driver removal
symmetricaly (i.e. as appropriate).
Some user-visible changes in sysfs are made (for example, the
'sysdev' link from the ACPI device node to the processor device's
directory is gone and a 'physical_node' link is present instead
and a corresponding 'firmware_node' is present in the processor
device's directory, the processor driver is now visible under
/sys/bus/cpu/drivers/ and bound to the processor device), but
that shouldn't affect the functionality that users care about
(frequency scaling, C-states and thermal management).
Tested on my venerable Toshiba Portege R500.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
2013-05-03 06:26:22 +08:00
|
|
|
struct device *dev; /* Processor device. */
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct acpi_processor_errata {
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 smp;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct {
|
2005-08-05 12:44:28 +08:00
|
|
|
u8 throttle:1;
|
|
|
|
u8 fdma:1;
|
|
|
|
u8 reserved:6;
|
|
|
|
u32 bmisx;
|
|
|
|
} piix4;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2007-05-10 11:34:35 +08:00
|
|
|
extern int acpi_processor_preregister_performance(struct
|
|
|
|
acpi_processor_performance
|
2010-02-02 13:39:15 +08:00
|
|
|
__percpu *performance);
|
2005-12-15 04:05:00 +08:00
|
|
|
|
2005-08-05 12:44:28 +08:00
|
|
|
extern int acpi_processor_register_performance(struct acpi_processor_performance
|
|
|
|
*performance, unsigned int cpu);
|
2015-07-23 04:11:16 +08:00
|
|
|
extern void acpi_processor_unregister_performance(unsigned int cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-11-18 05:47:47 +08:00
|
|
|
int acpi_processor_pstate_control(void);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* note: this locks both the calling module and the processor module
|
|
|
|
if a _PPC object exists, rmmod is disallowed then */
|
|
|
|
int acpi_processor_notify_smm(struct module *calling_module);
|
|
|
|
|
2013-03-06 02:42:54 +08:00
|
|
|
/* parsing the _P* objects. */
|
|
|
|
extern int acpi_processor_get_performance_info(struct acpi_processor *pr);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* for communication between multiple parts of the processor kernel module */
|
2008-06-10 07:22:23 +08:00
|
|
|
DECLARE_PER_CPU(struct acpi_processor *, processors);
|
2005-04-17 06:20:36 +08:00
|
|
|
extern struct acpi_processor_errata errata;
|
|
|
|
|
2016-07-20 01:52:53 +08:00
|
|
|
#if defined(ARCH_HAS_POWER_INIT) && defined(CONFIG_ACPI_PROCESSOR_CSTATE)
|
2005-04-16 03:07:10 +08:00
|
|
|
void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
|
2005-08-05 12:44:28 +08:00
|
|
|
unsigned int cpu);
|
2006-09-26 07:28:13 +08:00
|
|
|
int acpi_processor_ffh_cstate_probe(unsigned int cpu,
|
2007-05-10 11:34:35 +08:00
|
|
|
struct acpi_processor_cx *cx,
|
|
|
|
struct acpi_power_register *reg);
|
2006-09-26 07:28:13 +08:00
|
|
|
void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate);
|
2005-04-16 03:07:10 +08:00
|
|
|
#else
|
2005-08-05 12:44:28 +08:00
|
|
|
static inline void acpi_processor_power_init_bm_check(struct
|
|
|
|
acpi_processor_flags
|
|
|
|
*flags, unsigned int cpu)
|
2005-04-16 03:07:10 +08:00
|
|
|
{
|
|
|
|
flags->bm_check = 1;
|
|
|
|
return;
|
|
|
|
}
|
2006-09-26 07:28:13 +08:00
|
|
|
static inline int acpi_processor_ffh_cstate_probe(unsigned int cpu,
|
2007-05-10 11:34:35 +08:00
|
|
|
struct acpi_processor_cx *cx,
|
|
|
|
struct acpi_power_register
|
|
|
|
*reg)
|
2006-09-26 07:28:13 +08:00
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
2007-05-10 11:34:35 +08:00
|
|
|
static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
|
|
|
|
*cstate)
|
2006-09-26 07:28:13 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2005-04-16 03:07:10 +08:00
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* in processor_perflib.c */
|
2005-04-16 03:07:10 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
|
|
void acpi_processor_ppc_init(void);
|
|
|
|
void acpi_processor_ppc_exit(void);
|
2016-11-18 20:57:54 +08:00
|
|
|
void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
|
2009-11-19 19:31:01 +08:00
|
|
|
extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
|
2005-04-17 06:20:36 +08:00
|
|
|
#else
|
2005-08-05 12:44:28 +08:00
|
|
|
static inline void acpi_processor_ppc_init(void)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
static inline void acpi_processor_ppc_exit(void)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2009-10-16 09:20:41 +08:00
|
|
|
static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr,
|
|
|
|
int event_flag)
|
2005-08-05 12:44:28 +08:00
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
static unsigned int printout = 1;
|
|
|
|
if (printout) {
|
2005-08-05 12:44:28 +08:00
|
|
|
printk(KERN_WARNING
|
|
|
|
"Warning: Processor Platform Limit event detected, but not handled.\n");
|
|
|
|
printk(KERN_WARNING
|
|
|
|
"Consider compiling CPUfreq support into your kernel.\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
printout = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2009-11-19 19:31:01 +08:00
|
|
|
static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2005-08-05 12:44:28 +08:00
|
|
|
#endif /* CONFIG_CPU_FREQ */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-02-23 03:11:14 +08:00
|
|
|
/* in processor_core.c */
|
2015-03-24 22:02:46 +08:00
|
|
|
phys_cpuid_t acpi_get_phys_id(acpi_handle, int type, u32 acpi_id);
|
2016-05-25 06:35:43 +08:00
|
|
|
phys_cpuid_t acpi_map_madt_entry(u32 acpi_id);
|
2015-03-24 22:02:46 +08:00
|
|
|
int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id);
|
2010-02-23 03:11:19 +08:00
|
|
|
int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
|
2009-12-21 03:19:09 +08:00
|
|
|
|
2015-09-10 04:27:07 +08:00
|
|
|
#ifdef CONFIG_ACPI_CPPC_LIB
|
|
|
|
extern int acpi_cppc_processor_probe(struct acpi_processor *pr);
|
|
|
|
extern void acpi_cppc_processor_exit(struct acpi_processor *pr);
|
|
|
|
#else
|
|
|
|
static inline int acpi_cppc_processor_probe(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static inline void acpi_cppc_processor_exit(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_ACPI_CPPC_LIB */
|
|
|
|
|
2014-10-30 17:52:58 +08:00
|
|
|
/* in processor_pdc.c */
|
|
|
|
void acpi_processor_set_pdc(acpi_handle handle);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* in processor_throttling.c */
|
2015-08-05 21:40:25 +08:00
|
|
|
#ifdef CONFIG_ACPI_CPU_FREQ_PSS
|
2008-06-10 07:22:24 +08:00
|
|
|
int acpi_processor_tstate_has_changed(struct acpi_processor *pr);
|
2005-08-05 12:44:28 +08:00
|
|
|
int acpi_processor_get_throttling_info(struct acpi_processor *pr);
|
2009-08-27 05:29:29 +08:00
|
|
|
extern int acpi_processor_set_throttling(struct acpi_processor *pr,
|
|
|
|
int state, bool force);
|
2011-01-10 16:35:45 +08:00
|
|
|
/*
|
|
|
|
* Reevaluate whether the T-state is invalid after one cpu is
|
|
|
|
* onlined/offlined. In such case the flags.throttling will be updated.
|
|
|
|
*/
|
|
|
|
extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
|
2016-09-07 01:04:47 +08:00
|
|
|
bool is_dead);
|
2009-01-12 07:07:55 +08:00
|
|
|
extern const struct file_operations acpi_processor_throttling_fops;
|
2008-01-28 13:53:42 +08:00
|
|
|
extern void acpi_processor_throttling_init(void);
|
2015-08-05 21:40:25 +08:00
|
|
|
#else
|
|
|
|
static inline int acpi_processor_tstate_has_changed(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int acpi_processor_get_throttling_info(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int acpi_processor_set_throttling(struct acpi_processor *pr,
|
|
|
|
int state, bool force)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
|
2016-09-07 01:04:47 +08:00
|
|
|
bool is_dead) {}
|
2015-08-05 21:40:25 +08:00
|
|
|
|
|
|
|
static inline void acpi_processor_throttling_init(void) {}
|
|
|
|
#endif /* CONFIG_ACPI_CPU_FREQ_PSS */
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* in processor_idle.c */
|
2015-08-05 21:40:26 +08:00
|
|
|
extern struct cpuidle_driver acpi_idle_driver;
|
|
|
|
#ifdef CONFIG_ACPI_PROCESSOR_IDLE
|
2012-09-16 04:42:54 +08:00
|
|
|
int acpi_processor_power_init(struct acpi_processor *pr);
|
|
|
|
int acpi_processor_power_exit(struct acpi_processor *pr);
|
2016-07-22 00:18:07 +08:00
|
|
|
int acpi_processor_power_state_has_changed(struct acpi_processor *pr);
|
2011-10-28 18:50:42 +08:00
|
|
|
int acpi_processor_hotplug(struct acpi_processor *pr);
|
2015-08-05 21:40:26 +08:00
|
|
|
#else
|
|
|
|
static inline int acpi_processor_power_init(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int acpi_processor_power_exit(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2016-07-22 00:18:07 +08:00
|
|
|
static inline int acpi_processor_power_state_has_changed(struct acpi_processor *pr)
|
2015-08-05 21:40:26 +08:00
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int acpi_processor_hotplug(struct acpi_processor *pr)
|
|
|
|
{
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_ACPI_PROCESSOR_IDLE */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* in processor_thermal.c */
|
2005-08-05 12:44:28 +08:00
|
|
|
int acpi_processor_get_limit_info(struct acpi_processor *pr);
|
2011-06-26 01:07:52 +08:00
|
|
|
extern const struct thermal_cooling_device_ops processor_cooling_ops;
|
2015-08-05 21:40:25 +08:00
|
|
|
#if defined(CONFIG_ACPI_CPU_FREQ_PSS) & defined(CONFIG_CPU_FREQ)
|
2005-04-17 06:20:36 +08:00
|
|
|
void acpi_thermal_cpufreq_init(void);
|
|
|
|
void acpi_thermal_cpufreq_exit(void);
|
|
|
|
#else
|
2005-08-05 12:44:28 +08:00
|
|
|
static inline void acpi_thermal_cpufreq_init(void)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
static inline void acpi_thermal_cpufreq_exit(void)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2015-08-05 21:40:25 +08:00
|
|
|
#endif /* CONFIG_ACPI_CPU_FREQ_PSS */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#endif
|