Skip to content

L
linux
Commit db1c291a authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files
Options

ACPI: SBS: Make SBS reads table-driven. 

Re-factor SBS functions to use tables and cycles for repeated operations.
Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 89862e3b
Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 1017 deletions
drivers/acpi/sbs.c
View file @ db1c291a
/* /*
* acpi_sbs.c - ACPI Smart Battery System Driver ($Revision: 1.16 $) * sbs.c - ACPI Smart Battery System Driver ($Revision: 2.0 $)
* *
* Copyright (c) 2007 Alexey Starikovskiy <astarikovskiy@suse.de>
* Copyright (c) 2005-2007 Vladimir Lebedev <vladimir.p.lebedev@intel.com>
* Copyright (c) 2005 Rich Townsend <rhdt@bartol.udel.edu> * Copyright (c) 2005 Rich Townsend <rhdt@bartol.udel.edu>
* *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...@@ -46,34 +48,25 @@ ...@@ -46,34 +48,25 @@
#define ACPI_SBS_FILE_ALARM "alarm" #define ACPI_SBS_FILE_ALARM "alarm"
#define ACPI_BATTERY_DIR_NAME "BAT%i" #define ACPI_BATTERY_DIR_NAME "BAT%i"
#define ACPI_AC_DIR_NAME "AC0" #define ACPI_AC_DIR_NAME "AC0"
#define ACPI_SBC_SMBUS_ADDR 0x9
#define ACPI_SBSM_SMBUS_ADDR 0xa
#define ACPI_SB_SMBUS_ADDR 0xb
#define ACPI_SBS_AC_NOTIFY_STATUS 0x80
#define ACPI_SBS_BATTERY_NOTIFY_STATUS 0x80
#define ACPI_SBS_BATTERY_NOTIFY_INFO 0x81
#define _COMPONENT ACPI_SBS_COMPONENT enum acpi_sbs_device_addr {
ACPI_SBS_CHARGER = 0x9,
ACPI_SBS_MANAGER = 0xa,
ACPI_SBS_BATTERY = 0xb,
};
#define ACPI_SBS_NOTIFY_STATUS 0x80
#define ACPI_SBS_NOTIFY_INFO 0x81
ACPI_MODULE_NAME("sbs"); ACPI_MODULE_NAME("sbs");
MODULE_AUTHOR("Rich Townsend"); MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");
MODULE_DESCRIPTION("Smart Battery System ACPI interface driver"); MODULE_DESCRIPTION("Smart Battery System ACPI interface driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define DEF_CAPACITY_UNIT 3 static unsigned int cache_time = 1000;
#define MAH_CAPACITY_UNIT 1 module_param(cache_time, uint, 0644);
#define MWH_CAPACITY_UNIT 2 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
#define CAPACITY_UNIT DEF_CAPACITY_UNIT
#define REQUEST_UPDATE_MODE 1
#define QUEUE_UPDATE_MODE 2
#define DATA_TYPE_COMMON 0
#define DATA_TYPE_INFO 1
#define DATA_TYPE_STATE 2
#define DATA_TYPE_ALARM 3
#define DATA_TYPE_AC_STATE 4
extern struct proc_dir_entry *acpi_lock_ac_dir(void); extern struct proc_dir_entry *acpi_lock_ac_dir(void);
extern struct proc_dir_entry *acpi_lock_battery_dir(void); extern struct proc_dir_entry *acpi_lock_battery_dir(void);
...@@ -83,16 +76,6 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); ...@@ -83,16 +76,6 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
#define MAX_SBS_BAT 4 #define MAX_SBS_BAT 4
#define ACPI_SBS_BLOCK_MAX 32 #define ACPI_SBS_BLOCK_MAX 32
#define UPDATE_DELAY 10
/* 0 - every time, > 0 - by update_time */
static unsigned int update_time = 120;
static unsigned int mode = CAPACITY_UNIT;
module_param(update_time, uint, 0644);
module_param(mode, uint, 0444);
static int acpi_sbs_add(struct acpi_device *device); static int acpi_sbs_add(struct acpi_device *device);
static int acpi_sbs_remove(struct acpi_device *device, int type); static int acpi_sbs_remove(struct acpi_device *device, int type);
static int acpi_sbs_resume(struct acpi_device *device); static int acpi_sbs_resume(struct acpi_device *device);
...@@ -117,486 +100,187 @@ static struct acpi_driver acpi_sbs_driver = { ...@@ -117,486 +100,187 @@ static struct acpi_driver acpi_sbs_driver = {
struct acpi_battery { struct acpi_battery {
struct acpi_sbs *sbs; struct acpi_sbs *sbs;
struct proc_dir_entry *proc_entry; struct proc_dir_entry *proc_entry;
int vscale; unsigned long update_time;
int ipscale; char name[8];
char manufacturer_name[ACPI_SBS_BLOCK_MAX]; char manufacturer_name[ACPI_SBS_BLOCK_MAX];
char device_name[ACPI_SBS_BLOCK_MAX]; char device_name[ACPI_SBS_BLOCK_MAX];
char device_chemistry[ACPI_SBS_BLOCK_MAX]; char device_chemistry[ACPI_SBS_BLOCK_MAX];
u32 alarm_capacity;
u16 full_charge_capacity; u16 full_charge_capacity;
u16 design_capacity; u16 design_capacity;
u16 design_voltage; u16 design_voltage;
u16 serial_number; u16 serial_number;
u16 cycle_count;
u16 temp_now;
u16 voltage_now; u16 voltage_now;
s16 current_now; s16 current_now;
s16 current_avg;
u16 capacity_now; u16 capacity_now;
u16 state_of_charge;
u16 state; u16 state;
u16 alarm_capacity;
u16 mode; u16 mode;
u16 spec;
u8 id; u8 id;
u8 alive:1;
u8 init_state:1;
u8 present:1; u8 present:1;
}; };
struct acpi_sbs { struct acpi_sbs {
struct acpi_device *device; struct acpi_device *device;
struct acpi_smb_hc *hc; struct acpi_smb_hc *hc;
struct mutex mutex; struct mutex lock;
struct proc_dir_entry *ac_entry; struct proc_dir_entry *charger_entry;
struct acpi_battery battery[MAX_SBS_BAT]; struct acpi_battery battery[MAX_SBS_BAT];
int zombie; u8 batteries_supported:4;
struct timer_list update_timer;
int run_cnt;
int update_proc_flg;
u8 batteries_supported;
u8 manager_present:1; u8 manager_present:1;
u8 charger_present:1; u8 charger_present:1;
}; };
static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type); static inline int battery_scale(int log)
static void acpi_sbs_update_time(void *data);
static int sbs_zombie(struct acpi_sbs *sbs)
{ {
return (sbs->zombie); int scale = 1;
while (log--)
scale *= 10;
return scale;
} }
static int sbs_mutex_lock(struct acpi_sbs *sbs) static inline int acpi_battery_vscale(struct acpi_battery *battery)
{ {
if (sbs_zombie(sbs)) { return battery_scale((battery->spec & 0x0f00) >> 8);
return -ENODEV;
}
mutex_lock(&sbs->mutex);
return 0;
} }
static void sbs_mutex_unlock(struct acpi_sbs *sbs) static inline int acpi_battery_ipscale(struct acpi_battery *battery)
{ {
mutex_unlock(&sbs->mutex); return battery_scale((battery->spec & 0xf000) >> 12);
} }
/* -------------------------------------------------------------------------- static inline int acpi_battery_mode(struct acpi_battery *battery)
Smart Battery System Management
-------------------------------------------------------------------------- */
static int acpi_check_update_proc(struct acpi_sbs *sbs)
{ {
acpi_status status = AE_OK; return (battery->mode & 0x8000);
if (update_time == 0) {
sbs->update_proc_flg = 0;
return 0;
}
if (sbs->update_proc_flg == 0) {
status = acpi_os_execute(OSL_GPE_HANDLER,
acpi_sbs_update_time, sbs);
if (status != AE_OK) {
ACPI_EXCEPTION((AE_INFO, status,
"acpi_os_execute() failed"));
return 1;
}
sbs->update_proc_flg = 1;
}
return 0;
} }
static int acpi_battery_get_present(struct acpi_battery *battery) static inline int acpi_battery_scale(struct acpi_battery *battery)
{ {
s16 state; return (acpi_battery_mode(battery) ? 10 : 1) *
int result = 0; acpi_battery_ipscale(battery);
int is_present = 0;
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
ACPI_SBSM_SMBUS_ADDR, 0x01, (u8 *)&state);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
}
if (!result) {
is_present = (state & 0x000f) & (1 << battery->id);
}
battery->present = is_present;
return result;
} }
static int acpi_battery_select(struct acpi_battery *battery) /* --------------------------------------------------------------------------
{ Smart Battery System Management
struct acpi_sbs *sbs = battery->sbs; -------------------------------------------------------------------------- */
int result = 0;
s16 state;
int foo;
if (sbs->manager_present) {
/* Take special care not to knobble other nibbles of
* state (aka selector_state), since
* it causes charging to halt on SBSELs */
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, struct acpi_battery_reader {
ACPI_SBSM_SMBUS_ADDR, 0x01, (u8 *)&state); u8 command; /* command for battery */
if (result) { u8 mode; /* word or block? */
ACPI_EXCEPTION((AE_INFO, AE_ERROR, size_t offset; /* offset inside struct acpi_sbs_battery */
"acpi_smbus_read() failed")); };
goto end;
}
foo = (state & 0x0fff) | (1 << (battery->id + 12)); static struct acpi_battery_reader info_readers[] = {
result = acpi_smbus_write(battery->sbs->hc, SMBUS_WRITE_WORD, {0x01, SMBUS_READ_WORD, offsetof(struct acpi_battery, alarm_capacity)},
ACPI_SBSM_SMBUS_ADDR, 0x01, (u8 *)&foo, 2); {0x03, SMBUS_READ_WORD, offsetof(struct acpi_battery, mode)},
if (result) { {0x10, SMBUS_READ_WORD, offsetof(struct acpi_battery, full_charge_capacity)},
ACPI_EXCEPTION((AE_INFO, AE_ERROR, {0x17, SMBUS_READ_WORD, offsetof(struct acpi_battery, cycle_count)},
"acpi_smbus_write() failed")); {0x18, SMBUS_READ_WORD, offsetof(struct acpi_battery, design_capacity)},
goto end; {0x19, SMBUS_READ_WORD, offsetof(struct acpi_battery, design_voltage)},
} {0x1a, SMBUS_READ_WORD, offsetof(struct acpi_battery, spec)},
} {0x1c, SMBUS_READ_WORD, offsetof(struct acpi_battery, serial_number)},
{0x20, SMBUS_READ_BLOCK, offsetof(struct acpi_battery, manufacturer_name)},
{0x21, SMBUS_READ_BLOCK, offsetof(struct acpi_battery, device_name)},
{0x22, SMBUS_READ_BLOCK, offsetof(struct acpi_battery, device_chemistry)},
};
end: static struct acpi_battery_reader state_readers[] = {
return result; {0x08, SMBUS_READ_WORD, offsetof(struct acpi_battery, temp_now)},
} {0x09, SMBUS_READ_WORD, offsetof(struct acpi_battery, voltage_now)},
{0x0a, SMBUS_READ_WORD, offsetof(struct acpi_battery, current_now)},
{0x0b, SMBUS_READ_WORD, offsetof(struct acpi_battery, current_avg)},
{0x0f, SMBUS_READ_WORD, offsetof(struct acpi_battery, capacity_now)},
{0x0e, SMBUS_READ_WORD, offsetof(struct acpi_battery, state_of_charge)},
{0x16, SMBUS_READ_WORD, offsetof(struct acpi_battery, state)},
};
static int acpi_sbsm_get_info(struct acpi_sbs *sbs) static int acpi_manager_get_info(struct acpi_sbs *sbs)
{ {
int result = 0; int result = 0;
s16 battery_system_info; u16 battery_system_info;
result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBSM_SMBUS_ADDR, 0x04,
(u8 *)&battery_system_info);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
sbs->manager_present = 1;
end:
result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_MANAGER,
0x04, (u8 *) & battery_system_info);
if (!result)
sbs->batteries_supported = battery_system_info & 0x000f;
return result; return result;
} }
static int acpi_battery_get_info(struct acpi_battery *battery) static int acpi_battery_get_info(struct acpi_battery *battery)
{ {
int result = 0; int i, result = 0;
s16 battery_mode;
s16 specification_info;
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x03,
(u8 *)&battery_mode);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
battery->mode = (battery_mode & 0x8000) >> 15;
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x10,
(u8 *)&battery->full_charge_capacity);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x18,
(u8 *)&battery->design_capacity);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x19,
(u8 *)&battery->design_voltage);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x1a,
(u8 *)&specification_info);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
switch ((specification_info & 0x0f00) >> 8) {
case 1:
battery->vscale = 10;
break;
case 2:
battery->vscale = 100;
break;
case 3:
battery->vscale = 1000;
break;
default:
battery->vscale = 1;
}
switch ((specification_info & 0xf000) >> 12) { for (i = 0; i < ARRAY_SIZE(info_readers); ++i) {
case 1: result = acpi_smbus_read(battery->sbs->hc, info_readers[i].mode,
battery->ipscale = 10; ACPI_SBS_BATTERY, info_readers[i].command,
break; (u8 *) battery + info_readers[i].offset);
case 2: if (result)
battery->ipscale = 100;
break;
case 3:
battery->ipscale = 1000;
break; break;
default:
battery->ipscale = 1;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x1c,
(u8 *)&battery->serial_number);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_BLOCK, ACPI_SB_SMBUS_ADDR, 0x20,
(u8 *)battery->manufacturer_name);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_str() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_BLOCK, ACPI_SB_SMBUS_ADDR, 0x21,
(u8 *)battery->device_name);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_str() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_BLOCK, ACPI_SB_SMBUS_ADDR, 0x22,
(u8 *)battery->device_chemistry);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_str() failed"));
goto end;
} }
end:
return result; return result;
} }
static int acpi_battery_get_state(struct acpi_battery *battery) static int acpi_battery_get_state(struct acpi_battery *battery)
{ {
int result = 0; int i, result = 0;
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x09,
(u8 *)&battery->voltage_now);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x0a,
(u8 *)&battery->current_now);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x0f,
(u8 *)&battery->capacity_now);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x16, if (time_before(jiffies, battery->update_time +
(u8 *)&battery->state); msecs_to_jiffies(cache_time)))
if (result) { return 0;
ACPI_EXCEPTION((AE_INFO, AE_ERROR, for (i = 0; i < ARRAY_SIZE(state_readers); ++i) {
"acpi_smbus_read() failed")); result = acpi_smbus_read(battery->sbs->hc,
state_readers[i].mode,
ACPI_SBS_BATTERY,
state_readers[i].command,
(u8 *)battery +
state_readers[i].offset);
if (result)
goto end; goto end;
} }
end: end:
battery->update_time = jiffies;
return result; return result;
} }
static int acpi_battery_get_alarm(struct acpi_battery *battery) static int acpi_battery_get_alarm(struct acpi_battery *battery)
{ {
int result = 0; return acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
ACPI_SBS_BATTERY, 0x01,
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x01, (u8 *) & battery->alarm_capacity);
(u8 *)&battery->alarm_capacity);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
end:
return result;
}
static int acpi_battery_set_alarm(struct acpi_battery *battery,
unsigned long alarm)
{
int result = 0;
s16 battery_mode;
int foo;
result = acpi_battery_select(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_select() failed"));
goto end;
}
/* If necessary, enable the alarm */
if (alarm > 0) {
result =
acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x03,
(u8 *)&battery_mode);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
battery_mode &= 0xbfff;
result =
acpi_smbus_write(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x01,
(u8 *)&battery_mode, 2);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_write() failed"));
goto end;
}
}
foo = alarm / (battery->mode ? 10 : 1);
result = acpi_smbus_write(battery->sbs->hc, SMBUS_READ_WORD, ACPI_SB_SMBUS_ADDR, 0x01,
(u8 *)&foo, 2);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_write() failed"));
goto end;
}
end:
return result;
}
static int acpi_battery_set_mode(struct acpi_battery *battery)
{
int result = 0;
s16 battery_mode;
if (mode == DEF_CAPACITY_UNIT) {
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
ACPI_SB_SMBUS_ADDR, 0x03, (u8 *)&battery_mode);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
if (mode == MAH_CAPACITY_UNIT) {
battery_mode &= 0x7fff;
} else {
battery_mode |= 0x8000;
}
result = acpi_smbus_write(battery->sbs->hc, SMBUS_READ_WORD,
ACPI_SB_SMBUS_ADDR, 0x03, (u8 *)&battery_mode, 2);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_write() failed"));
goto end;
}
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
ACPI_SB_SMBUS_ADDR, 0x03, (u8 *)&battery_mode);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
end:
return result;
} }
static int acpi_battery_init(struct acpi_battery *battery) static int acpi_battery_set_alarm(struct acpi_battery *battery)
{ {
int result = 0; struct acpi_sbs *sbs = battery->sbs;
u16 value;
result = acpi_battery_select(battery); return 0;
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_select() failed"));
goto end;
}
result = acpi_battery_set_mode(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_set_mode() failed"));
goto end;
}
result = acpi_battery_get_info(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_info() failed"));
goto end;
}
result = acpi_battery_get_state(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_state() failed"));
goto end;
}
result = acpi_battery_get_alarm(battery); if (sbs->manager_present) {
if (result) { acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_MANAGER,
ACPI_EXCEPTION((AE_INFO, AE_ERROR, 0x01, (u8 *)&value);
"acpi_battery_get_alarm() failed")); value &= 0x0fff;
goto end; value |= 1 << (battery->id + 12);
acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD, ACPI_SBS_MANAGER,
0x01, (u8 *)&value, 2);
} }
value = battery->alarm_capacity / (acpi_battery_mode(battery) ? 10 : 1);
end: return acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD, ACPI_SBS_BATTERY,
return result; 0x01, (u8 *)&value, 2);
} }
static int acpi_ac_get_present(struct acpi_sbs *sbs) static int acpi_ac_get_present(struct acpi_sbs *sbs)
{ {
int result = 0; int result;
s16 charger_status; u16 status;
result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBC_SMBUS_ADDR, 0x13,
(u8 *)&charger_status);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_smbus_read() failed"));
goto end;
}
sbs->charger_present = (charger_status & 0x8000) >> 15;
end:
result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_CHARGER,
0x13, (u8 *) & status);
if (!result)
sbs->charger_present = (status >> 15) & 0x1;
return result; return result;
} }
...@@ -607,7 +291,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs) ...@@ -607,7 +291,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs)
/* Generic Routines */ /* Generic Routines */
static int static int
acpi_sbs_generic_add_fs(struct proc_dir_entry **dir, acpi_sbs_add_fs(struct proc_dir_entry **dir,
struct proc_dir_entry *parent_dir, struct proc_dir_entry *parent_dir,
char *dir_name, char *dir_name,
struct file_operations *info_fops, struct file_operations *info_fops,
...@@ -669,7 +353,7 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir, ...@@ -669,7 +353,7 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir,
} }
static void static void
acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir, acpi_sbs_remove_fs(struct proc_dir_entry **dir,
struct proc_dir_entry *parent_dir) struct proc_dir_entry *parent_dir)
{ {
...@@ -687,75 +371,47 @@ acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir, ...@@ -687,75 +371,47 @@ acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir,
static struct proc_dir_entry *acpi_battery_dir = NULL; static struct proc_dir_entry *acpi_battery_dir = NULL;
static inline char *acpi_battery_units(struct acpi_battery *battery)
{
return acpi_battery_mode(battery) ? " mWh" : " mAh";
}
static int acpi_battery_read_info(struct seq_file *seq, void *offset) static int acpi_battery_read_info(struct seq_file *seq, void *offset)
{ {
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs; struct acpi_sbs *sbs = battery->sbs;
int cscale;
int result = 0; int result = 0;
if (sbs_mutex_lock(sbs)) { mutex_lock(&sbs->lock);
return -ENODEV;
}
result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (update_time == 0) {
result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_INFO);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed"));
}
}
if (battery->present) { seq_printf(seq, "present: %s\n",
seq_printf(seq, "present: yes\n"); (battery->present) ? "yes" : "no");
} else { if (!battery->present)
seq_printf(seq, "present: no\n");
goto end; goto end;
}
if (battery->mode) {
cscale = battery->vscale * battery->ipscale;
} else {
cscale = battery->ipscale;
}
seq_printf(seq, "design capacity: %i%s\n", seq_printf(seq, "design capacity: %i%s\n",
battery->design_capacity * cscale, battery->design_capacity * acpi_battery_scale(battery),
battery->mode ? "0 mWh" : " mAh"); acpi_battery_units(battery));
seq_printf(seq, "last full capacity: %i%s\n", seq_printf(seq, "last full capacity: %i%s\n",
battery->full_charge_capacity * cscale, battery->full_charge_capacity * acpi_battery_scale(battery),
battery->mode ? "0 mWh" : " mAh"); acpi_battery_units(battery));
seq_printf(seq, "battery technology: rechargeable\n"); seq_printf(seq, "battery technology: rechargeable\n");
seq_printf(seq, "design voltage: %i mV\n", seq_printf(seq, "design voltage: %i mV\n",
battery->design_voltage * battery->vscale); battery->design_voltage * acpi_battery_vscale(battery));
seq_printf(seq, "design capacity warning: unknown\n"); seq_printf(seq, "design capacity warning: unknown\n");
seq_printf(seq, "design capacity low: unknown\n"); seq_printf(seq, "design capacity low: unknown\n");
seq_printf(seq, "capacity granularity 1: unknown\n"); seq_printf(seq, "capacity granularity 1: unknown\n");
seq_printf(seq, "capacity granularity 2: unknown\n"); seq_printf(seq, "capacity granularity 2: unknown\n");
seq_printf(seq, "model number: %s\n", battery->device_name);
seq_printf(seq, "model number: %s\n",
battery->device_name);
seq_printf(seq, "serial number: %i\n", seq_printf(seq, "serial number: %i\n",
battery->serial_number); battery->serial_number);
seq_printf(seq, "battery type: %s\n", seq_printf(seq, "battery type: %s\n",
battery->device_chemistry); battery->device_chemistry);
seq_printf(seq, "OEM info: %s\n", seq_printf(seq, "OEM info: %s\n",
battery->manufacturer_name); battery->manufacturer_name);
end: end:
mutex_unlock(&sbs->lock);
sbs_mutex_unlock(sbs);
return result; return result;
} }
...@@ -769,73 +425,29 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset) ...@@ -769,73 +425,29 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs; struct acpi_sbs *sbs = battery->sbs;
int result = 0; int result = 0;
int cscale;
int foo;
if (sbs_mutex_lock(sbs)) { mutex_lock(&sbs->lock);
return -ENODEV; seq_printf(seq, "present: %s\n",
} (battery->present) ? "yes" : "no");
if (!battery->present)
result = acpi_check_update_proc(sbs); goto end;
if (result)
goto end;
if (update_time == 0) {
result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_STATE);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed"));
}
}
if (battery->present) {
seq_printf(seq, "present: yes\n");
} else {
seq_printf(seq, "present: no\n");
goto end;
}
if (battery->mode) {
cscale = battery->vscale * battery->ipscale;
} else {
cscale = battery->ipscale;
}
if (battery->state & 0x0010) {
seq_printf(seq, "capacity state: critical\n");
} else {
seq_printf(seq, "capacity state: ok\n");
}
foo = (s16) battery->current_now * battery->ipscale;
if (battery->mode) {
foo = foo * battery->design_voltage / 1000;
}
if (battery->current_now < 0) {
seq_printf(seq, "charging state: discharging\n");
seq_printf(seq, "present rate: %d %s\n",
-foo, battery->mode ? "mW" : "mA");
} else if (battery->current_now > 0) {
seq_printf(seq, "charging state: charging\n");
seq_printf(seq, "present rate: %d %s\n",
foo, battery->mode ? "mW" : "mA");
} else {
seq_printf(seq, "charging state: charged\n");
seq_printf(seq, "present rate: 0 %s\n",
battery->mode ? "mW" : "mA");
}
acpi_battery_get_state(battery);
seq_printf(seq, "capacity state: %s\n",
(battery->state & 0x0010) ? "critical" : "ok");
seq_printf(seq, "charging state: %s\n",
(battery->current_now < 0) ? "discharging" :
((battery->current_now > 0) ? "charging" : "charged"));
seq_printf(seq, "present rate: %d mA\n",
abs(battery->current_now) * acpi_battery_ipscale(battery));
seq_printf(seq, "remaining capacity: %i%s\n", seq_printf(seq, "remaining capacity: %i%s\n",
battery->capacity_now * cscale, battery->capacity_now * acpi_battery_scale(battery),
battery->mode ? "0 mWh" : " mAh"); acpi_battery_units(battery));
seq_printf(seq, "present voltage: %i mV\n", seq_printf(seq, "present voltage: %i mV\n",
battery->voltage_now * battery->vscale); battery->voltage_now * acpi_battery_vscale(battery));
end: end:
mutex_unlock(&sbs->lock);
sbs_mutex_unlock(sbs);
return result; return result;
} }
...@@ -849,48 +461,25 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) ...@@ -849,48 +461,25 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs; struct acpi_sbs *sbs = battery->sbs;
int result = 0; int result = 0;
int cscale;
if (sbs_mutex_lock(sbs)) { mutex_lock(&sbs->lock);
return -ENODEV;
}
result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (update_time == 0) {
result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_ALARM);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed"));
}
}
if (!battery->present) { if (!battery->present) {
seq_printf(seq, "present: no\n"); seq_printf(seq, "present: no\n");
goto end; goto end;
} }
if (battery->mode) { acpi_battery_get_alarm(battery);
cscale = battery->vscale * battery->ipscale;
} else {
cscale = battery->ipscale;
}
seq_printf(seq, "alarm: "); seq_printf(seq, "alarm: ");
if (battery->alarm_capacity) { if (battery->alarm_capacity)
seq_printf(seq, "%i%s\n", seq_printf(seq, "%i%s\n",
battery->alarm_capacity * cscale, battery->alarm_capacity *
battery->mode ? "0 mWh" : " mAh"); acpi_battery_scale(battery),
} else { acpi_battery_units(battery));
else
seq_printf(seq, "disabled\n"); seq_printf(seq, "disabled\n");
}
end: end:
mutex_unlock(&sbs->lock);
sbs_mutex_unlock(sbs);
return result; return result;
} }
...@@ -902,59 +491,28 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer, ...@@ -902,59 +491,28 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs; struct acpi_sbs *sbs = battery->sbs;
char alarm_string[12] = { '\0' }; char alarm_string[12] = { '\0' };
int result, old_alarm, new_alarm; int result = 0;
mutex_lock(&sbs->lock);
if (sbs_mutex_lock(sbs)) {
return -ENODEV;
}
result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (!battery->present) { if (!battery->present) {
result = -ENODEV; result = -ENODEV;
goto end; goto end;
} }
if (count > sizeof(alarm_string) - 1) { if (count > sizeof(alarm_string) - 1) {
result = -EINVAL; result = -EINVAL;
goto end; goto end;
} }
if (copy_from_user(alarm_string, buffer, count)) { if (copy_from_user(alarm_string, buffer, count)) {
result = -EFAULT; result = -EFAULT;
goto end; goto end;
} }
alarm_string[count] = 0; alarm_string[count] = 0;
battery->alarm_capacity = simple_strtoul(alarm_string, NULL, 0);
old_alarm = battery->alarm_capacity; acpi_battery_set_alarm(battery);
new_alarm = simple_strtoul(alarm_string, NULL, 0);
result = acpi_battery_set_alarm(battery, new_alarm);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_set_alarm() failed"));
acpi_battery_set_alarm(battery, old_alarm);
goto end;
}
result = acpi_battery_get_alarm(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_alarm() failed"));
acpi_battery_set_alarm(battery, old_alarm);
goto end;
}
end: end:
sbs_mutex_unlock(sbs); mutex_unlock(&sbs->lock);
if (result)
if (result) {
return result; return result;
} else {
return count; return count;
}
} }
static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file) static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
...@@ -993,26 +551,15 @@ static struct proc_dir_entry *acpi_ac_dir = NULL; ...@@ -993,26 +551,15 @@ static struct proc_dir_entry *acpi_ac_dir = NULL;
static int acpi_ac_read_state(struct seq_file *seq, void *offset) static int acpi_ac_read_state(struct seq_file *seq, void *offset)
{ {
struct acpi_sbs *sbs = seq->private;
int result;
if (sbs_mutex_lock(sbs)) { struct acpi_sbs *sbs = seq->private;
return -ENODEV;
}
if (update_time == 0) { mutex_lock(&sbs->lock);
result = acpi_sbs_update_run(sbs, -1, DATA_TYPE_AC_STATE);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed"));
}
}
seq_printf(seq, "state: %s\n", seq_printf(seq, "state: %s\n",
sbs->charger_present ? "on-line" : "off-line"); sbs->charger_present ? "on-line" : "off-line");
sbs_mutex_unlock(sbs); mutex_unlock(&sbs->lock);
return 0; return 0;
} }
...@@ -1035,67 +582,54 @@ static struct file_operations acpi_ac_state_fops = { ...@@ -1035,67 +582,54 @@ static struct file_operations acpi_ac_state_fops = {
/* Smart Battery */ /* Smart Battery */
static int acpi_battery_add(struct acpi_sbs *sbs, int id) static int acpi_battery_read(struct acpi_battery *battery)
{ {
int is_present; int result = 0, saved_present = battery->present;
int result; u16 state;
char dir_name[32];
struct acpi_battery *battery;
battery = &sbs->battery[id]; if (battery->sbs->manager_present) {
result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
ACPI_SBS_MANAGER, 0x01, (u8 *)&state);
if (!result)
battery->present = state & (1 << battery->id);
state &= 0x0fff;
state |= 1 << (battery->id + 12);
acpi_smbus_write(battery->sbs->hc, SMBUS_WRITE_WORD,
ACPI_SBS_MANAGER, 0x01, (u8 *)&state, 2);
} else if (battery->id == 0)
battery->present = 1;
if (result || !battery->present)
return result;
battery->alive = 0; if (saved_present != battery->present) {
battery->update_time = 0;
result = acpi_battery_get_info(battery);
if (result)
return result;
}
result = acpi_battery_get_state(battery);
return result;
}
battery->init_state = 0; static int acpi_battery_add(struct acpi_sbs *sbs, int id)
{
int result;
struct acpi_battery *battery = &sbs->battery[id];
battery->id = id; battery->id = id;
battery->sbs = sbs; battery->sbs = sbs;
battery->update_time = 0;
result = acpi_battery_read(battery);
if (result)
return result;
result = acpi_battery_select(battery); sprintf(battery->name, ACPI_BATTERY_DIR_NAME, id);
if (result) { acpi_sbs_add_fs(&battery->proc_entry, acpi_battery_dir,
ACPI_EXCEPTION((AE_INFO, AE_ERROR, battery->name, &acpi_battery_info_fops,
"acpi_battery_select() failed")); &acpi_battery_state_fops, &acpi_battery_alarm_fops,
goto end; battery);
}
result = acpi_battery_get_present(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_present() failed"));
goto end;
}
is_present = battery->present;
if (is_present) {
result = acpi_battery_init(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_init() failed"));
goto end;
}
battery->init_state = 1;
}
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
result = acpi_sbs_generic_add_fs(&battery->proc_entry,
acpi_battery_dir,
dir_name,
&acpi_battery_info_fops,
&acpi_battery_state_fops,
&acpi_battery_alarm_fops, battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_generic_add_fs() failed"));
goto end;
}
battery->alive = 1;
printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n", printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), dir_name, ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
sbs->battery->present ? "present" : "absent"); battery->name, sbs->battery->present ? "present" : "absent");
end:
return result; return result;
} }
...@@ -1103,354 +637,105 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id) ...@@ -1103,354 +637,105 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
{ {
if (sbs->battery[id].proc_entry) { if (sbs->battery[id].proc_entry) {
acpi_sbs_generic_remove_fs(&(sbs->battery[id].proc_entry), acpi_sbs_remove_fs(&(sbs->battery[id].proc_entry),
acpi_battery_dir); acpi_battery_dir);
} }
} }
static int acpi_ac_add(struct acpi_sbs *sbs) static int acpi_charger_add(struct acpi_sbs *sbs)
{ {
int result; int result;
result = acpi_ac_get_present(sbs); result = acpi_ac_get_present(sbs);
if (result) { if (result)
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_ac_get_present() failed"));
goto end; goto end;
} result = acpi_sbs_add_fs(&sbs->charger_entry, acpi_ac_dir,
ACPI_AC_DIR_NAME, NULL,
result = acpi_sbs_generic_add_fs(&sbs->ac_entry, &acpi_ac_state_fops, NULL, sbs);
acpi_ac_dir, if (result)
ACPI_AC_DIR_NAME,
NULL, &acpi_ac_state_fops, NULL, sbs);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_generic_add_fs() failed"));
goto end; goto end;
}
printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n", printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n",
ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line"); ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line");
end: end:
return result; return result;
} }
static void acpi_ac_remove(struct acpi_sbs *sbs) static void acpi_charger_remove(struct acpi_sbs *sbs)
{ {
if (sbs->ac_entry) { if (sbs->charger_entry)
acpi_sbs_generic_remove_fs(&sbs->ac_entry, acpi_ac_dir); acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir);
}
}
static void acpi_sbs_update_time_run(unsigned long data)
{
acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_time, (void *)data);
} }
static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type) void acpi_sbs_callback(void *context)
{ {
struct acpi_battery *battery; int id;
int result = 0, cnt; struct acpi_sbs *sbs = context;
int old_ac_present = -1; struct acpi_battery *bat;
int old_present = -1; u8 saved_charger_state = sbs->charger_present;
int new_ac_present = -1; u8 saved_battery_state;
int new_present = -1; acpi_ac_get_present(sbs);
int id_min = 0, id_max = MAX_SBS_BAT - 1; if (sbs->charger_present != saved_charger_state) {
char dir_name[32]; acpi_bus_generate_proc_event4(ACPI_AC_CLASS, ACPI_AC_DIR_NAME,
int do_battery_init = 0, do_ac_init = 0; ACPI_SBS_NOTIFY_STATUS,
int old_remaining_capacity = 0; sbs->charger_present);
int update_battery = 1;
int up_tm = update_time;
if (sbs_zombie(sbs)) {
goto end;
}
if (id >= 0) {
id_min = id_max = id;
}
if (data_type == DATA_TYPE_COMMON && up_tm > 0) {
cnt = up_tm / (up_tm > UPDATE_DELAY ? UPDATE_DELAY : up_tm);
if (sbs->run_cnt % cnt != 0) {
update_battery = 0;
}
}
sbs->run_cnt++;
if (!update_battery) {
goto end;
}
old_ac_present = sbs->charger_present;
result = acpi_ac_get_present(sbs);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_ac_get_present() failed"));
}
new_ac_present = sbs->charger_present;
do_ac_init = (old_ac_present != new_ac_present);
if (sbs->run_cnt == 1 && data_type == DATA_TYPE_COMMON) {
do_ac_init = 1;
}
if (do_ac_init) {
result = acpi_bus_generate_proc_event4(ACPI_AC_CLASS,
ACPI_AC_DIR_NAME,
ACPI_SBS_AC_NOTIFY_STATUS,
new_ac_present);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_bus_generate_event4() failed"));
}
acpi_bus_generate_netlink_event(ACPI_AC_CLASS, ACPI_AC_DIR_NAME,
ACPI_SBS_AC_NOTIFY_STATUS,
new_ac_present);
}
if (data_type == DATA_TYPE_COMMON) {
if (!do_ac_init && !update_battery) {
goto end;
}
}
if (data_type == DATA_TYPE_AC_STATE && !do_ac_init) {
goto end;
}
for (id = id_min; id <= id_max; id++) {
battery = &sbs->battery[id];
if (battery->alive == 0) {
continue;
}
old_remaining_capacity = battery->capacity_now;
old_present = battery->present;
result = acpi_battery_select(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_select() failed"));
}
result = acpi_battery_get_present(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_present() failed"));
}
new_present = battery->present;
do_battery_init = ((old_present != new_present)
&& new_present);
if (!new_present)
goto event;
if (do_ac_init || do_battery_init) {
result = acpi_battery_init(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_init() "
"failed"));
}
}
if (sbs_zombie(sbs)) {
goto end;
}
if ((data_type == DATA_TYPE_COMMON
|| data_type == DATA_TYPE_INFO)
&& new_present) {
result = acpi_battery_get_info(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_info() failed"));
}
} }
if (data_type == DATA_TYPE_INFO) { if (sbs->manager_present) {
for (id = 0; id < MAX_SBS_BAT; ++id) {
if (!(sbs->batteries_supported & (1 << id)))
continue; continue;
} bat = &sbs->battery[id];
if (sbs_zombie(sbs)) { saved_battery_state = bat->present;
goto end; acpi_battery_read(bat);
} if (saved_battery_state == bat->present)
if ((data_type == DATA_TYPE_COMMON
|| data_type == DATA_TYPE_STATE)
&& new_present) {
result = acpi_battery_get_state(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_state() failed"));
}
}
if (data_type == DATA_TYPE_STATE) {
goto event;
}
if (sbs_zombie(sbs)) {
goto end;
}
if ((data_type == DATA_TYPE_COMMON
|| data_type == DATA_TYPE_ALARM)
&& new_present) {
result = acpi_battery_get_alarm(battery);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_alarm() "
"failed"));
}
}
if (data_type == DATA_TYPE_ALARM) {
continue; continue;
} acpi_bus_generate_proc_event4(ACPI_BATTERY_CLASS,
if (sbs_zombie(sbs)) { bat->name,
goto end; ACPI_SBS_NOTIFY_STATUS,
} bat->present);
event:
if (old_present != new_present || do_ac_init ||
old_remaining_capacity !=
battery->capacity_now) {
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
result = acpi_bus_generate_proc_event4(ACPI_BATTERY_CLASS,
dir_name,
ACPI_SBS_BATTERY_NOTIFY_STATUS,
new_present);
acpi_bus_generate_netlink_event(ACPI_BATTERY_CLASS, dir_name,
ACPI_SBS_BATTERY_NOTIFY_STATUS,
new_present);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_bus_generate_proc_event4() "
"failed"));
} }
} }
}
end:
return result;
} }
static void acpi_sbs_update_time(void *data) static int acpi_sbs_remove(struct acpi_device *device, int type);
{
struct acpi_sbs *sbs = data;
unsigned long delay = -1;
int result;
unsigned int up_tm = update_time;
if (sbs_mutex_lock(sbs))
return;
result = acpi_sbs_update_run(sbs, -1, DATA_TYPE_COMMON);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed"));
}
if (sbs_zombie(sbs)) {
goto end;
}
if (!up_tm) {
if (timer_pending(&sbs->update_timer))
del_timer(&sbs->update_timer);
} else {
delay = (up_tm > UPDATE_DELAY ? UPDATE_DELAY : up_tm);
delay = jiffies + HZ * delay;
if (timer_pending(&sbs->update_timer)) {
mod_timer(&sbs->update_timer, delay);
} else {
sbs->update_timer.data = (unsigned long)data;
sbs->update_timer.function = acpi_sbs_update_time_run;
sbs->update_timer.expires = delay;
add_timer(&sbs->update_timer);
}
}
end:
sbs_mutex_unlock(sbs);
}
static int acpi_sbs_add(struct acpi_device *device) static int acpi_sbs_add(struct acpi_device *device)
{ {
struct acpi_sbs *sbs = NULL; struct acpi_sbs *sbs;
int result = 0, remove_result = 0; int result = 0;
int id; int id;
sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL); sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
if (!sbs) { if (!sbs) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, "kzalloc() failed"));
result = -ENOMEM; result = -ENOMEM;
goto end; goto end;
} }
mutex_init(&sbs->mutex); mutex_init(&sbs->lock);
sbs_mutex_lock(sbs);
sbs->device = device;
sbs->hc = acpi_driver_data(device->parent); sbs->hc = acpi_driver_data(device->parent);
sbs->device = device;
strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME); strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_SBS_CLASS); strcpy(acpi_device_class(device), ACPI_SBS_CLASS);
acpi_driver_data(device) = sbs; acpi_driver_data(device) = sbs;
result = acpi_ac_add(sbs); result = acpi_charger_add(sbs);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, "acpi_ac_add() failed"));
goto end;
}
acpi_sbsm_get_info(sbs);
if (!sbs->manager_present) {
result = acpi_battery_add(sbs, 0);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_add() failed"));
goto end;
}
} else {
for (id = 0; id < MAX_SBS_BAT; id++) {
if ((sbs->batteries_supported & (1 << id))) {
result = acpi_battery_add(sbs, id);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_add() failed"));
goto end;
}
}
}
}
init_timer(&sbs->update_timer);
result = acpi_check_update_proc(sbs);
if (result) if (result)
goto end; goto end;
result = acpi_manager_get_info(sbs);
if (!result) {
sbs->manager_present = 1;
for (id = 0; id < MAX_SBS_BAT; ++id)
if ((sbs->batteries_supported & (1 << id)))
acpi_battery_add(sbs, id);
} else
acpi_battery_add(sbs, 0);
acpi_smbus_register_callback(sbs->hc, acpi_sbs_callback, sbs);
end: end:
if (result)
sbs_mutex_unlock(sbs); acpi_sbs_remove(device, 0);
if (result) {
remove_result = acpi_sbs_remove(device, 0);
if (remove_result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_remove() failed"));
}
}
return result; return result;
} }
...@@ -1459,34 +744,19 @@ static int acpi_sbs_remove(struct acpi_device *device, int type) ...@@ -1459,34 +744,19 @@ static int acpi_sbs_remove(struct acpi_device *device, int type)
struct acpi_sbs *sbs; struct acpi_sbs *sbs;
int id; int id;
if (!device) { if (!device)
return -EINVAL; return -EINVAL;
}
sbs = acpi_driver_data(device); sbs = acpi_driver_data(device);
if (!sbs) { if (!sbs)
return -EINVAL; return -EINVAL;
} mutex_lock(&sbs->lock);
acpi_smbus_unregister_callback(sbs->hc);
sbs_mutex_lock(sbs); for (id = 0; id < MAX_SBS_BAT; ++id)
sbs->zombie = 1;
del_timer_sync(&sbs->update_timer);
acpi_os_wait_events_complete(NULL);
del_timer_sync(&sbs->update_timer);
for (id = 0; id < MAX_SBS_BAT; id++) {
acpi_battery_remove(sbs, id); acpi_battery_remove(sbs, id);
} acpi_charger_remove(sbs);
mutex_unlock(&sbs->lock);
acpi_ac_remove(sbs); mutex_destroy(&sbs->lock);
sbs_mutex_unlock(sbs);
mutex_destroy(&sbs->mutex);
kfree(sbs); kfree(sbs);
return 0; return 0;
} }
...@@ -1505,14 +775,10 @@ static void acpi_sbs_rmdirs(void) ...@@ -1505,14 +775,10 @@ static void acpi_sbs_rmdirs(void)
static int acpi_sbs_resume(struct acpi_device *device) static int acpi_sbs_resume(struct acpi_device *device)
{ {
struct acpi_sbs *sbs; struct acpi_sbs *sbs;
if (!device) if (!device)
return -EINVAL; return -EINVAL;
sbs = device->driver_data; sbs = device->driver_data;
acpi_sbs_callback(sbs);
sbs->run_cnt = 0;
return 0; return 0;
} }
...@@ -1523,14 +789,6 @@ static int __init acpi_sbs_init(void) ...@@ -1523,14 +789,6 @@ static int __init acpi_sbs_init(void)
if (acpi_disabled) if (acpi_disabled)
return -ENODEV; return -ENODEV;
if (mode != DEF_CAPACITY_UNIT
&& mode != MAH_CAPACITY_UNIT
&& mode != MWH_CAPACITY_UNIT) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"invalid mode = %d", mode));
return -EINVAL;
}
acpi_ac_dir = acpi_lock_ac_dir(); acpi_ac_dir = acpi_lock_ac_dir();
if (!acpi_ac_dir) { if (!acpi_ac_dir) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7