cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic

The only place where the time is invalid is when the ACPI_CSTATE_FFH entry
method is not set. Otherwise for all the drivers, the time can be correctly
measured.

Instead of duplicating the CPUIDLE_FLAG_TIME_VALID flag in all the drivers
for all the states, just invert the logic by replacing it by the flag
CPUIDLE_FLAG_TIME_INVALID, hence we can set this flag only for the acpi idle
driver, remove the former flag from all the drivers and invert the logic with
this flag in the different governor.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
index 2fca60ab513a596a6f94eb14855f880ea5e33d86..af319ac4960c707d7e16a5635d2bce83c98761c4 100644 (file)
--- a/arch/arm/include/asm/cpuidle.h
+++ b/arch/arm/include/asm/cpuidle.h
@@ -15,7 +15,6 @@ static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
        .exit_latency           = 1,\
        .target_residency       = 1,\
        .power_usage            = p,\
-       .flags                  = CPUIDLE_FLAG_TIME_VALID,\
        .name                   = "WFI",\
        .desc                   = "ARM WFI",\
 }

diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index f1ac1c94ac0f363123842f4e9077c2bd58e645df..b4675fc28f83348ae94a1390d90218f80a3489ff 100644 (file)
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -66,7 +66,6 @@ static struct cpuidle_driver davinci_idle_driver = {
                .enter                  = davinci_enter_idle,
                .exit_latency           = 10,
                .target_residency       = 10000,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "DDR SR",
                .desc                   = "WFI and DDR Self Refresh",
        },

diff --git a/arch/arm/mach-imx/cpuidle-imx5.c b/arch/arm/mach-imx/cpuidle-imx5.c
index 5a47e3c6172f3fc239b7ed15af92b336339bb63d..3feca526d16b8f1171b445563956be84ce830deb 100644 (file)
--- a/arch/arm/mach-imx/cpuidle-imx5.c
+++ b/arch/arm/mach-imx/cpuidle-imx5.c
@@ -24,7 +24,6 @@ static struct cpuidle_driver imx5_cpuidle_driver = {
                .enter            = imx5_cpuidle_enter,
                .exit_latency     = 2,
                .target_residency = 1,
-               .flags            = CPUIDLE_FLAG_TIME_VALID,
                .name             = "IMX5 SRPG",
                .desc             = "CPU state retained,powered off",
        },

diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c
index aa935787b74354fe1be5d35d6a9a6900effb8560..d76d08623f9f945ad95cb211f317c2d8c42f3c7c 100644 (file)
--- a/arch/arm/mach-imx/cpuidle-imx6q.c
+++ b/arch/arm/mach-imx/cpuidle-imx6q.c
@@ -53,8 +53,7 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {
                {
                        .exit_latency = 50,
                        .target_residency = 75,
-                       .flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_TIMER_STOP,
+                       .flags = CPUIDLE_FLAG_TIMER_STOP,
                        .enter = imx6q_enter_wait,
                        .name = "WAIT",
                        .desc = "Clock off",

diff --git a/arch/arm/mach-imx/cpuidle-imx6sl.c b/arch/arm/mach-imx/cpuidle-imx6sl.c
index d4b6b8171fa911c441cf25b6376835d937948f5b..7d92e658455162bcb6ce25d84f6b9894895d3834 100644 (file)
--- a/arch/arm/mach-imx/cpuidle-imx6sl.c
+++ b/arch/arm/mach-imx/cpuidle-imx6sl.c
@@ -40,8 +40,7 @@ static struct cpuidle_driver imx6sl_cpuidle_driver = {
                {
                        .exit_latency = 50,
                        .target_residency = 75,
-                       .flags = CPUIDLE_FLAG_TIME_VALID |
-                               CPUIDLE_FLAG_TIMER_STOP,
+                       .flags = CPUIDLE_FLAG_TIMER_STOP,
                        .enter = imx6sl_enter_wait,
                        .name = "WAIT",
                        .desc = "Clock off",

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index e18709d3b95d906e79e070774e2c277d81b5f709..aa7b379e266148fa8990165a8dae7ba3e09edcf7 100644 (file)
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -265,7 +265,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 2 + 2,
                        .target_residency = 5,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C1",
                        .desc             = "MPU ON + CORE ON",
                },
@@ -273,7 +272,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 10 + 10,
                        .target_residency = 30,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C2",
                        .desc             = "MPU ON + CORE ON",
                },
@@ -281,7 +279,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 50 + 50,
                        .target_residency = 300,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C3",
                        .desc             = "MPU RET + CORE ON",
                },
@@ -289,7 +286,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 1500 + 1800,
                        .target_residency = 4000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C4",
                        .desc             = "MPU OFF + CORE ON",
                },
