Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: ACPI_DOCK: Initialize the atomic notifier list ACPI: acpi_os_allocate() fixes ACPI: SBS: fix initialization, sem2mutex ACPI: add 'const' to several ACPI file_operations ACPI: delete some defaults from ACPI Kconfig ACPI: "Device `[%s]' is not power manageable" make message debug only ACPI: ACPI_DOCK Kconfig Revert "Revert "ACPI: dock driver"" ACPI: acpi_os_get_thread_id() returns current ACPI: ACPICA 20060707
This commit is contained in:
Linus Torvalds
commit
c80dc60b03
52 changed files with 1086 additions and 228 deletions
|
|
@ -132,6 +132,12 @@ config ACPI_FAN
|
|||
This driver adds support for ACPI fan devices, allowing user-mode
|
||||
applications to perform basic fan control (on, off, status).
|
||||
|
||||
config ACPI_DOCK
|
||||
tristate "Dock"
|
||||
depends on EXPERIMENTAL
|
||||
help
|
||||
This driver adds support for ACPI controlled docking stations
|
||||
|
||||
config ACPI_PROCESSOR
|
||||
tristate "Processor"
|
||||
default y
|
||||
|
|
@ -206,6 +212,7 @@ config ACPI_IBM
|
|||
config ACPI_IBM_DOCK
|
||||
bool "Legacy Docking Station Support"
|
||||
depends on ACPI_IBM
|
||||
depends on ACPI_DOCK=n
|
||||
default n
|
||||
---help---
|
||||
Allows the ibm_acpi driver to handle docking station events.
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ obj-$(CONFIG_ACPI_BATTERY) += battery.o
|
|||
obj-$(CONFIG_ACPI_BUTTON) += button.o
|
||||
obj-$(CONFIG_ACPI_EC) += ec.o
|
||||
obj-$(CONFIG_ACPI_FAN) += fan.o
|
||||
obj-$(CONFIG_ACPI_DOCK) += dock.o
|
||||
obj-$(CONFIG_ACPI_VIDEO) += video.o
|
||||
obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o
|
||||
obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ struct acpi_ac {
|
|||
unsigned long state;
|
||||
};
|
||||
|
||||
static struct file_operations acpi_ac_fops = {
|
||||
static const struct file_operations acpi_ac_fops = {
|
||||
.open = acpi_ac_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
|
|||
return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
|
||||
}
|
||||
|
||||
static struct file_operations acpi_battery_info_ops = {
|
||||
static const struct file_operations acpi_battery_info_ops = {
|
||||
.open = acpi_battery_info_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
|
|
@ -565,7 +565,7 @@ static struct file_operations acpi_battery_info_ops = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_battery_state_ops = {
|
||||
static const struct file_operations acpi_battery_state_ops = {
|
||||
.open = acpi_battery_state_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
|
|
@ -573,7 +573,7 @@ static struct file_operations acpi_battery_state_ops = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_battery_alarm_ops = {
|
||||
static const struct file_operations acpi_battery_alarm_ops = {
|
||||
.open = acpi_battery_alarm_open_fs,
|
||||
.read = seq_read,
|
||||
.write = acpi_battery_write_alarm,
|
||||
|
|
|
|||
|
|
@ -192,8 +192,8 @@ int acpi_bus_set_power(acpi_handle handle, int state)
|
|||
/* Make sure this is a valid target state */
|
||||
|
||||
if (!device->flags.power_manageable) {
|
||||
printk(KERN_DEBUG "Device `[%s]' is not power manageable",
|
||||
device->kobj.name);
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable",
|
||||
device->kobj.name));
|
||||
return -ENODEV;
|
||||
}
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -87,14 +87,14 @@ struct acpi_button {
|
|||
unsigned long pushed;
|
||||
};
|
||||
|
||||
static struct file_operations acpi_button_info_fops = {
|
||||
static const struct file_operations acpi_button_info_fops = {
|
||||
.open = acpi_button_info_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static struct file_operations acpi_button_state_fops = {
|
||||
static const struct file_operations acpi_button_state_fops = {
|
||||
.open = acpi_button_state_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
|
|
|
|||
|
|
@ -39,50 +39,43 @@ ACPI_MODULE_NAME("cm_sbs")
|
|||
static struct proc_dir_entry *acpi_ac_dir;
|
||||
static struct proc_dir_entry *acpi_battery_dir;
|
||||
|
||||
static struct semaphore cm_sbs_sem;
|
||||
static DEFINE_MUTEX(cm_sbs_mutex);
|
||||
|
||||
static int lock_ac_dir_cnt = 0;
|
||||
static int lock_battery_dir_cnt = 0;
|
||||
static int lock_ac_dir_cnt;
|
||||
static int lock_battery_dir_cnt;
|
||||
|
||||
struct proc_dir_entry *acpi_lock_ac_dir(void)
|
||||
{
|
||||
|
||||
down(&cm_sbs_sem);
|
||||
if (!acpi_ac_dir) {
|
||||
mutex_lock(&cm_sbs_mutex);
|
||||
if (!acpi_ac_dir)
|
||||
acpi_ac_dir = proc_mkdir(ACPI_AC_CLASS, acpi_root_dir);
|
||||
}
|
||||
if (acpi_ac_dir) {
|
||||
lock_ac_dir_cnt++;
|
||||
} else {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Cannot create %s\n", ACPI_AC_CLASS));
|
||||
}
|
||||
up(&cm_sbs_sem);
|
||||
mutex_unlock(&cm_sbs_mutex);
|
||||
return acpi_ac_dir;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_lock_ac_dir);
|
||||
|
||||
void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param)
|
||||
{
|
||||
|
||||
down(&cm_sbs_sem);
|
||||
if (acpi_ac_dir_param) {
|
||||
mutex_lock(&cm_sbs_mutex);
|
||||
if (acpi_ac_dir_param)
|
||||
lock_ac_dir_cnt--;
|
||||
}
|
||||
if (lock_ac_dir_cnt == 0 && acpi_ac_dir_param && acpi_ac_dir) {
|
||||
remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);
|
||||
acpi_ac_dir = 0;
|
||||
}
|
||||
up(&cm_sbs_sem);
|
||||
mutex_unlock(&cm_sbs_mutex);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_unlock_ac_dir);
|
||||
|
||||
struct proc_dir_entry *acpi_lock_battery_dir(void)
|
||||
{
|
||||
|
||||
down(&cm_sbs_sem);
|
||||
mutex_lock(&cm_sbs_mutex);
|
||||
if (!acpi_battery_dir) {
|
||||
acpi_battery_dir =
|
||||
proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir);
|
||||
|
|
@ -93,39 +86,28 @@ struct proc_dir_entry *acpi_lock_battery_dir(void)
|
|||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"Cannot create %s\n", ACPI_BATTERY_CLASS));
|
||||
}
|
||||
up(&cm_sbs_sem);
|
||||
mutex_unlock(&cm_sbs_mutex);
|
||||
return acpi_battery_dir;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_lock_battery_dir);
|
||||
|
||||
void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param)
|
||||
{
|
||||
|
||||
down(&cm_sbs_sem);
|
||||
if (acpi_battery_dir_param) {
|
||||
mutex_lock(&cm_sbs_mutex);
|
||||
if (acpi_battery_dir_param)
|
||||
lock_battery_dir_cnt--;
|
||||
}
|
||||
if (lock_battery_dir_cnt == 0 && acpi_battery_dir_param
|
||||
&& acpi_battery_dir) {
|
||||
remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
|
||||
acpi_battery_dir = 0;
|
||||
}
|
||||
up(&cm_sbs_sem);
|
||||
mutex_unlock(&cm_sbs_mutex);
|
||||
return;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_unlock_battery_dir);
|
||||
|
||||
static int __init acpi_cm_sbs_init(void)
|
||||
{
|
||||
|
||||
if (acpi_disabled)
|
||||
return 0;
|
||||
|
||||
init_MUTEX(&cm_sbs_sem);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
subsys_initcall(acpi_cm_sbs_init);
|
||||
|
|
|
|||
|
|
@ -116,16 +116,6 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
|
|||
|
||||
case ACPI_TYPE_METHOD:
|
||||
|
||||
/*
|
||||
* Set the execution data width (32 or 64) based upon the
|
||||
* revision number of the parent ACPI table.
|
||||
* TBD: This is really for possible future support of integer width
|
||||
* on a per-table basis. Currently, we just use a global for the width.
|
||||
*/
|
||||
if (info->table_desc->pointer->revision == 1) {
|
||||
node->flags |= ANOBJ_DATA_WIDTH_32;
|
||||
}
|
||||
|
||||
info->method_count++;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc)
|
|||
union acpi_operand_object *mutex_desc;
|
||||
acpi_status status;
|
||||
|
||||
ACPI_FUNCTION_NAME(ds_create_method_mutex);
|
||||
ACPI_FUNCTION_TRACE(ds_create_method_mutex);
|
||||
|
||||
/* Create the new mutex object */
|
||||
|
||||
|
|
@ -493,7 +493,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
|
|||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
|
||||
"****Restart [%4.4s] Op %p ReturnValueFromCallee %p\n",
|
||||
(char *)&walk_state->method_node->name,
|
||||
acpi_ut_get_node_name(walk_state->method_node),
|
||||
walk_state->method_call_op, return_desc));
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
|
||||
|
|
@ -610,6 +610,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
|
|||
|
||||
acpi_os_release_mutex(method_desc->method.mutex->mutex.
|
||||
os_mutex);
|
||||
method_desc->method.mutex->mutex.owner_thread = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -620,27 +621,11 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
|
|||
*/
|
||||
method_node = walk_state->method_node;
|
||||
|
||||
/* Lock namespace for possible update */
|
||||
|
||||
status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
return_VOID;
|
||||
}
|
||||
|
||||
/*
|
||||
* Delete any namespace entries created immediately underneath
|
||||
* the method
|
||||
*/
|
||||
if (method_node && method_node->child) {
|
||||
acpi_ns_delete_namespace_subtree(method_node);
|
||||
}
|
||||
|
||||
/*
|
||||
* Delete any namespace entries created anywhere else within
|
||||
* Delete any namespace objects created anywhere within
|
||||
* the namespace by the execution of this method
|
||||
*/
|
||||
acpi_ns_delete_namespace_by_owner(method_desc->method.owner_id);
|
||||
status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
|
||||
}
|
||||
|
||||
/* Decrement the thread count on the method */
|
||||
|
|
|
|||
|
|
@ -313,10 +313,10 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
|
|||
case AML_CLASS_EXECUTE:
|
||||
case AML_CLASS_CREATE:
|
||||
/*
|
||||
* Most operators with arguments.
|
||||
* Most operators with arguments (except create_xxx_field operators)
|
||||
* Start a new result/operand state
|
||||
*/
|
||||
if (walk_state->opcode != AML_CREATE_FIELD_OP) {
|
||||
if (walk_state->op_info->object_type != ACPI_TYPE_BUFFER_FIELD) {
|
||||
status = acpi_ds_result_stack_push(walk_state);
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
740
drivers/acpi/dock.c
Normal file
740
drivers/acpi/dock.c
Normal file
|
|
@ -0,0 +1,740 @@
|
|||
/*
|
||||
* dock.c - ACPI dock station driver
|
||||
*
|
||||
* Copyright (C) 2006 Kristen Carlson Accardi <kristen.c.accardi@intel.com>
|
||||
*
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
*
|
||||
* 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/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/notifier.h>
|
||||
#include <acpi/acpi_bus.h>
|
||||
#include <acpi/acpi_drivers.h>
|
||||
|
||||
#define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver"
|
||||
|
||||
ACPI_MODULE_NAME("dock")
|
||||
MODULE_AUTHOR("Kristen Carlson Accardi");
|
||||
MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static struct atomic_notifier_head dock_notifier_list;
|
||||
|
||||
struct dock_station {
|
||||
acpi_handle handle;
|
||||
unsigned long last_dock_time;
|
||||
u32 flags;
|
||||
spinlock_t dd_lock;
|
||||
spinlock_t hp_lock;
|
||||
struct list_head dependent_devices;
|
||||
struct list_head hotplug_devices;
|
||||
};
|
||||
|
||||
struct dock_dependent_device {
|
||||
struct list_head list;
|
||||
struct list_head hotplug_list;
|
||||
acpi_handle handle;
|
||||
acpi_notify_handler handler;
|
||||
void *context;
|
||||
};
|
||||
|
||||
#define DOCK_DOCKING 0x00000001
|
||||
#define DOCK_EVENT KOBJ_DOCK
|
||||
#define UNDOCK_EVENT KOBJ_UNDOCK
|
||||
|
||||
static struct dock_station *dock_station;
|
||||
|
||||
/*****************************************************************************
|
||||
* Dock Dependent device functions *
|
||||
*****************************************************************************/
|
||||
/**
|
||||
* alloc_dock_dependent_device - allocate and init a dependent device
|
||||
* @handle: the acpi_handle of the dependent device
|
||||
*
|
||||
* Allocate memory for a dependent device structure for a device referenced
|
||||
* by the acpi handle
|
||||
*/
|
||||
static struct dock_dependent_device *
|
||||
alloc_dock_dependent_device(acpi_handle handle)
|
||||
{
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
dd = kzalloc(sizeof(*dd), GFP_KERNEL);
|
||||
if (dd) {
|
||||
dd->handle = handle;
|
||||
INIT_LIST_HEAD(&dd->list);
|
||||
INIT_LIST_HEAD(&dd->hotplug_list);
|
||||
}
|
||||
return dd;
|
||||
}
|
||||
|
||||
/**
|
||||
* add_dock_dependent_device - associate a device with the dock station
|
||||
* @ds: The dock station
|
||||
* @dd: The dependent device
|
||||
*
|
||||
* Add the dependent device to the dock's dependent device list.
|
||||
*/
|
||||
static void
|
||||
add_dock_dependent_device(struct dock_station *ds,
|
||||
struct dock_dependent_device *dd)
|
||||
{
|
||||
spin_lock(&ds->dd_lock);
|
||||
list_add_tail(&dd->list, &ds->dependent_devices);
|
||||
spin_unlock(&ds->dd_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* dock_add_hotplug_device - associate a hotplug handler with the dock station
|
||||
* @ds: The dock station
|
||||
* @dd: The dependent device struct
|
||||
*
|
||||
* Add the dependent device to the dock's hotplug device list
|
||||
*/
|
||||
static void
|
||||
dock_add_hotplug_device(struct dock_station *ds,
|
||||
struct dock_dependent_device *dd)
|
||||
{
|
||||
spin_lock(&ds->hp_lock);
|
||||
list_add_tail(&dd->hotplug_list, &ds->hotplug_devices);
|
||||
spin_unlock(&ds->hp_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* dock_del_hotplug_device - remove a hotplug handler from the dock station
|
||||
* @ds: The dock station
|
||||
* @dd: the dependent device struct
|
||||
*
|
||||
* Delete the dependent device from the dock's hotplug device list
|
||||
*/
|
||||
static void
|
||||
dock_del_hotplug_device(struct dock_station *ds,
|
||||
struct dock_dependent_device *dd)
|
||||
{
|
||||
spin_lock(&ds->hp_lock);
|
||||
list_del(&dd->hotplug_list);
|
||||
spin_unlock(&ds->hp_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* find_dock_dependent_device - get a device dependent on this dock
|
||||
* @ds: the dock station
|
||||
* @handle: the acpi_handle of the device we want
|
||||
*
|
||||
* iterate over the dependent device list for this dock. If the
|
||||
* dependent device matches the handle, return.
|
||||
*/
|
||||
static struct dock_dependent_device *
|
||||
find_dock_dependent_device(struct dock_station *ds, acpi_handle handle)
|
||||
{
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
spin_lock(&ds->dd_lock);
|
||||
list_for_each_entry(dd, &ds->dependent_devices, list) {
|
||||
if (handle == dd->handle) {
|
||||
spin_unlock(&ds->dd_lock);
|
||||
return dd;
|
||||
}
|
||||
}
|
||||
spin_unlock(&ds->dd_lock);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Dock functions *
|
||||
*****************************************************************************/
|
||||
/**
|
||||
* is_dock - see if a device is a dock station
|
||||
* @handle: acpi handle of the device
|
||||
*
|
||||
* If an acpi object has a _DCK method, then it is by definition a dock
|
||||
* station, so return true.
|
||||
*/
|
||||
static int is_dock(acpi_handle handle)
|
||||
{
|
||||
acpi_status status;
|
||||
acpi_handle tmp;
|
||||
|
||||
status = acpi_get_handle(handle, "_DCK", &tmp);
|
||||
if (ACPI_FAILURE(status))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* is_dock_device - see if a device is on a dock station
|
||||
* @handle: acpi handle of the device
|
||||
*
|
||||
* If this device is either the dock station itself,
|
||||
* or is a device dependent on the dock station, then it
|
||||
* is a dock device
|
||||
*/
|
||||
int is_dock_device(acpi_handle handle)
|
||||
{
|
||||
if (!dock_station)
|
||||
return 0;
|
||||
|
||||
if (is_dock(handle) || find_dock_dependent_device(dock_station, handle))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(is_dock_device);
|
||||
|
||||
/**
|
||||
* dock_present - see if the dock station is present.
|
||||
* @ds: the dock station
|
||||
*
|
||||
* execute the _STA method. note that present does not
|
||||
* imply that we are docked.
|
||||
*/
|
||||
static int dock_present(struct dock_station *ds)
|
||||
{
|
||||
unsigned long sta;
|
||||
acpi_status status;
|
||||
|
||||
if (ds) {
|
||||
status = acpi_evaluate_integer(ds->handle, "_STA", NULL, &sta);
|
||||
if (ACPI_SUCCESS(status) && sta)
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* dock_create_acpi_device - add new devices to acpi
|
||||
* @handle - handle of the device to add
|
||||
*
|
||||
* This function will create a new acpi_device for the given
|
||||
* handle if one does not exist already. This should cause
|
||||
* acpi to scan for drivers for the given devices, and call
|
||||
* matching driver's add routine.
|
||||
*
|
||||
* Returns a pointer to the acpi_device corresponding to the handle.
|
||||
*/
|
||||
static struct acpi_device * dock_create_acpi_device(acpi_handle handle)
|
||||
{
|
||||
struct acpi_device *device = NULL;
|
||||
struct acpi_device *parent_device;
|
||||
acpi_handle parent;
|
||||
int ret;
|
||||
|
||||
if (acpi_bus_get_device(handle, &device)) {
|
||||
/*
|
||||
* no device created for this object,
|
||||
* so we should create one.
|
||||
*/
|
||||
acpi_get_parent(handle, &parent);
|
||||
if (acpi_bus_get_device(parent, &parent_device))
|
||||
parent_device = NULL;
|
||||
|
||||
ret = acpi_bus_add(&device, parent_device, handle,
|
||||
ACPI_BUS_TYPE_DEVICE);
|
||||
if (ret) {
|
||||
pr_debug("error adding bus, %x\n",
|
||||
-ret);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return device;
|
||||
}
|
||||
|
||||
/**
|
||||
* dock_remove_acpi_device - remove the acpi_device struct from acpi
|
||||
* @handle - the handle of the device to remove
|
||||
*
|
||||
* Tell acpi to remove the acpi_device. This should cause any loaded
|
||||
* driver to have it's remove routine called.
|
||||
*/
|
||||
static void dock_remove_acpi_device(acpi_handle handle)
|
||||
{
|
||||
struct acpi_device *device;
|
||||
int ret;
|
||||
|
||||
if (!acpi_bus_get_device(handle, &device)) {
|
||||
ret = acpi_bus_trim(device, 1);
|
||||
if (ret)
|
||||
pr_debug("error removing bus, %x\n", -ret);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* hotplug_dock_devices - insert or remove devices on the dock station
|
||||
* @ds: the dock station
|
||||
* @event: either bus check or eject request
|
||||
*
|
||||
* Some devices on the dock station need to have drivers called
|
||||
* to perform hotplug operations after a dock event has occurred.
|
||||
* Traverse the list of dock devices that have registered a
|
||||
* hotplug handler, and call the handler.
|
||||
*/
|
||||
static void hotplug_dock_devices(struct dock_station *ds, u32 event)
|
||||
{
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
spin_lock(&ds->hp_lock);
|
||||
|
||||
/*
|
||||
* First call driver specific hotplug functions
|
||||
*/
|
||||
list_for_each_entry(dd, &ds->hotplug_devices, hotplug_list) {
|
||||
if (dd->handler)
|
||||
dd->handler(dd->handle, event, dd->context);
|
||||
}
|
||||
|
||||
/*
|
||||
* Now make sure that an acpi_device is created for each
|
||||
* dependent device, or removed if this is an eject request.
|
||||
* This will cause acpi_drivers to be stopped/started if they
|
||||
* exist
|
||||
*/
|
||||
list_for_each_entry(dd, &ds->dependent_devices, list) {
|
||||
if (event == ACPI_NOTIFY_EJECT_REQUEST)
|
||||
dock_remove_acpi_device(dd->handle);
|
||||
else
|
||||
dock_create_acpi_device(dd->handle);
|
||||
}
|
||||
spin_unlock(&ds->hp_lock);
|
||||
}
|
||||
|
||||
static void dock_event(struct dock_station *ds, u32 event, int num)
|
||||
{
|
||||
struct acpi_device *device;
|
||||
|
||||
device = dock_create_acpi_device(ds->handle);
|
||||
if (device)
|
||||
kobject_uevent(&device->kobj, num);
|
||||
}
|
||||
|
||||
/**
|
||||
* eject_dock - respond to a dock eject request
|
||||
* @ds: the dock station
|
||||
*
|
||||
* This is called after _DCK is called, to execute the dock station's
|
||||
* _EJ0 method.
|
||||
*/
|
||||
static void eject_dock(struct dock_station *ds)
|
||||
{
|
||||
struct acpi_object_list arg_list;
|
||||
union acpi_object arg;
|
||||
acpi_status status;
|
||||
acpi_handle tmp;
|
||||
|
||||
/* all dock devices should have _EJ0, but check anyway */
|
||||
status = acpi_get_handle(ds->handle, "_EJ0", &tmp);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
pr_debug("No _EJ0 support for dock device\n");
|
||||
return;
|
||||
}
|
||||
|
||||
arg_list.count = 1;
|
||||
arg_list.pointer = &arg;
|
||||
arg.type = ACPI_TYPE_INTEGER;
|
||||
arg.integer.value = 1;
|
||||
|
||||
if (ACPI_FAILURE(acpi_evaluate_object(ds->handle, "_EJ0",
|
||||
&arg_list, NULL)))
|
||||
pr_debug("Failed to evaluate _EJ0!\n");
|
||||
}
|
||||
|
||||
/**
|
||||
* handle_dock - handle a dock event
|
||||
* @ds: the dock station
|
||||
* @dock: to dock, or undock - that is the question
|
||||
*
|
||||
* Execute the _DCK method in response to an acpi event
|
||||
*/
|
||||
static void handle_dock(struct dock_station *ds, int dock)
|
||||
{
|
||||
acpi_status status;
|
||||
struct acpi_object_list arg_list;
|
||||
union acpi_object arg;
|
||||
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
|
||||
struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
|
||||
union acpi_object *obj;
|
||||
|
||||
acpi_get_name(ds->handle, ACPI_FULL_PATHNAME, &name_buffer);
|
||||
obj = name_buffer.pointer;
|
||||
|
||||
printk(KERN_INFO PREFIX "%s\n", dock ? "docking" : "undocking");
|
||||
|
||||
/* _DCK method has one argument */
|
||||
arg_list.count = 1;
|
||||
arg_list.pointer = &arg;
|
||||
arg.type = ACPI_TYPE_INTEGER;
|
||||
arg.integer.value = dock;
|
||||
status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer);
|
||||
if (ACPI_FAILURE(status))
|
||||
pr_debug("%s: failed to execute _DCK\n", obj->string.pointer);
|
||||
kfree(buffer.pointer);
|
||||
kfree(name_buffer.pointer);
|
||||
}
|
||||
|
||||
static inline void dock(struct dock_station *ds)
|
||||
{
|
||||
handle_dock(ds, 1);
|
||||
}
|
||||
|
||||
static inline void undock(struct dock_station *ds)
|
||||
{
|
||||
handle_dock(ds, 0);
|
||||
}
|
||||
|
||||
static inline void begin_dock(struct dock_station *ds)
|
||||
{
|
||||
ds->flags |= DOCK_DOCKING;
|
||||
}
|
||||
|
||||
static inline void complete_dock(struct dock_station *ds)
|
||||
{
|
||||
ds->flags &= ~(DOCK_DOCKING);
|
||||
ds->last_dock_time = jiffies;
|
||||
}
|
||||
|
||||
/**
|
||||
* dock_in_progress - see if we are in the middle of handling a dock event
|
||||
* @ds: the dock station
|
||||
*
|
||||
* Sometimes while docking, false dock events can be sent to the driver
|
||||
* because good connections aren't made or some other reason. Ignore these
|
||||
* if we are in the middle of doing something.
|
||||
*/
|
||||
static int dock_in_progress(struct dock_station *ds)
|
||||
{
|
||||
if ((ds->flags & DOCK_DOCKING) ||
|
||||
time_before(jiffies, (ds->last_dock_time + HZ)))
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* register_dock_notifier - add yourself to the dock notifier list
|
||||
* @nb: the callers notifier block
|
||||
*
|
||||
* If a driver wishes to be notified about dock events, they can
|
||||
* use this function to put a notifier block on the dock notifier list.
|
||||
* this notifier call chain will be called after a dock event, but
|
||||
* before hotplugging any new devices.
|
||||
*/
|
||||
int register_dock_notifier(struct notifier_block *nb)
|
||||
{
|
||||
return atomic_notifier_chain_register(&dock_notifier_list, nb);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(register_dock_notifier);
|
||||
|
||||
/**
|
||||
* unregister_dock_notifier - remove yourself from the dock notifier list
|
||||
* @nb: the callers notifier block
|
||||
*/
|
||||
void unregister_dock_notifier(struct notifier_block *nb)
|
||||
{
|
||||
atomic_notifier_chain_unregister(&dock_notifier_list, nb);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(unregister_dock_notifier);
|
||||
|
||||
/**
|
||||
* register_hotplug_dock_device - register a hotplug function
|
||||
* @handle: the handle of the device
|
||||
* @handler: the acpi_notifier_handler to call after docking
|
||||
* @context: device specific data
|
||||
*
|
||||
* If a driver would like to perform a hotplug operation after a dock
|
||||
* event, they can register an acpi_notifiy_handler to be called by
|
||||
* the dock driver after _DCK is executed.
|
||||
*/
|
||||
int
|
||||
register_hotplug_dock_device(acpi_handle handle, acpi_notify_handler handler,
|
||||
void *context)
|
||||
{
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
if (!dock_station)
|
||||
return -ENODEV;
|
||||
|
||||
/*
|
||||
* make sure this handle is for a device dependent on the dock,
|
||||
* this would include the dock station itself
|
||||
*/
|
||||
dd = find_dock_dependent_device(dock_station, handle);
|
||||
if (dd) {
|
||||
dd->handler = handler;
|
||||
dd->context = context;
|
||||
dock_add_hotplug_device(dock_station, dd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(register_hotplug_dock_device);
|
||||
|
||||
/**
|
||||
* unregister_hotplug_dock_device - remove yourself from the hotplug list
|
||||
* @handle: the acpi handle of the device
|
||||
*/
|
||||
void unregister_hotplug_dock_device(acpi_handle handle)
|
||||
{
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
if (!dock_station)
|
||||
return;
|
||||
|
||||
dd = find_dock_dependent_device(dock_station, handle);
|
||||
if (dd)
|
||||
dock_del_hotplug_device(dock_station, dd);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
|
||||
|
||||
/**
|
||||
* dock_notify - act upon an acpi dock notification
|
||||
* @handle: the dock station handle
|
||||
* @event: the acpi event
|
||||
* @data: our driver data struct
|
||||
*
|
||||
* If we are notified to dock, then check to see if the dock is
|
||||
* present and then dock. Notify all drivers of the dock event,
|
||||
* and then hotplug and devices that may need hotplugging. For undock
|
||||
* check to make sure the dock device is still present, then undock
|
||||
* and hotremove all the devices that may need removing.
|
||||
*/
|
||||
static void dock_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct dock_station *ds = (struct dock_station *)data;
|
||||
|
||||
switch (event) {
|
||||
case ACPI_NOTIFY_BUS_CHECK:
|
||||
if (!dock_in_progress(ds) && dock_present(ds)) {
|
||||
begin_dock(ds);
|
||||
dock(ds);
|
||||
if (!dock_present(ds)) {
|
||||
printk(KERN_ERR PREFIX "Unable to dock!\n");
|
||||
break;
|
||||
}
|
||||
atomic_notifier_call_chain(&dock_notifier_list,
|
||||
event, NULL);
|
||||
hotplug_dock_devices(ds, event);
|
||||
complete_dock(ds);
|
||||
dock_event(ds, event, DOCK_EVENT);
|
||||
}
|
||||
break;
|
||||
case ACPI_NOTIFY_DEVICE_CHECK:
|
||||
/*
|
||||
* According to acpi spec 3.0a, if a DEVICE_CHECK notification
|
||||
* is sent and _DCK is present, it is assumed to mean an
|
||||
* undock request. This notify routine will only be called
|
||||
* for objects defining _DCK, so we will fall through to eject
|
||||
* request here. However, we will pass an eject request through
|
||||
* to the driver who wish to hotplug.
|
||||
*/
|
||||
case ACPI_NOTIFY_EJECT_REQUEST:
|
||||
if (!dock_in_progress(ds) && dock_present(ds)) {
|
||||
/*
|
||||
* here we need to generate the undock
|
||||
* event prior to actually doing the undock
|
||||
* so that the device struct still exists.
|
||||
*/
|
||||
dock_event(ds, event, UNDOCK_EVENT);
|
||||
hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
|
||||
undock(ds);
|
||||
eject_dock(ds);
|
||||
if (dock_present(ds))
|
||||
printk(KERN_ERR PREFIX "Unable to undock!\n");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR PREFIX "Unknown dock event %d\n", event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* find_dock_devices - find devices on the dock station
|
||||
* @handle: the handle of the device we are examining
|
||||
* @lvl: unused
|
||||
* @context: the dock station private data
|
||||
* @rv: unused
|
||||
*
|
||||
* This function is called by acpi_walk_namespace. It will
|
||||
* check to see if an object has an _EJD method. If it does, then it
|
||||
* will see if it is dependent on the dock station.
|
||||
*/
|
||||
static acpi_status
|
||||
find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||
{
|
||||
acpi_status status;
|
||||
acpi_handle tmp;
|
||||
struct dock_station *ds = (struct dock_station *)context;
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
status = acpi_bus_get_ejd(handle, &tmp);
|
||||
if (ACPI_FAILURE(status))
|
||||
return AE_OK;
|
||||
|
||||
if (tmp == ds->handle) {
|
||||
dd = alloc_dock_dependent_device(handle);
|
||||
if (dd)
|
||||
add_dock_dependent_device(ds, dd);
|
||||
}
|
||||
|
||||
return AE_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* dock_add - add a new dock station
|
||||
* @handle: the dock station handle
|
||||
*
|
||||
* allocated and initialize a new dock station device. Find all devices
|
||||
* that are on the dock station, and register for dock event notifications.
|
||||
*/
|
||||
static int dock_add(acpi_handle handle)
|
||||
{
|
||||
int ret;
|
||||
acpi_status status;
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
/* allocate & initialize the dock_station private data */
|
||||
dock_station = kzalloc(sizeof(*dock_station), GFP_KERNEL);
|
||||
if (!dock_station)
|
||||
return -ENOMEM;
|
||||
dock_station->handle = handle;
|
||||
dock_station->last_dock_time = jiffies - HZ;
|
||||
INIT_LIST_HEAD(&dock_station->dependent_devices);
|
||||
INIT_LIST_HEAD(&dock_station->hotplug_devices);
|
||||
spin_lock_init(&dock_station->dd_lock);
|
||||
spin_lock_init(&dock_station->hp_lock);
|
||||
ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
|
||||
|
||||
/* Find dependent devices */
|
||||
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
|
||||
ACPI_UINT32_MAX, find_dock_devices, dock_station,
|
||||
NULL);
|
||||
|
||||
/* add the dock station as a device dependent on itself */
|
||||
dd = alloc_dock_dependent_device(handle);
|
||||
if (!dd) {
|
||||
kfree(dock_station);
|
||||
return -ENOMEM;
|
||||
}
|
||||
add_dock_dependent_device(dock_station, dd);
|
||||
|
||||
/* register for dock events */
|
||||
status = acpi_install_notify_handler(dock_station->handle,
|
||||
ACPI_SYSTEM_NOTIFY,
|
||||
dock_notify, dock_station);
|
||||
|
||||
if (ACPI_FAILURE(status)) {
|
||||
printk(KERN_ERR PREFIX "Error installing notify handler\n");
|
||||
ret = -ENODEV;
|
||||
goto dock_add_err;
|
||||
}
|
||||
|
||||
printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_NAME);
|
||||
|
||||
return 0;
|
||||
|
||||
dock_add_err:
|
||||
kfree(dock_station);
|
||||
kfree(dd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* dock_remove - free up resources related to the dock station
|
||||
*/
|
||||
static int dock_remove(void)
|
||||
{
|
||||
struct dock_dependent_device *dd, *tmp;
|
||||
acpi_status status;
|
||||
|
||||
if (!dock_station)
|
||||
return 0;
|
||||
|
||||
/* remove dependent devices */
|
||||
list_for_each_entry_safe(dd, tmp, &dock_station->dependent_devices,
|
||||
list)
|
||||
kfree(dd);
|
||||
|
||||
/* remove dock notify handler */
|
||||
status = acpi_remove_notify_handler(dock_station->handle,
|
||||
ACPI_SYSTEM_NOTIFY,
|
||||
dock_notify);
|
||||
if (ACPI_FAILURE(status))
|
||||
printk(KERN_ERR "Error removing notify handler\n");
|
||||
|
||||
/* free dock station memory */
|
||||
kfree(dock_station);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* find_dock - look for a dock station
|
||||
* @handle: acpi handle of a device
|
||||
* @lvl: unused
|
||||
* @context: counter of dock stations found
|
||||
* @rv: unused
|
||||
*
|
||||
* This is called by acpi_walk_namespace to look for dock stations.
|
||||
*/
|
||||
static acpi_status
|
||||
find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||
{
|
||||
int *count = (int *)context;
|
||||
acpi_status status = AE_OK;
|
||||
|
||||
if (is_dock(handle)) {
|
||||
if (dock_add(handle) >= 0) {
|
||||
(*count)++;
|
||||
status = AE_CTRL_TERMINATE;
|
||||
}
|
||||
}
|
||||
return status;
|
||||
}
|
||||
|
||||
static int __init dock_init(void)
|
||||
{
|
||||
int num = 0;
|
||||
|
||||
dock_station = NULL;
|
||||
|
||||
/* look for a dock station */
|
||||
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
|
||||
ACPI_UINT32_MAX, find_dock, &num, NULL);
|
||||
|
||||
if (!num)
|
||||
return -ENODEV;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit dock_exit(void)
|
||||
{
|
||||
dock_remove();
|
||||
}
|
||||
|
||||
postcore_initcall(dock_init);
|
||||
module_exit(dock_exit);
|
||||
|
|
@ -929,7 +929,7 @@ static int acpi_ec_info_open_fs(struct inode *inode, struct file *file)
|
|||
return single_open(file, acpi_ec_read_info, PDE(inode)->data);
|
||||
}
|
||||
|
||||
static struct file_operations acpi_ec_info_ops = {
|
||||
static const struct file_operations acpi_ec_info_ops = {
|
||||
.open = acpi_ec_info_open_fs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ static unsigned int acpi_system_poll_event(struct file *file, poll_table * wait)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct file_operations acpi_system_event_ops = {
|
||||
static const struct file_operations acpi_system_event_ops = {
|
||||
.open = acpi_system_open_event,
|
||||
.read = acpi_system_read_event,
|
||||
.release = acpi_system_close_event,
|
||||
|
|
|
|||
|
|
@ -528,34 +528,40 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
|
|||
}
|
||||
}
|
||||
|
||||
/* Call the setup handler with the deactivate notification */
|
||||
/*
|
||||
* If the region has been activated, call the setup handler
|
||||
* with the deactivate notification
|
||||
*/
|
||||
if (region_obj->region.flags & AOPOBJ_SETUP_COMPLETE) {
|
||||
region_setup = handler_obj->address_space.setup;
|
||||
status =
|
||||
region_setup(region_obj,
|
||||
ACPI_REGION_DEACTIVATE,
|
||||
handler_obj->address_space.
|
||||
context, region_context);
|
||||
|
||||
region_setup = handler_obj->address_space.setup;
|
||||
status =
|
||||
region_setup(region_obj, ACPI_REGION_DEACTIVATE,
|
||||
handler_obj->address_space.context,
|
||||
region_context);
|
||||
/* Init routine may fail, Just ignore errors */
|
||||
|
||||
/* Init routine may fail, Just ignore errors */
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_EXCEPTION((AE_INFO, status,
|
||||
"from region handler - deactivate, [%s]",
|
||||
acpi_ut_get_region_name
|
||||
(region_obj->region.
|
||||
space_id)));
|
||||
}
|
||||
|
||||
if (ACPI_FAILURE(status)) {
|
||||
ACPI_EXCEPTION((AE_INFO, status,
|
||||
"from region init, [%s]",
|
||||
acpi_ut_get_region_name
|
||||
(region_obj->region.space_id)));
|
||||
region_obj->region.flags &=
|
||||
~(AOPOBJ_SETUP_COMPLETE);
|
||||
}
|
||||
|
||||
region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
|
||||
|
||||
/*
|
||||
* Remove handler reference in the region
|
||||
*
|
||||
* NOTE: this doesn't mean that the region goes away
|
||||
* The region is just inaccessible as indicated to
|
||||
* the _REG method
|
||||
* NOTE: this doesn't mean that the region goes away, the region
|
||||
* is just inaccessible as indicated to the _REG method
|
||||
*
|
||||
* If the region is on the handler's list
|
||||
* this better be the region's handler
|
||||
* If the region is on the handler's list, this must be the
|
||||
* region's handler
|
||||
*/
|
||||
region_obj->region.handler = NULL;
|
||||
acpi_ut_remove_reference(handler_obj);
|
||||
|
|
|
|||
|
|
@ -428,7 +428,7 @@ acpi_remove_notify_handler(acpi_handle device,
|
|||
node = acpi_ns_map_handle_to_node(device);
|
||||
if (!node) {
|
||||
status = AE_BAD_PARAMETER;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Root Object */
|
||||
|
|
@ -442,7 +442,7 @@ acpi_remove_notify_handler(acpi_handle device,
|
|||
((handler_type & ACPI_DEVICE_NOTIFY) &&
|
||||
!acpi_gbl_device_notify.handler)) {
|
||||
status = AE_NOT_EXIST;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Make sure all deferred tasks are completed */
|
||||
|
|
@ -474,7 +474,7 @@ acpi_remove_notify_handler(acpi_handle device,
|
|||
|
||||
if (!acpi_ev_is_notify_object(node)) {
|
||||
status = AE_TYPE;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Check for an existing internal object */
|
||||
|
|
@ -482,17 +482,21 @@ acpi_remove_notify_handler(acpi_handle device,
|
|||
obj_desc = acpi_ns_get_attached_object(node);
|
||||
if (!obj_desc) {
|
||||
status = AE_NOT_EXIST;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Object exists - make sure there's an existing handler */
|
||||
|
||||
if (handler_type & ACPI_SYSTEM_NOTIFY) {
|
||||
notify_obj = obj_desc->common_notify.system_notify;
|
||||
if ((!notify_obj) ||
|
||||
(notify_obj->notify.handler != handler)) {
|
||||
if (!notify_obj) {
|
||||
status = AE_NOT_EXIST;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
if (notify_obj->notify.handler != handler) {
|
||||
status = AE_BAD_PARAMETER;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
/* Make sure all deferred tasks are completed */
|
||||
|
||||
|
|
@ -510,10 +514,14 @@ acpi_remove_notify_handler(acpi_handle device,
|
|||
|
||||
if (handler_type & ACPI_DEVICE_NOTIFY) {
|
||||
notify_obj = obj_desc->common_notify.device_notify;
|
||||
if ((!notify_obj) ||
|
||||
(notify_obj->notify.handler != handler)) {
|
||||
if (!notify_obj) {
|
||||
status = AE_NOT_EXIST;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
if (notify_obj->notify.handler != handler) {
|
||||
status = AE_BAD_PARAMETER;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
/* Make sure all deferred tasks are completed */
|
||||
|
||||
|
|
@ -530,9 +538,9 @@ acpi_remove_notify_handler(acpi_handle device,
|
|||
}
|
||||
}
|
||||
|
||||
unlock:
|
||||
unlock_and_exit:
|
||||
(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
|
||||
exit:
|
||||
exit:
|
||||
if (ACPI_FAILURE(status))
|
||||
ACPI_EXCEPTION((AE_INFO, status, "Removing notify handler"));
|
||||
return_ACPI_STATUS(status);
|
||||
|
|
@ -586,7 +594,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
|
|||
gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
|
||||
if (!gpe_event_info) {
|
||||
status = AE_BAD_PARAMETER;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Make sure that there isn't a handler there already */
|
||||
|
|
@ -594,7 +602,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
|
|||
if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
|
||||
ACPI_GPE_DISPATCH_HANDLER) {
|
||||
status = AE_ALREADY_EXISTS;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Allocate and init handler object */
|
||||
|
|
@ -602,7 +610,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
|
|||
handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_handler_info));
|
||||
if (!handler) {
|
||||
status = AE_NO_MEMORY;
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
handler->address = address;
|
||||
|
|
@ -613,7 +621,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
|
|||
|
||||
status = acpi_ev_disable_gpe(gpe_event_info);
|
||||
if (ACPI_FAILURE(status)) {
|
||||
goto unlock;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Install the handler */
|
||||
|
|
@ -628,9 +636,9 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
|
|||
|
||||
acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
|
||||
|
||||
unlock:
|
||||
unlock_and_exit:
|
||||
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
|
||||
exit:
|
||||
exit:
|
||||
if (ACPI_FAILURE(status))
|
||||
ACPI_EXCEPTION((AE_INFO, status,
|
||||
"Installing notify handler failed"));
|
||||
|
|
|
|||
|
|
@ -155,7 +155,11 @@ acpi_remove_address_space_handler(acpi_handle device,
|
|||
/* Convert and validate the device handle */
|
||||
|
||||
node = acpi_ns_map_handle_to_node(device);
|
||||
if (!node) {
|
||||
if (!node ||
|
||||
((node->type != ACPI_TYPE_DEVICE) &&
|
||||
(node->type != ACPI_TYPE_PROCESSOR) &&
|
||||
(node->type != ACPI_TYPE_THERMAL) &&
|
||||
(node != acpi_gbl_root_node))) {
|
||||
status = AE_BAD_PARAMETER;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
|
@ -178,6 +182,13 @@ acpi_remove_address_space_handler(acpi_handle device,
|
|||
|
||||
if (handler_obj->address_space.space_id == space_id) {
|
||||
|
||||
/* Handler must be the same as the installed handler */
|
||||
|
||||
if (handler_obj->address_space.handler != handler) {
|
||||
status = AE_BAD_PARAMETER;
|
||||
goto unlock_and_exit;
|
||||
}
|
||||
|
||||
/* Matched space_id, first dereference this in the Regions */
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
|
||||
|
|
|
|||
|
|
@ -502,7 +502,6 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
|
|||
* (Offset contains the table_id)
|
||||
*/
|
||||
acpi_ns_delete_namespace_by_owner(table_info->owner_id);
|
||||
acpi_ut_release_owner_id(&table_info->owner_id);
|
||||
|
||||
/* Delete the table itself */
|
||||
|
||||
|
|
|
|||
|
|
@ -170,6 +170,9 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
|
|||
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Converted value: %8.8X%8.8X\n",
|
||||
ACPI_FORMAT_UINT64(result)));
|
||||
|
||||
/* Save the Result */
|
||||
|
||||
return_desc->integer.value = result;
|
||||
|
|
|
|||
|
|
@ -267,9 +267,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
|
|||
&& (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Thread %X cannot release Mutex [%4.4s] acquired by thread %X",
|
||||
walk_state->thread->thread_id,
|
||||
(u32) walk_state->thread->thread_id,
|
||||
acpi_ut_get_node_name(obj_desc->mutex.node),
|
||||
obj_desc->mutex.owner_thread->thread_id));
|
||||
(u32) obj_desc->mutex.owner_thread->thread_id));
|
||||
return_ACPI_STATUS(AE_AML_NOT_OWNER);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ ACPI_MODULE_NAME("exsystem")
|
|||
*
|
||||
* DESCRIPTION: Implements a semaphore wait with a check to see if the
|
||||
* semaphore is available immediately. If it is not, the
|
||||
* interpreter is released.
|
||||
* interpreter is released before waiting.
|
||||
*
|
||||
******************************************************************************/
|
||||
acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
|
||||
|
|
@ -110,9 +110,9 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
|
|||
*
|
||||
* RETURN: Status
|
||||
*
|
||||
* DESCRIPTION: Implements a semaphore wait with a check to see if the
|
||||
* semaphore is available immediately. If it is not, the
|
||||
* interpreter is released.
|
||||
* DESCRIPTION: Implements a mutex wait with a check to see if the
|
||||
* mutex is available immediately. If it is not, the
|
||||
* interpreter is released before waiting.
|
||||
*
|
||||
******************************************************************************/
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue