Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
PATCH 1/1 Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
The acpi_pm clocksource driver uses CLOCK_TICK_RATE which is defined as PIT_TICK_RATE on x86. This patch cleans it up to just use the later so that CLOCK_TICK_RATE can be depecrated.
--- drivers/clocksource/acpi_pm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/clocksource/acpi_pm.c +1 -1
@@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,#ifndef CONFIG_X86_64 #include <asm/mach_timer.h> #define PMTMR_EXPECTED_RATE \ - ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) + ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (PIT_TICK_RATE>>10))/* * Some boards have the PMTMR running way too fast. We check * the PMTMR rate against PIT channel 2 to catch these cases.
Signature · 1 line
1.7.4.1
Quoted 14 lines · Deepak Saxena
The
acpi_pmclocksource driver usesCLOCK_TICK_RATEwhich is defined asPIT_TICK_RATEon x86. This patch cleans it up to just use the later so thatCLOCK_TICK_RATEcan be depecrated.Signed-off-by Deepak Saxena <[email protected]>--- drivers/clocksource/acpi_pm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/clocksource/acpi_pm.c +0
-0
drivers/clocksource/acpi_pm.c DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE, · line 149
Quoted 8 lines
drivers/clocksource/acpi_pm.c +1
-1@@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,#ifndef CONFIG_X86_64 #include <asm/mach_timer.h> #define PMTMR_EXPECTED_RATE \ - ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) + ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (PIT_TICK_RATE>>10))/* * Some boards have the PMTMR running way too fast. We check * the PMTMR rate against PIT channel 2 to catch these cases.
I suspect the PMTMR_EXPECTED_RATE is not so sensitive that it actually needs to use CLOCK_TICK_RATE or PIT_TICK_RATE here.
Instead we probably should rework mach_countup() to return how long it ran for (in nsecs), since the acpi_pm code really shouldn't need to know PIT_TICK_RATE details at all.
That said, mach_countup is pretty old and crusty code that is important to TSC and loop-per-jiffy calibration. So I'm not sure if there's much gain to digging in and mucking with things there.
So for now, the PIT_TICK_RATE change seems like a fair change.