Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux

[cascardo/linux.git] / drivers / idle / intel_idle.c

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 9b7ee7e..9cceacb 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -128,28 +128,28 @@ static struct cpuidle_state nehalem_cstates[] = {
        {
                .name = "C1-NHM",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 3,
                .target_residency = 6,
                .enter = &intel_idle },
        {
                .name = "C1E-NHM",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 20,
                .enter = &intel_idle },
        {
                .name = "C3-NHM",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 20,
                .target_residency = 80,
                .enter = &intel_idle },
        {
                .name = "C6-NHM",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 200,
                .target_residency = 800,
                .enter = &intel_idle },
@@ -161,35 +161,35 @@ static struct cpuidle_state snb_cstates[] = {
        {
                .name = "C1-SNB",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 2,
                .target_residency = 2,
                .enter = &intel_idle },
        {
                .name = "C1E-SNB",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 20,
                .enter = &intel_idle },
        {
                .name = "C3-SNB",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 80,
                .target_residency = 211,
                .enter = &intel_idle },
        {
                .name = "C6-SNB",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 104,
                .target_residency = 345,
                .enter = &intel_idle },
        {
                .name = "C7-SNB",
                .desc = "MWAIT 0x30",
-               .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 109,
                .target_residency = 345,
                .enter = &intel_idle },
@@ -201,42 +201,42 @@ static struct cpuidle_state byt_cstates[] = {
        {
                .name = "C1-BYT",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 1,
                .target_residency = 1,
                .enter = &intel_idle },
        {
                .name = "C1E-BYT",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 15,
                .target_residency = 30,
                .enter = &intel_idle },
        {
                .name = "C6N-BYT",
                .desc = "MWAIT 0x58",
-               .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 40,
                .target_residency = 275,
                .enter = &intel_idle },
        {
                .name = "C6S-BYT",
                .desc = "MWAIT 0x52",
-               .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 140,
                .target_residency = 560,
                .enter = &intel_idle },
        {
                .name = "C7-BYT",
                .desc = "MWAIT 0x60",
-               .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 1200,
                .target_residency = 1500,
                .enter = &intel_idle },
        {
                .name = "C7S-BYT",
                .desc = "MWAIT 0x64",
-               .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 10000,
                .target_residency = 20000,
                .enter = &intel_idle },
@@ -248,35 +248,35 @@ static struct cpuidle_state ivb_cstates[] = {
        {
                .name = "C1-IVB",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 1,
                .target_residency = 1,
                .enter = &intel_idle },
        {
                .name = "C1E-IVB",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 20,
                .enter = &intel_idle },
        {
                .name = "C3-IVB",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 59,
                .target_residency = 156,
                .enter = &intel_idle },
        {
                .name = "C6-IVB",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 80,
                .target_residency = 300,
                .enter = &intel_idle },
        {
                .name = "C7-IVB",
                .desc = "MWAIT 0x30",
-               .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 87,
                .target_residency = 300,
                .enter = &intel_idle },
@@ -288,28 +288,28 @@ static struct cpuidle_state ivt_cstates[] = {
        {
                .name = "C1-IVT",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 1,
                .target_residency = 1,
                .enter = &intel_idle },
        {
                .name = "C1E-IVT",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 80,
                .enter = &intel_idle },
        {
                .name = "C3-IVT",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 59,
                .target_residency = 156,
                .enter = &intel_idle },
        {
                .name = "C6-IVT",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 82,
                .target_residency = 300,
                .enter = &intel_idle },
@@ -321,28 +321,28 @@ static struct cpuidle_state ivt_cstates_4s[] = {
        {
                .name = "C1-IVT-4S",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 1,
                .target_residency = 1,
                .enter = &intel_idle },
        {
                .name = "C1E-IVT-4S",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 250,
                .enter = &intel_idle },
        {
                .name = "C3-IVT-4S",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 59,
                .target_residency = 300,
                .enter = &intel_idle },
        {
                .name = "C6-IVT-4S",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 84,
                .target_residency = 400,
                .enter = &intel_idle },
@@ -354,28 +354,28 @@ static struct cpuidle_state ivt_cstates_8s[] = {
        {
                .name = "C1-IVT-8S",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 1,
                .target_residency = 1,
                .enter = &intel_idle },
        {
                .name = "C1E-IVT-8S",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 500,
                .enter = &intel_idle },
        {
                .name = "C3-IVT-8S",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 59,
                .target_residency = 600,
                .enter = &intel_idle },
        {
                .name = "C6-IVT-8S",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 88,
                .target_residency = 700,
                .enter = &intel_idle },
@@ -387,56 +387,56 @@ static struct cpuidle_state hsw_cstates[] = {
        {
                .name = "C1-HSW",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 2,
                .target_residency = 2,
                .enter = &intel_idle },
        {
                .name = "C1E-HSW",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 20,
                .enter = &intel_idle },
        {
                .name = "C3-HSW",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 33,
                .target_residency = 100,
                .enter = &intel_idle },
        {
                .name = "C6-HSW",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 133,
                .target_residency = 400,
                .enter = &intel_idle },
        {
                .name = "C7s-HSW",
                .desc = "MWAIT 0x32",
-               .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 166,
                .target_residency = 500,
                .enter = &intel_idle },
        {
                .name = "C8-HSW",
                .desc = "MWAIT 0x40",
-               .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 300,
                .target_residency = 900,
                .enter = &intel_idle },
        {
                .name = "C9-HSW",
                .desc = "MWAIT 0x50",
-               .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 600,
                .target_residency = 1800,
                .enter = &intel_idle },
        {
                .name = "C10-HSW",
                .desc = "MWAIT 0x60",
-               .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 2600,
                .target_residency = 7700,
                .enter = &intel_idle },
@@ -447,56 +447,56 @@ static struct cpuidle_state bdw_cstates[] = {
        {
                .name = "C1-BDW",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 2,
                .target_residency = 2,
                .enter = &intel_idle },
        {
                .name = "C1E-BDW",
                .desc = "MWAIT 0x01",
-               .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x01),
                .exit_latency = 10,
                .target_residency = 20,
                .enter = &intel_idle },
        {
                .name = "C3-BDW",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 40,
                .target_residency = 100,
                .enter = &intel_idle },
        {
                .name = "C6-BDW",
                .desc = "MWAIT 0x20",
-               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 133,
                .target_residency = 400,
                .enter = &intel_idle },
        {
                .name = "C7s-BDW",
                .desc = "MWAIT 0x32",
-               .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 166,
                .target_residency = 500,
                .enter = &intel_idle },
        {
                .name = "C8-BDW",
                .desc = "MWAIT 0x40",
-               .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 300,
                .target_residency = 900,
                .enter = &intel_idle },
        {
                .name = "C9-BDW",
                .desc = "MWAIT 0x50",
-               .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 600,
                .target_residency = 1800,
                .enter = &intel_idle },
        {
                .name = "C10-BDW",
                .desc = "MWAIT 0x60",
-               .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 2600,
                .target_residency = 7700,
                .enter = &intel_idle },
@@ -508,28 +508,28 @@ static struct cpuidle_state atom_cstates[] = {
        {
                .name = "C1E-ATM",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 10,
                .target_residency = 20,
                .enter = &intel_idle },
        {
                .name = "C2-ATM",
                .desc = "MWAIT 0x10",
-               .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x10),
                .exit_latency = 20,
                .target_residency = 80,
                .enter = &intel_idle },
        {
                .name = "C4-ATM",
                .desc = "MWAIT 0x30",
-               .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x30) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 100,
                .target_residency = 400,
                .enter = &intel_idle },
        {
                .name = "C6-ATM",
                .desc = "MWAIT 0x52",
-               .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 140,
                .target_residency = 560,
                .enter = &intel_idle },
@@ -540,14 +540,14 @@ static struct cpuidle_state avn_cstates[] = {
        {
                .name = "C1-AVN",
                .desc = "MWAIT 0x00",
-               .flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,
+               .flags = MWAIT2flg(0x00),
                .exit_latency = 2,
                .target_residency = 2,
                .enter = &intel_idle },
        {
                .name = "C6-AVN",
                .desc = "MWAIT 0x51",
-               .flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
+               .flags = MWAIT2flg(0x51) | CPUIDLE_FLAG_TLB_FLUSHED,
                .exit_latency = 15,
                .target_residency = 45,
                .enter = &intel_idle },