提交 7343d0f6 编写于 作者: H Hanjun Guo 提交者: Yang Yingliang

cpufreq : CPPC: Break out if HiSilicon CPPC workaround is matched

mainline inclusion
from mainline-v5.6-rc1
commit c7402379
category: bugfix
bugzilla: NA
CVE: NA

--------------------------------

Bail out if we match the OEM information, to save some possible
extra iteration.

Also update the code to fix minor coding style issue.
Signed-off-by: NHanjun Guo <guohanjun@huawei.com>
[ rjw: Subject ]
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 8410c6a0
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,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;
}; };
...@@ -97,8 +97,10 @@ static void cppc_check_hisi_workaround(void) ...@@ -97,8 +97,10 @@ 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;
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册