redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem() 

The function do_suspend_lowlevel() is specific to x86 and defined in
assembly code, so it should be called from the x86 low-level suspend
code rather than from acpi_suspend_enter().

Merge do_suspend_lowlevel() into the x86's acpi_save_state_mem() and
change the name of the latter to acpi_suspend_lowlevel(), so that the
function's purpose is better reflected by its name.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
hifive-unleashed-5.1
Rafael J. Wysocki 2011-02-08 23:42:22 +01:00
parent 979f11b060
commit f1a2003e22
6 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/include/asm/acpi.h
View File

@ -128,8 +128,8 @@ static inline const char *acpi_get_sysname (void)
int acpi_request_vector (u32 int_type);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
/* Routine for saving kernel state during suspend. */
extern int acpi_save_state_mem(void);
/* Low-level suspend routine. */
extern int acpi_suspend_lowlevel(void);
extern unsigned long acpi_wakeup_address;

9
arch/ia64/kernel/acpi.c
View File

@ -1034,13 +1034,8 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
EXPORT_SYMBOL(acpi_unregister_ioapic);
/*
* acpi_save_state_mem() - save kernel state
* acpi_suspend_lowlevel() - save kernel state and suspend.
*
* TBD when when IA64 starts to support suspend...
*/
int acpi_save_state_mem(void) { return 0; }
/*
* do_suspend_lowlevel()
*/
void do_suspend_lowlevel(void) {}
int acpi_suspend_lowlevel(void) { return 0; }

4
arch/x86/include/asm/acpi.h
View File

@ -112,8 +112,8 @@ static inline void acpi_disable_pci(void)
acpi_noirq_set();
}
/* Routine for saving kernel state during suspend. */
extern int acpi_save_state_mem(void);
/* Low-level suspend routine. */
extern int acpi_suspend_lowlevel(void);
extern unsigned long acpi_wakeup_address;

5
arch/x86/kernel/acpi/sleep.c
View File

@ -29,14 +29,14 @@ static char temp_stack[4096];
#endif
/**
* acpi_save_state_mem - save kernel state
* acpi_suspend_lowlevel - save kernel state
*
* Create an identity mapped page table and copy the wakeup routine to
* low memory.
*
* Note that this is too late to change acpi_wakeup_address.
*/
int acpi_save_state_mem(void)
int acpi_suspend_lowlevel(void)
{
struct wakeup_header *header;
@ -107,6 +107,7 @@ int acpi_save_state_mem(void)
saved_magic = 0x123456789abcdef0L;
#endif /* CONFIG_64BIT */
do_suspend_lowlevel();
return 0;
}

2
arch/x86/kernel/acpi/sleep.h
View File

@ -14,3 +14,5 @@ extern char swsusp_pg_dir[PAGE_SIZE];
extern unsigned long acpi_copy_wakeup_routine(unsigned long);
extern void wakeup_long64(void);
extern void do_suspend_lowlevel(void);

5
drivers/acpi/sleep.c
View File

@ -199,8 +199,6 @@ static void acpi_pm_end(void)
#endif /* CONFIG_ACPI_SLEEP */
#ifdef CONFIG_SUSPEND
extern void do_suspend_lowlevel(void);
static u32 acpi_suspend_states[] = {
[PM_SUSPEND_ON] = ACPI_STATE_S0,
[PM_SUSPEND_STANDBY] = ACPI_STATE_S1,
@ -255,10 +253,9 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
break;
case ACPI_STATE_S3:
error = acpi_save_state_mem();
error = acpi_suspend_lowlevel();
if (error)
return error;
do_suspend_lowlevel();
pr_info(PREFIX "Low-level resume complete\n");
break;
}