@@ -297,7 +293,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 2500 + 7500,
                        .target_residency = 12000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C5",
                        .desc             = "MPU RET + CORE RET",
                },
@@ -305,7 +300,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 3000 + 8500,
                        .target_residency = 15000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C6",
                        .desc             = "MPU OFF + CORE RET",
                },
@@ -313,7 +307,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 10000 + 30000,
                        .target_residency = 30000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C7",
                        .desc             = "MPU OFF + CORE OFF",
                },

diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 2498ab025fa296416c03494df6070daf456451ee..01e398a868bcbf9d0e33456e8fc70c0a2996848d 100644 (file)
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -196,7 +196,6 @@ static struct cpuidle_driver omap4_idle_driver = {
                        /* C1 - CPU0 ON + CPU1 ON + MPU ON */
                        .exit_latency = 2 + 2,
                        .target_residency = 5,
-                       .flags = CPUIDLE_FLAG_TIME_VALID,
                        .enter = omap_enter_idle_simple,
                        .name = "C1",
                        .desc = "CPUx ON, MPUSS ON"
@@ -205,7 +204,7 @@ static struct cpuidle_driver omap4_idle_driver = {
                        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
                        .exit_latency = 328 + 440,
                        .target_residency = 960,
-                       .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
+                       .flags = CPUIDLE_FLAG_COUPLED,
                        .enter = omap_enter_idle_coupled,
                        .name = "C2",
                        .desc = "CPUx OFF, MPUSS CSWR",
@@ -214,7 +213,7 @@ static struct cpuidle_driver omap4_idle_driver = {
                        /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
                        .exit_latency = 460 + 518,
                        .target_residency = 1100,
-                       .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
+                       .flags = CPUIDLE_FLAG_COUPLED,
                        .enter = omap_enter_idle_coupled,
                        .name = "C3",
                        .desc = "CPUx OFF, MPUSS OSWR",

diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c
index 3c8ab07c2012c40c11775f425c4cbb93f9eca95c..2eb072440dfa7a9222250457ab0e26c278236920 100644 (file)
--- a/arch/arm/mach-s3c64xx/cpuidle.c
+++ b/arch/arm/mach-s3c64xx/cpuidle.c
@@ -48,7 +48,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = {
                        .enter            = s3c64xx_enter_idle,
                        .exit_latency     = 1,
                        .target_residency = 1,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "IDLE",
                        .desc             = "System active, ARM gated",
                },

diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 7e5c2676c48902f17138c242c0cd097a28d4044c..0e37da654ed5dfe20b6dc9962fbce3d80b0876f0 100644 (file)
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -423,7 +423,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
                .desc = "Core Standby Mode",
                .exit_latency = 10,
                .target_residency = 20 + 10,
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .enter = sh7372_enter_core_standby,
        },
        .states[2] = {
@@ -431,7 +430,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
                .desc = "A3SM PLL ON",
                .exit_latency = 20,
                .target_residency = 30 + 20,
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .enter = sh7372_enter_a3sm_pll_on,
        },
        .states[3] = {
@@ -439,7 +437,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
                .desc = "A3SM PLL OFF",
                .exit_latency = 120,
                .target_residency = 30 + 120,
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .enter = sh7372_enter_a3sm_pll_off,
        },
        .states[4] = {
@@ -447,7 +444,6 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
                .desc = "A4S PLL OFF",
                .exit_latency = 240,
                .target_residency = 30 + 240,
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .enter = sh7372_enter_a4s,
                .disabled = true,
        },

diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
index e3ebdce3e71f62c48099191bf18cb00892c05aca..b30908235d5233a2c35eb9618b5428e4f4b00908 100644 (file)
--- a/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -75,7 +75,6 @@ static struct cpuidle_driver tegra_idle_driver = {
                        .exit_latency           = 500,
                        .target_residency       = 1000,
                        .power_usage            = 0,
-                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
                        .name                   = "powered-down",
                        .desc                   = "CPU power gated",
                },

diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index b30bf5cba65b033b5f6a7f75a29657db746d7cd4..4f25a7c7ca0fed7b74c8aab8b0f4281021f9e175 100644 (file)
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -59,8 +59,7 @@ static struct cpuidle_driver tegra_idle_driver = {
                        .exit_latency     = 5000,
                        .target_residency = 10000,
                        .power_usage      = 0,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID |
-                       CPUIDLE_FLAG_COUPLED,
+                       .flags            = CPUIDLE_FLAG_COUPLED,
                        .name             = "powered-down",
                        .desc             = "CPU power gated",
                },

diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c
index 35561274f6cf64d36a25886415c0aa3d50282ecb..f8815ed65d9d5227b3f21ddea6c316bb9e24723a 100644 (file)
--- a/arch/arm/mach-tegra/cpuidle-tegra30.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra30.c
@@ -56,7 +56,6 @@ static struct cpuidle_driver tegra_idle_driver = {
                        .exit_latency           = 2000,
                        .target_residency       = 2200,
                        .power_usage            = 0,
-                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
                        .name                   = "powered-down",
                        .desc                   = "CPU power gated",
                },

diff --git a/arch/mips/include/asm/idle.h b/arch/mips/include/asm/idle.h
index 1c967abd545c688c806367762db0ea34618ae955..a2d18ab57ac608bcf3959863a7232330de08f2d7 100644 (file)
--- a/arch/mips/include/asm/idle.h
+++ b/arch/mips/include/asm/idle.h
@@ -22,7 +22,6 @@ extern int mips_cpuidle_wait_enter(struct cpuidle_device *dev,
        .exit_latency           = 1,\
        .target_residency       = 1,\
        .power_usage            = UINT_MAX,\
-       .flags                  = CPUIDLE_FLAG_TIME_VALID,\
        .name                   = "wait",\
        .desc                   = "MIPS wait",\
 }

diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index e3abfd4277e22502f632f206a99425ed540fdb2b..53b8eeb1db20dbf9e87a2a1f8548f1e0c04c0752 100644 (file)
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -59,7 +59,6 @@ static struct cpuidle_driver cpuidle_driver = {
                        .exit_latency = 1,
                        .target_residency = 1 * 2,
                        .power_usage = 3,
-                       .flags = CPUIDLE_FLAG_TIME_VALID,
                        .enter = cpuidle_sleep_enter,
                        .name = "C1",
                        .desc = "SuperH Sleep Mode",
@@ -68,7 +67,6 @@ static struct cpuidle_driver cpuidle_driver = {
                        .exit_latency = 100,
                        .target_residency = 1 * 2,
                        .power_usage = 1,
-                       .flags = CPUIDLE_FLAG_TIME_VALID,
                        .enter = cpuidle_sleep_enter,
                        .name = "C2",
                        .desc = "SuperH Sleep Mode [SF]",
@@ -78,7 +76,6 @@ static struct cpuidle_driver cpuidle_driver = {
                        .exit_latency = 2300,
                        .target_residency = 1 * 2,
                        .power_usage = 1,
-                       .flags = CPUIDLE_FLAG_TIME_VALID,
                        .enter = cpuidle_sleep_enter,
                        .name = "C3",
                        .desc = "SuperH Mobile Standby Mode [SF]",

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 5848744514142c374174cdff06e3d7fe9f8cc793..927ec923594798bda4d5a4dff74cfbe577ad540f 100644 (file)
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -378,7 +378,6 @@ static struct cpuidle_driver apm_idle_driver = {
                { /* entry 1 is for APM idle */
                        .name = "APM",
                        .desc = "APM idle",
-                       .flags = CPUIDLE_FLAG_TIME_VALID,
                        .exit_latency = 250,    /* WAG */
                        .target_residency = 500,        /* WAG */
                        .enter = &apm_cpu_idle

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 17f9ec501972ef208b505ed881173e2dac0cc2ea..380b4b43f3612a31292ec89a195aeca347a3d079 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -985,8 +985,8 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
                state->flags = 0;
                switch (cx->type) {
                        case ACPI_STATE_C1:
-                       if (cx->entry_method == ACPI_CSTATE_FFH)
-                               state->flags |= CPUIDLE_FLAG_TIME_VALID;
+                       if (cx->entry_method != ACPI_CSTATE_FFH)
+                               state->flags |= CPUIDLE_FLAG_TIME_INVALID;
 
                        state->enter = acpi_idle_enter_c1;
                        state->enter_dead = acpi_idle_play_dead;
@@ -994,14 +994,12 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
                        break;
 
                        case ACPI_STATE_C2:
-                       state->flags |= CPUIDLE_FLAG_TIME_VALID;
                        state->enter = acpi_idle_enter_simple;
                        state->enter_dead = acpi_idle_play_dead;
                        drv->safe_state_index = count;
                        break;
 
                        case ACPI_STATE_C3:
-                       state->flags |= CPUIDLE_FLAG_TIME_VALID;
                        state->enter = pr->flags.bm_check ?
                                        acpi_idle_enter_bm :
                                        acpi_idle_enter_simple;

diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c
index 50997ea942fce58975db9f7d933183671f6e740f..87320e62c721ae7bac8f1540ee681a2c169a72a6 100644 (file)
--- a/drivers/cpuidle/cpuidle-arm64.c
+++ b/drivers/cpuidle/cpuidle-arm64.c
@@ -73,7 +73,6 @@ static struct cpuidle_driver arm64_idle_driver = {
                .exit_latency           = 1,
                .target_residency       = 1,
                .power_usage            = UINT_MAX,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "WFI",
                .desc                   = "ARM64 WFI",
        }

diff --git a/drivers/cpuidle/cpuidle-at91.c b/drivers/cpuidle/cpuidle-at91.c
index a0774370c6bc41acd38c410beedd55e4592558d0..1964ff07117c26b7f0d61edb88850a532c0b9262 100644 (file)
--- a/drivers/cpuidle/cpuidle-at91.c
+++ b/drivers/cpuidle/cpuidle-at91.c
@@ -43,7 +43,6 @@ static struct cpuidle_driver at91_idle_driver = {
                .enter                  = at91_enter_idle,
                .exit_latency           = 10,
                .target_residency       = 10000,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "RAM_SR",
                .desc                   = "WFI and DDR Self Refresh",
        },

diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c
index fbc00a1d3c486a5e9d98f31ebecaf5149b2f3d5c..e3e225fe6b45ed33418b0bd1357eb257e487ba70 100644 (file)
--- a/drivers/cpuidle/cpuidle-big_little.c
+++ b/drivers/cpuidle/cpuidle-big_little.c
@@ -67,8 +67,7 @@ static struct cpuidle_driver bl_idle_little_driver = {
                .enter                  = bl_enter_powerdown,
                .exit_latency           = 700,
                .target_residency       = 2500,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID |
-                                         CPUIDLE_FLAG_TIMER_STOP,
+               .flags                  = CPUIDLE_FLAG_TIMER_STOP,
                .name                   = "C1",
                .desc                   = "ARM little-cluster power down",
        },
@@ -89,8 +88,7 @@ static struct cpuidle_driver bl_idle_big_driver = {
                .enter                  = bl_enter_powerdown,
                .exit_latency           = 500,
                .target_residency       = 2000,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID |
-                                         CPUIDLE_FLAG_TIMER_STOP,
+               .flags                  = CPUIDLE_FLAG_TIMER_STOP,
                .name                   = "C1",
                .desc                   = "ARM big-cluster power down",
        },

diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c
index 6e51114057d0963605ef1dfc80b231946e1b88f7..6541b0bfdfaada5673166a86072106494b820b92 100644 (file)
--- a/drivers/cpuidle/cpuidle-calxeda.c
+++ b/drivers/cpuidle/cpuidle-calxeda.c
@@ -55,7 +55,6 @@ static struct cpuidle_driver calxeda_idle_driver = {
                {
                        .name = "PG",
                        .desc = "Power Gate",
-                       .flags = CPUIDLE_FLAG_TIME_VALID,
                        .exit_latency = 30,
                        .power_usage = 50,
                        .target_residency = 200,

diff --git a/drivers/cpuidle/cpuidle-cps.c b/drivers/cpuidle/cpuidle-cps.c
index fc7b62720debf3e95cae71973d1f726d1c7ce79d..1adb6980b707ced6b9737e1d1df79ce10af41def 100644 (file)
--- a/drivers/cpuidle/cpuidle-cps.c
+++ b/drivers/cpuidle/cpuidle-cps.c
@@ -79,7 +79,6 @@ static struct cpuidle_driver cps_driver = {
                        .enter  = cps_nc_enter,
                        .exit_latency           = 200,
                        .target_residency       = 450,
-                       .flags  = CPUIDLE_FLAG_TIME_VALID,
                        .name   = "nc-wait",
                        .desc   = "non-coherent MIPS wait",
                },
@@ -87,8 +86,7 @@ static struct cpuidle_driver cps_driver = {
                        .enter  = cps_nc_enter,
                        .exit_latency           = 300,
                        .target_residency       = 700,
-                       .flags  = CPUIDLE_FLAG_TIME_VALID |
-                                 CPUIDLE_FLAG_TIMER_STOP,
+                       .flags  = CPUIDLE_FLAG_TIMER_STOP,
                        .name   = "clock-gated",
                        .desc   = "core clock gated",
                },
@@ -96,8 +94,7 @@ static struct cpuidle_driver cps_driver = {
                        .enter  = cps_nc_enter,
                        .exit_latency           = 600,
                        .target_residency       = 1000,
-                       .flags  = CPUIDLE_FLAG_TIME_VALID |
-                                 CPUIDLE_FLAG_TIMER_STOP,
+                       .flags  = CPUIDLE_FLAG_TIMER_STOP,
                        .name   = "power-gated",
                        .desc   = "core power gated",
                },

diff --git a/drivers/cpuidle/cpuidle-exynos.c b/drivers/cpuidle/cpuidle-exynos.c
index ba9b34b579f3d1a2757004f05a19412fd0c6043b..64d12a855ec684590833f2b01907f6331e6b1b89 100644 (file)
--- a/drivers/cpuidle/cpuidle-exynos.c
+++ b/drivers/cpuidle/cpuidle-exynos.c
@@ -47,7 +47,6 @@ static struct cpuidle_driver exynos_idle_driver = {
                        .enter                  = exynos_enter_lowpower,
                        .exit_latency           = 300,
                        .target_residency       = 100000,
-                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
                        .name                   = "C1",
                        .desc                   = "ARM power down",
                },

diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index 41ba843251b8e843e60ade3e87c1a0d39d444c48..d88f8d7c21433ac4cf99faa546f5806c11707006 100644 (file)
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -47,7 +47,6 @@ static struct cpuidle_driver kirkwood_idle_driver = {
                .enter                  = kirkwood_enter_idle,
                .exit_latency           = 10,
                .target_residency       = 100000,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "DDR SR",
                .desc                   = "WFI and DDR Self Refresh",
        },

diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c
index 45371bb16214c7568371d5a7348f53d05137ccff..dd4c176df2a3d682c6465cf42587ab500b601ad3 100644 (file)
--- a/drivers/cpuidle/cpuidle-mvebu-v7.c
+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c
@@ -53,7 +53,6 @@ static struct cpuidle_driver armadaxp_idle_driver = {
                .exit_latency           = 10,
                .power_usage            = 50,
                .target_residency       = 100,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "MV CPU IDLE",
                .desc                   = "CPU power down",
        },
@@ -62,8 +61,7 @@ static struct cpuidle_driver armadaxp_idle_driver = {
                .exit_latency           = 100,
                .power_usage            = 5,
                .target_residency       = 1000,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID |
-                                               MVEBU_V7_FLAG_DEEP_IDLE,
+               .flags                  = MVEBU_V7_FLAG_DEEP_IDLE,
                .name                   = "MV CPU DEEP IDLE",
                .desc                   = "CPU and L2 Fabric power down",
        },
@@ -78,8 +76,7 @@ static struct cpuidle_driver armada370_idle_driver = {
                .exit_latency           = 100,
                .power_usage            = 5,
                .target_residency       = 1000,
-               .flags                  = (CPUIDLE_FLAG_TIME_VALID |
-                                          MVEBU_V7_FLAG_DEEP_IDLE),
+               .flags                  = MVEBU_V7_FLAG_DEEP_IDLE,
                .name                   = "Deep Idle",
                .desc                   = "CPU and L2 Fabric power down",
        },
@@ -94,7 +91,6 @@ static struct cpuidle_driver armada38x_idle_driver = {
                .exit_latency           = 10,
                .power_usage            = 5,
                .target_residency       = 100,
-               .flags                  = CPUIDLE_FLAG_TIME_VALID,
                .name                   = "Idle",
                .desc                   = "CPU and SCU power down",
        },

diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
index 7d3a3497dd4cfeef09f7d4fbaf88ecace4c4c5bf..e9248bb9173ae267ff09c14d06128527352f9f20 100644 (file)
--- a/drivers/cpuidle/cpuidle-powernv.c
+++ b/drivers/cpuidle/cpuidle-powernv.c
@@ -93,7 +93,6 @@ static struct cpuidle_state powernv_states[MAX_POWERNV_IDLE_STATES] = {
        { /* Snooze */
                .name = "snooze",
                .desc = "snooze",
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .exit_latency = 0,
                .target_residency = 0,
                .enter = &snooze_loop },
@@ -202,7 +201,7 @@ static int powernv_add_idle_states(void)
                        /* Add NAP state */
                        strcpy(powernv_states[nr_idle_states].name, "Nap");
                        strcpy(powernv_states[nr_idle_states].desc, "Nap");
-                       powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIME_VALID;
+                       powernv_states[nr_idle_states].flags = 0;
                        powernv_states[nr_idle_states].exit_latency =
                                        ((unsigned int)latency_ns) / 1000;
                        powernv_states[nr_idle_states].target_residency =
@@ -215,8 +214,7 @@ static int powernv_add_idle_states(void)
                        /* Add FASTSLEEP state */
                        strcpy(powernv_states[nr_idle_states].name, "FastSleep");
                        strcpy(powernv_states[nr_idle_states].desc, "FastSleep");
-                       powernv_states[nr_idle_states].flags =
-                               CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TIMER_STOP;
+                       powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIMER_STOP;
                        powernv_states[nr_idle_states].exit_latency =
                                        ((unsigned int)latency_ns) / 1000;
                        powernv_states[nr_idle_states].target_residency =

diff --git a/drivers/cpuidle/cpuidle-pseries.c b/drivers/cpuidle/cpuidle-pseries.c
index 6f7b019568850c68478abcaae6de2238a4fac934..bb9e2b6f3ecc33b5e9fde738d6c1405a4a2d642e 100644 (file)
--- a/drivers/cpuidle/cpuidle-pseries.c
+++ b/drivers/cpuidle/cpuidle-pseries.c
@@ -142,14 +142,12 @@ static struct cpuidle_state dedicated_states[] = {
        { /* Snooze */
                .name = "snooze",
                .desc = "snooze",
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .exit_latency = 0,
                .target_residency = 0,
                .enter = &snooze_loop },
        { /* CEDE */
                .name = "CEDE",
                .desc = "CEDE",
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .exit_latency = 10,
                .target_residency = 100,
                .enter = &dedicated_cede_loop },
@@ -162,7 +160,6 @@ static struct cpuidle_state shared_states[] = {
        { /* Shared Cede */
                .name = "Shared Cede",
                .desc = "Shared Cede",
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .exit_latency = 0,
                .target_residency = 0,
                .enter = &shared_cede_loop },

diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c
index 5e35804b1a952393dd84b20aacaf96442eac4d62..292e65a903080ef157822b2d9b842cf8b2b0ffbf 100644 (file)
--- a/drivers/cpuidle/cpuidle-ux500.c
+++ b/drivers/cpuidle/cpuidle-ux500.c
@@ -101,8 +101,7 @@ static struct cpuidle_driver ux500_idle_driver = {
                        .enter            = ux500_enter_idle,
                        .exit_latency     = 70,
                        .target_residency = 260,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID |
-                                           CPUIDLE_FLAG_TIMER_STOP,
+                       .flags            = CPUIDLE_FLAG_TIMER_STOP,
                        .name             = "ApIdle",
                        .desc             = "ARM Retention",
                },

diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
index c61b8b2a7c77e1696f5856a0d4ddf30143f6c07d..022dec86de8e2edc9cb1e54841cd23ff11be5bf0 100644 (file)
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -52,7 +52,6 @@ static struct cpuidle_driver zynq_idle_driver = {
                        .enter                  = zynq_enter_idle,
                        .exit_latency           = 10,
                        .target_residency       = 10000,
-                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
                        .name                   = "RAM_SR",
                        .desc                   = "WFI and RAM Self Refresh",
                },

diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index e431d11abf8d86deb79b200ef17eaa24a2c139ca..2697e87d5b34ff9ae520f1130220afb4d0876dff 100644 (file)
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -201,7 +201,6 @@ static void poll_idle_init(struct cpuidle_driver *drv)
        state->exit_latency = 0;
        state->target_residency = 0;
        state->power_usage = -1;
-       state->flags = CPUIDLE_FLAG_TIME_VALID;
        state->enter = poll_idle;
        state->disabled = false;
 }

diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c
index 52f4d11bbf3f697e8466b82c6667e27e3e04c213..6e6f0b272835878d715df2c8cc5894805ba21335 100644 (file)
--- a/drivers/cpuidle/dt_idle_states.c
+++ b/drivers/cpuidle/dt_idle_states.c
@@ -73,7 +73,7 @@ static int init_state_node(struct cpuidle_state *idle_state,
                return -EINVAL;
        }
 
-       idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+       idle_state->flags = 0;
        if (of_property_read_bool(state_node, "local-timer-stop"))
                idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
        /*

diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index 06b57c4c4d80debb885002bb48b7c318c5dbd5ec..37263d9a105127079cd71baed298467495000dd6 100644 (file)
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -79,7 +79,7 @@ static int ladder_select_state(struct cpuidle_driver *drv,
 
        last_state = &ldev->states[last_idx];
 
-       if (drv->states[last_idx].flags & CPUIDLE_FLAG_TIME_VALID) {
+       if (!(drv->states[last_idx].flags & CPUIDLE_FLAG_TIME_INVALID)) {
                last_residency = cpuidle_get_last_residency(dev) - \
                                         drv->states[last_idx].exit_latency;
        }

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 710a233b9b0d6e2fa0a3f06543283bde1cb885ee..659d7b0c9ebfd1e78348d539f497112c36f2cdc5 100644 (file)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -405,7 +405,7 @@ static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev)
         * the measured amount of time is less than the exit latency,
         * assume the state was never reached and the exit latency is 0.
         */
-       if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID))) {
+       if (unlikely(target->flags & CPUIDLE_FLAG_TIME_INVALID)) {
                /* Use timer value as is */
                measured_us = data->next_timer_us;
 

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 9b7ee7e427df4f3b84cf611cf0fb0965d6a5db58..9cceacb92f9d3846e5e7f350d4e7217a3a81995e 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 },

diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 25e0df6155a4c2838c47cb8be6738aaf50c160e6..a07e087f54b205741da6c126d0ca2144257140af 100644 (file)
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -53,7 +53,7 @@ struct cpuidle_state {
 };
 
 /* Idle State Flags */
-#define CPUIDLE_FLAG_TIME_VALID        (0x01) /* is residency time measurable? */
+#define CPUIDLE_FLAG_TIME_INVALID      (0x01) /* is residency time measurable? */
 #define CPUIDLE_FLAG_COUPLED   (0x02) /* state applies to multiple cpus */
 #define CPUIDLE_FLAG_TIMER_STOP (0x04)  /* timer is stopped on this state */
 
@@ -90,7 +90,7 @@ DECLARE_PER_CPU(struct cpuidle_device, cpuidle_dev);
  * cpuidle_get_last_residency - retrieves the last state's residency time
  * @dev: the target CPU
  *
- * NOTE: this value is invalid if CPUIDLE_FLAG_TIME_VALID isn't set
+ * NOTE: this value is invalid if CPUIDLE_FLAG_TIME_INVALID is set
  */
 static inline int cpuidle_get_last_residency(struct cpuidle_device *dev)
 {