Skip to content

Commit 11e7bf5

Browse files
mwilczyrafaeljw
authored andcommitted
ACPI: processor: Remove acpi_hwp_native_thermal_lvt_osc()
The workaround for buggy skylake BIOSes is now implemented in acpi_processor_osc() and acpi_hwp_native_thermal_lvt_osc() has no callers, so drop it. Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 9527264 commit 11e7bf5

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

drivers/acpi/acpi_processor.c

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ bool __init processor_physically_present(acpi_handle handle)
561561

562562
/* vendor specific UUID indicating an Intel platform */
563563
static u8 sb_uuid_str[] = "4077A616-290C-47BE-9EBD-D87058713953";
564-
static bool acpi_hwp_native_thermal_lvt_set;
565564

566565
static acpi_status __init acpi_processor_osc(acpi_handle handle, u32 lvl,
567566
void *context, void **rv)
@@ -589,41 +588,6 @@ static acpi_status __init acpi_processor_osc(acpi_handle handle, u32 lvl,
589588
return AE_OK;
590589
}
591590

592-
static acpi_status __init acpi_hwp_native_thermal_lvt_osc(acpi_handle handle,
593-
u32 lvl,
594-
void *context,
595-
void **rv)
596-
{
597-
u32 capbuf[2];
598-
struct acpi_osc_context osc_context = {
599-
.uuid_str = sb_uuid_str,
600-
.rev = 1,
601-
.cap.length = 8,
602-
.cap.pointer = capbuf,
603-
};
604-
605-
if (acpi_hwp_native_thermal_lvt_set)
606-
return AE_CTRL_TERMINATE;
607-
608-
capbuf[0] = 0x0000;
609-
capbuf[1] = 0x1000; /* set bit 12 */
610-
611-
if (ACPI_SUCCESS(acpi_run_osc(handle, &osc_context))) {
612-
if (osc_context.ret.pointer && osc_context.ret.length > 1) {
613-
u32 *capbuf_ret = osc_context.ret.pointer;
614-
615-
if (capbuf_ret[1] & 0x1000) {
616-
acpi_handle_info(handle,
617-
"_OSC native thermal LVT Acked\n");
618-
acpi_hwp_native_thermal_lvt_set = true;
619-
}
620-
}
621-
kfree(osc_context.ret.pointer);
622-
}
623-
624-
return AE_OK;
625-
}
626-
627591
static bool __init acpi_early_processor_osc(void)
628592
{
629593
acpi_status status;

0 commit comments

Comments
 (0)