Merge branch 'pm-cpuidle'
* pm-cpuidle: intel_idle: Support Intel Atom Processor C2000 Product Family
This commit is contained in:
commit
077a671d7b
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* intel_idle.c - native hardware idle loop for modern Intel processors
|
* intel_idle.c - native hardware idle loop for modern Intel processors
|
||||||
*
|
*
|
||||||
* Copyright (c) 2010, Intel Corporation.
|
* Copyright (c) 2013, Intel Corporation.
|
||||||
* Len Brown <len.brown@intel.com>
|
* Len Brown <len.brown@intel.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
@ -329,6 +329,22 @@ static struct cpuidle_state atom_cstates[] __initdata = {
|
||||||
{
|
{
|
||||||
.enter = NULL }
|
.enter = NULL }
|
||||||
};
|
};
|
||||||
|
static struct cpuidle_state avn_cstates[CPUIDLE_STATE_MAX] = {
|
||||||
|
{
|
||||||
|
.name = "C1-AVN",
|
||||||
|
.desc = "MWAIT 0x00",
|
||||||
|
.flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
|
||||||
|
.exit_latency = 2,
|
||||||
|
.target_residency = 2,
|
||||||
|
.enter = &intel_idle },
|
||||||
|
{
|
||||||
|
.name = "C6-AVN",
|
||||||
|
.desc = "MWAIT 0x51",
|
||||||
|
.flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
|
||||||
|
.exit_latency = 15,
|
||||||
|
.target_residency = 45,
|
||||||
|
.enter = &intel_idle },
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* intel_idle
|
* intel_idle
|
||||||
|
@ -462,6 +478,11 @@ static const struct idle_cpu idle_cpu_hsw = {
|
||||||
.disable_promotion_to_c1e = true,
|
.disable_promotion_to_c1e = true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct idle_cpu idle_cpu_avn = {
|
||||||
|
.state_table = avn_cstates,
|
||||||
|
.disable_promotion_to_c1e = true,
|
||||||
|
};
|
||||||
|
|
||||||
#define ICPU(model, cpu) \
|
#define ICPU(model, cpu) \
|
||||||
{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&cpu }
|
{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&cpu }
|
||||||
|
|
||||||
|
@ -483,6 +504,7 @@ static const struct x86_cpu_id intel_idle_ids[] = {
|
||||||
ICPU(0x3f, idle_cpu_hsw),
|
ICPU(0x3f, idle_cpu_hsw),
|
||||||
ICPU(0x45, idle_cpu_hsw),
|
ICPU(0x45, idle_cpu_hsw),
|
||||||
ICPU(0x46, idle_cpu_hsw),
|
ICPU(0x46, idle_cpu_hsw),
|
||||||
|
ICPU(0x4D, idle_cpu_avn),
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);
|
MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);
|
||||||
|
|
Loading…
Reference in a new issue