Skip to content

L
linux-davinci
Commit 4fc2fba8 authored by Pavel Machek's avatar Pavel Machek Committed by Ingo Molnar
Browse files
Options

x86: unify arch/x86/kernel/acpi/sleep*.c 

Unify arch/x86/kernel/acpi/sleep*.c

Pretty trivial unification; when two functions differed, it was
usually in error handling, and better of the two was picked up.
Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Looks-okay-to: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8a19da7b
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 71 deletions
arch/x86/kernel/acpi/Makefile
View file @ 4fc2fba8
obj-$(CONFIG_ACPI) += boot.o obj-$(CONFIG_ACPI) += boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep_$(BITS).o wakeup_$(BITS).o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_$(BITS).o
ifneq ($(CONFIG_ACPI_PROCESSOR),) ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o obj-y += cstate.o processor.o
......
arch/x86/kernel/acpi/sleep_64.c → arch/x86/kernel/acpi/sleep.c
View file @ 4fc2fba8
/* /*
* acpi.c - Architecture-Specific Low-Level ACPI Support * sleep.c - x86-specific ACPI sleep support.
* *
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> * Copyright (C) 2001-2003 Patrick Mochel
* Copyright (C) 2001 Jun Nakajima <jun.nakajima@intel.com> * Copyright (C) 2001-2003 Pavel Machek <pavel@suse.cz>
* Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
* Copyright (C) 2002 Andi Kleen, SuSE Labs (x86-64 port)
* Copyright (C) 2003 Pavel Machek, SuSE Labs
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/ */
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/stddef.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/bootmem.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/bootmem.h>
#include <linux/dmi.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <asm/mpspec.h> #include <asm/smp.h>
#include <asm/io.h>
#include <asm/apic.h>
#include <asm/apicdef.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
#include <asm/io_apic.h>
#include <asm/proto.h>
#include <asm/tlbflush.h>
/* --------------------------------------------------------------------------
Low-Level Sleep Support
-------------------------------------------------------------------------- */
/* address in low memory of the wakeup routine. */ /* address in low memory of the wakeup routine. */
unsigned long acpi_wakeup_address = 0; unsigned long acpi_wakeup_address = 0;
...@@ -66,6 +27,10 @@ extern unsigned long acpi_copy_wakeup_routine(unsigned long); ...@@ -66,6 +27,10 @@ extern unsigned long acpi_copy_wakeup_routine(unsigned long);
*/ */
int acpi_save_state_mem(void) int acpi_save_state_mem(void)
{ {
if (!acpi_wakeup_address) {
printk(KERN_ERR "Could not allocate memory during boot, S3 disabled\n");
return -ENOMEM;
}
memcpy((void *)acpi_wakeup_address, &wakeup_start, memcpy((void *)acpi_wakeup_address, &wakeup_start,
&wakeup_end - &wakeup_start); &wakeup_end - &wakeup_start);
acpi_copy_wakeup_routine(acpi_wakeup_address); acpi_copy_wakeup_routine(acpi_wakeup_address);
...@@ -74,29 +39,35 @@ int acpi_save_state_mem(void) ...@@ -74,29 +39,35 @@ int acpi_save_state_mem(void)
} }
/* /*
* acpi_restore_state * acpi_restore_state - undo effects of acpi_save_state_mem
*/ */
void acpi_restore_state_mem(void) void acpi_restore_state_mem(void)
{ {
} }
/** /**
* acpi_reserve_bootmem - do _very_ early ACPI initialisation * acpi_reserve_bootmem - do _very_ early ACPI initialisation
* *
* We allocate a page in low memory for the wakeup * We allocate a page from the first 1MB of memory for the wakeup
* routine for when we come back from a sleep state. The * routine for when we come back from a sleep state. The
* runtime allocator allows specification of <16M pages, but not * runtime allocator allows specification of <16MB pages, but not
* <1M pages. * <1MB pages.
*/ */
void __init acpi_reserve_bootmem(void) void __init acpi_reserve_bootmem(void)
{ {
if ((&wakeup_end - &wakeup_start) > PAGE_SIZE*2) {
printk(KERN_ERR
"ACPI: Wakeup code way too big, S3 disabled.\n");
return;
}
acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE*2); acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE*2);
if ((&wakeup_end - &wakeup_start) > (PAGE_SIZE*2)) if (!acpi_wakeup_address)
printk(KERN_CRIT printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
"ACPI: Wakeup code way too big, will crash on attempt"
" to suspend\n");
} }
static int __init acpi_sleep_setup(char *str) static int __init acpi_sleep_setup(char *str)
{ {
while ((str != NULL) && (*str != '\0')) { while ((str != NULL) && (*str != '\0')) {
...@@ -114,4 +85,3 @@ static int __init acpi_sleep_setup(char *str) ...@@ -114,4 +85,3 @@ static int __init acpi_sleep_setup(char *str)
} }
__setup("acpi_sleep=", acpi_sleep_setup); __setup("acpi_sleep=", acpi_sleep_setup);
arch/x86/kernel/acpi/sleep_32.c
View file @ 4fc2fba8
...@@ -12,76 +12,6 @@ ...@@ -12,76 +12,6 @@
#include <asm/smp.h> #include <asm/smp.h>
/* address in low memory of the wakeup routine. */
unsigned long acpi_wakeup_address = 0;
unsigned long acpi_realmode_flags;
extern char wakeup_start, wakeup_end;
extern unsigned long acpi_copy_wakeup_routine(unsigned long);
/**
* acpi_save_state_mem - save kernel state
*
* Create an identity mapped page table and copy the wakeup routine to
* low memory.
*/
int acpi_save_state_mem(void)
{
if (!acpi_wakeup_address)
return 1;
memcpy((void *)acpi_wakeup_address, &wakeup_start,
&wakeup_end - &wakeup_start);
acpi_copy_wakeup_routine(acpi_wakeup_address);
return 0;
}
/*
* acpi_restore_state - undo effects of acpi_save_state_mem
*/
void acpi_restore_state_mem(void)
{
}
/**
* acpi_reserve_bootmem - do _very_ early ACPI initialisation
*
* We allocate a page from the first 1MB of memory for the wakeup
* routine for when we come back from a sleep state. The
* runtime allocator allows specification of <16MB pages, but not
* <1MB pages.
*/
void __init acpi_reserve_bootmem(void)
{
if ((&wakeup_end - &wakeup_start) > PAGE_SIZE) {
printk(KERN_ERR
"ACPI: Wakeup code way too big, S3 disabled.\n");
return;
}
acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE);
if (!acpi_wakeup_address)
printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
}
static int __init acpi_sleep_setup(char *str)
{
while ((str != NULL) && (*str != '\0')) {
if (strncmp(str, "s3_bios", 7) == 0)
acpi_realmode_flags |= 1;
if (strncmp(str, "s3_mode", 7) == 0)
acpi_realmode_flags |= 2;
if (strncmp(str, "s3_beep", 7) == 0)
acpi_realmode_flags |= 4;
str = strchr(str, ',');
if (str != NULL)
str += strspn(str, ", \t");
}
return 1;
}
__setup("acpi_sleep=", acpi_sleep_setup);
/* Ouch, we want to delete this. We already have better version in userspace, in /* Ouch, we want to delete this. We already have better version in userspace, in
s2ram from suspend.sf.net project */ s2ram from suspend.sf.net project */
static __init int reset_videomode_after_s3(const struct dmi_system_id *d) static __init int reset_videomode_after_s3(const struct dmi_system_id *d)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment