microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

intel_idle: Add ->enter_freeze callbacks 

Add an ->enter_freeze callback routine, intel_idle_freeze(), to
the intel_idle driver and point the ->enter_freeze callback
pointers of all of the driver's state objects to it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
This commit is contained in:
Rafael J. Wysocki 2015-02-11 05:04:17 +01:00 коммит произвёл Rafael J. Wysocki
Родитель 124cf9117c
Коммит 5fe2e52720
1 изменённых файлов: 125 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

179
drivers/idle/intel_idle.c
Просмотреть файл

@ -97,6 +97,8 @@ static const struct idle_cpu *icpu;
static struct cpuidle_device __percpu *intel_idle_cpuidle_devices; static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
static int intel_idle(struct cpuidle_device *dev, static int intel_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index); struct cpuidle_driver *drv, int index);
static void intel_idle_freeze(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index);
static int intel_idle_cpu_init(int cpu); static int intel_idle_cpu_init(int cpu);
static struct cpuidle_state *cpuidle_state_table; static struct cpuidle_state *cpuidle_state_table;
@ -131,28 +133,32 @@ static struct cpuidle_state nehalem_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 3, .exit_latency = 3,
.target_residency = 6, .target_residency = 6,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-NHM", .name = "C1E-NHM",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 20, .target_residency = 20,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-NHM", .name = "C3-NHM",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 20, .exit_latency = 20,
.target_residency = 80, .target_residency = 80,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-NHM", .name = "C6-NHM",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 200, .exit_latency = 200,
.target_residency = 800, .target_residency = 800,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -164,35 +170,40 @@ static struct cpuidle_state snb_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 2, .exit_latency = 2,
.target_residency = 2, .target_residency = 2,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-SNB", .name = "C1E-SNB",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 20, .target_residency = 20,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-SNB", .name = "C3-SNB",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 80, .exit_latency = 80,
.target_residency = 211, .target_residency = 211,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-SNB", .name = "C6-SNB",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 104, .exit_latency = 104,
.target_residency = 345, .target_residency = 345,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C7-SNB", .name = "C7-SNB",
.desc = "MWAIT 0x30", .desc = "MWAIT 0x30",
.flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 109, .exit_latency = 109,
.target_residency = 345, .target_residency = 345,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -204,42 +215,48 @@ static struct cpuidle_state byt_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 1, .exit_latency = 1,
.target_residency = 1, .target_residency = 1,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-BYT", .name = "C1E-BYT",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 15, .exit_latency = 15,
.target_residency = 30, .target_residency = 30,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6N-BYT", .name = "C6N-BYT",
.desc = "MWAIT 0x58", .desc = "MWAIT 0x58",
.flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 40, .exit_latency = 40,
.target_residency = 275, .target_residency = 275,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6S-BYT", .name = "C6S-BYT",
.desc = "MWAIT 0x52", .desc = "MWAIT 0x52",
.flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 140, .exit_latency = 140,
.target_residency = 560, .target_residency = 560,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C7-BYT", .name = "C7-BYT",
.desc = "MWAIT 0x60", .desc = "MWAIT 0x60",
.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 1200, .exit_latency = 1200,
.target_residency = 1500, .target_residency = 1500,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C7S-BYT", .name = "C7S-BYT",
.desc = "MWAIT 0x64", .desc = "MWAIT 0x64",
.flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 10000, .exit_latency = 10000,
.target_residency = 20000, .target_residency = 20000,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -251,35 +268,40 @@ static struct cpuidle_state ivb_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 1, .exit_latency = 1,
.target_residency = 1, .target_residency = 1,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-IVB", .name = "C1E-IVB",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 20, .target_residency = 20,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-IVB", .name = "C3-IVB",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 59, .exit_latency = 59,
.target_residency = 156, .target_residency = 156,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-IVB", .name = "C6-IVB",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 80, .exit_latency = 80,
.target_residency = 300, .target_residency = 300,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C7-IVB", .name = "C7-IVB",
.desc = "MWAIT 0x30", .desc = "MWAIT 0x30",
.flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 87, .exit_latency = 87,
.target_residency = 300, .target_residency = 300,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -291,28 +313,32 @@ static struct cpuidle_state ivt_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 1, .exit_latency = 1,
.target_residency = 1, .target_residency = 1,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-IVT", .name = "C1E-IVT",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 80, .target_residency = 80,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-IVT", .name = "C3-IVT",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 59, .exit_latency = 59,
.target_residency = 156, .target_residency = 156,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-IVT", .name = "C6-IVT",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 82, .exit_latency = 82,
.target_residency = 300, .target_residency = 300,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -324,28 +350,32 @@ static struct cpuidle_state ivt_cstates_4s[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 1, .exit_latency = 1,
.target_residency = 1, .target_residency = 1,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-IVT-4S", .name = "C1E-IVT-4S",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 250, .target_residency = 250,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-IVT-4S", .name = "C3-IVT-4S",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 59, .exit_latency = 59,
.target_residency = 300, .target_residency = 300,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-IVT-4S", .name = "C6-IVT-4S",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 84, .exit_latency = 84,
.target_residency = 400, .target_residency = 400,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -357,28 +387,32 @@ static struct cpuidle_state ivt_cstates_8s[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 1, .exit_latency = 1,
.target_residency = 1, .target_residency = 1,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-IVT-8S", .name = "C1E-IVT-8S",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 500, .target_residency = 500,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-IVT-8S", .name = "C3-IVT-8S",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 59, .exit_latency = 59,
.target_residency = 600, .target_residency = 600,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-IVT-8S", .name = "C6-IVT-8S",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 88, .exit_latency = 88,
.target_residency = 700, .target_residency = 700,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -390,56 +424,64 @@ static struct cpuidle_state hsw_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 2, .exit_latency = 2,
.target_residency = 2, .target_residency = 2,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-HSW", .name = "C1E-HSW",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 20, .target_residency = 20,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-HSW", .name = "C3-HSW",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 33, .exit_latency = 33,
.target_residency = 100, .target_residency = 100,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-HSW", .name = "C6-HSW",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 133, .exit_latency = 133,
.target_residency = 400, .target_residency = 400,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C7s-HSW", .name = "C7s-HSW",
.desc = "MWAIT 0x32", .desc = "MWAIT 0x32",
.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 166, .exit_latency = 166,
.target_residency = 500, .target_residency = 500,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C8-HSW", .name = "C8-HSW",
.desc = "MWAIT 0x40", .desc = "MWAIT 0x40",
.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 300, .exit_latency = 300,
.target_residency = 900, .target_residency = 900,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C9-HSW", .name = "C9-HSW",
.desc = "MWAIT 0x50", .desc = "MWAIT 0x50",
.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 600, .exit_latency = 600,
.target_residency = 1800, .target_residency = 1800,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C10-HSW", .name = "C10-HSW",
.desc = "MWAIT 0x60", .desc = "MWAIT 0x60",
.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 2600, .exit_latency = 2600,
.target_residency = 7700, .target_residency = 7700,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -450,56 +492,64 @@ static struct cpuidle_state bdw_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 2, .exit_latency = 2,
.target_residency = 2, .target_residency = 2,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C1E-BDW", .name = "C1E-BDW",
.desc = "MWAIT 0x01", .desc = "MWAIT 0x01",
.flags = MWAIT2flg(0x01), .flags = MWAIT2flg(0x01),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 20, .target_residency = 20,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C3-BDW", .name = "C3-BDW",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 40, .exit_latency = 40,
.target_residency = 100, .target_residency = 100,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-BDW", .name = "C6-BDW",
.desc = "MWAIT 0x20", .desc = "MWAIT 0x20",
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 133, .exit_latency = 133,
.target_residency = 400, .target_residency = 400,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C7s-BDW", .name = "C7s-BDW",
.desc = "MWAIT 0x32", .desc = "MWAIT 0x32",
.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 166, .exit_latency = 166,
.target_residency = 500, .target_residency = 500,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C8-BDW", .name = "C8-BDW",
.desc = "MWAIT 0x40", .desc = "MWAIT 0x40",
.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 300, .exit_latency = 300,
.target_residency = 900, .target_residency = 900,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C9-BDW", .name = "C9-BDW",
.desc = "MWAIT 0x50", .desc = "MWAIT 0x50",
.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 600, .exit_latency = 600,
.target_residency = 1800, .target_residency = 1800,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C10-BDW", .name = "C10-BDW",
.desc = "MWAIT 0x60", .desc = "MWAIT 0x60",
.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 2600, .exit_latency = 2600,
.target_residency = 7700, .target_residency = 7700,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -511,28 +561,32 @@ static struct cpuidle_state atom_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 10, .exit_latency = 10,
.target_residency = 20, .target_residency = 20,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C2-ATM", .name = "C2-ATM",
.desc = "MWAIT 0x10", .desc = "MWAIT 0x10",
.flags = MWAIT2flg(0x10), .flags = MWAIT2flg(0x10),
.exit_latency = 20, .exit_latency = 20,
.target_residency = 80, .target_residency = 80,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C4-ATM", .name = "C4-ATM",
.desc = "MWAIT 0x30", .desc = "MWAIT 0x30",
.flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 100, .exit_latency = 100,
.target_residency = 400, .target_residency = 400,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-ATM", .name = "C6-ATM",
.desc = "MWAIT 0x52", .desc = "MWAIT 0x52",
.flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 140, .exit_latency = 140,
.target_residency = 560, .target_residency = 560,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -543,14 +597,16 @@ static struct cpuidle_state avn_cstates[] = {
.flags = MWAIT2flg(0x00), .flags = MWAIT2flg(0x00),
.exit_latency = 2, .exit_latency = 2,
.target_residency = 2, .target_residency = 2,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.name = "C6-AVN", .name = "C6-AVN",
.desc = "MWAIT 0x51", .desc = "MWAIT 0x51",
.flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TLB_FLUSHED, .flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TLB_FLUSHED,
.exit_latency = 15, .exit_latency = 15,
.target_residency = 45, .target_residency = 45,
.enter = &intel_idle }, .enter = &intel_idle,
.enter_freeze = intel_idle_freeze, },
{ {
.enter = NULL } .enter = NULL }
}; };
@ -592,6 +648,21 @@ static int intel_idle(struct cpuidle_device *dev,
return index; return index;
} }
/**
* intel_idle_freeze - simplified "enter" callback routine for suspend-to-idle
* @dev: cpuidle_device
* @drv: cpuidle driver
* @index: state index
*/
static void intel_idle_freeze(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
unsigned long ecx = 1; /* break on interrupt flag */
unsigned long eax = flg2MWAIT(drv->states[index].flags);
mwait_idle_with_hints(eax, ecx);
}
static void __setup_broadcast_timer(void *arg) static void __setup_broadcast_timer(void *arg)
{ {
unsigned long reason = (unsigned long)arg; unsigned long reason = (unsigned long)arg;