Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge back ACPI processor driver updates for 7.1
+7
-14
+7
-14
drivers/acpi/processor_idle.c
+7
-14
drivers/acpi/processor_idle.c
···
819
819
drv->state_count = count;
820
820
}
821
821
822
-
static inline void acpi_processor_cstate_first_run_checks(void)
822
+
static inline void acpi_processor_update_max_cstate(void)
823
823
{
824
-
static int first_run;
825
-
826
-
if (first_run)
827
-
return;
828
824
dmi_check_system(processor_power_dmi_table);
829
825
max_cstate = acpi_processor_cstate_check(max_cstate);
830
826
if (max_cstate < ACPI_C_STATES_MAX)
831
827
pr_notice("processor limited to max C-state %d\n", max_cstate);
832
-
833
-
first_run++;
834
828
835
829
if (nocst)
836
830
return;
···
834
840
#else
835
841
836
842
static inline int disabled_by_idle_boot_param(void) { return 0; }
837
-
static inline void acpi_processor_cstate_first_run_checks(void) { }
843
+
static inline void acpi_processor_update_max_cstate(void) { }
838
844
static int acpi_processor_get_cstate_info(struct acpi_processor *pr)
839
845
{
840
846
return -ENODEV;
···
1010
1016
result->arch_flags = parent->arch_flags;
1011
1017
result->index = parent->index;
1012
1018
1013
-
strscpy(result->desc, local->desc, ACPI_CX_DESC_LEN);
1014
-
strlcat(result->desc, "+", ACPI_CX_DESC_LEN);
1015
-
strlcat(result->desc, parent->desc, ACPI_CX_DESC_LEN);
1019
+
scnprintf(result->desc, ACPI_CX_DESC_LEN, "%s+%s", local->desc, parent->desc);
1016
1020
return true;
1017
1021
}
1018
1022
···
1060
1068
stash_composite_state(curr_level, flpi);
1061
1069
flat_state_cnt++;
1062
1070
flpi++;
1071
+
if (flat_state_cnt >= ACPI_PROCESSOR_MAX_POWER)
1072
+
break;
1063
1073
}
1064
1074
}
1065
1075
}
···
1351
1357
int ret = -ENODEV;
1352
1358
int cpu;
1353
1359
1360
+
acpi_processor_update_max_cstate();
1361
+
1354
1362
/*
1355
1363
* ACPI idle driver is used by all possible CPUs.
1356
1364
* Use the processor power info of one in them to set up idle states.
···
1364
1368
if (!pr)
1365
1369
continue;
1366
1370
1367
-
acpi_processor_cstate_first_run_checks();
1368
1371
ret = acpi_processor_get_power_info(pr);
1369
1372
if (!ret) {
1370
1373
pr->flags.power_setup_done = 1;
···
1403
1408
1404
1409
if (disabled_by_idle_boot_param())
1405
1410
return;
1406
-
1407
-
acpi_processor_cstate_first_run_checks();
1408
1411
1409
1412
if (!acpi_processor_get_power_info(pr))
1410
1413
pr->flags.power_setup_done = 1;