Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712

Authored by Thomas Renninger
Committed by Len Brown
1 parent bfb53ccf1c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

intel_idle: Rename cpuidle states 

Userspace apps might have to cut off parts off the
idle state name for display reasons.
Switch NHM-C1 to C1-NHM (and others) so that a cut off
name is unique and makes sense to the user.

Signed-off-by: Thomas Renninger <trenn@suse.de>
CC: lenb@kernel.org
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff

drivers/idle/intel_idle.c
Diff comments   View file @ 15e123e
... ... @@ -107,7 +107,7 @@
107 107 static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = {
108 108 { /* MWAIT C0 */ },
109 109 { /* MWAIT C1 */
110   - .name = "NHM-C1",
  110 + .name = "C1-NHM",
111 111 .desc = "MWAIT 0x00",
112 112 .driver_data = (void *) 0x00,
113 113 .flags = CPUIDLE_FLAG_TIME_VALID,
... ... @@ -115,7 +115,7 @@
115 115 .target_residency = 6,
116 116 .enter = &intel_idle },
117 117 { /* MWAIT C2 */
118   - .name = "NHM-C3",
  118 + .name = "C3-NHM",
119 119 .desc = "MWAIT 0x10",
120 120 .driver_data = (void *) 0x10,
121 121 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
... ... @@ -123,7 +123,7 @@
123 123 .target_residency = 80,
124 124 .enter = &intel_idle },
125 125 { /* MWAIT C3 */
126   - .name = "NHM-C6",
  126 + .name = "C6-NHM",
127 127 .desc = "MWAIT 0x20",
128 128 .driver_data = (void *) 0x20,
129 129 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
... ... @@ -135,7 +135,7 @@
135 135 static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
136 136 { /* MWAIT C0 */ },
137 137 { /* MWAIT C1 */
138   - .name = "SNB-C1",
  138 + .name = "C1-SNB",
139 139 .desc = "MWAIT 0x00",
140 140 .driver_data = (void *) 0x00,
141 141 .flags = CPUIDLE_FLAG_TIME_VALID,
... ... @@ -143,7 +143,7 @@
143 143 .target_residency = 1,
144 144 .enter = &intel_idle },
145 145 { /* MWAIT C2 */
146   - .name = "SNB-C3",
  146 + .name = "C3-SNB",
147 147 .desc = "MWAIT 0x10",
148 148 .driver_data = (void *) 0x10,
149 149 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
... ... @@ -151,7 +151,7 @@
151 151 .target_residency = 211,
152 152 .enter = &intel_idle },
153 153 { /* MWAIT C3 */
154   - .name = "SNB-C6",
  154 + .name = "C6-SNB",
155 155 .desc = "MWAIT 0x20",
156 156 .driver_data = (void *) 0x20,
157 157 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
... ... @@ -159,7 +159,7 @@
159 159 .target_residency = 345,
160 160 .enter = &intel_idle },
161 161 { /* MWAIT C4 */
162   - .name = "SNB-C7",
  162 + .name = "C7-SNB",
163 163 .desc = "MWAIT 0x30",
164 164 .driver_data = (void *) 0x30,
165 165 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
... ... @@ -171,7 +171,7 @@
171 171 static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
172 172 { /* MWAIT C0 */ },
173 173 { /* MWAIT C1 */
174   - .name = "ATM-C1",
  174 + .name = "C1-ATM",
175 175 .desc = "MWAIT 0x00",
176 176 .driver_data = (void *) 0x00,
177 177 .flags = CPUIDLE_FLAG_TIME_VALID,
... ... @@ -179,7 +179,7 @@
179 179 .target_residency = 4,
180 180 .enter = &intel_idle },
181 181 { /* MWAIT C2 */
182   - .name = "ATM-C2",
  182 + .name = "C2-ATM",
183 183 .desc = "MWAIT 0x10",
184 184 .driver_data = (void *) 0x10,
185 185 .flags = CPUIDLE_FLAG_TIME_VALID,
... ... @@ -188,7 +188,7 @@
188 188 .enter = &intel_idle },
189 189 { /* MWAIT C3 */ },
190 190 { /* MWAIT C4 */
191   - .name = "ATM-C4",
  191 + .name = "C4-ATM",
192 192 .desc = "MWAIT 0x30",
193 193 .driver_data = (void *) 0x30,
194 194 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
... ... @@ -197,7 +197,7 @@
197 197 .enter = &intel_idle },
198 198 { /* MWAIT C5 */ },
199 199 { /* MWAIT C6 */
200   - .name = "ATM-C6",
  200 + .name = "C6-ATM",
201 201 .desc = "MWAIT 0x52",
202 202 .driver_data = (void *) 0x52,
203 203 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,