diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2017-02-24 16:11:55 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2017-02-24 16:11:55 +0000 |
| commit | 8cd5962571783eda7ce0ac5a0d2e5ce277cde64e (patch) | |
| tree | 93f20083e559424fc31fd9adaed9e169d0e831c7 /sys | |
| parent | 9c8efa1dfbcea53cb251fc16b37db4bce2919ac1 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/acpica/acpi_cpu.c | 9 | ||||
| -rw-r--r-- | sys/kern/kern_clocksource.c | 1 | ||||
| -rw-r--r-- | sys/sys/systm.h | 1 | ||||
| -rw-r--r-- | sys/x86/x86/tsc.c | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index 9a6a2995c798..cc0fd0a8ac24 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -703,7 +703,6 @@ acpi_cpu_generic_cx_probe(struct acpi_cpu_softc *sc) sc->cpu_non_c2 = sc->cpu_cx_count; sc->cpu_non_c3 = sc->cpu_cx_count; sc->cpu_cx_count++; - cpu_deepest_sleep = 1; /* * The spec says P_BLK must be 6 bytes long. However, some systems @@ -729,7 +728,6 @@ acpi_cpu_generic_cx_probe(struct acpi_cpu_softc *sc) cx_ptr++; sc->cpu_non_c3 = sc->cpu_cx_count; sc->cpu_cx_count++; - cpu_deepest_sleep = 2; } } if (sc->cpu_p_blk_len < 6) @@ -746,7 +744,6 @@ acpi_cpu_generic_cx_probe(struct acpi_cpu_softc *sc) cx_ptr->trans_lat = AcpiGbl_FADT.C3Latency; cx_ptr++; sc->cpu_cx_count++; - cpu_deepest_sleep = 3; } } } @@ -831,7 +828,6 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc) cx_ptr->type = ACPI_STATE_C0; cx_ptr++; sc->cpu_cx_count++; - cpu_deepest_sleep = 1; /* Set up all valid states. */ for (i = 0; i < count; i++) { @@ -884,8 +880,6 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc) continue; case ACPI_STATE_C2: sc->cpu_non_c3 = sc->cpu_cx_count; - if (cpu_deepest_sleep < 2) - cpu_deepest_sleep = 2; break; case ACPI_STATE_C3: default: @@ -894,8 +888,7 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc) "acpi_cpu%d: C3[%d] not available.\n", device_get_unit(sc->cpu_dev), i)); continue; - } else - cpu_deepest_sleep = 3; + } break; } diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c index 8bacff61d2d7..61293173f22d 100644 --- a/sys/kern/kern_clocksource.c +++ b/sys/kern/kern_clocksource.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/smp.h> -int cpu_deepest_sleep = 0; /* Deepest Cx state available. */ int cpu_disable_c2_sleep = 0; /* Timer dies in C2. */ int cpu_disable_c3_sleep = 0; /* Timer dies in C3. */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index c564547123a1..d9b5c1494082 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -321,7 +321,6 @@ sbintime_t cpu_idleclock(void); void cpu_activeclock(void); void cpu_new_callout(int cpu, sbintime_t bt, sbintime_t bt_opt); void cpu_et_frequency(struct eventtimer *et, uint64_t newfreq); -extern int cpu_deepest_sleep; extern int cpu_disable_c2_sleep; extern int cpu_disable_c3_sleep; diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 3f36fbd9f8ac..7dcf77fc4315 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -542,7 +542,7 @@ init_TSC_tc(void) * result incorrect runtimes for kernel idle threads (but not * for any non-idle threads). */ - if (cpu_deepest_sleep >= 2 && cpu_vendor_id == CPU_VENDOR_INTEL && + if (cpu_vendor_id == CPU_VENDOR_INTEL && (amd_pminfo & AMDPM_TSC_INVARIANT) == 0) { tsc_timecounter.tc_flags |= TC_FLAGS_C2STOP; if (bootverbose) |