| Message ID | 1577152590-25574-1-git-send-email-guohanjun@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/2] cpufreq : cppc: Break out if we match the HiSilicon cppc workaround | expand |
On Tuesday, December 24, 2019 2:56:29 AM CET Hanjun Guo wrote: > Bail out if we match the OEM information, to save some possible > extra iteration. And update the code to fix minor coding style issue. > > Signed-off-by: Hanjun Guo <guohanjun@huawei.com> > --- > drivers/cpufreq/cppc_cpufreq.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c > index 8d8da76..d0ca300 100644 > --- a/drivers/cpufreq/cppc_cpufreq.c > +++ b/drivers/cpufreq/cppc_cpufreq.c > @@ -39,7 +39,7 @@ > static struct cppc_cpudata **all_cpu_data; > > 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]; > u32 oem_revision; > }; > @@ -93,8 +93,10 @@ static void cppc_check_hisi_workaround(void) > for (i = 0; i < ARRAY_SIZE(wa_info); i++) { > 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) && > - wa_info[i].oem_revision == tbl->oem_revision) > + wa_info[i].oem_revision == tbl->oem_revision) { > apply_hisi_workaround = true; > + break; > + } > } > } > > Both this and the [2/2] applies as 5.6 material with reworked subjects and changelog changes. Thanks!
On 2019/12/30 6:47, Rafael J. Wysocki wrote: > On Tuesday, December 24, 2019 2:56:29 AM CET Hanjun Guo wrote: >> Bail out if we match the OEM information, to save some possible >> extra iteration. And update the code to fix minor coding style issue. >> >> Signed-off-by: Hanjun Guo <guohanjun@huawei.com> >> --- >> drivers/cpufreq/cppc_cpufreq.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c >> index 8d8da76..d0ca300 100644 >> --- a/drivers/cpufreq/cppc_cpufreq.c >> +++ b/drivers/cpufreq/cppc_cpufreq.c >> @@ -39,7 +39,7 @@ >> static struct cppc_cpudata **all_cpu_data; >> >> 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]; >> u32 oem_revision; >> }; >> @@ -93,8 +93,10 @@ static void cppc_check_hisi_workaround(void) >> for (i = 0; i < ARRAY_SIZE(wa_info); i++) { >> 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) && >> - wa_info[i].oem_revision == tbl->oem_revision) >> + wa_info[i].oem_revision == tbl->oem_revision) { >> apply_hisi_workaround = true; >> + break; >> + } >> } >> } >> >> > > Both this and the [2/2] applies as 5.6 material with reworked > subjects and changelog changes. Thanks! Much better for the reworked subject and changelog, thank you very much! Hanjun
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 8d8da76..d0ca300 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -39,7 +39,7 @@ static struct cppc_cpudata **all_cpu_data; 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]; u32 oem_revision; }; @@ -93,8 +93,10 @@ static void cppc_check_hisi_workaround(void) for (i = 0; i < ARRAY_SIZE(wa_info); i++) { 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) && - wa_info[i].oem_revision == tbl->oem_revision) + wa_info[i].oem_revision == tbl->oem_revision) { apply_hisi_workaround = true; + break; + } } }
Bail out if we match the OEM information, to save some possible extra iteration. And update the code to fix minor coding style issue. Signed-off-by: Hanjun Guo <guohanjun@huawei.com> --- drivers/cpufreq/cppc_cpufreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)