diff options
author | Hanjun Guo <hanjun.guo@linaro.org> | 2014-07-18 06:02:54 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-21 07:50:58 -0400 |
commit | 46ba51ea8f8639da32c55744b35479fdfb4e7232 (patch) | |
tree | a1544217bd2406bb63eca797c7206acb9313e6d2 /drivers/acpi/processor_core.c | |
parent | b50154d53e668314542ef9a592accc37137a8f65 (diff) |
ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC
The use of _PDC is deprecated in ACPI 3.0 in favor of _OSC,
as ARM platform is supported only in ACPI 5.0 or higher version,
_PDC will not be used in ARM platform, so make Make _PDC only for
platforms with Intel CPUs.
Introduce ARCH_MIGHT_HAVE_ACPI_PDC and move _PDC related code in
ACPI processor driver into a single file processor_pdc.c, make x86
and ia64 select it when ACPI is enabled.
This patch also use pr_* to replace printk to fix the checkpatch
warning and factor acpi_processor_alloc_pdc() a little bit to
avoid duplicate pr_err() code.
Suggested-by: Robert Richter <rric@kernel.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/processor_core.c')
-rw-r--r-- | drivers/acpi/processor_core.c | 198 |
1 files changed, 0 insertions, 198 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 71e2065639a6..00f48d13a516 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -4,17 +4,11 @@ | |||
4 | * | 4 | * |
5 | * Alex Chiang <achiang@hp.com> | 5 | * Alex Chiang <achiang@hp.com> |
6 | * - Unified x86/ia64 implementations | 6 | * - Unified x86/ia64 implementations |
7 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | ||
8 | * - Added _PDC for platforms with Intel CPUs | ||
9 | */ | 7 | */ |
10 | #include <linux/export.h> | 8 | #include <linux/export.h> |
11 | #include <linux/dmi.h> | ||
12 | #include <linux/slab.h> | ||
13 | #include <linux/acpi.h> | 9 | #include <linux/acpi.h> |
14 | #include <acpi/processor.h> | 10 | #include <acpi/processor.h> |
15 | 11 | ||
16 | #include "internal.h" | ||
17 | |||
18 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT | 12 | #define _COMPONENT ACPI_PROCESSOR_COMPONENT |
19 | ACPI_MODULE_NAME("processor_core"); | 13 | ACPI_MODULE_NAME("processor_core"); |
20 | 14 | ||
@@ -208,195 +202,3 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) | |||
208 | return acpi_map_cpuid(apic_id, acpi_id); | 202 | return acpi_map_cpuid(apic_id, acpi_id); |
209 | } | 203 | } |
210 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); | 204 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); |
211 | |||
212 | static bool __init processor_physically_present(acpi_handle handle) | ||
213 | { | ||
214 | int cpuid, type; | ||
215 | u32 acpi_id; | ||
216 | acpi_status status; | ||
217 | acpi_object_type acpi_type; | ||
218 | unsigned long long tmp; | ||
219 | union acpi_object object = { 0 }; | ||
220 | struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; | ||
221 | |||
222 | status = acpi_get_type(handle, &acpi_type); | ||
223 | if (ACPI_FAILURE(status)) | ||
224 | return false; | ||
225 | |||
226 | switch (acpi_type) { | ||
227 | case ACPI_TYPE_PROCESSOR: | ||
228 | status = acpi_evaluate_object(handle, NULL, NULL, &buffer); | ||
229 | if (ACPI_FAILURE(status)) | ||
230 | return false; | ||
231 | acpi_id = object.processor.proc_id; | ||
232 | break; | ||
233 | case ACPI_TYPE_DEVICE: | ||
234 | status = acpi_evaluate_integer(handle, "_UID", NULL, &tmp); | ||
235 | if (ACPI_FAILURE(status)) | ||
236 | return false; | ||
237 | acpi_id = tmp; | ||
238 | break; | ||
239 | default: | ||
240 | return false; | ||
241 | } | ||
242 | |||
243 | type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; | ||
244 | cpuid = acpi_get_cpuid(handle, type, acpi_id); | ||
245 | |||
246 | if (cpuid == -1) | ||
247 | return false; | ||
248 | |||
249 | return true; | ||
250 | } | ||
251 | |||
252 | static void acpi_set_pdc_bits(u32 *buf) | ||
253 | { | ||
254 | buf[0] = ACPI_PDC_REVISION_ID; | ||
255 | buf[1] = 1; | ||
256 | |||
257 | /* Enable coordination with firmware's _TSD info */ | ||
258 | buf[2] = ACPI_PDC_SMP_T_SWCOORD; | ||
259 | |||
260 | /* Twiddle arch-specific bits needed for _PDC */ | ||
261 | arch_acpi_set_pdc_bits(buf); | ||
262 | } | ||
263 | |||
264 | static struct acpi_object_list *acpi_processor_alloc_pdc(void) | ||
265 | { | ||
266 | struct acpi_object_list *obj_list; | ||
267 | union acpi_object *obj; | ||
268 | u32 *buf; | ||
269 | |||
270 | /* allocate and initialize pdc. It will be used later. */ | ||
271 | obj_list = kmalloc(sizeof(struct acpi_object_list), GFP_KERNEL); | ||
272 | if (!obj_list) { | ||
273 | printk(KERN_ERR "Memory allocation error\n"); | ||
274 | return NULL; | ||
275 | } | ||
276 | |||
277 | obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL); | ||
278 | if (!obj) { | ||
279 | printk(KERN_ERR "Memory allocation error\n"); | ||
280 | kfree(obj_list); | ||
281 | return NULL; | ||
282 | } | ||
283 | |||
284 | buf = kmalloc(12, GFP_KERNEL); | ||
285 | if (!buf) { | ||
286 | printk(KERN_ERR "Memory allocation error\n"); | ||
287 | kfree(obj); | ||
288 | kfree(obj_list); | ||
289 | return NULL; | ||
290 | } | ||
291 | |||
292 | acpi_set_pdc_bits(buf); | ||
293 | |||
294 | obj->type = ACPI_TYPE_BUFFER; | ||
295 | obj->buffer.length = 12; | ||
296 | obj->buffer.pointer = (u8 *) buf; | ||
297 | obj_list->count = 1; | ||
298 | obj_list->pointer = obj; | ||
299 | |||
300 | return obj_list; | ||
301 | } | ||
302 | |||
303 | /* | ||
304 | * _PDC is required for a BIOS-OS handshake for most of the newer | ||
305 | * ACPI processor features. | ||
306 | */ | ||
307 | static acpi_status | ||
308 | acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) | ||
309 | { | ||
310 | acpi_status status = AE_OK; | ||
311 | |||
312 | if (boot_option_idle_override == IDLE_NOMWAIT) { | ||
313 | /* | ||
314 | * If mwait is disabled for CPU C-states, the C2C3_FFH access | ||
315 | * mode will be disabled in the parameter of _PDC object. | ||
316 | * Of course C1_FFH access mode will also be disabled. | ||
317 | */ | ||
318 | union acpi_object *obj; | ||
319 | u32 *buffer = NULL; | ||
320 | |||
321 | obj = pdc_in->pointer; | ||
322 | buffer = (u32 *)(obj->buffer.pointer); | ||
323 | buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); | ||
324 | |||
325 | } | ||
326 | status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL); | ||
327 | |||
328 | if (ACPI_FAILURE(status)) | ||
329 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
330 | "Could not evaluate _PDC, using legacy perf. control.\n")); | ||
331 | |||
332 | return status; | ||
333 | } | ||
334 | |||
335 | void acpi_processor_set_pdc(acpi_handle handle) | ||
336 | { | ||
337 | struct acpi_object_list *obj_list; | ||
338 | |||
339 | if (arch_has_acpi_pdc() == false) | ||
340 | return; | ||
341 | |||
342 | obj_list = acpi_processor_alloc_pdc(); | ||
343 | if (!obj_list) | ||
344 | return; | ||
345 | |||
346 | acpi_processor_eval_pdc(handle, obj_list); | ||
347 | |||
348 | kfree(obj_list->pointer->buffer.pointer); | ||
349 | kfree(obj_list->pointer); | ||
350 | kfree(obj_list); | ||
351 | } | ||
352 | |||
353 | static acpi_status __init | ||
354 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) | ||
355 | { | ||
356 | if (processor_physically_present(handle) == false) | ||
357 | return AE_OK; | ||
358 | |||
359 | acpi_processor_set_pdc(handle); | ||
360 | return AE_OK; | ||
361 | } | ||
362 | |||
363 | #if defined(CONFIG_X86) || defined(CONFIG_IA64) | ||
364 | static int __init set_no_mwait(const struct dmi_system_id *id) | ||
365 | { | ||
366 | pr_notice(PREFIX "%s detected - disabling mwait for CPU C-states\n", | ||
367 | id->ident); | ||
368 | boot_option_idle_override = IDLE_NOMWAIT; | ||
369 | return 0; | ||
370 | } | ||
371 | |||
372 | static struct dmi_system_id processor_idle_dmi_table[] __initdata = { | ||
373 | { | ||
374 | set_no_mwait, "Extensa 5220", { | ||
375 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), | ||
376 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
377 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), | ||
378 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, | ||
379 | {}, | ||
380 | }; | ||
381 | |||
382 | static void __init processor_dmi_check(void) | ||
383 | { | ||
384 | /* | ||
385 | * Check whether the system is DMI table. If yes, OSPM | ||
386 | * should not use mwait for CPU-states. | ||
387 | */ | ||
388 | dmi_check_system(processor_idle_dmi_table); | ||
389 | } | ||
390 | #else | ||
391 | static inline void processor_dmi_check(void) {} | ||
392 | #endif | ||
393 | |||
394 | void __init acpi_early_processor_set_pdc(void) | ||
395 | { | ||
396 | processor_dmi_check(); | ||
397 | |||
398 | acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, | ||
399 | ACPI_UINT32_MAX, | ||
400 | early_init_pdc, NULL, NULL, NULL); | ||
401 | acpi_get_devices(ACPI_PROCESSOR_DEVICE_HID, early_init_pdc, NULL, NULL); | ||
402 | } | ||