|
@@ -74,7 +74,7 @@ static struct cpuidle_driver intel_idle_driver = {
|
|
|
.en_core_tk_irqen = 1,
|
|
|
};
|
|
|
/* intel_idle.max_cstate=0 disables driver */
|
|
|
-static int max_cstate = MWAIT_MAX_NUM_CSTATES - 1;
|
|
|
+static int max_cstate = CPUIDLE_STATE_MAX - 1;
|
|
|
|
|
|
static unsigned int mwait_substates;
|
|
|
|
|
@@ -123,7 +123,7 @@ static struct cpuidle_state *cpuidle_state_table;
|
|
|
* which is also the index into the MWAIT hint array.
|
|
|
* Thus C0 is a dummy.
|
|
|
*/
|
|
|
-static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
+static struct cpuidle_state nehalem_cstates[CPUIDLE_STATE_MAX] = {
|
|
|
{ /* MWAIT C0 */ },
|
|
|
{ /* MWAIT C1 */
|
|
|
.name = "C1-NHM",
|
|
@@ -148,7 +148,7 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
.enter = &intel_idle },
|
|
|
};
|
|
|
|
|
|
-static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
+static struct cpuidle_state snb_cstates[CPUIDLE_STATE_MAX] = {
|
|
|
{ /* MWAIT C0 */ },
|
|
|
{ /* MWAIT C1 */
|
|
|
.name = "C1-SNB",
|
|
@@ -180,7 +180,7 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
.enter = &intel_idle },
|
|
|
};
|
|
|
|
|
|
-static struct cpuidle_state ivb_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
+static struct cpuidle_state ivb_cstates[CPUIDLE_STATE_MAX] = {
|
|
|
{ /* MWAIT C0 */ },
|
|
|
{ /* MWAIT C1 */
|
|
|
.name = "C1-IVB",
|
|
@@ -212,7 +212,7 @@ static struct cpuidle_state ivb_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
.enter = &intel_idle },
|
|
|
};
|
|
|
|
|
|
-static struct cpuidle_state hsw_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
+static struct cpuidle_state hsw_cstates[CPUIDLE_STATE_MAX] = {
|
|
|
{ /* MWAIT C0 */ },
|
|
|
{ /* MWAIT C1 */
|
|
|
.name = "C1-HSW",
|
|
@@ -244,7 +244,7 @@ static struct cpuidle_state hsw_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
.enter = &intel_idle },
|
|
|
};
|
|
|
|
|
|
-static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
|
|
|
+static struct cpuidle_state atom_cstates[CPUIDLE_STATE_MAX] = {
|
|
|
{ /* MWAIT C0 */ },
|
|
|
{ /* MWAIT C1 */
|
|
|
.name = "C1-ATM",
|
|
@@ -503,7 +503,7 @@ static int intel_idle_cpuidle_driver_init(void)
|
|
|
|
|
|
drv->state_count = 1;
|
|
|
|
|
|
- for (cstate = 1; cstate < MWAIT_MAX_NUM_CSTATES; ++cstate) {
|
|
|
+ for (cstate = 1; cstate < CPUIDLE_STATE_MAX; ++cstate) {
|
|
|
int num_substates;
|
|
|
|
|
|
if (cstate > max_cstate) {
|
|
@@ -560,7 +560,7 @@ static int intel_idle_cpu_init(int cpu)
|
|
|
|
|
|
dev->state_count = 1;
|
|
|
|
|
|
- for (cstate = 1; cstate < MWAIT_MAX_NUM_CSTATES; ++cstate) {
|
|
|
+ for (cstate = 1; cstate < CPUIDLE_STATE_MAX; ++cstate) {
|
|
|
int num_substates;
|
|
|
|
|
|
if (cstate > max_cstate) {
|