struct acpi_generic_address command_addr;
struct acpi_generic_address data_addr;
unsigned long global_lock;
- struct semaphore sem;
+ spinlock_t lock;
} poll;
};
{
int result = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_wait");
ec->intr.expect_event = event;
smp_mb();
switch (event) {
case ACPI_EC_EVENT_IBE:
- if (~acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) {
+ if (~acpi_ec_read_status(ec) & event) {
ec->intr.expect_event = 0;
- return 0;
+ return_VALUE(0);
}
break;
default:
switch (event) {
case ACPI_EC_EVENT_OBF:
if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_OBF)
- return 0;
+ return_VALUE(0);
break;
case ACPI_EC_EVENT_IBE:
if (~acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)
- return 0;
+ return_VALUE(0);
break;
}
- return -ETIME;
+ return_VALUE(-ETIME);
}
#ifdef ACPI_FUTURE_USAGE
u32 tmp = 0;
int status = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_enter_burst_mode");
status = acpi_ec_read_status(ec);
if (status != -EINVAL && !(status & ACPI_EC_FLAG_BURST)) {
status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
acpi_hw_low_level_read(8, &tmp, &ec->common.data_addr);
if (tmp != 0x90) { /* Burst ACK byte */
- return -EINVAL;
+ return_VALUE(-EINVAL);
}
}
atomic_set(&ec->intr.leaving_burst, 0);
- return 0;
+ return_VALUE(0);
end:
- ACPI_EXCEPTION ((AE_INFO, status, "EC wait, burst mode");
- return -1;
+ printk(KERN_WARNING PREFIX "Error in acpi_ec_wait\n");
+ return_VALUE(-1);
}
int acpi_ec_leave_burst_mode(union acpi_ec *ec)
{
int status = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_leave_burst_mode");
status = acpi_ec_read_status(ec);
if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)){
acpi_ec_wait(ec, ACPI_EC_FLAG_IBF);
}
atomic_set(&ec->intr.leaving_burst, 1);
- return 0;
+ return_VALUE(0);
end:
- ACPI_EXCEPTION((AE_INFO, status, "EC leave burst mode");
- return -1;
+ printk(KERN_WARNING PREFIX "leave burst_mode:error\n");
+ return_VALUE(-1);
}
#endif /* ACPI_FUTURE_USAGE */
{
acpi_status status = AE_OK;
int result = 0;
+ unsigned long flags = 0;
u32 glk = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_read");
if (!ec || !data)
- return -EINVAL;
+ return_VALUE(-EINVAL);
*data = 0;
if (ec->common.global_lock) {
status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
- if (down_interruptible(&ec->poll.sem)) {
- result = -ERESTARTSYS;
- goto end_nosem;
- }
-
+ spin_lock_irqsave(&ec->poll.lock, flags);
+
acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ,
&ec->common.command_addr);
result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
*data, address));
end:
- up(&ec->poll.sem);
-end_nosem:
+ spin_unlock_irqrestore(&ec->poll.lock, flags);
+
if (ec->common.global_lock)
acpi_release_global_lock(glk);
- return result;
+ return_VALUE(result);
}
static int acpi_ec_poll_write(union acpi_ec *ec, u8 address, u8 data)
{
int result = 0;
acpi_status status = AE_OK;
+ unsigned long flags = 0;
u32 glk = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_write");
if (!ec)
- return -EINVAL;
+ return_VALUE(-EINVAL);
if (ec->common.global_lock) {
status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
- if (down_interruptible(&ec->poll.sem)) {
- result = -ERESTARTSYS;
- goto end_nosem;
- }
-
+ spin_lock_irqsave(&ec->poll.lock, flags);
+
acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE,
&ec->common.command_addr);
result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
data, address));
end:
- up(&ec->poll.sem);
-end_nosem:
+ spin_unlock_irqrestore(&ec->poll.lock, flags);
+
if (ec->common.global_lock)
acpi_release_global_lock(glk);
- return result;
+ return_VALUE(result);
}
static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data)
int status = 0;
u32 glk;
+ ACPI_FUNCTION_TRACE("acpi_ec_read");
if (!ec || !data)
- return -EINVAL;
+ return_VALUE(-EINVAL);
*data = 0;
if (ec->common.global_lock) {
status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
WARN_ON(in_interrupt());
if (ec->common.global_lock)
acpi_release_global_lock(glk);
- return status;
+ return_VALUE(status);
}
static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data)
int status = 0;
u32 glk;
+ ACPI_FUNCTION_TRACE("acpi_ec_write");
if (!ec)
- return -EINVAL;
+ return_VALUE(-EINVAL);
if (ec->common.global_lock) {
status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
WARN_ON(in_interrupt());
if (ec->common.global_lock)
acpi_release_global_lock(glk);
- return status;
+ return_VALUE(status);
}
/*
{
int result = 0;
acpi_status status = AE_OK;
+ unsigned long flags = 0;
u32 glk = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_query");
if (!ec || !data)
- return -EINVAL;
+ return_VALUE(-EINVAL);
*data = 0;
if (ec->common.global_lock) {
status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
/*
* Note that successful completion of the query causes the ACPI_EC_SCI
* bit to be cleared (and thus clearing the interrupt source).
*/
- if (down_interruptible(&ec->poll.sem)) {
- result = -ERESTARTSYS;
- goto end_nosem;
- }
-
+ spin_lock_irqsave(&ec->poll.lock, flags);
+
acpi_hw_low_level_write(8, ACPI_EC_COMMAND_QUERY,
&ec->common.command_addr);
result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
result = -ENODATA;
end:
- up(&ec->poll.sem);
-end_nosem:
+ spin_unlock_irqrestore(&ec->poll.lock, flags);
+
if (ec->common.global_lock)
acpi_release_global_lock(glk);
- return result;
+ return_VALUE(result);
}
static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data)
{
int status = 0;
u32 glk;
+ ACPI_FUNCTION_TRACE("acpi_ec_query");
if (!ec || !data)
- return -EINVAL;
+ return_VALUE(-EINVAL);
*data = 0;
if (ec->common.global_lock) {
status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
down(&ec->intr.sem);
if (ec->common.global_lock)
acpi_release_global_lock(glk);
- return status;
+ return_VALUE(status);
}
/* --------------------------------------------------------------------------
{
union acpi_ec *ec = (union acpi_ec *)ec_cxt;
u32 value = 0;
+ unsigned long flags = 0;
static char object_name[5] = { '_', 'Q', '0', '0', '\0' };
const char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
};
+ ACPI_FUNCTION_TRACE("acpi_ec_gpe_query");
if (!ec_cxt)
goto end;
- if (down_interruptible (&ec->poll.sem)) {
- return;
- }
+ spin_lock_irqsave(&ec->poll.lock, flags);
acpi_hw_low_level_read(8, &value, &ec->common.command_addr);
- up(&ec->poll.sem);
+ spin_unlock_irqrestore(&ec->poll.lock, flags);
/* TBD: Implement asynch events!
* NOTE: All we care about are EC-SCI's. Other EC events are
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
};
+ ACPI_FUNCTION_TRACE("acpi_ec_gpe_query");
if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_SCI)
result = acpi_ec_query(ec, &value);
acpi_disable_gpe(NULL, ec->common.gpe_bit, ACPI_ISR);
- status = acpi_os_execute(OSL_EC_POLL_HANDLER, acpi_ec_gpe_query, ec);
+ status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
+ acpi_ec_gpe_query, ec);
if (status == AE_OK)
return ACPI_INTERRUPT_HANDLED;
case ACPI_EC_EVENT_OBF:
if (!(value & ACPI_EC_FLAG_OBF))
break;
- ec->intr.expect_event = 0;
- wake_up(&ec->intr.wait);
- break;
case ACPI_EC_EVENT_IBE:
if ((value & ACPI_EC_FLAG_IBF))
break;
ec->intr.expect_event = 0;
wake_up(&ec->intr.wait);
- break;
+ return ACPI_INTERRUPT_HANDLED;
default:
break;
}
if (value & ACPI_EC_FLAG_SCI) {
atomic_add(1, &ec->intr.pending_gpe);
- status = acpi_os_execute(OSL_EC_BURST_HANDLER,
+ status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
acpi_ec_gpe_query, ec);
return status == AE_OK ?
ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
acpi_integer f_v = 0;
int i = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_space_handler");
if ((address > 0xFF) || !value || !handler_context)
- return AE_BAD_PARAMETER;
+ return_VALUE(AE_BAD_PARAMETER);
if (bit_width != 8 && acpi_strict) {
printk(KERN_WARNING PREFIX
"acpi_ec_space_handler: bit_width should be 8\n");
- return AE_BAD_PARAMETER;
+ return_VALUE(AE_BAD_PARAMETER);
}
ec = (union acpi_ec *)handler_context;
out:
switch (result) {
case -EINVAL:
- return AE_BAD_PARAMETER;
+ return_VALUE(AE_BAD_PARAMETER);
break;
case -ENODEV:
- return AE_NOT_FOUND;
+ return_VALUE(AE_NOT_FOUND);
break;
case -ETIME:
- return AE_TIME;
+ return_VALUE(AE_TIME);
break;
default:
- return AE_OK;
+ return_VALUE(AE_OK);
}
}
{
union acpi_ec *ec = (union acpi_ec *)seq->private;
+ ACPI_FUNCTION_TRACE("acpi_ec_read_info");
if (!ec)
goto end;
acpi_enable_gpe(NULL, ec->common.gpe_bit, ACPI_NOT_ISR);
end:
- return 0;
+ return_VALUE(0);
}
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 const struct file_operations acpi_ec_info_ops = {
+static struct file_operations acpi_ec_info_ops = {
.open = acpi_ec_info_open_fs,
.read = seq_read,
.llseek = seq_lseek,
{
struct proc_dir_entry *entry = NULL;
+ ACPI_FUNCTION_TRACE("acpi_ec_add_fs");
if (!acpi_device_dir(device)) {
acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
acpi_ec_dir);
if (!acpi_device_dir(device))
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
entry = create_proc_entry(ACPI_EC_FILE_INFO, S_IRUGO,
acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_WARN,
+ "Unable to create '%s' fs entry\n",
+ ACPI_EC_FILE_INFO));
else {
entry->proc_fops = &acpi_ec_info_ops;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
- return 0;
+ return_VALUE(0);
}
static int acpi_ec_remove_fs(struct acpi_device *device)
{
+ ACPI_FUNCTION_TRACE("acpi_ec_remove_fs");
if (acpi_device_dir(device)) {
remove_proc_entry(ACPI_EC_FILE_INFO, acpi_device_dir(device));
acpi_device_dir(device) = NULL;
}
- return 0;
+ return_VALUE(0);
}
/* --------------------------------------------------------------------------
int result = 0;
acpi_status status = AE_OK;
union acpi_ec *ec = NULL;
+ unsigned long uid;
+ ACPI_FUNCTION_TRACE("acpi_ec_add");
if (!device)
- return -EINVAL;
+ return_VALUE(-EINVAL);
ec = kmalloc(sizeof(union acpi_ec), GFP_KERNEL);
if (!ec)
- return -ENOMEM;
+ return_VALUE(-ENOMEM);
memset(ec, 0, sizeof(union acpi_ec));
ec->common.handle = device->handle;
ec->common.uid = -1;
- init_MUTEX(&ec->poll.sem);
+ spin_lock_init(&ec->poll.lock);
strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_EC_CLASS);
acpi_driver_data(device) = ec;
acpi_evaluate_integer(ec->common.handle, "_GLK", NULL,
&ec->common.global_lock);
- /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
- http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
- if (ec_ecdt) {
+ /* If our UID matches the UID for the ECDT-enumerated EC,
+ we now have the *real* EC info, so kill the makeshift one. */
+ acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
+ if (ec_ecdt && ec_ecdt->common.uid == uid) {
acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler);
acpi_evaluate_integer(ec->common.handle, "_GPE", NULL,
&ec->common.gpe_bit);
if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status, "Obtaining GPE bit"));
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Error obtaining GPE bit assignment\n"));
result = -ENODEV;
goto end;
}
if (result)
kfree(ec);
- return result;
+ return_VALUE(result);
}
static int acpi_ec_intr_add(struct acpi_device *device)
{
int result = 0;
acpi_status status = AE_OK;
union acpi_ec *ec = NULL;
+ unsigned long uid;
+ ACPI_FUNCTION_TRACE("acpi_ec_add");
if (!device)
- return -EINVAL;
+ return_VALUE(-EINVAL);
ec = kmalloc(sizeof(union acpi_ec), GFP_KERNEL);
if (!ec)
- return -ENOMEM;
+ return_VALUE(-ENOMEM);
memset(ec, 0, sizeof(union acpi_ec));
ec->common.handle = device->handle;
acpi_evaluate_integer(ec->common.handle, "_GLK", NULL,
&ec->common.global_lock);
- /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
- http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
- if (ec_ecdt) {
+ /* If our UID matches the UID for the ECDT-enumerated EC,
+ we now have the *real* EC info, so kill the makeshift one. */
+ acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
+ if (ec_ecdt && ec_ecdt->common.uid == uid) {
acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler);
acpi_evaluate_integer(ec->common.handle, "_GPE", NULL,
&ec->common.gpe_bit);
if (ACPI_FAILURE(status)) {
- printk(KERN_ERR PREFIX "Obtaining GPE bit assignment\n");
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Error obtaining GPE bit assignment\n"));
result = -ENODEV;
goto end;
}
if (result)
kfree(ec);
- return result;
+ return_VALUE(result);
}
static int acpi_ec_remove(struct acpi_device *device, int type)
{
union acpi_ec *ec = NULL;
+ ACPI_FUNCTION_TRACE("acpi_ec_remove");
if (!device)
- return -EINVAL;
+ return_VALUE(-EINVAL);
ec = acpi_driver_data(device);
kfree(ec);
- return 0;
+ return_VALUE(0);
}
static acpi_status
acpi_status status = AE_OK;
union acpi_ec *ec = NULL;
+ ACPI_FUNCTION_TRACE("acpi_ec_start");
if (!device)
- return -EINVAL;
+ return_VALUE(-EINVAL);
ec = acpi_driver_data(device);
if (!ec)
- return -EINVAL;
+ return_VALUE(-EINVAL);
/*
* Get I/O port addresses. Convert to GAS format.
acpi_ec_io_ports, ec);
if (ACPI_FAILURE(status)
|| ec->common.command_addr.register_bit_width == 0) {
- printk(KERN_ERR PREFIX "Error getting I/O port addresses\n");
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Error getting I/O port addresses"));
+ return_VALUE(-ENODEV);
}
ec->common.status_addr = ec->common.command_addr;
ACPI_GPE_EDGE_TRIGGERED,
&acpi_ec_gpe_handler, ec);
if (ACPI_FAILURE(status)) {
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
acpi_set_gpe_type(NULL, ec->common.gpe_bit, ACPI_GPE_TYPE_RUNTIME);
acpi_enable_gpe(NULL, ec->common.gpe_bit, ACPI_NOT_ISR);
if (ACPI_FAILURE(status)) {
acpi_remove_gpe_handler(NULL, ec->common.gpe_bit,
&acpi_ec_gpe_handler);
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
- return AE_OK;
+ return_VALUE(AE_OK);
}
static int acpi_ec_stop(struct acpi_device *device, int type)
acpi_status status = AE_OK;
union acpi_ec *ec = NULL;
+ ACPI_FUNCTION_TRACE("acpi_ec_stop");
if (!device)
- return -EINVAL;
+ return_VALUE(-EINVAL);
ec = acpi_driver_data(device);
ACPI_ADR_SPACE_EC,
&acpi_ec_space_handler);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
status =
acpi_remove_gpe_handler(NULL, ec->common.gpe_bit,
&acpi_ec_gpe_handler);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
- return 0;
+ return_VALUE(0);
}
static acpi_status __init
&ec_ecdt->common.gpe_bit);
if (ACPI_FAILURE(status))
return status;
- init_MUTEX(&ec_ecdt->poll.sem);
+ spin_lock_init(&ec_ecdt->poll.lock);
ec_ecdt->common.global_lock = TRUE;
ec_ecdt->common.handle = handle;
ec_ecdt->common.status_addr = ecdt_ptr->ec_control;
ec_ecdt->common.data_addr = ecdt_ptr->ec_data;
ec_ecdt->common.gpe_bit = ecdt_ptr->gpe_bit;
- init_MUTEX(&ec_ecdt->poll.sem);
+ spin_lock_init(&ec_ecdt->poll.lock);
/* use the GL just to be safe */
ec_ecdt->common.global_lock = TRUE;
ec_ecdt->common.uid = ecdt_ptr->uid;
{
int result = 0;
+ ACPI_FUNCTION_TRACE("acpi_ec_init");
if (acpi_disabled)
- return 0;
+ return_VALUE(0);
acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);
if (!acpi_ec_dir)
- return -ENODEV;
+ return_VALUE(-ENODEV);
/* Now register the driver for the EC */
result = acpi_bus_register_driver(&acpi_ec_driver);
if (result < 0) {
remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
- return result;
+ return_VALUE(result);
}
subsys_initcall(acpi_ec_init);
#if 0
static void __exit acpi_ec_exit(void)
{
+ ACPI_FUNCTION_TRACE("acpi_ec_exit");
acpi_bus_unregister_driver(&acpi_ec_driver);
remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);
- return;
+ return_VOID;
}
#endif /* 0 */
static int __init acpi_fake_ecdt_setup(char *str)
{
acpi_fake_ecdt_enabled = 1;
- return 1;
+ return 0;
}
__setup("acpi_fake_ecdt", acpi_fake_ecdt_setup);
acpi_ec_driver.ops.add = acpi_ec_poll_add;
}
printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling");
- return 1;
+ return 0;
}
__setup("ec_intr=", acpi_ec_set_intr_mode);
git://git.onelab.eu / linux-2.6.git / blobdiff