adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

ACPI: restore CONFIG_ACPI_SLEEP

Browse source 
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the
new CONFIG_PM_SLEEP option.

Signed-off-by: Len Brown <len.brown@intel.com>
[ Modified to work with the PM config setup changes. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Len Brown 2007-07-28 03:33:16 -04:00 committed by Linus Torvalds
parent 296699de6b
commit 673d5b43da
13 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/i386/kernel/acpi/Makefile
View file

@ -2,7 +2,7 @@ obj-$(CONFIG_ACPI) += boot.o
ifneq ($(CONFIG_PCI),) ifneq ($(CONFIG_PCI),)
obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
endif endif
obj-$(CONFIG_ACPI) += sleep.o wakeup.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
ifneq ($(CONFIG_ACPI_PROCESSOR),) ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o obj-y += cstate.o processor.o

2
arch/i386/kernel/setup.c
View file

@ -422,7 +422,7 @@ void __init setup_bootmem_allocator(void)
*/ */
reserve_bootmem(PAGE_SIZE, PAGE_SIZE); reserve_bootmem(PAGE_SIZE, PAGE_SIZE);
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI_SLEEP
/* /*
* Reserve low memory region for sleep support. * Reserve low memory region for sleep support.
*/ */

2
arch/x86_64/kernel/acpi/Makefile
View file

@ -1,6 +1,6 @@
obj-y := boot.o obj-y := boot.o
boot-y := ../../../i386/kernel/acpi/boot.o boot-y := ../../../i386/kernel/acpi/boot.o
obj-y += sleep.o wakeup.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
ifneq ($(CONFIG_ACPI_PROCESSOR),) ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += processor.o obj-y += processor.o

2
arch/x86_64/kernel/head.S
View file

@ -120,7 +120,7 @@ ident_complete:
addq %rbp, trampoline_level4_pgt + 0(%rip) addq %rbp, trampoline_level4_pgt + 0(%rip)
addq %rbp, trampoline_level4_pgt + (511*8)(%rip) addq %rbp, trampoline_level4_pgt + (511*8)(%rip)
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI_SLEEP
addq %rbp, wakeup_level4_pgt + 0(%rip) addq %rbp, wakeup_level4_pgt + 0(%rip)
addq %rbp, wakeup_level4_pgt + (511*8)(%rip) addq %rbp, wakeup_level4_pgt + (511*8)(%rip)
#endif #endif

2
arch/x86_64/kernel/setup.c
View file

@ -333,7 +333,7 @@ void __init setup_arch(char **cmdline_p)
reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE); reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, 2*PAGE_SIZE);
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI_SLEEP
/* /*
* Reserve low memory region for sleep support. * Reserve low memory region for sleep support.
*/ */

5
drivers/acpi/Kconfig
View file

@ -42,6 +42,11 @@ menuconfig ACPI
if ACPI if ACPI
config ACPI_SLEEP
bool
depends on PM_SLEEP
default y
config ACPI_PROCFS config ACPI_PROCFS
bool "Deprecated /proc/acpi files" bool "Deprecated /proc/acpi files"
depends on PROC_FS depends on PROC_FS

4
drivers/acpi/sleep/Makefile
View file

@ -1,5 +1,5 @@
obj-y := poweroff.o wakeup.o obj-y := poweroff.o wakeup.o
obj-$(CONFIG_PM_SLEEP) += main.o obj-$(CONFIG_ACPI_SLEEP) += main.o
obj-$(CONFIG_X86) += proc.o obj-$(CONFIG_ACPI_SLEEP) += proc.o
EXTRA_CFLAGS += $(ACPI_CFLAGS) EXTRA_CFLAGS += $(ACPI_CFLAGS)

2
drivers/acpi/sleep/poweroff.c
View file

