Commit 504997cf authored by Sudeep Holla's avatar Sudeep Holla Committed by Rafael J. Wysocki
Browse files

ACPI / sleep: move acpi_processor_sleep to sleep.c 



acpi_processor_sleep is neither related nor used by CPUIdle framework.
It's used in system suspend/resume path as a syscore operation. It makes
more sense to move it to acpi/sleep.c where all the S-state transition
(a.k.a. Linux system suspend/hiberate) related code are present.

Also make it depend on CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT so that
it's not compiled on architecture like ARM64 where S-states are not
yet defined in ACPI.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent db62fda3

drivers/acpi/processor_driver.c

+0 −2
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ static int __init acpi_processor_driver_init(void) 
	if (result < 0)

		return result;



	acpi_processor_syscore_init();

	register_hotcpu_notifier(&acpi_cpu_notifier);

	acpi_thermal_cpufreq_init();

	acpi_processor_ppc_init();
@@ -330,7 +329,6 @@ static void __exit acpi_processor_driver_exit(void) 
	acpi_processor_ppc_exit();

	acpi_thermal_cpufreq_exit();

	unregister_hotcpu_notifier(&acpi_cpu_notifier);

	acpi_processor_syscore_exit();

	driver_unregister(&acpi_processor_driver);

}

drivers/acpi/processor_idle.c

+0 −37
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/sched.h>       /* need_resched() */

#include <linux/tick.h>

#include <linux/cpuidle.h>

#include <linux/syscore_ops.h>

#include <acpi/processor.h>



/*
@@ -193,42 +192,6 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr, 


#endif



#ifdef CONFIG_PM_SLEEP

static u32 saved_bm_rld;



static int acpi_processor_suspend(void)

{

	acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &saved_bm_rld);

	return 0;

}



static void acpi_processor_resume(void)

{

	u32 resumed_bm_rld = 0;



	acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &resumed_bm_rld);

	if (resumed_bm_rld == saved_bm_rld)

		return;



	acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);

}



static struct syscore_ops acpi_processor_syscore_ops = {

	.suspend = acpi_processor_suspend,

	.resume = acpi_processor_resume,

};



void acpi_processor_syscore_init(void)

{

	register_syscore_ops(&acpi_processor_syscore_ops);

}



void acpi_processor_syscore_exit(void)

{

	unregister_syscore_ops(&acpi_processor_syscore_ops);

}

#endif /* CONFIG_PM_SLEEP */



#if defined(CONFIG_X86)

static void tsc_check_state(int state)

{

drivers/acpi/sleep.c

+35 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/reboot.h>

#include <linux/acpi.h>

#include <linux/module.h>

#include <linux/syscore_ops.h>

#include <asm/io.h>

#include <trace/events/power.h>
@@ -677,6 +678,39 @@ static void acpi_sleep_suspend_setup(void) 
static inline void acpi_sleep_suspend_setup(void) {}

#endif /* !CONFIG_SUSPEND */



#ifdef CONFIG_PM_SLEEP

static u32 saved_bm_rld;



static int  acpi_save_bm_rld(void)

{

	acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &saved_bm_rld);

	return 0;

}



static void  acpi_restore_bm_rld(void)

{

	u32 resumed_bm_rld = 0;



	acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_RLD, &resumed_bm_rld);

	if (resumed_bm_rld == saved_bm_rld)

		return;



	acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);

}



static struct syscore_ops acpi_sleep_syscore_ops = {

	.suspend = acpi_save_bm_rld,

	.resume = acpi_restore_bm_rld,

};



void acpi_sleep_syscore_init(void)

{

	register_syscore_ops(&acpi_sleep_syscore_ops);

}

#else

static inline void acpi_sleep_syscore_init(void) {}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_HIBERNATION

static unsigned long s4_hardware_signature;

static struct acpi_table_facs *facs;
@@ -839,6 +873,7 @@ int __init acpi_sleep_init(void) 


	sleep_states[ACPI_STATE_S0] = 1;



	acpi_sleep_syscore_init();

	acpi_sleep_suspend_setup();

	acpi_sleep_hibernate_setup();

include/acpi/processor.h

+0 −8
Original line number Diff line number Diff line
@@ -395,14 +395,6 @@ static inline int acpi_processor_hotplug(struct acpi_processor *pr) 
}

#endif /* CONFIG_ACPI_PROCESSOR_IDLE */



#if defined(CONFIG_PM_SLEEP) & defined(CONFIG_ACPI_PROCESSOR_IDLE)

void acpi_processor_syscore_init(void);

void acpi_processor_syscore_exit(void);

#else

static inline void acpi_processor_syscore_init(void) {}

static inline void acpi_processor_syscore_exit(void) {}

#endif



/* in processor_thermal.c */

int acpi_processor_get_limit_info(struct acpi_processor *pr);

extern const struct thermal_cooling_device_ops processor_cooling_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE