Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...

[safe/jmp/linux-2.6] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 58d2c91..75f39f2 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -54,6 +54,7 @@
 #define ACPI_BATTERY_DEVICE_NAME       "Battery"
 #define ACPI_BATTERY_NOTIFY_STATUS     0x80
 #define ACPI_BATTERY_NOTIFY_INFO       0x81
+#define ACPI_BATTERY_NOTIFY_THRESHOLD   0x82
 
 #define _COMPONENT             ACPI_BATTERY_COMPONENT
 
@@ -88,10 +89,15 @@ static const struct acpi_device_id battery_device_ids[] = {
 
 MODULE_DEVICE_TABLE(acpi, battery_device_ids);
 
-/* For buggy DSDTs that report negative 16-bit values for either charging
- * or discharging current and/or report 0 as 65536 due to bad math.
- */
-#define QUIRK_SIGNED16_CURRENT 0x0001
+enum {
+       ACPI_BATTERY_ALARM_PRESENT,
+       ACPI_BATTERY_XINFO_PRESENT,
+       /* For buggy DSDTs that report negative 16-bit values for either
+        * charging or discharging current and/or report 0 as 65536
+        * due to bad math.
+        */
+       ACPI_BATTERY_QUIRK_SIGNED16_CURRENT,
+};
 
 struct acpi_battery {
        struct mutex lock;
@@ -109,6 +115,12 @@ struct acpi_battery {
        int design_voltage;
        int design_capacity_warning;
        int design_capacity_low;
+       int cycle_count;
+       int measurement_accuracy;
+       int max_sampling_time;
+       int min_sampling_time;
+       int max_averaging_interval;
+       int min_averaging_interval;
        int capacity_granularity_1;
        int capacity_granularity_2;
        int alarm;
@@ -118,8 +130,7 @@ struct acpi_battery {
        char oem_info[32];
        int state;
        int power_unit;
-       u8 alarm_present;
-       long quirks;
+       unsigned long flags;
 };
 
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
@@ -198,6 +209,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_TECHNOLOGY:
                val->intval = acpi_battery_technology(battery);
                break;
+       case POWER_SUPPLY_PROP_CYCLE_COUNT:
+               val->intval = battery->cycle_count;
+               break;
        case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
                val->intval = battery->design_voltage * 1000;
                break;
@@ -239,6 +253,7 @@ static enum power_supply_property charge_battery_props[] = {
        POWER_SUPPLY_PROP_STATUS,
        POWER_SUPPLY_PROP_PRESENT,
        POWER_SUPPLY_PROP_TECHNOLOGY,
+       POWER_SUPPLY_PROP_CYCLE_COUNT,
        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
        POWER_SUPPLY_PROP_VOLTAGE_NOW,
        POWER_SUPPLY_PROP_CURRENT_NOW,
@@ -254,6 +269,7 @@ static enum power_supply_property energy_battery_props[] = {
        POWER_SUPPLY_PROP_STATUS,
        POWER_SUPPLY_PROP_PRESENT,
        POWER_SUPPLY_PROP_TECHNOLOGY,
+       POWER_SUPPLY_PROP_CYCLE_COUNT,
        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
        POWER_SUPPLY_PROP_VOLTAGE_NOW,
        POWER_SUPPLY_PROP_CURRENT_NOW,
@@ -305,6 +321,28 @@ static struct acpi_offsets info_offsets[] = {
        {offsetof(struct acpi_battery, oem_info), 1},
 };
 
+static struct acpi_offsets extended_info_offsets[] = {
+       {offsetof(struct acpi_battery, power_unit), 0},
+       {offsetof(struct acpi_battery, design_capacity), 0},
+       {offsetof(struct acpi_battery, full_charge_capacity), 0},
+       {offsetof(struct acpi_battery, technology), 0},
+       {offsetof(struct acpi_battery, design_voltage), 0},
+       {offsetof(struct acpi_battery, design_capacity_warning), 0},
+       {offsetof(struct acpi_battery, design_capacity_low), 0},
+       {offsetof(struct acpi_battery, cycle_count), 0},
+       {offsetof(struct acpi_battery, measurement_accuracy), 0},
+       {offsetof(struct acpi_battery, max_sampling_time), 0},
+       {offsetof(struct acpi_battery, min_sampling_time), 0},
+       {offsetof(struct acpi_battery, max_averaging_interval), 0},
+       {offsetof(struct acpi_battery, min_averaging_interval), 0},
+       {offsetof(struct acpi_battery, capacity_granularity_1), 0},
+       {offsetof(struct acpi_battery, capacity_granularity_2), 0},
+       {offsetof(struct acpi_battery, model_number), 1},
+       {offsetof(struct acpi_battery, serial_number), 1},
+       {offsetof(struct acpi_battery, type), 1},
+       {offsetof(struct acpi_battery, oem_info), 1},
+};
+
 static int extract_package(struct acpi_battery *battery,
                           union acpi_object *package,
                           struct acpi_offsets *offsets, int num)
@@ -350,22 +388,29 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
 {
        int result = -EFAULT;
        acpi_status status = 0;
+       char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags)?
+                       "_BIX" : "_BIF";
+
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
        if (!acpi_battery_present(battery))
                return 0;
        mutex_lock(&battery->lock);
-       status = acpi_evaluate_object(battery->device->handle, "_BIF",
-                                     NULL, &buffer);
+       status = acpi_evaluate_object(battery->device->handle, name,
+                                               NULL, &buffer);
        mutex_unlock(&battery->lock);
 
        if (ACPI_FAILURE(status)) {
-               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", name));
                return -ENODEV;
        }
-
-       result = extract_package(battery, buffer.pointer,
-                                info_offsets, ARRAY_SIZE(info_offsets));
+       if (test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags))
+               result = extract_package(battery, buffer.pointer,
+                               extended_info_offsets,
+                               ARRAY_SIZE(extended_info_offsets));
+       else
+               result = extract_package(battery, buffer.pointer,
+                               info_offsets, ARRAY_SIZE(info_offsets));
        kfree(buffer.pointer);
        return result;
 }
@@ -399,7 +444,7 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
        battery->update_time = jiffies;
        kfree(buffer.pointer);
 
-       if ((battery->quirks & QUIRK_SIGNED16_CURRENT) &&
+       if (test_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags) &&
            battery->rate_now != -1)
                battery->rate_now = abs((s16)battery->rate_now);
 
@@ -412,7 +457,8 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery)
        union acpi_object arg0 = { .type = ACPI_TYPE_INTEGER };
        struct acpi_object_list arg_list = { 1, &arg0 };
 
-       if (!acpi_battery_present(battery)|| !battery->alarm_present)
+       if (!acpi_battery_present(battery) ||
+           !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))
                return -ENODEV;
 
        arg0.integer.value = battery->alarm;
@@ -437,10 +483,10 @@ static int acpi_battery_init_alarm(struct acpi_battery *battery)
        /* See if alarms are supported, and if so, set default */
        status = acpi_get_handle(battery->device->handle, "_BTP", &handle);
        if (ACPI_FAILURE(status)) {
-               battery->alarm_present = 0;
+               clear_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags);
                return 0;
        }