@ -18,6 +18,7 @@
int acpi_sleep_prepare(u32 acpi_state) int acpi_sleep_prepare(u32 acpi_state)
{ {
#ifdef CONFIG_ACPI_SLEEP
/* do we have a wakeup address for S2 and S3? */ /* do we have a wakeup address for S2 and S3? */
if (acpi_state == ACPI_STATE_S3) { if (acpi_state == ACPI_STATE_S3) {
if (!acpi_wakeup_address) { if (!acpi_wakeup_address) {
@ -30,6 +31,7 @@ int acpi_sleep_prepare(u32 acpi_state)
} }
ACPI_FLUSH_CPU_CACHE(); ACPI_FLUSH_CPU_CACHE();
acpi_enable_wakeup_device_prep(acpi_state); acpi_enable_wakeup_device_prep(acpi_state);
#endif
acpi_gpe_sleep_prepare(acpi_state); acpi_gpe_sleep_prepare(acpi_state);
acpi_enter_sleep_state_prep(acpi_state); acpi_enter_sleep_state_prep(acpi_state);
return 0; return 0;

2
drivers/acpi/sleep/proc.c
View file

@ -78,7 +78,7 @@ acpi_system_write_sleep(struct file *file,
} }
#endif /* CONFIG_ACPI_PROCFS_SLEEP */ #endif /* CONFIG_ACPI_PROCFS_SLEEP */
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)
/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */ /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
#else #else
#define HAVE_ACPI_LEGACY_ALARM #define HAVE_ACPI_LEGACY_ALARM

4
drivers/pci/pci-acpi.c
View file

@ -220,6 +220,7 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
} }
EXPORT_SYMBOL(pci_osc_control_set); EXPORT_SYMBOL(pci_osc_control_set);
#ifdef CONFIG_ACPI_SLEEP
/* /*
* _SxD returns the D-state with the highest power * _SxD returns the D-state with the highest power
* (lowest D-state number) supported in the S-state "x". * (lowest D-state number) supported in the S-state "x".
@ -267,6 +268,7 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
} }
return PCI_POWER_ERROR; return PCI_POWER_ERROR;
} }
#endif
static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
{ {
@ -340,7 +342,9 @@ static int __init acpi_pci_init(void)
ret = register_acpi_bus_type(&acpi_pci_bus); ret = register_acpi_bus_type(&acpi_pci_bus);
if (ret) if (ret)
return 0; return 0;
#ifdef CONFIG_ACPI_SLEEP
platform_pci_choose_state = acpi_pci_choose_state; platform_pci_choose_state = acpi_pci_choose_state;
#endif
platform_pci_set_power_state = acpi_pci_set_power_state; platform_pci_set_power_state = acpi_pci_set_power_state;
return 0; return 0;
} }

4
drivers/pnp/pnpacpi/core.c
View file

@ -127,6 +127,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
return ACPI_FAILURE(status) ? -ENODEV : 0; return ACPI_FAILURE(status) ? -ENODEV : 0;
} }
#ifdef CONFIG_ACPI_SLEEP
static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
{ {
return acpi_bus_set_power((acpi_handle) dev->data, return acpi_bus_set_power((acpi_handle) dev->data,
@ -140,14 +141,17 @@ static int pnpacpi_resume(struct pnp_dev *dev)
{ {
return acpi_bus_set_power((acpi_handle) dev->data, ACPI_STATE_D0); return acpi_bus_set_power((acpi_handle) dev->data, ACPI_STATE_D0);
} }
#endif
static struct pnp_protocol pnpacpi_protocol = { static struct pnp_protocol pnpacpi_protocol = {
.name = "Plug and Play ACPI", .name = "Plug and Play ACPI",
.get = pnpacpi_get_resources, .get = pnpacpi_get_resources,
.set = pnpacpi_set_resources, .set = pnpacpi_set_resources,
.disable = pnpacpi_disable_resources, .disable = pnpacpi_disable_resources,
#ifdef CONFIG_ACPI_SLEEP
.suspend = pnpacpi_suspend, .suspend = pnpacpi_suspend,
.resume = pnpacpi_resume, .resume = pnpacpi_resume,
#endif
}; };
static int __init pnpacpi_add_device(struct acpi_device *device) static int __init pnpacpi_add_device(struct acpi_device *device)

2
include/acpi/acpi_drivers.h
View file

@ -147,7 +147,7 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle)
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
Suspend/Resume Suspend/Resume
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ACPI_SLEEP
extern int acpi_sleep_init(void); extern int acpi_sleep_init(void);
#else #else
static inline int acpi_sleep_init(void) { return 0; } static inline int acpi_sleep_init(void) { return 0; }

2
kernel/sysctl.c
View file

@ -689,7 +689,7 @@ static ctl_table kern_table[] = {
.proc_handler = &proc_dointvec, .proc_handler = &proc_dointvec,
}, },
#endif #endif
#if defined(CONFIG_ACPI) && defined(CONFIG_X86) #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86)
{ {
.ctl_name = KERN_ACPI_VIDEO_FLAGS, .ctl_name = KERN_ACPI_VIDEO_FLAGS,
.procname = "acpi_video_flags", .procname = "acpi_video_flags",