Revert "cpuidle: Fix disabled sysfs entry"

This reverts commit f23e8a88998fd69e85b14d0b68db16f62adb846c.

"disabled" parameter is currently used by generic PM domains to control
attached cpuidle state. This patch moves disable parameter from idle state
back to state_usage which to avoid the race between sysfs control and
generic PM domains.

Bug 1517825
Bug 1493508
Bug 200008021
Bug 1469274

Change-Id: Iedd950ec19e89f0517d99532a43c1db051473611
Signed-off-by: Allen Yu <alleny@nvidia.com>
Reviewed-on: http://git-master/r/423146
GVS: Gerrit_Virtual_Submit
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 74d82561d7665a6ecfdd175ce2b58a369d9546a1..c67523f92ef1614cb19f57d66723f3c681778b03 100644 (file)
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -267,9 +267,9 @@ static ssize_t store_state_##_name(struct cpuidle_state *state, \
        if (err) \
                return err; \
        if (value) \
-               state->_name = 1; \
+               state_usage->_name = 1; \
        else \
-               state->_name = 0; \
+               state_usage->_name = 0; \
        return size; \
 }
 
@@ -298,8 +298,8 @@ define_show_state_ull_function(usage)
 define_show_state_ull_function(time)
 define_show_state_str_function(name)
 define_show_state_str_function(desc)
-define_show_state_function(disabled)
-define_store_state_ull_function(disabled)
+define_show_state_ull_function(disable)
+define_store_state_ull_function(disable)
 
 define_one_state_ro(name, show_state_name);
 define_one_state_ro(desc, show_state_desc);
@@ -308,7 +308,7 @@ define_one_state_ro(power, show_state_power_usage);
 define_one_state_ro(residency, show_state_target_residency);
 define_one_state_ro(usage, show_state_usage);
 define_one_state_ro(time, show_state_time);
-define_one_state_rw(disabled, show_state_disabled, store_state_disabled);
+define_one_state_rw(disable, show_state_disable, store_state_disable);
 
 static struct attribute *cpuidle_state_default_attrs[] = {
        &attr_name.attr,
@@ -318,7 +318,7 @@ static struct attribute *cpuidle_state_default_attrs[] = {
        &attr_residency.attr,
        &attr_usage.attr,
        &attr_time.attr,
-       &attr_disabled.attr,
+       &attr_disable.attr,
        NULL
 };