-       battery->alarm_present = 1;
+       set_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags);
        if (!battery->alarm)
                battery->alarm = battery->design_capacity_warning;
        return acpi_battery_set_alarm(battery);
@@ -510,9 +556,8 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
 
 static void acpi_battery_quirks(struct acpi_battery *battery)
 {
-       battery->quirks = 0;
        if (dmi_name_in_vendors("Acer") && battery->power_unit) {
-               battery->quirks |= QUIRK_SIGNED16_CURRENT;
+               set_bit(ACPI_BATTERY_QUIRK_SIGNED16_CURRENT, &battery->flags);
        }
 }
 
@@ -590,6 +635,7 @@ static int acpi_battery_print_info(struct seq_file *seq, int result)
        seq_printf(seq, "design capacity low:     %d %sh\n",
                   battery->design_capacity_low,
                   acpi_battery_units(battery));
+       seq_printf(seq, "cycle count:             %i\n", battery->cycle_count);
        seq_printf(seq, "capacity granularity 1:  %d %sh\n",
                   battery->capacity_granularity_1,
                   acpi_battery_units(battery));
@@ -841,6 +887,7 @@ static int acpi_battery_add(struct acpi_device *device)
 {
        int result = 0;
        struct acpi_battery *battery = NULL;
+       acpi_handle handle;
        if (!device)
                return -EINVAL;
        battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
@@ -851,6 +898,9 @@ static int acpi_battery_add(struct acpi_device *device)
        strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
        device->driver_data = battery;
        mutex_init(&battery->lock);
+       if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle,
+                       "_BIX", &handle)))
+               set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
        acpi_battery_update(battery);
 #ifdef CONFIG_ACPI_PROCFS_POWER
        result = acpi_battery_add_fs(device);