Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 141910
b: refs/heads/master
c: e1eb477
h: refs/heads/master
v: v3
  • Loading branch information
Stanislaw Gruszka authored and Len Brown committed Mar 28, 2009
1 parent 61d3cfd commit 2bd7a81
Show file tree
Hide file tree
Showing 114 changed files with 2,136 additions and 2,769 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3266d63c0684138f4900d4e5c6fbfab59e054afc
refs/heads/master: e1eb47797ac0773cb3efe7495e14fc26e18a23c2
6 changes: 3 additions & 3 deletions trunk/arch/x86/kernel/cpu/cpufreq/longhaul.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static void longhaul_setstate(unsigned int table_index)
outb(3, 0x22);
} else if ((pr != NULL) && pr->flags.bm_control) {
/* Disable bus master arbitration */
acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1);
acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
}
switch (longhaul_version) {

Expand All @@ -326,7 +326,7 @@ static void longhaul_setstate(unsigned int table_index)
case TYPE_POWERSAVER:
if (longhaul_flags & USE_ACPI_C3) {
/* Don't allow wakeup */
acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
do_powersaver(cx->address, clock_ratio_index, dir);
} else {
do_powersaver(0, clock_ratio_index, dir);
Expand All @@ -339,7 +339,7 @@ static void longhaul_setstate(unsigned int table_index)
outb(0, 0x22);
} else if ((pr != NULL) && pr->flags.bm_control) {
/* Enable bus master arbitration */
acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
}
outb(pic2_mask,0xA1); /* restore mask */
outb(pic1_mask,0x21);
Expand Down
150 changes: 64 additions & 86 deletions trunk/drivers/acpi/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ menuconfig ACPI
select PNP
select CPU_IDLE
default y
help
---help---
Advanced Configuration and Power Interface (ACPI) support for
Linux requires an ACPI-compliant platform (hardware/firmware),
Linux requires an ACPI compliant platform (hardware/firmware),
and assumes the presence of OS-directed configuration and power
management (OSPM) software. This option will enlarge your
kernel by about 70K.
Expand All @@ -23,19 +23,20 @@ menuconfig ACPI
the Plug-and-Play BIOS specification (PnP BIOS), the
MultiProcessor Specification (MPS), and the Advanced Power
Management (APM) specification. If both ACPI and APM support
are configured, ACPI is used.
are configured, whichever is loaded first shall be used.

The project home page for the Linux ACPI subsystem is here:
<http://www.lesswatts.org/projects/acpi/>
The ACPI SourceForge project contains the latest source code,
documentation, tools, mailing list subscription, and other
information. This project is available at:
<http://sourceforge.net/projects/acpi>

Linux support for ACPI is based on Intel Corporation's ACPI
Component Architecture (ACPI CA). For more information on the
ACPI CA, see:
<http://acpica.org/>
Component Architecture (ACPI CA). For more information see:
<http://developer.intel.com/technology/iapc/acpi>

ACPI is an open industry specification co-developed by
Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba.
The specification is available at:
ACPI is an open industry specification co-developed by Compaq,
Intel, Microsoft, Phoenix, and Toshiba. The specification is
available at:
<http://www.acpi.info>

if ACPI
Expand All @@ -48,14 +49,14 @@ config ACPI_SLEEP
config ACPI_PROCFS
bool "Deprecated /proc/acpi files"
depends on PROC_FS
help
---help---
For backwards compatibility, this option allows
deprecated /proc/acpi/ files to exist, even when
they have been replaced by functions in /sys.
The deprecated files (and their replacements) include:

/proc/acpi/sleep (/sys/power/state)
/proc/acpi/info (/sys/module/acpi/parameters/acpica_version)
/proc/acpi/info (/sys/modules/acpi/parameters/acpica_version)
/proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
/proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
/proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
Expand All @@ -65,12 +66,11 @@ config ACPI_PROCFS
and functions which do not yet exist in /sys.

Say N to delete /proc/acpi/ files that have moved to /sys/

config ACPI_PROCFS_POWER
bool "Deprecated power /proc/acpi directories"
depends on PROC_FS
default y
help
---help---
For backwards compatibility, this option allows
deprecated power /proc/acpi/ directories to exist, even when
they have been replaced by functions in /sys.
Expand All @@ -86,19 +86,19 @@ config ACPI_SYSFS_POWER
bool "Future power /sys interface"
select POWER_SUPPLY
default y
help
---help---
Say N to disable power /sys interface

config ACPI_PROC_EVENT
bool "Deprecated /proc/acpi/event support"
depends on PROC_FS
default y
help
A user-space daemon, acpid, typically reads /proc/acpi/event
and handles all ACPI-generated events.
---help---
A user-space daemon, acpi, typically read /proc/acpi/event
and handled all ACPI sub-system generated events.

These events are now delivered to user-space either
via the input layer or as netlink events.
These events are now delivered to user-space via
either the input layer, or as netlink events.

This build option enables the old code for legacy
user-space implementation. After some time, this will
Expand All @@ -112,13 +112,10 @@ config ACPI_AC
depends on X86
default y
help
This driver supports the AC Adapter object, which indicates
whether a system is on AC or not. If you have a system that can
This driver adds support for the AC Adapter object, which indicates
whether a system is on AC, or not. If you have a system that can
switch between A/C and battery, say Y.

To compile this driver as a module, choose M here:
the module will be called ac.

config ACPI_BATTERY
tristate "Battery"
depends on X86
Expand All @@ -128,67 +125,54 @@ config ACPI_BATTERY
/proc/acpi/battery. If you have a mobile system with a battery,
say Y.

To compile this driver as a module, choose M here:
the module will be called battery.

config ACPI_BUTTON
tristate "Button"
depends on INPUT
default y
help
This driver handles events on the power, sleep, and lid buttons.
This driver handles events on the power, sleep and lid buttons.
A daemon reads /proc/acpi/event and perform user-defined actions
such as shutting down the system. This is necessary for
software-controlled poweroff.

To compile this driver as a module, choose M here:
the module will be called button.
software controlled poweroff.

config ACPI_VIDEO
tristate "Video"
depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
depends on INPUT
select THERMAL
help
This driver implements the ACPI Extensions For Display Adapters
This driver implement the ACPI Extensions For Display Adapters
for integrated graphics devices on motherboard, as specified in
ACPI 2.0 Specification, Appendix B. This supports basic operations
such as defining the video POST device, retrieving EDID information,
and setting up a video output.

To compile this driver as a module, choose M here:
the module will be called video.
ACPI 2.0 Specification, Appendix B, allowing to perform some basic
control like defining the video POST device, retrieving EDID information
or to setup a video output, etc.
Note that this is an ref. implementation only. It may or may not work
for your integrated video device.

config ACPI_FAN
tristate "Fan"
select THERMAL
default y
help
This driver supports ACPI fan devices, allowing user-mode
This driver adds support for ACPI fan devices, allowing user-mode
applications to perform basic fan control (on, off, status).

To compile this driver as a module, choose M here:
the module will be called fan.

config ACPI_DOCK
bool "Dock"
depends on EXPERIMENTAL
help
This driver supports ACPI-controlled docking stations and removable
drive bays such as the IBM Ultrabay and the Dell Module Bay.
This driver adds support for ACPI controlled docking stations and removable
drive bays such as the IBM ultrabay or the Dell Module Bay.

config ACPI_PROCESSOR
tristate "Processor"
select THERMAL
default y
help
This driver installs ACPI as the idle handler for Linux and uses
ACPI C2 and C3 processor states to save power on systems that
This driver installs ACPI as the idle handler for Linux, and uses
ACPI C2 and C3 processor states to save power, on systems that
support it. It is required by several flavors of cpufreq
performance-state drivers.

To compile this driver as a module, choose M here:
the module will be called processor.
Performance-state drivers.

config ACPI_HOTPLUG_CPU
bool
Expand All @@ -202,14 +186,11 @@ config ACPI_THERMAL
select THERMAL
default y
help
This driver supports ACPI thermal zones. Most mobile and
This driver adds support for ACPI thermal zones. Most mobile and
some desktop systems support ACPI thermal zones. It is HIGHLY
recommended that this option be enabled, as your processor(s)
may be damaged without it.

To compile this driver as a module, choose M here:
the module will be called thermal.

config ACPI_NUMA
bool "NUMA support"
depends on NUMA
Expand Down Expand Up @@ -237,7 +218,7 @@ config ACPI_BLACKLIST_YEAR
int "Disable ACPI for systems before Jan 1st this year" if X86_32
default 0
help
Enter a 4-digit year, e.g., 2001, to disable ACPI by default
enter a 4-digit year, eg. 2001 to disable ACPI by default
on platforms with DMI BIOS date before January 1st that year.
"acpi=force" can be used to override this mechanism.

Expand Down Expand Up @@ -268,13 +249,10 @@ config ACPI_PCI_SLOT
tristate "PCI slot detection driver"
default n
help
This driver creates entries in /sys/bus/pci/slots/ for all PCI
slots in the system. This can help correlate PCI bus addresses,
i.e., segment/bus/device/function tuples, with physical slots in
the system. If you are unsure, say N.

To compile this driver as a module, choose M here:
the module will be called pci_slot.
This driver will attempt to discover all PCI slots in your system,
and creates entries in /sys/bus/pci/slots/. This feature can
help you correlate PCI bus addresses with the physical geography
of your slots. If you are unsure, say N.

config X86_PM_TIMER
bool "Power Management Timer Support" if EMBEDDED
Expand All @@ -293,43 +271,43 @@ config X86_PM_TIMER
systems require this timer.

config ACPI_CONTAINER
tristate "Container and Module Devices (EXPERIMENTAL)"
tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"
depends on EXPERIMENTAL
default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
help
This driver supports ACPI Container and Module devices (IDs
ACPI0004, PNP0A05, and PNP0A06).
---help---
This allows _physical_ insertion and removal of CPUs and memory.
This can be useful, for example, on NUMA machines that support
ACPI based physical hotplug of nodes, or non-NUMA machines that
support physical cpu/memory hot-plug.

This helps support hotplug of nodes, CPUs, and memory.

To compile this driver as a module, choose M here:
the module will be called container.
If one selects "m", this driver can be loaded with
"modprobe container".

config ACPI_HOTPLUG_MEMORY
tristate "Memory Hotplug"
depends on MEMORY_HOTPLUG
default n
help
This driver supports ACPI memory hotplug. The driver
fields notifications on ACPI memory devices (PNP0C80),
which represent memory ranges that may be onlined or
offlined during runtime.
This driver adds supports for ACPI Memory Hotplug. This driver
provides support for fielding notifications on ACPI memory
devices (PNP0C80) which represent memory ranges that may be
onlined or offlined during runtime.

If your hardware and firmware do not support adding or
removing memory devices at runtime, you need not enable
this driver.
Enabling this driver assumes that your platform hardware
and firmware have support for hot-plugging physical memory. If
your system does not support physically adding or ripping out
memory DIMMs at some platform defined granularity (individually
or as a bank) at runtime, then you need not enable this driver.

To compile this driver as a module, choose M here:
the module will be called acpi_memhotplug.
If one selects "m," this driver can be loaded using the following
command:
$>modprobe acpi_memhotplug

config ACPI_SBS
tristate "Smart Battery System"
depends on X86
help
This driver supports the Smart Battery System, another
This driver adds support for the Smart Battery System, another
type of access to battery information, found on some laptops.

To compile this driver as a module, choose M here:
the modules will be called sbs and sbshc.

endif # ACPI
8 changes: 6 additions & 2 deletions trunk/drivers/acpi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ ifdef CONFIG_CPU_FREQ
processor-objs += processor_perflib.o
endif

obj-y += bus.o glue.o scan.o ec.o \
power.o system.o event.o
obj-y += bus.o glue.o
obj-y += scan.o
# Keep EC driver first. Initialization of others depend on it.
obj-y += ec.o
obj-$(CONFIG_ACPI_AC) += ac.o
obj-$(CONFIG_ACPI_BATTERY) += battery.o
obj-$(CONFIG_ACPI_BUTTON) += button.o
Expand All @@ -49,6 +51,8 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
obj-$(CONFIG_ACPI_CONTAINER) += container.o
obj-$(CONFIG_ACPI_THERMAL) += thermal.o
obj-y += power.o
obj-y += system.o event.o
obj-$(CONFIG_ACPI_DEBUG) += debug.o
obj-$(CONFIG_ACPI_NUMA) += numa.o
obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/acpi/acpica/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ obj-y += exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\
excreate.o exmisc.o exoparg2.o exregion.o exstore.o exutils.o \
exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o

obj-y += hwacpi.o hwgpe.o hwregs.o hwsleep.o hwxface.o hwvalid.o
obj-y += hwacpi.o hwgpe.o hwregs.o hwsleep.o hwxface.o

obj-$(ACPI_FUTURE_USAGE) += hwtimer.o

Expand All @@ -41,4 +41,4 @@ obj-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o

obj-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
utstate.o utmutex.o utobject.o utresrc.o utlock.o
utstate.o utmutex.o utobject.o utresrc.o
Loading

0 comments on commit 2bd7a81

Please sign in to comment.