Commit 2c7a8bd6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge back cpufreq fixes for v5.6.

parents c936069f 80e8b1e5
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
static struct cppc_cpudata **all_cpu_data; static struct cppc_cpudata **all_cpu_data;
struct cppc_workaround_oem_info { struct cppc_workaround_oem_info {
char oem_id[ACPI_OEM_ID_SIZE +1]; char oem_id[ACPI_OEM_ID_SIZE + 1];
char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1]; char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1];
u32 oem_revision; u32 oem_revision;
}; };
...@@ -93,9 +93,13 @@ static void cppc_check_hisi_workaround(void) ...@@ -93,9 +93,13 @@ static void cppc_check_hisi_workaround(void)
for (i = 0; i < ARRAY_SIZE(wa_info); i++) { for (i = 0; i < ARRAY_SIZE(wa_info); i++) {
if (!memcmp(wa_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) && if (!memcmp(wa_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) &&
!memcmp(wa_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) && !memcmp(wa_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) &&
wa_info[i].oem_revision == tbl->oem_revision) wa_info[i].oem_revision == tbl->oem_revision) {
apply_hisi_workaround = true; apply_hisi_workaround = true;
break;
}
} }
acpi_put_table(tbl);
} }
/* Callback function used to retrieve the max frequency from DMI */ /* Callback function used to retrieve the max frequency from DMI */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment