* battery driver
@ 2006-11-24 17:27 Lebedev, Vladimir P
2007-01-26 19:43 ` Len Brown
0 siblings, 1 reply; 3+ messages in thread
From: Lebedev, Vladimir P @ 2006-11-24 17:27 UTC (permalink / raw)
To: Len Brown, Starikovskiy, Alexey Y; +Cc: linux-acpi
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
Len,
Attached patch contains new release of battery driver. The battery
driver was restructured and it is ready now for future development: for
example: porting from procfs to sysfs. Patch is based on 2.6.19-rc6-mm1.
It was tested on few laptops on such functionality as: system
suspend/resume + removing/inserting and so on. I suggest add patch to mm
tree.
Vladimir.
[-- Attachment #2: battery.patch --]
[-- Type: application/octet-stream, Size: 34581 bytes --]
diff -rup linux-2.6.19-rc6-mm1.a/drivers/acpi/battery.c linux-2.6.19-rc6-mm1.b/drivers/acpi/battery.c
--- linux-2.6.19-rc6-mm1.a/drivers/acpi/battery.c 2006-11-24 19:51:09.000000000 +0300
+++ linux-2.6.19-rc6-mm1.b/drivers/acpi/battery.c 2006-11-24 19:53:13.000000000 +0300
@@ -1,6 +1,7 @@
/*
- * acpi_battery.c - ACPI Battery Driver ($Revision: 37 $)
+ * battery.c - ACPI Battery Driver
*
+ * Copyright (c) 2006 Vladimir Lebedev <vladimir.p.lebedev@intel.com>
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
*
@@ -30,14 +31,17 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <asm/uaccess.h>
+#include <linux/time.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
-#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
+#define ACPI_BATTERY_UPDATE_TIME 0
-#define ACPI_BATTERY_FORMAT_BIF "NNNNNNNNNSSSS"
-#define ACPI_BATTERY_FORMAT_BST "NNNN"
+#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
+
+#define ACPI_BATTERY_FORMAT_BIF "NNNNNNNNNSSSS"
+#define ACPI_BATTERY_FORMAT_BST "NNNN"
#define ACPI_BATTERY_COMPONENT 0x00040000
#define ACPI_BATTERY_CLASS "battery"
@@ -45,20 +49,30 @@
#define ACPI_BATTERY_DRIVER_NAME "ACPI Battery Driver"
#define ACPI_BATTERY_DEVICE_NAME "Battery"
#define ACPI_BATTERY_FILE_INFO "info"
-#define ACPI_BATTERY_FILE_STATUS "state"
+#define ACPI_BATTERY_FILE_STATE "state"
#define ACPI_BATTERY_FILE_ALARM "alarm"
-#define ACPI_BATTERY_NOTIFY_STATUS 0x80
-#define ACPI_BATTERY_NOTIFY_INFO 0x81
#define ACPI_BATTERY_UNITS_WATTS "mW"
#define ACPI_BATTERY_UNITS_AMPS "mA"
+#define ACPI_BATTERY_NOTIFY_STATE 0x80
+#define ACPI_BATTERY_NOTIFY_INFO 0x81
+
+#define ACPI_BATTERY_NONE_UPDATE 0
+#define ACPI_BATTERY_EASY_UPDATE 1
+#define ACPI_BATTERY_INIT_UPDATE 2
+
+#define _COMPONENT ACPI_BATTERY_COMPONENT
-#define _COMPONENT ACPI_BATTERY_COMPONENT
ACPI_MODULE_NAME("acpi_battery")
MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
MODULE_LICENSE("GPL");
+static unsigned int update_time = ACPI_BATTERY_UPDATE_TIME;
+
+/* 0 - always, > 0 - by time */
+module_param(update_time, uint, 0644);
+
extern struct proc_dir_entry *acpi_lock_battery_dir(void);
extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
@@ -77,13 +91,6 @@ static struct acpi_driver acpi_battery_d
},
};
-struct acpi_battery_status {
- acpi_integer state;
- acpi_integer present_rate;
- acpi_integer remaining_capacity;
- acpi_integer present_voltage;
-};
-
struct acpi_battery_info {
acpi_integer power_unit;
acpi_integer design_capacity;
@@ -100,33 +107,119 @@ struct acpi_battery_info {
acpi_string oem_info;
};
-struct acpi_battery_flags {
- u8 present:1; /* Bay occupied? */
- u8 power_unit:1; /* 0=watts, 1=apms */
- u8 alarm:1; /* _BTP present? */
- u8 reserved:5;
+struct acpi_battery_state {
+ acpi_integer state;
+ acpi_integer present_rate;
+ acpi_integer remaining_capacity;
+ acpi_integer present_voltage;
};
-struct acpi_battery_trips {
- unsigned long warning;
- unsigned long low;
+struct acpi_battery_flags {
+ u8 battery_present_saved;
+ u8 alarm_present;
+ u8 init_update;
+ u8 info_update;
+ u8 state_update;
+ u8 alarm_update;
+ u8 power_unit;
};
struct acpi_battery {
- struct acpi_device * device;
+ struct mutex mutex;
+ struct acpi_device *device;
struct acpi_battery_flags flags;
- struct acpi_battery_trips trips;
+ struct acpi_buffer bif_data;
+ struct acpi_buffer bst_data;
unsigned long alarm;
- struct acpi_battery_info *info;
+ unsigned long info_update_time;
+ unsigned long state_update_time;
+ unsigned long alarm_update_time;
};
-/* --------------------------------------------------------------------------
+#define acpi_battery_present(battery) battery->device->status.battery_present
+
+#define acpi_battery_present_saved(battery) battery->flags.battery_present_saved
+#define acpi_battery_alarm_present(battery) battery->flags.alarm_present
+#define acpi_battery_init_update_flag(battery) battery->flags.init_update
+#define acpi_battery_info_update_flag(battery) battery->flags.info_update
+#define acpi_battery_state_update_flag(battery) battery->flags.state_update
+#define acpi_battery_alarm_update_flag(battery) battery->flags.alarm_update
+#define acpi_battery_power_units(battery) battery->flags.power_unit ? \
+ ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS
+
+#define acpi_battery_handle(battery) battery->device->handle
+
+#define acpi_battery_inserted(battery) \
+ (!acpi_battery_present_saved(battery) & acpi_battery_present(battery))
+
+#define acpi_battery_removed(battery) \
+ (acpi_battery_present_saved(battery) & !acpi_battery_present(battery))
+
+#define acpi_battery_bid(battery) acpi_device_bid(battery->device)
+
+#define acpi_battery_status_str(battery) \
+ acpi_battery_present(battery) ? "present" : "absent"
+
+/* -----------------------------------------------------------------------
Battery Management
- -------------------------------------------------------------------------- */
+ ----------------------------------------------------------------------- */
+
+static void battery_mutex_lock(struct acpi_battery *battery)
+{
+ mutex_lock(&battery->mutex);
+}
+
+static void battery_mutex_unlock(struct acpi_battery *battery)
+{
+ mutex_unlock(&battery->mutex);
+}
+
+static int acpi_battery_get_status(struct acpi_battery *battery)
+{
+ int result = 0;
+
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "_STA"));
+
+ result = acpi_bus_get_status(battery->device);
+
+ if (result) {
+ ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Evaluating _STA"));
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static int acpi_battery_extract_package(union acpi_object *package,
+ struct acpi_buffer *format,
+ struct acpi_buffer *data,
+ char *package_name)
+{
+ acpi_status status = 0;
+
+ status = acpi_extract_package(package, format, data);
+
+ if (status == AE_BUFFER_OVERFLOW) {
+ if (data->pointer) {
+ kfree(data->pointer);
+ }
+ data->pointer = kzalloc(data->length, GFP_KERNEL);
+ if (!data->pointer) {
+ return -ENOMEM;
+ }
+ status = acpi_extract_package(package, format, data);
+ }
+ if (ACPI_FAILURE(status)) {
+ ACPI_EXCEPTION((AE_INFO, status, "Extracting %s",
+ package_name));
+ return -ENODEV;
+ }
+ return 0;
+}
-static int
-acpi_battery_get_info(struct acpi_battery *battery,
- struct acpi_battery_info **bif)
+static int acpi_battery_get_info(struct acpi_battery *battery)
{
int result = 0;
acpi_status status = 0;
@@ -134,16 +227,22 @@ acpi_battery_get_info(struct acpi_batter
struct acpi_buffer format = { sizeof(ACPI_BATTERY_FORMAT_BIF),
ACPI_BATTERY_FORMAT_BIF
};
- struct acpi_buffer data = { 0, NULL };
union acpi_object *package = NULL;
+ struct acpi_buffer *data = NULL;
+ struct acpi_battery_info *bif = NULL;
+ battery->info_update_time = get_seconds();
- if (!battery || !bif)
- return -EINVAL;
+ if (!acpi_battery_present(battery))
+ return 0;
- /* Evalute _BIF */
-
- status = acpi_evaluate_object(battery->device->handle, "_BIF", NULL, &buffer);
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "_BIF"));
+
+ status =
+ acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,
+ &buffer);
if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
return -ENODEV;
@@ -151,41 +250,27 @@ acpi_battery_get_info(struct acpi_batter
package = buffer.pointer;
- /* Extract Package Data */
+ data = &battery->bif_data;
- status = acpi_extract_package(package, &format, &data);
- if (status != AE_BUFFER_OVERFLOW) {
- ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));
- result = -ENODEV;
+ result = acpi_battery_extract_package(package, &format, data, "_BIF");
+ if (result)
goto end;
- }
- data.pointer = kzalloc(data.length, GFP_KERNEL);
- if (!data.pointer) {
- result = -ENOMEM;
- goto end;
- }
+ end:
- status = acpi_extract_package(package, &format, &data);
- if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));
- kfree(data.pointer);
- result = -ENODEV;
- goto end;
+ if (buffer.pointer) {
+ kfree(buffer.pointer);
}
- end:
- kfree(buffer.pointer);
-
- if (!result)
- (*bif) = data.pointer;
+ if (!result) {
+ bif = data->pointer;
+ battery->flags.power_unit = bif->power_unit;
+ }
return result;
}
-static int
-acpi_battery_get_status(struct acpi_battery *battery,
- struct acpi_battery_status **bst)
+static int acpi_battery_get_state(struct acpi_battery *battery)
{
int result = 0;
acpi_status status = 0;
@@ -193,16 +278,21 @@ acpi_battery_get_status(struct acpi_batt
struct acpi_buffer format = { sizeof(ACPI_BATTERY_FORMAT_BST),
ACPI_BATTERY_FORMAT_BST
};
- struct acpi_buffer data = { 0, NULL };
union acpi_object *package = NULL;
+ struct acpi_buffer *data = NULL;
+ battery->state_update_time = get_seconds();
- if (!battery || !bst)
- return -EINVAL;
+ if (!acpi_battery_present(battery))
+ return 0;
- /* Evalute _BST */
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "_BST"));
- status = acpi_evaluate_object(battery->device->handle, "_BST", NULL, &buffer);
+ status =
+ acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,
+ &buffer);
if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
return -ENODEV;
@@ -210,168 +300,226 @@ acpi_battery_get_status(struct acpi_batt
package = buffer.pointer;
- /* Extract Package Data */
+ data = &battery->bst_data;
- status = acpi_extract_package(package, &format, &data);
- if (status != AE_BUFFER_OVERFLOW) {
- ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));
- result = -ENODEV;
- goto end;
- }
-
- data.pointer = kzalloc(data.length, GFP_KERNEL);
- if (!data.pointer) {
- result = -ENOMEM;
+ result = acpi_battery_extract_package(package, &format, data, "_BST");
+ if (result)
goto end;
- }
- status = acpi_extract_package(package, &format, &data);
- if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));
- kfree(data.pointer);
- result = -ENODEV;
- goto end;
+ end:
+ if (buffer.pointer) {
+ kfree(buffer.pointer);
}
- end:
- kfree(buffer.pointer);
+ return result;
+}
- if (!result)
- (*bst) = data.pointer;
+static int acpi_battery_get_alarm(struct acpi_battery *battery)
+{
+ battery->alarm_update_time = get_seconds();
- return result;
+ return 0;
}
-static int
-acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)
+static int acpi_battery_set_alarm(struct acpi_battery *battery,
+ unsigned long alarm)
{
acpi_status status = 0;
union acpi_object arg0 = { ACPI_TYPE_INTEGER };
struct acpi_object_list arg_list = { 1, &arg0 };
+ battery->alarm_update_time = get_seconds();
- if (!battery)
- return -EINVAL;
+ if (!acpi_battery_present(battery))
+ return -ENODEV;
- if (!battery->flags.alarm)
+ if (!acpi_battery_alarm_present(battery))
return -ENODEV;
arg0.integer.value = alarm;
- status = acpi_evaluate_object(battery->device->handle, "_BTP", &arg_list, NULL);
- if (ACPI_FAILURE(status))
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "_BTP"));
+
+ status = acpi_evaluate_object(acpi_battery_handle(battery),
+ "_BTP", &arg_list, NULL);
+ if (ACPI_FAILURE(status)) {
+ ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BTP"));
return -ENODEV;
+ }
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", (u32) alarm));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: alarm set to %lu\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), alarm));
battery->alarm = alarm;
return 0;
}
-static int acpi_battery_check(struct acpi_battery *battery)
+static int acpi_battery_init_alarm(struct acpi_battery *battery)
{
int result = 0;
acpi_status status = AE_OK;
acpi_handle handle = NULL;
- struct acpi_device *device = NULL;
- struct acpi_battery_info *bif = NULL;
+ struct acpi_battery_info *bif = battery->bif_data.pointer;
+ unsigned long alarm = battery->alarm;
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "_BTP handle"));
+
+ status = acpi_get_handle(acpi_battery_handle(battery), "_BTP", &handle);
+ if (ACPI_SUCCESS(status)) {
+ acpi_battery_alarm_present(battery) = 1;
+ if (!alarm && bif) {
+ alarm = bif->design_capacity_warning;
+ }
+ result = acpi_battery_set_alarm(battery, alarm);
+ if (result)
+ goto end;
+ } else {
+ acpi_battery_alarm_present(battery) = 0;
+ }
- if (!battery)
- return -EINVAL;
+ end:
- device = battery->device;
+ return result;
+}
- result = acpi_bus_get_status(device);
+static int acpi_battery_init_update(struct acpi_battery *battery)
+{
+ int result = 0;
+
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "init update"));
+
+ result = acpi_battery_get_status(battery);
if (result)
return result;
- /* Insertion? */
+ acpi_battery_present_saved(battery) = acpi_battery_present(battery);
- if (!battery->flags.present && device->status.battery_present) {
+ if (acpi_battery_present(battery)) {
+ result = acpi_battery_get_info(battery);
+ if (result)
+ return result;
+ result = acpi_battery_get_state(battery);
+ if (result)
+ return result;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Battery inserted\n"));
+ acpi_battery_init_alarm(battery);
+ }
- /* Evalute _BIF to get certain static information */
+ return result;
+}
- result = acpi_battery_get_info(battery, &bif);
- if (result)
- return result;
+static int acpi_battery_update(struct acpi_battery *battery,
+ int update, int *update_result_ptr)
+{
+ int result = 0;
+ int update_result = ACPI_BATTERY_NONE_UPDATE;
- battery->flags.power_unit = bif->power_unit;
- battery->trips.warning = bif->design_capacity_warning;
- battery->trips.low = bif->design_capacity_low;
- kfree(bif);
-
- /* See if alarms are supported, and if so, set default */
-
- status = acpi_get_handle(battery->device->handle, "_BTP", &handle);
- if (ACPI_SUCCESS(status)) {
- battery->flags.alarm = 1;
- acpi_battery_set_alarm(battery, battery->trips.warning);
+ if (acpi_battery_init_update_flag(battery)) {
+ result = acpi_battery_init_update(battery);
+ if (result)
+ goto end;;
+ update_result = ACPI_BATTERY_INIT_UPDATE;
+ } else if (update) {
+ result = acpi_battery_get_status(battery);
+ if (result)
+ goto end;;
+ if (acpi_battery_inserted(battery)
+ || acpi_battery_removed(battery)) {
+ result = acpi_battery_init_update(battery);
+ if (result)
+ goto end;;
+ update_result = ACPI_BATTERY_INIT_UPDATE;
+ } else {
+ update_result = ACPI_BATTERY_EASY_UPDATE;
}
}
- /* Removal? */
+ end:
- else if (battery->flags.present && !device->status.battery_present) {
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Battery removed\n"));
- }
+ acpi_battery_init_update_flag(battery) = 0;
- battery->flags.present = device->status.battery_present;
+ *update_result_ptr = update_result;
return result;
}
-/* --------------------------------------------------------------------------
+static void acpi_battery_notify_update(struct acpi_battery *battery)
+{
+ acpi_battery_get_status(battery);
+
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: %s\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), "notify"));
+
+ if (acpi_battery_init_update_flag(battery)) {
+ return;
+ }
+
+ if (acpi_battery_inserted(battery)) {
+ acpi_battery_init_update_flag(battery) = 1;
+ } else if (acpi_battery_removed(battery)) {
+ acpi_battery_init_update_flag(battery) = 1;
+ } else {
+ acpi_battery_info_update_flag(battery) = 1;
+ acpi_battery_state_update_flag(battery) = 1;
+ acpi_battery_alarm_update_flag(battery) = 1;
+ }
+}
+
+/* -----------------------------------------------------------------------
FS Interface (/proc)
- -------------------------------------------------------------------------- */
+ ----------------------------------------------------------------------- */
static struct proc_dir_entry *acpi_battery_dir;
-static int acpi_battery_read_info(struct seq_file *seq, void *offset)
+
+static int acpi_battery_read_info_print(struct seq_file *seq, int result)
{
- int result = 0;
struct acpi_battery *battery = seq->private;
struct acpi_battery_info *bif = NULL;
char *units = "?";
-
- if (!battery)
+ if (result)
goto end;
- if (battery->flags.present)
+ if (acpi_battery_present(battery)) {
seq_printf(seq, "present: yes\n");
- else {
+ } else {
seq_printf(seq, "present: no\n");
goto end;
}
- /* Battery Info (_BIF) */
-
- result = acpi_battery_get_info(battery, &bif);
- if (result || !bif) {
- seq_printf(seq, "ERROR: Unable to read battery information\n");
+ bif = battery->bif_data.pointer;
+ if (!bif) {
+ ACPI_EXCEPTION((AE_INFO, AE_ERROR, "BIF buffer is NULL"));
+ result = -ENODEV;
goto end;
}
- units =
- bif->
- power_unit ? ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS;
+ units = acpi_battery_power_units(battery);
- if (bif->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+ if (bif->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN) {
seq_printf(seq, "design capacity: unknown\n");
- else
+ } else {
seq_printf(seq, "design capacity: %d %sh\n",
- (u32) bif->design_capacity, units);
+ (int)bif->design_capacity, units);
+ }
- if (bif->last_full_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+ if (bif->last_full_capacity == ACPI_BATTERY_VALUE_UNKNOWN) {
seq_printf(seq, "last full capacity: unknown\n");
- else
+ } else {
seq_printf(seq, "last full capacity: %d %sh\n",
- (u32) bif->last_full_capacity, units);
+ (int)bif->last_full_capacity, units);
+ }
- switch ((u32) bif->battery_technology) {
+ switch ((int)bif->battery_technology) {
case 0:
seq_printf(seq, "battery technology: non-rechargeable\n");
break;
@@ -383,108 +531,208 @@ static int acpi_battery_read_info(struct
break;
}
- if (bif->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
+ if (bif->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN) {
seq_printf(seq, "design voltage: unknown\n");
- else
+ } else {
seq_printf(seq, "design voltage: %d mV\n",
- (u32) bif->design_voltage);
-
+ (int)bif->design_voltage);
+ }
seq_printf(seq, "design capacity warning: %d %sh\n",
- (u32) bif->design_capacity_warning, units);
+ (int)bif->design_capacity_warning, units);
seq_printf(seq, "design capacity low: %d %sh\n",
- (u32) bif->design_capacity_low, units);
+ (int)bif->design_capacity_low, units);
seq_printf(seq, "capacity granularity 1: %d %sh\n",
- (u32) bif->battery_capacity_granularity_1, units);
+ (int)bif->battery_capacity_granularity_1, units);
seq_printf(seq, "capacity granularity 2: %d %sh\n",
- (u32) bif->battery_capacity_granularity_2, units);
+ (int)bif->battery_capacity_granularity_2, units);
seq_printf(seq, "model number: %s\n", bif->model_number);
seq_printf(seq, "serial number: %s\n", bif->serial_number);
seq_printf(seq, "battery type: %s\n", bif->battery_type);
seq_printf(seq, "OEM info: %s\n", bif->oem_info);
end:
- kfree(bif);
- return 0;
-}
+ if (result) {
+ seq_printf(seq, "ERROR: Unable to read battery info\n");
+ }
-static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
-{
- return single_open(file, acpi_battery_read_info, PDE(inode)->data);
+ return result;
}
-static int acpi_battery_read_state(struct seq_file *seq, void *offset)
+static int acpi_battery_read_state_print(struct seq_file *seq, int result)
{
- int result = 0;
struct acpi_battery *battery = seq->private;
- struct acpi_battery_status *bst = NULL;
+ struct acpi_battery_state *bst = NULL;
char *units = "?";
-
- if (!battery)
+ if (result)
goto end;
- if (battery->flags.present)
+ if (acpi_battery_present(battery)) {
seq_printf(seq, "present: yes\n");
- else {
+ } else {
seq_printf(seq, "present: no\n");
goto end;
}
- /* Battery Units */
-
- units =
- battery->flags.
- power_unit ? ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS;
-
- /* Battery Status (_BST) */
-
- result = acpi_battery_get_status(battery, &bst);
- if (result || !bst) {
- seq_printf(seq, "ERROR: Unable to read battery status\n");
+ bst = battery->bst_data.pointer;
+ if (!bst) {
+ ACPI_EXCEPTION((AE_INFO, AE_ERROR, "BST buffer is NULL"));
+ result = -ENODEV;
goto end;
}
- if (!(bst->state & 0x04))
+ units = acpi_battery_power_units(battery);
+
+ if (!(bst->state & 0x04)) {
seq_printf(seq, "capacity state: ok\n");
- else
+ } else {
seq_printf(seq, "capacity state: critical\n");
+ }
if ((bst->state & 0x01) && (bst->state & 0x02)) {
seq_printf(seq,
"charging state: charging/discharging\n");
- } else if (bst->state & 0x01)
+ } else if (bst->state & 0x01) {
seq_printf(seq, "charging state: discharging\n");
- else if (bst->state & 0x02)
+ } else if (bst->state & 0x02) {
seq_printf(seq, "charging state: charging\n");
- else {
+ } else {
seq_printf(seq, "charging state: charged\n");
}
- if (bst->present_rate == ACPI_BATTERY_VALUE_UNKNOWN)
+ if (bst->present_rate == ACPI_BATTERY_VALUE_UNKNOWN) {
seq_printf(seq, "present rate: unknown\n");
- else
+ } else {
seq_printf(seq, "present rate: %d %s\n",
- (u32) bst->present_rate, units);
+ (int)bst->present_rate, units);
+ }
- if (bst->remaining_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+ if (bst->remaining_capacity == ACPI_BATTERY_VALUE_UNKNOWN) {
seq_printf(seq, "remaining capacity: unknown\n");
- else
+ } else {
seq_printf(seq, "remaining capacity: %d %sh\n",
- (u32) bst->remaining_capacity, units);
+ (int)bst->remaining_capacity, units);
+ }
- if (bst->present_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
+ if (bst->present_voltage == ACPI_BATTERY_VALUE_UNKNOWN) {
seq_printf(seq, "present voltage: unknown\n");
- else
+ } else {
seq_printf(seq, "present voltage: %d mV\n",
- (u32) bst->present_voltage);
+ (int)bst->present_voltage);
+ }
+
+ end:
+
+ if (result) {
+ seq_printf(seq, "ERROR: Unable to read battery state\n");
+ }
+
+ return result;
+}
+
+static int acpi_battery_read_alarm_print(struct seq_file *seq, int result)
+{
+ struct acpi_battery *battery = seq->private;
+ char *units = "?";
+
+ if (result)
+ goto end;
+
+ if (!acpi_battery_present(battery)) {
+ seq_printf(seq, "present: no\n");
+ goto end;
+ }
+
+ units = acpi_battery_power_units(battery);
+
+ seq_printf(seq, "alarm: ");
+ if (!battery->alarm) {
+ seq_printf(seq, "unsupported\n");
+ } else {
+ seq_printf(seq, "%lu %sh\n", battery->alarm, units);
+ }
end:
- kfree(bst);
+
+ if (result) {
+ seq_printf(seq, "ERROR: Unable to read battery alarm\n");
+ }
return 0;
}
+static int acpi_battery_read_info(struct seq_file *seq, void *offset)
+{
+ struct acpi_battery *battery = seq->private;
+ int result = 0;
+ int update_result = ACPI_BATTERY_NONE_UPDATE;
+ int update = 0;
+
+ battery_mutex_lock(battery);
+
+ update = (get_seconds() - battery->info_update_time >= update_time);
+ update = (update | acpi_battery_info_update_flag(battery));
+
+ result = acpi_battery_update(battery, update, &update_result);
+ if (result)
+ goto end;
+
+ if (update_result == ACPI_BATTERY_EASY_UPDATE) {
+ result = acpi_battery_get_info(battery);
+ if (result)
+ goto end;
+ }
+
+ end:
+
+ result = acpi_battery_read_info_print(seq, result);
+
+ acpi_battery_info_update_flag(battery) = 0;
+
+ battery_mutex_unlock(battery);
+
+ return result;
+}
+
+static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
+{
+ return single_open(file, acpi_battery_read_info, PDE(inode)->data);
+}
+
+static int acpi_battery_read_state(struct seq_file *seq, void *offset)
+{
+ struct acpi_battery *battery = seq->private;
+ int result = 0;
+ int update_result = ACPI_BATTERY_NONE_UPDATE;
+ int update = 0;
+
+ battery_mutex_lock(battery);
+
+ update = (get_seconds() - battery->state_update_time >= update_time);
+ update = (update | acpi_battery_state_update_flag(battery));
+
+ result = acpi_battery_update(battery, update, &update_result);
+ if (result)
+ goto end;
+
+ if (update_result == ACPI_BATTERY_EASY_UPDATE) {
+ result = acpi_battery_get_state(battery);
+ if (result)
+ goto end;
+ }
+
+ end:
+
+ result = acpi_battery_read_state_print(seq, result);
+
+ acpi_battery_state_update_flag(battery) = 0;
+
+ battery_mutex_unlock(battery);
+
+ return result;
+}
+
static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
{
return single_open(file, acpi_battery_read_state, PDE(inode)->data);
@@ -493,33 +741,34 @@ static int acpi_battery_state_open_fs(st
static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
{
struct acpi_battery *battery = seq->private;
- char *units = "?";
+ int result = 0;
+ int update_result = ACPI_BATTERY_NONE_UPDATE;
+ int update = 0;
+ battery_mutex_lock(battery);
- if (!battery)
- goto end;
+ update = (get_seconds() - battery->alarm_update_time >= update_time);
+ update = (update | acpi_battery_alarm_update_flag(battery));
- if (!battery->flags.present) {
- seq_printf(seq, "present: no\n");
+ result = acpi_battery_update(battery, update, &update_result);
+ if (result)
goto end;
+
+ if (update_result == ACPI_BATTERY_EASY_UPDATE) {
+ result = acpi_battery_get_alarm(battery);
+ if (result)
+ goto end;
}
- /* Battery Units */
+ end:
- units =
- battery->flags.
- power_unit ? ACPI_BATTERY_UNITS_AMPS : ACPI_BATTERY_UNITS_WATTS;
+ result = acpi_battery_read_alarm_print(seq, result);
- /* Battery Alarm */
+ acpi_battery_alarm_update_flag(battery) = 0;
- seq_printf(seq, "alarm: ");
- if (!battery->alarm)
- seq_printf(seq, "unsupported\n");
- else
- seq_printf(seq, "%d %sh\n", (u32) battery->alarm, units);
+ battery_mutex_unlock(battery);
- end:
- return 0;
+ return result;
}
static ssize_t
@@ -531,25 +780,46 @@ acpi_battery_write_alarm(struct file *fi
char alarm_string[12] = { '\0' };
struct seq_file *m = file->private_data;
struct acpi_battery *battery = m->private;
+ int update_result = ACPI_BATTERY_NONE_UPDATE;
+ battery_mutex_lock(battery);
- if (!battery || (count > sizeof(alarm_string) - 1))
- return -EINVAL;
+ result = acpi_battery_update(battery, 1, &update_result);
+ if (result) {
+ result = -ENODEV;
+ goto end;
+ }
- if (!battery->flags.present)
- return -ENODEV;
+ if (!acpi_battery_present(battery)) {
+ result = -ENODEV;
+ goto end;
+ }
- if (copy_from_user(alarm_string, buffer, count))
- return -EFAULT;
+ if (count > sizeof(alarm_string) - 1) {
+ result = -EINVAL;
+ goto end;
+ }
+
+ if (copy_from_user(alarm_string, buffer, count)) {
+ result = -EFAULT;
+ goto end;
+ }
alarm_string[count] = '\0';
result = acpi_battery_set_alarm(battery,
simple_strtoul(alarm_string, NULL, 0));
if (result)
- return result;
+ goto end;
+
+ end:
- return count;
+ if (!result)
+ result = count;
+
+ battery_mutex_unlock(battery);
+
+ return result;
}
static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
@@ -586,7 +856,6 @@ static int acpi_battery_add_fs(struct ac
{
struct proc_dir_entry *entry = NULL;
-
if (!acpi_device_dir(device)) {
acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
acpi_battery_dir);
@@ -595,35 +864,33 @@ static int acpi_battery_add_fs(struct ac
acpi_device_dir(device)->owner = THIS_MODULE;
}
- /* 'info' [R] */
entry = create_proc_entry(ACPI_BATTERY_FILE_INFO,
S_IRUGO, acpi_device_dir(device));
- if (!entry)
+ if (!entry) {
return -ENODEV;
- else {
+ } else {
entry->proc_fops = &acpi_battery_info_ops;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
- /* 'status' [R] */
- entry = create_proc_entry(ACPI_BATTERY_FILE_STATUS,
+ entry = create_proc_entry(ACPI_BATTERY_FILE_STATE,
S_IRUGO, acpi_device_dir(device));
- if (!entry)
+ if (!entry) {
return -ENODEV;
- else {
+ } else {
entry->proc_fops = &acpi_battery_state_ops;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
- /* 'alarm' [R/W] */
entry = create_proc_entry(ACPI_BATTERY_FILE_ALARM,
S_IFREG | S_IRUGO | S_IWUSR,
acpi_device_dir(device));
- if (!entry)
+ if (!entry) {
return -ENODEV;
- else {
+ } else {
+
entry->proc_fops = &acpi_battery_alarm_ops;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
@@ -634,11 +901,10 @@ static int acpi_battery_add_fs(struct ac
static int acpi_battery_remove_fs(struct acpi_device *device)
{
-
if (acpi_device_dir(device)) {
remove_proc_entry(ACPI_BATTERY_FILE_ALARM,
acpi_device_dir(device));
- remove_proc_entry(ACPI_BATTERY_FILE_STATUS,
+ remove_proc_entry(ACPI_BATTERY_FILE_STATE,
acpi_device_dir(device));
remove_proc_entry(ACPI_BATTERY_FILE_INFO,
acpi_device_dir(device));
@@ -650,32 +916,35 @@ static int acpi_battery_remove_fs(struct
return 0;
}
-/* --------------------------------------------------------------------------
+/* -----------------------------------------------------------------------
Driver Interface
- -------------------------------------------------------------------------- */
+ ----------------------------------------------------------------------- */
static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
{
struct acpi_battery *battery = data;
struct acpi_device *device = NULL;
-
if (!battery)
return;
- device = battery->device;
-
switch (event) {
- case ACPI_BATTERY_NOTIFY_STATUS:
+ case ACPI_BATTERY_NOTIFY_STATE:
case ACPI_BATTERY_NOTIFY_INFO:
case ACPI_NOTIFY_BUS_CHECK:
case ACPI_NOTIFY_DEVICE_CHECK:
- acpi_battery_check(battery);
- acpi_bus_generate_event(device, event, battery->flags.present);
+ battery_mutex_lock(battery);
+ device = battery->device;
+ acpi_battery_notify_update(battery);
+ battery_mutex_unlock(battery);
+ acpi_bus_generate_event(device, event,
+ acpi_battery_present(battery));
break;
default:
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "Unsupported event [0x%x]\n", event));
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: unsupported event %d\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery),
+ (int)event));
break;
}
@@ -688,7 +957,6 @@ static int acpi_battery_add(struct acpi_
acpi_status status = 0;
struct acpi_battery *battery = NULL;
-
if (!device)
return -EINVAL;
@@ -696,15 +964,25 @@ static int acpi_battery_add(struct acpi_
if (!battery)
return -ENOMEM;
+ mutex_init(&battery->mutex);
+
+ battery_mutex_lock(battery);
+
battery->device = device;
strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
acpi_driver_data(device) = battery;
- result = acpi_battery_check(battery);
+ result = acpi_battery_get_status(battery);
if (result)
goto end;
+ if (acpi_battery_present(battery)) {
+ result = acpi_battery_init_update(battery);
+ if (result)
+ goto end;
+ }
+
result = acpi_battery_add_fs(device);
if (result)
goto end;
@@ -713,40 +991,53 @@ static int acpi_battery_add(struct acpi_
ACPI_ALL_NOTIFY,
acpi_battery_notify, battery);
if (ACPI_FAILURE(status)) {
+ ACPI_EXCEPTION((AE_INFO, status, "Installing notify handler"));
result = -ENODEV;
goto end;
}
printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
- ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
- device->status.battery_present ? "present" : "absent");
+ ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(battery->device),
+ acpi_battery_present(battery) ? "present" : "absent");
end:
+
if (result) {
acpi_battery_remove_fs(device);
kfree(battery);
}
+ battery_mutex_unlock(battery);
+
return result;
}
static int acpi_battery_remove(struct acpi_device *device, int type)
{
- acpi_status status = 0;
struct acpi_battery *battery = NULL;
-
if (!device || !acpi_driver_data(device))
return -EINVAL;
battery = acpi_driver_data(device);
- status = acpi_remove_notify_handler(device->handle,
- ACPI_ALL_NOTIFY,
- acpi_battery_notify);
+ battery_mutex_lock(battery);
+
+ acpi_remove_notify_handler(device->handle,
+ ACPI_ALL_NOTIFY, acpi_battery_notify);
acpi_battery_remove_fs(device);
+ if (battery->bif_data.pointer)
+ kfree(battery->bif_data.pointer);
+
+ if (battery->bst_data.pointer)
+ kfree(battery->bst_data.pointer);
+
+ battery_mutex_unlock(battery);
+
+ mutex_destroy(&battery->mutex);
+
kfree(battery);
return 0;
@@ -755,18 +1046,29 @@ static int acpi_battery_remove(struct ac
/* this is needed to learn about changes made in suspended state */
static int acpi_battery_resume(struct acpi_device *device, int state)
{
- struct acpi_battery *battery;
+ struct acpi_battery *battery = NULL;
if (!device)
return -EINVAL;
battery = device->driver_data;
- return acpi_battery_check(battery);
+
+ battery_mutex_lock(battery);
+
+ acpi_battery_init_update_flag(battery) = 1;
+
+ battery_mutex_unlock(battery);
+
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s %s: resume state %d\n",
+ acpi_battery_bid(battery),
+ acpi_battery_status_str(battery), state));
+
+ return 0;
}
static int __init acpi_battery_init(void)
{
- int result;
+ int result = 0;
if (acpi_disabled)
return -ENODEV;
@@ -786,7 +1088,6 @@ static int __init acpi_battery_init(void
static void __exit acpi_battery_exit(void)
{
-
acpi_bus_unregister_driver(&acpi_battery_driver);
acpi_unlock_battery_dir(acpi_battery_dir);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: battery driver
2006-11-24 17:27 battery driver Lebedev, Vladimir P
@ 2007-01-26 19:43 ` Len Brown
2007-02-07 20:07 ` Bugs fixing Lebedev, Vladimir P
0 siblings, 1 reply; 3+ messages in thread
From: Len Brown @ 2007-01-26 19:43 UTC (permalink / raw)
To: Lebedev, Vladimir P; +Cc: Starikovskiy, Alexey Y, linux-acpi
On Friday 24 November 2006 12:27, Lebedev, Vladimir P wrote:
> Len,
>
> Attached patch contains new release of battery driver. The battery
> driver was restructured and it is ready now for future development: for
> example: porting from procfs to sysfs. Patch is based on 2.6.19-rc6-mm1.
> It was tested on few laptops on such functionality as: system
> suspend/resume + removing/inserting and so on. I suggest add patch to mm
> tree.
Same comment as for sbs.
It is not practical to review (and thus apply) this patch --
over 800 lines changed with no check-in comment about
what changed or why, no new comments in the code,
tons of whitespace changes, re-names, and apparently
code moving around inside the file.
This needs to be broken up in to a series of patches --
each making a single logical change. each change needs
a check-in comment telling the reviewer exactly what to
expect when reading the patch. cosmetic changes must
never be mixed in the same patch as functional changes --
else it makes the functional change harder to review
and backport.
I'd rather have a series of 80 simple patches of 10 lines
than a single patch of 800 lines. That makes reviewing
easy, and it makes bisect and isolation of regressions easy --
and that is what we need to optimize for.
So download quilt or stgit and learn to use it.
I'm sorry I didn't see this patch when you sent it 8 weeks ago
so I could tell you this right away. However, the good news
is that battery.c has seen only trivial changes since.
thanks,
-Len
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-02-07 20:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-24 17:27 battery driver Lebedev, Vladimir P
2007-01-26 19:43 ` Len Brown
2007-02-07 20:07 ` Bugs fixing Lebedev, Vladimir P
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).