From: Al Stone ahs3@redhat.com
Remove the saving and restoring of bus master reload registers in suspend/resume when in reduced HW mode; according to the spec, no such registers should exist.
Signed-off-by: Al Stone al.stone@linaro.org --- drivers/acpi/processor_idle.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index e45f913..3cee9a1 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -219,14 +219,29 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr, #endif
#ifdef CONFIG_PM_SLEEP +#if (!ACPI_REDUCED_HARDWARE) +/* Bus Master Reload is not supported in the reduced hardware profile */ static u32 saved_bm_rld; +#endif
+#ifdef ACPI_REDUCED_HARDWARE +/* Bus Master Reload is not supported in the reduced hardware profile */ +static int acpi_processor_suspend(void) +{ + return 0; +} +#else static int acpi_processor_suspend(void) { acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &saved_bm_rld); return 0; } +#endif
+#ifdef ACPI_REDUCED_HARDWARE +/* Bus Master Reload is not supported in the reduced hardware profile */ +static void acpi_processor_resume(void) { } +#else static void acpi_processor_resume(void) { u32 resumed_bm_rld; @@ -237,6 +252,7 @@ static void acpi_processor_resume(void)
acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld); } +#endif
static struct syscore_ops acpi_processor_syscore_ops = { .suspend = acpi_processor_suspend, @@ -617,7 +633,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) case ACPI_STATE_C2: if (!cx->address) break; - cx->valid = 1; + cx->valid = 1; break;
case ACPI_STATE_C3: