leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge back cpufreq fixes for v5.6.

Browse Source
This commit is contained in:
Rafael J. Wysocki 2020-01-13 10:33:29 +01:00
commit 2c7a8bd606
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cpufreq/cppc_cpufreq.c
View File

@ -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)
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 */