* [PATCH v3 0/3] DPTF Platform power participant driver
@ 2016-06-23 21:42 Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 1/3] acpi: battery: Split battery driver for reuse by DPTF power participant Srinivas Pandruvada
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-23 21:42 UTC (permalink / raw)
To: rjw; +Cc: linux-acpi, Srinivas Pandruvada
This series implements DPTF power participant driver. Intel ® Dynamic
Platform and Thermal Framework (Intel ® DPTF) platform Power Participant
is responsible for exposing platform telemetry such as
-Platform Power
-Battery Information such as State of Charge, estimated maximum
sustainable power (PMax), SMART battery spec information
Intel ® DPTF Power Participant loads as an ACPI Device (INT3407). This
device utilizes and exposes the platform power and Fuel Gauge information
and capabilities to the framework and for the policies to take control
action.
Implementation wise this is power supply battery driver with additional
attributes for platform power objects.
So the first patch splits the battery driver into two parts, a common part
and a ACPI battery enumeration part.
Next two patches add support for dptf power driver which uses common
battery driver and adds additional attributes for platform power.
v3:
Moved dptf_power to drivers/acpi/dptf folder.
v2:
When both CONFIG_ACPI_BATTERY and CONFIG_DPTF_POWER are defined and
platform has support for INT3407, then dptf power registration is
delayed for 100ms. In 100 ms, if there is no ACPI battery is registered
then dptf power will be registered. Since both can be modules and
battery driver loads in async thread, there can be race even if we
specify loading order for initialization.
Srinivas Pandruvada (3):
acpi: battery: Split battery driver for reuse by DPTF power
participant
acpi: dptf_power: Add DPTF power participant
acpi: battery_common: battery present status for INT3407
drivers/acpi/Kconfig | 7 +-
drivers/acpi/Makefile | 2 +
drivers/acpi/battery.c | 1199 +-----------------------------------
drivers/acpi/battery.h | 31 +
drivers/acpi/battery_common.c | 1299 ++++++++++++++++++++++++++++++++++++++++
drivers/acpi/dptf/Kconfig | 17 +
drivers/acpi/dptf/Makefile | 3 +
drivers/acpi/dptf/dptf_power.c | 184 ++++++
8 files changed, 1547 insertions(+), 1195 deletions(-)
create mode 100644 drivers/acpi/battery_common.c
create mode 100644 drivers/acpi/dptf/Kconfig
create mode 100644 drivers/acpi/dptf/Makefile
create mode 100644 drivers/acpi/dptf/dptf_power.c
--
2.5.5
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 1/3] acpi: battery: Split battery driver for reuse by DPTF power participant
2016-06-23 21:42 [PATCH v3 0/3] DPTF Platform power participant driver Srinivas Pandruvada
@ 2016-06-23 21:42 ` Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 2/3] acpi: dptf_power: Add " Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 3/3] acpi: battery_common: battery present status for INT3407 Srinivas Pandruvada
2 siblings, 0 replies; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-23 21:42 UTC (permalink / raw)
To: rjw; +Cc: linux-acpi, Srinivas Pandruvada
DPTF power participant device have common objects with ACPI battery device
"PNP0C0A". For example the main battery objects:
_BST: returns dynamic battery information
_BIX: The static battery properties and control method
Also both needs to register with power_supply class to present properties
of a typical battery device.
To avoid code duplication, the existing battery driver is split into two
parts:
- A common part
- ACPI battery driver
battery_common
Most of the existing battery driver source, except ACPI enumeration part
moved a separate file. It exposes an interface, which can be used by ACPI
battery driver and DPTF power participant driver.
Also the current battery driver code had lots of check_patch errors.
These check_patch errors are addressed in this battery_common. These are
the main interface functions:
acpi_battery_common_add
acpi_battery_common_remove
acpi_battery_common_resume
acpi_battery_common_notify
battery: This is ACPI battery driver, which just enumerate on PNP0C0A
device and use interface functions offered by battery common part.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/acpi/Kconfig | 5 +
drivers/acpi/Makefile | 1 +
drivers/acpi/battery.c | 1199 +-------------------------------------
drivers/acpi/battery.h | 31 +
drivers/acpi/battery_common.c | 1294 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 1336 insertions(+), 1194 deletions(-)
create mode 100644 drivers/acpi/battery_common.c
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b7e2e77..27ae351 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -151,9 +151,14 @@ config ACPI_AC
To compile this driver as a module, choose M here:
the module will be called ac.
+config ACPI_BATTERY_COMMON
+ bool
+ default n
+
config ACPI_BATTERY
tristate "Battery"
depends on X86
+ select ACPI_BATTERY_COMMON
select POWER_SUPPLY
default y
help
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 251ce85..950bf8e 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_ACPI_THERMAL) += thermal.o
obj-$(CONFIG_ACPI_NFIT) += nfit.o
obj-$(CONFIG_ACPI) += acpi_memhotplug.o
obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o
+obj-$(CONFIG_ACPI_BATTERY_COMMON) += battery_common.o
obj-$(CONFIG_ACPI_BATTERY) += battery.o
obj-$(CONFIG_ACPI_SBS) += sbshc.o
obj-$(CONFIG_ACPI_SBS) += sbs.o
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index ab23479..a5c9bde 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -23,40 +23,14 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/jiffies.h>
#include <linux/async.h>
-#include <linux/dmi.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/suspend.h>
-#include <asm/unaligned.h>
-
-#ifdef CONFIG_ACPI_PROCFS_POWER
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <asm/uaccess.h>
-#endif
-
#include <linux/acpi.h>
-#include <linux/power_supply.h>
-
+#include <linux/dmi.h>
#include "battery.h"
#define PREFIX "ACPI: "
-
-#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
-
#define ACPI_BATTERY_DEVICE_NAME "Battery"
-/* Battery power unit: 0 means mW, 1 means mA */
-#define ACPI_BATTERY_POWER_UNIT_MA 1
-
-#define ACPI_BATTERY_STATE_DISCHARGING 0x1
-#define ACPI_BATTERY_STATE_CHARGING 0x2
-#define ACPI_BATTERY_STATE_CRITICAL 0x4
-
#define _COMPONENT ACPI_BATTERY_COMPONENT
ACPI_MODULE_NAME("battery");
@@ -67,24 +41,6 @@ MODULE_DESCRIPTION("ACPI Battery Driver");
MODULE_LICENSE("GPL");
static async_cookie_t async_cookie;
-static int battery_bix_broken_package;
-static int battery_notification_delay_ms;
-static unsigned int cache_time = 1000;
-module_param(cache_time, uint, 0644);
-MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
-
-#ifdef CONFIG_ACPI_PROCFS_POWER
-extern struct proc_dir_entry *acpi_lock_battery_dir(void);
-extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
-
-enum acpi_battery_files {
- info_tag = 0,
- state_tag,
- alarm_tag,
- ACPI_BATTERY_NUMFILES,
-};
-
-#endif
static const struct acpi_device_id battery_device_ids[] = {
{"PNP0C0A", 0},
@@ -93,1033 +49,6 @@ static const struct acpi_device_id battery_device_ids[] = {
MODULE_DEVICE_TABLE(acpi, battery_device_ids);
-enum {
- ACPI_BATTERY_ALARM_PRESENT,
- ACPI_BATTERY_XINFO_PRESENT,
- ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
- /* On Lenovo Thinkpad models from 2010 and 2011, the power unit
- switches between mWh and mAh depending on whether the system
- is running on battery or not. When mAh is the unit, most
- reported values are incorrect and need to be adjusted by
- 10000/design_voltage. Verified on x201, t410, t410s, and x220.
- Pre-2010 and 2012 models appear to always report in mWh and
- are thus unaffected (tested with t42, t61, t500, x200, x300,
- and x230). Also, in mid-2012 Lenovo issued a BIOS update for
- the 2011 models that fixes the issue (tested on x220 with a
- post-1.29 BIOS), but as of Nov. 2012, no such update is
- available for the 2010 models. */
- ACPI_BATTERY_QUIRK_THINKPAD_MAH,
-};
-
-struct acpi_battery {
- struct mutex lock;
- struct mutex sysfs_lock;
- struct power_supply *bat;
- struct power_supply_desc bat_desc;
- struct acpi_device *device;
- struct notifier_block pm_nb;
- unsigned long update_time;
- int revision;
- int rate_now;
- int capacity_now;
- int voltage_now;
- int design_capacity;
- int full_charge_capacity;
- int technology;
- 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;
- char model_number[32];
- char serial_number[32];
- char type[32];
- char oem_info[32];
- int state;
- int power_unit;
- unsigned long flags;
-};
-
-#define to_acpi_battery(x) power_supply_get_drvdata(x)
-
-static inline int acpi_battery_present(struct acpi_battery *battery)
-{
- return battery->device->status.battery_present;
-}
-
-static int acpi_battery_technology(struct acpi_battery *battery)
-{
- if (!strcasecmp("NiCd", battery->type))
- return POWER_SUPPLY_TECHNOLOGY_NiCd;
- if (!strcasecmp("NiMH", battery->type))
- return POWER_SUPPLY_TECHNOLOGY_NiMH;
- if (!strcasecmp("LION", battery->type))
- return POWER_SUPPLY_TECHNOLOGY_LION;
- if (!strncasecmp("LI-ION", battery->type, 6))
- return POWER_SUPPLY_TECHNOLOGY_LION;
- if (!strcasecmp("LiP", battery->type))
- return POWER_SUPPLY_TECHNOLOGY_LIPO;
- return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
-}
-
-static int acpi_battery_get_state(struct acpi_battery *battery);
-
-static int acpi_battery_is_charged(struct acpi_battery *battery)
-{
- /* charging, discharging or critical low */
- if (battery->state != 0)
- return 0;
-
- /* battery not reporting charge */
- if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN ||
- battery->capacity_now == 0)
- return 0;
-
- /* good batteries update full_charge as the batteries degrade */
- if (battery->full_charge_capacity == battery->capacity_now)
- return 1;
-
- /* fallback to using design values for broken batteries */
- if (battery->design_capacity == battery->capacity_now)
- return 1;
-
- /* we don't do any sort of metric based on percentages */
- return 0;
-}
-
-static int acpi_battery_get_property(struct power_supply *psy,
- enum power_supply_property psp,
- union power_supply_propval *val)
-{
- int ret = 0;
- struct acpi_battery *battery = to_acpi_battery(psy);
-
- if (acpi_battery_present(battery)) {
- /* run battery update only if it is present */
- acpi_battery_get_state(battery);
- } else if (psp != POWER_SUPPLY_PROP_PRESENT)
- return -ENODEV;
- switch (psp) {
- case POWER_SUPPLY_PROP_STATUS:
- if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
- val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
- else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
- val->intval = POWER_SUPPLY_STATUS_CHARGING;
- else if (acpi_battery_is_charged(battery))
- val->intval = POWER_SUPPLY_STATUS_FULL;
- else
- val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
- break;
- case POWER_SUPPLY_PROP_PRESENT:
- val->intval = acpi_battery_present(battery);
- break;
- 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:
- if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
- ret = -ENODEV;
- else
- val->intval = battery->design_voltage * 1000;
- break;
- case POWER_SUPPLY_PROP_VOLTAGE_NOW:
- if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)
- ret = -ENODEV;
- else
- val->intval = battery->voltage_now * 1000;
- break;
- case POWER_SUPPLY_PROP_CURRENT_NOW:
- case POWER_SUPPLY_PROP_POWER_NOW:
- if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
- ret = -ENODEV;
- else
- val->intval = battery->rate_now * 1000;
- break;
- case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
- case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
- if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
- ret = -ENODEV;
- else
- val->intval = battery->design_capacity * 1000;
- break;
- case POWER_SUPPLY_PROP_CHARGE_FULL:
- case POWER_SUPPLY_PROP_ENERGY_FULL:
- if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
- ret = -ENODEV;
- else
- val->intval = battery->full_charge_capacity * 1000;
- break;
- case POWER_SUPPLY_PROP_CHARGE_NOW:
- case POWER_SUPPLY_PROP_ENERGY_NOW:
- if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
- ret = -ENODEV;
- else
- val->intval = battery->capacity_now * 1000;
- break;
- case POWER_SUPPLY_PROP_CAPACITY:
- if (battery->capacity_now && battery->full_charge_capacity)
- val->intval = battery->capacity_now * 100/
- battery->full_charge_capacity;
- else
- val->intval = 0;
- break;
- case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
- if (battery->state & ACPI_BATTERY_STATE_CRITICAL)
- val->intval = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
- else if (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&
- (battery->capacity_now <= battery->alarm))
- val->intval = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
- else if (acpi_battery_is_charged(battery))
- val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
- else
- val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
- break;
- case POWER_SUPPLY_PROP_MODEL_NAME:
- val->strval = battery->model_number;
- break;
- case POWER_SUPPLY_PROP_MANUFACTURER:
- val->strval = battery->oem_info;
- break;
- case POWER_SUPPLY_PROP_SERIAL_NUMBER:
- val->strval = battery->serial_number;
- break;
- default:
- ret = -EINVAL;
- }
- return ret;
-}
-
-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,
- POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
- POWER_SUPPLY_PROP_CHARGE_FULL,
- POWER_SUPPLY_PROP_CHARGE_NOW,
- POWER_SUPPLY_PROP_CAPACITY,
- POWER_SUPPLY_PROP_CAPACITY_LEVEL,
- POWER_SUPPLY_PROP_MODEL_NAME,
- POWER_SUPPLY_PROP_MANUFACTURER,
- POWER_SUPPLY_PROP_SERIAL_NUMBER,
-};
-
-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_POWER_NOW,
- POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
- POWER_SUPPLY_PROP_ENERGY_FULL,
- POWER_SUPPLY_PROP_ENERGY_NOW,
- POWER_SUPPLY_PROP_CAPACITY,
- POWER_SUPPLY_PROP_CAPACITY_LEVEL,
- POWER_SUPPLY_PROP_MODEL_NAME,
- POWER_SUPPLY_PROP_MANUFACTURER,
- POWER_SUPPLY_PROP_SERIAL_NUMBER,
-};
-
-/* --------------------------------------------------------------------------
- Battery Management
- -------------------------------------------------------------------------- */
-struct acpi_offsets {
- size_t offset; /* offset inside struct acpi_sbs_battery */
- u8 mode; /* int or string? */
-};
-
-static const struct acpi_offsets state_offsets[] = {
- {offsetof(struct acpi_battery, state), 0},
- {offsetof(struct acpi_battery, rate_now), 0},
- {offsetof(struct acpi_battery, capacity_now), 0},
- {offsetof(struct acpi_battery, voltage_now), 0},
-};
-
-static const struct acpi_offsets 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, 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 const struct acpi_offsets extended_info_offsets[] = {
- {offsetof(struct acpi_battery, revision), 0},
- {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,
- const struct acpi_offsets *offsets, int num)
-{
- int i;
- union acpi_object *element;
- if (package->type != ACPI_TYPE_PACKAGE)
- return -EFAULT;
- for (i = 0; i < num; ++i) {
- if (package->package.count <= i)
- return -EFAULT;
- element = &package->package.elements[i];
- if (offsets[i].mode) {
- u8 *ptr = (u8 *)battery + offsets[i].offset;
- if (element->type == ACPI_TYPE_STRING ||
- element->type == ACPI_TYPE_BUFFER)
- strncpy(ptr, element->string.pointer, 32);
- else if (element->type == ACPI_TYPE_INTEGER) {
- strncpy(ptr, (u8 *)&element->integer.value,
- sizeof(u64));
- ptr[sizeof(u64)] = 0;
- } else
- *ptr = 0; /* don't have value */
- } else {
- int *x = (int *)((u8 *)battery + offsets[i].offset);
- *x = (element->type == ACPI_TYPE_INTEGER) ?
- element->integer.value : -1;
- }
- }
- return 0;
-}
-
-static int acpi_battery_get_status(struct acpi_battery *battery)
-{
- if (acpi_bus_get_status(battery->device)) {
- ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Evaluating _STA"));
- return -ENODEV;
- }
- return 0;
-}
-
-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, name,
- NULL, &buffer);
- mutex_unlock(&battery->lock);
-
- if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", name));
- return -ENODEV;
- }
-
- if (battery_bix_broken_package)
- result = extract_package(battery, buffer.pointer,
- extended_info_offsets + 1,
- ARRAY_SIZE(extended_info_offsets) - 1);
- else 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);
- if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
- battery->full_charge_capacity = battery->design_capacity;
- if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
- battery->power_unit && battery->design_voltage) {
- battery->design_capacity = battery->design_capacity *
- 10000 / battery->design_voltage;
- battery->full_charge_capacity = battery->full_charge_capacity *
- 10000 / battery->design_voltage;
- battery->design_capacity_warning =
- battery->design_capacity_warning *
- 10000 / battery->design_voltage;
- /* Curiously, design_capacity_low, unlike the rest of them,
- is correct. */
- /* capacity_granularity_* equal 1 on the systems tested, so
- it's impossible to tell if they would need an adjustment
- or not if their values were higher. */
- }
- return result;
-}
-
-static int acpi_battery_get_state(struct acpi_battery *battery)
-{
- int result = 0;
- acpi_status status = 0;
- struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-
- if (!acpi_battery_present(battery))
- return 0;
-
- if (battery->update_time &&
- time_before(jiffies, battery->update_time +
- msecs_to_jiffies(cache_time)))
- return 0;
-
- mutex_lock(&battery->lock);
- status = acpi_evaluate_object(battery->device->handle, "_BST",
- NULL, &buffer);
- mutex_unlock(&battery->lock);
-
- if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
- return -ENODEV;
- }
-
- result = extract_package(battery, buffer.pointer,
- state_offsets, ARRAY_SIZE(state_offsets));
- battery->update_time = jiffies;
- kfree(buffer.pointer);
-
- /* 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.
- */
- if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA &&
- battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
- (s16)(battery->rate_now) < 0) {
- battery->rate_now = abs((s16)battery->rate_now);
- printk_once(KERN_WARNING FW_BUG
- "battery: (dis)charge rate invalid.\n");
- }
-
- if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
- && battery->capacity_now >= 0 && battery->capacity_now <= 100)
- battery->capacity_now = (battery->capacity_now *
- battery->full_charge_capacity) / 100;
- if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
- battery->power_unit && battery->design_voltage) {
- battery->capacity_now = battery->capacity_now *
- 10000 / battery->design_voltage;
- }
- return result;
-}
-
-static int acpi_battery_set_alarm(struct acpi_battery *battery)
-{
- acpi_status status = 0;
-
- if (!acpi_battery_present(battery) ||
- !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))
- return -ENODEV;
-
- mutex_lock(&battery->lock);
- status = acpi_execute_simple_method(battery->device->handle, "_BTP",
- battery->alarm);
- mutex_unlock(&battery->lock);
-
- if (ACPI_FAILURE(status))
- return -ENODEV;
-
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", battery->alarm));
- return 0;
-}
-
-static int acpi_battery_init_alarm(struct acpi_battery *battery)
-{
- /* See if alarms are supported, and if so, set default */
- if (!acpi_has_method(battery->device->handle, "_BTP")) {
- clear_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags);
- return 0;
- }
- set_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags);
- if (!battery->alarm)
- battery->alarm = battery->design_capacity_warning;
- return acpi_battery_set_alarm(battery);
-}
-
-static ssize_t acpi_battery_alarm_show(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
- return sprintf(buf, "%d\n", battery->alarm * 1000);
-}
-
-static ssize_t acpi_battery_alarm_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- unsigned long x;
- struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
- if (sscanf(buf, "%lu\n", &x) == 1)
- battery->alarm = x/1000;
- if (acpi_battery_present(battery))
- acpi_battery_set_alarm(battery);
- return count;
-}
-
-static struct device_attribute alarm_attr = {
- .attr = {.name = "alarm", .mode = 0644},
- .show = acpi_battery_alarm_show,
- .store = acpi_battery_alarm_store,
-};
-
-static int sysfs_add_battery(struct acpi_battery *battery)
-{
- struct power_supply_config psy_cfg = { .drv_data = battery, };
-
- if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {
- battery->bat_desc.properties = charge_battery_props;
- battery->bat_desc.num_properties =
- ARRAY_SIZE(charge_battery_props);
- } else {
- battery->bat_desc.properties = energy_battery_props;
- battery->bat_desc.num_properties =
- ARRAY_SIZE(energy_battery_props);
- }
-
- battery->bat_desc.name = acpi_device_bid(battery->device);
- battery->bat_desc.type = POWER_SUPPLY_TYPE_BATTERY;
- battery->bat_desc.get_property = acpi_battery_get_property;
-
- battery->bat = power_supply_register_no_ws(&battery->device->dev,
- &battery->bat_desc, &psy_cfg);
-
- if (IS_ERR(battery->bat)) {
- int result = PTR_ERR(battery->bat);
-
- battery->bat = NULL;
- return result;
- }
- return device_create_file(&battery->bat->dev, &alarm_attr);
-}
-
-static void sysfs_remove_battery(struct acpi_battery *battery)
-{
- mutex_lock(&battery->sysfs_lock);
- if (!battery->bat) {
- mutex_unlock(&battery->sysfs_lock);
- return;
- }
-
- device_remove_file(&battery->bat->dev, &alarm_attr);
- power_supply_unregister(battery->bat);
- battery->bat = NULL;
- mutex_unlock(&battery->sysfs_lock);
-}
-
-static void find_battery(const struct dmi_header *dm, void *private)
-{
- struct acpi_battery *battery = (struct acpi_battery *)private;
- /* Note: the hardcoded offsets below have been extracted from
- the source code of dmidecode. */
- if (dm->type == DMI_ENTRY_PORTABLE_BATTERY && dm->length >= 8) {
- const u8 *dmi_data = (const u8 *)(dm + 1);
- int dmi_capacity = get_unaligned((const u16 *)(dmi_data + 6));
- if (dm->length >= 18)
- dmi_capacity *= dmi_data[17];
- if (battery->design_capacity * battery->design_voltage / 1000
- != dmi_capacity &&
- battery->design_capacity * 10 == dmi_capacity)
- set_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
- &battery->flags);
- }
-}
-
-/*
- * According to the ACPI spec, some kinds of primary batteries can
- * report percentage battery remaining capacity directly to OS.
- * In this case, it reports the Last Full Charged Capacity == 100
- * and BatteryPresentRate == 0xFFFFFFFF.
- *
- * Now we found some battery reports percentage remaining capacity
- * even if it's rechargeable.
- * https://bugzilla.kernel.org/show_bug.cgi?id=15979
- *
- * Handle this correctly so that they won't break userspace.
- */
-static void acpi_battery_quirks(struct acpi_battery *battery)
-{
- if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
- return;
-
- if (battery->full_charge_capacity == 100 &&
- battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN &&
- battery->capacity_now >= 0 && battery->capacity_now <= 100) {
- set_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags);
- battery->full_charge_capacity = battery->design_capacity;
- battery->capacity_now = (battery->capacity_now *
- battery->full_charge_capacity) / 100;
- }
-
- if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
- return;
-
- if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
- const char *s;
- s = dmi_get_system_info(DMI_PRODUCT_VERSION);
- if (s && !strncasecmp(s, "ThinkPad", 8)) {
- dmi_walk(find_battery, battery);
- if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
- &battery->flags) &&
- battery->design_voltage) {
- battery->design_capacity =
- battery->design_capacity *
- 10000 / battery->design_voltage;
- battery->full_charge_capacity =
- battery->full_charge_capacity *
- 10000 / battery->design_voltage;
- battery->design_capacity_warning =
- battery->design_capacity_warning *
- 10000 / battery->design_voltage;
- battery->capacity_now = battery->capacity_now *
- 10000 / battery->design_voltage;
- }
- }
- }
-}
-
-static int acpi_battery_update(struct acpi_battery *battery, bool resume)
-{
- int result, old_present = acpi_battery_present(battery);
- result = acpi_battery_get_status(battery);
- if (result)
- return result;
- if (!acpi_battery_present(battery)) {
- sysfs_remove_battery(battery);
- battery->update_time = 0;
- return 0;
- }
-
- if (resume)
- return 0;
-
- if (!battery->update_time ||
- old_present != acpi_battery_present(battery)) {
- result = acpi_battery_get_info(battery);
- if (result)
- return result;
- acpi_battery_init_alarm(battery);
- }
- if (!battery->bat) {
- result = sysfs_add_battery(battery);
- if (result)
- return result;
- }
- result = acpi_battery_get_state(battery);
- if (result)
- return result;
- acpi_battery_quirks(battery);
-
- /*
- * Wakeup the system if battery is critical low
- * or lower than the alarm level
- */
- if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||
- (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&
- (battery->capacity_now <= battery->alarm)))
- pm_wakeup_event(&battery->device->dev, 0);
-
- return result;
-}
-
-static void acpi_battery_refresh(struct acpi_battery *battery)
-{
- int power_unit;
-
- if (!battery->bat)
- return;
-
- power_unit = battery->power_unit;
-
- acpi_battery_get_info(battery);
-
- if (power_unit == battery->power_unit)
- return;
-
- /* The battery has changed its reporting units. */
- sysfs_remove_battery(battery);
- sysfs_add_battery(battery);
-}
-
-/* --------------------------------------------------------------------------
- FS Interface (/proc)
- -------------------------------------------------------------------------- */
-
-#ifdef CONFIG_ACPI_PROCFS_POWER
-static struct proc_dir_entry *acpi_battery_dir;
-
-static const char *acpi_battery_units(const struct acpi_battery *battery)
-{
- return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ?
- "mA" : "mW";
-}
-
-static int acpi_battery_print_info(struct seq_file *seq, int result)
-{
- struct acpi_battery *battery = seq->private;
-
- if (result)
- goto end;
-
- seq_printf(seq, "present: %s\n",
- acpi_battery_present(battery) ? "yes" : "no");
- if (!acpi_battery_present(battery))
- goto end;
- if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
- seq_printf(seq, "design capacity: unknown\n");
- else
- seq_printf(seq, "design capacity: %d %sh\n",
- battery->design_capacity,
- acpi_battery_units(battery));
-
- if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
- seq_printf(seq, "last full capacity: unknown\n");
- else
- seq_printf(seq, "last full capacity: %d %sh\n",
- battery->full_charge_capacity,
- acpi_battery_units(battery));
-
- seq_printf(seq, "battery technology: %srechargeable\n",
- (!battery->technology)?"non-":"");
-
- if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
- seq_printf(seq, "design voltage: unknown\n");
- else
- seq_printf(seq, "design voltage: %d mV\n",
- battery->design_voltage);
- seq_printf(seq, "design capacity warning: %d %sh\n",
- battery->design_capacity_warning,
- acpi_battery_units(battery));
- 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));
- seq_printf(seq, "capacity granularity 2: %d %sh\n",
- battery->capacity_granularity_2,
- acpi_battery_units(battery));
- seq_printf(seq, "model number: %s\n", battery->model_number);
- seq_printf(seq, "serial number: %s\n", battery->serial_number);
- seq_printf(seq, "battery type: %s\n", battery->type);
- seq_printf(seq, "OEM info: %s\n", battery->oem_info);
- end:
- if (result)
- seq_printf(seq, "ERROR: Unable to read battery info\n");
- return result;
-}
-
-static int acpi_battery_print_state(struct seq_file *seq, int result)
-{
- struct acpi_battery *battery = seq->private;
-
- if (result)
- goto end;
-
- seq_printf(seq, "present: %s\n",
- acpi_battery_present(battery) ? "yes" : "no");
- if (!acpi_battery_present(battery))
- goto end;
-
- seq_printf(seq, "capacity state: %s\n",
- (battery->state & 0x04) ? "critical" : "ok");
- if ((battery->state & 0x01) && (battery->state & 0x02))
- seq_printf(seq,
- "charging state: charging/discharging\n");
- else if (battery->state & 0x01)
- seq_printf(seq, "charging state: discharging\n");
- else if (battery->state & 0x02)
- seq_printf(seq, "charging state: charging\n");
- else
- seq_printf(seq, "charging state: charged\n");
-
- if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
- seq_printf(seq, "present rate: unknown\n");
- else
- seq_printf(seq, "present rate: %d %s\n",
- battery->rate_now, acpi_battery_units(battery));
-
- if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
- seq_printf(seq, "remaining capacity: unknown\n");
- else
- seq_printf(seq, "remaining capacity: %d %sh\n",
- battery->capacity_now, acpi_battery_units(battery));
- if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)
- seq_printf(seq, "present voltage: unknown\n");
- else
- seq_printf(seq, "present voltage: %d mV\n",
- battery->voltage_now);
- end:
- if (result)
- seq_printf(seq, "ERROR: Unable to read battery state\n");
-
- return result;
-}
-
-static int acpi_battery_print_alarm(struct seq_file *seq, int result)
-{
- struct acpi_battery *battery = seq->private;
-
- if (result)
- goto end;
-
- if (!acpi_battery_present(battery)) {
- seq_printf(seq, "present: no\n");
- goto end;
- }
- seq_printf(seq, "alarm: ");
- if (!battery->alarm)
- seq_printf(seq, "unsupported\n");
- else
- seq_printf(seq, "%u %sh\n", battery->alarm,
- acpi_battery_units(battery));
- end:
- if (result)
- seq_printf(seq, "ERROR: Unable to read battery alarm\n");
- return result;
-}
-
-static ssize_t acpi_battery_write_alarm(struct file *file,
- const char __user * buffer,
- size_t count, loff_t * ppos)
-{
- int result = 0;
- char alarm_string[12] = { '\0' };
- struct seq_file *m = file->private_data;
- struct acpi_battery *battery = m->private;
-
- if (!battery || (count > sizeof(alarm_string) - 1))
- return -EINVAL;
- if (!acpi_battery_present(battery)) {
- result = -ENODEV;
- goto end;
- }
- if (copy_from_user(alarm_string, buffer, count)) {
- result = -EFAULT;
- goto end;
- }
- alarm_string[count] = '\0';
- if (kstrtoint(alarm_string, 0, &battery->alarm)) {
- result = -EINVAL;
- goto end;
- }
- result = acpi_battery_set_alarm(battery);
- end:
- if (!result)
- return count;
- return result;
-}
-
-typedef int(*print_func)(struct seq_file *seq, int result);
-
-static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = {
- acpi_battery_print_info,
- acpi_battery_print_state,
- acpi_battery_print_alarm,
-};
-
-static int acpi_battery_read(int fid, struct seq_file *seq)
-{
- struct acpi_battery *battery = seq->private;
- int result = acpi_battery_update(battery, false);
- return acpi_print_funcs[fid](seq, result);
-}
-
-#define DECLARE_FILE_FUNCTIONS(_name) \
-static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \
-{ \
- return acpi_battery_read(_name##_tag, seq); \
-} \
-static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \
-{ \
- return single_open(file, acpi_battery_read_##_name, PDE_DATA(inode)); \
-}
-
-DECLARE_FILE_FUNCTIONS(info);
-DECLARE_FILE_FUNCTIONS(state);
-DECLARE_FILE_FUNCTIONS(alarm);
-
-#undef DECLARE_FILE_FUNCTIONS
-
-#define FILE_DESCRIPTION_RO(_name) \
- { \
- .name = __stringify(_name), \
- .mode = S_IRUGO, \
- .ops = { \
- .open = acpi_battery_##_name##_open_fs, \
- .read = seq_read, \
- .llseek = seq_lseek, \
- .release = single_release, \
- .owner = THIS_MODULE, \
- }, \
- }
-
-#define FILE_DESCRIPTION_RW(_name) \
- { \
- .name = __stringify(_name), \
- .mode = S_IFREG | S_IRUGO | S_IWUSR, \
- .ops = { \
- .open = acpi_battery_##_name##_open_fs, \
- .read = seq_read, \
- .llseek = seq_lseek, \
- .write = acpi_battery_write_##_name, \
- .release = single_release, \
- .owner = THIS_MODULE, \
- }, \
- }
-
-static const struct battery_file {
- struct file_operations ops;
- umode_t mode;
- const char *name;
-} acpi_battery_file[] = {
- FILE_DESCRIPTION_RO(info),
- FILE_DESCRIPTION_RO(state),
- FILE_DESCRIPTION_RW(alarm),
-};
-
-#undef FILE_DESCRIPTION_RO
-#undef FILE_DESCRIPTION_RW
-
-static int acpi_battery_add_fs(struct acpi_device *device)
-{
- struct proc_dir_entry *entry = NULL;
- int i;
-
- printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
- " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
- if (!acpi_device_dir(device)) {
- acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
- acpi_battery_dir);
- if (!acpi_device_dir(device))
- return -ENODEV;
- }
-
- for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
- entry = proc_create_data(acpi_battery_file[i].name,
- acpi_battery_file[i].mode,
- acpi_device_dir(device),
- &acpi_battery_file[i].ops,
- acpi_driver_data(device));
- if (!entry)
- return -ENODEV;
- }
- return 0;
-}
-
-static void acpi_battery_remove_fs(struct acpi_device *device)
-{
- int i;
- if (!acpi_device_dir(device))
- return;
- for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i)
- remove_proc_entry(acpi_battery_file[i].name,
- acpi_device_dir(device));
-
- remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
- acpi_device_dir(device) = NULL;
-}
-
-#endif
-
-/* --------------------------------------------------------------------------
- Driver Interface
- -------------------------------------------------------------------------- */
-
-static void acpi_battery_notify(struct acpi_device *device, u32 event)
-{
- struct acpi_battery *battery = acpi_driver_data(device);
- struct power_supply *old;
-
- if (!battery)
- return;
- old = battery->bat;
- /*
- * On Acer Aspire V5-573G notifications are sometimes triggered too
- * early. For example, when AC is unplugged and notification is
- * triggered, battery state is still reported as "Full", and changes to
- * "Discharging" only after short delay, without any notification.
- */
- if (battery_notification_delay_ms > 0)
- msleep(battery_notification_delay_ms);
- if (event == ACPI_BATTERY_NOTIFY_INFO)
- acpi_battery_refresh(battery);
- acpi_battery_update(battery, false);
- acpi_bus_generate_netlink_event(device->pnp.device_class,
- dev_name(&device->dev), event,
- acpi_battery_present(battery));
- acpi_notifier_call_chain(device, event, acpi_battery_present(battery));
- /* acpi_battery_update could remove power_supply object */
- if (old && battery->bat)
- power_supply_changed(battery->bat);
-}
-
-static int battery_notify(struct notifier_block *nb,
- unsigned long mode, void *_unused)
-{
- struct acpi_battery *battery = container_of(nb, struct acpi_battery,
- pm_nb);
- int result;
-
- switch (mode) {
- case PM_POST_HIBERNATION:
- case PM_POST_SUSPEND:
- if (!acpi_battery_present(battery))
- return 0;
-
- if (!battery->bat) {
- result = acpi_battery_get_info(battery);
- if (result)
- return result;
-
- result = sysfs_add_battery(battery);
- if (result)
- return result;
- } else
- acpi_battery_refresh(battery);
-
- acpi_battery_init_alarm(battery);
- acpi_battery_get_state(battery);
- break;
- }
-
- return 0;
-}
-
static int __init
battery_bix_broken_package_quirk(const struct dmi_system_id *d)
{
@@ -1154,125 +83,7 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
{},
};
-/*
- * Some machines'(E,G Lenovo Z480) ECs are not stable
- * during boot up and this causes battery driver fails to be
- * probed due to failure of getting battery information
- * from EC sometimes. After several retries, the operation
- * may work. So add retry code here and 20ms sleep between
- * every retries.
- */
-static int acpi_battery_update_retry(struct acpi_battery *battery)
-{
- int retry, ret;
-
- for (retry = 5; retry; retry--) {
- ret = acpi_battery_update(battery, false);
- if (!ret)
- break;
-
- msleep(20);
- }
- return ret;
-}
-
-static int acpi_battery_add(struct acpi_device *device)
-{
- int result = 0;
- struct acpi_battery *battery = NULL;
-
- if (!device)
- return -EINVAL;
-
- if (device->dep_unmet)
- return -EPROBE_DEFER;
-
- battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
- if (!battery)
- return -ENOMEM;
- battery->device = device;
- strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
- strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
- device->driver_data = battery;
- mutex_init(&battery->lock);
- mutex_init(&battery->sysfs_lock);
- if (acpi_has_method(battery->device->handle, "_BIX"))
- set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
-
- result = acpi_battery_update_retry(battery);
- if (result)
- goto fail;
-
-#ifdef CONFIG_ACPI_PROCFS_POWER
- result = acpi_battery_add_fs(device);
-#endif
- if (result) {
-#ifdef CONFIG_ACPI_PROCFS_POWER
- acpi_battery_remove_fs(device);
-#endif
- goto fail;
- }
-
- printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
- ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
- device->status.battery_present ? "present" : "absent");
-
- battery->pm_nb.notifier_call = battery_notify;
- register_pm_notifier(&battery->pm_nb);
-
- device_init_wakeup(&device->dev, 1);
-
- return result;
-
-fail:
- sysfs_remove_battery(battery);
- mutex_destroy(&battery->lock);
- mutex_destroy(&battery->sysfs_lock);
- kfree(battery);
- return result;
-}
-
-static int acpi_battery_remove(struct acpi_device *device)
-{
- struct acpi_battery *battery = NULL;
-
- if (!device || !acpi_driver_data(device))
- return -EINVAL;
- device_init_wakeup(&device->dev, 0);
- battery = acpi_driver_data(device);
- unregister_pm_notifier(&battery->pm_nb);
-#ifdef CONFIG_ACPI_PROCFS_POWER
- acpi_battery_remove_fs(device);
-#endif
- sysfs_remove_battery(battery);
- mutex_destroy(&battery->lock);
- mutex_destroy(&battery->sysfs_lock);
- kfree(battery);
- return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-/* this is needed to learn about changes made in suspended state */
-static int acpi_battery_resume(struct device *dev)
-{
- struct acpi_battery *battery;
-
- if (!dev)
- return -EINVAL;
-
- battery = acpi_driver_data(to_acpi_device(dev));
- if (!battery)
- return -EINVAL;
-
- battery->update_time = 0;
- acpi_battery_update(battery, true);
- return 0;
-}
-#else
-#define acpi_battery_resume NULL
-#endif
-
-static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);
+static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_common_resume);
static struct acpi_driver acpi_battery_driver = {
.name = "battery",
@@ -1280,9 +91,9 @@ static struct acpi_driver acpi_battery_driver = {
.ids = battery_device_ids,
.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
.ops = {
- .add = acpi_battery_add,
- .remove = acpi_battery_remove,
- .notify = acpi_battery_notify,
+ .add = acpi_battery_common_add,
+ .remove = acpi_battery_common_remove,
+ .notify = acpi_battery_common_notify,
},
.drv.pm = &acpi_battery_pm,
};
diff --git a/drivers/acpi/battery.h b/drivers/acpi/battery.h
index 6c08497..4ccb731 100644
--- a/drivers/acpi/battery.h
+++ b/drivers/acpi/battery.h
@@ -1,3 +1,18 @@
+/*
+ * battery.h
+ * Copyright (c) 2016, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ */
+
#ifndef __ACPI_BATTERY_H
#define __ACPI_BATTERY_H
@@ -7,4 +22,20 @@
#define ACPI_BATTERY_NOTIFY_INFO 0x81
#define ACPI_BATTERY_NOTIFY_THRESHOLD 0x82
+extern int battery_bix_broken_package;
+extern int battery_notification_delay_ms;
+extern struct proc_dir_entry *acpi_battery_dir;
+extern bool battery_registered;
+
+int acpi_battery_common_add(struct acpi_device *device);
+int acpi_battery_common_remove(struct acpi_device *device);
+int acpi_battery_common_resume(struct device *dev);
+void acpi_battery_common_notify(struct acpi_device *device, u32 event);
+
+/* Defined in cm_sbs.c */
+#ifdef CONFIG_ACPI_PROCFS_POWER
+struct proc_dir_entry *acpi_lock_battery_dir(void);
+void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
+#endif
+
#endif
diff --git a/drivers/acpi/battery_common.c b/drivers/acpi/battery_common.c
new file mode 100644
index 0000000..01f221a
--- /dev/null
+++ b/drivers/acpi/battery_common.c
@@ -0,0 +1,1294 @@
+/*
+ * battery_common.c - ACPI Battery common interfaces
+ *
+ * Copyright (C) 2007 Alexey Starikovskiy <astarikovskiy@suse.de>
+ * Copyright (C) 2004-2007 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>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/jiffies.h>
+#include <linux/async.h>
+#include <linux/dmi.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/suspend.h>
+#include <asm/unaligned.h>
+
+#ifdef CONFIG_ACPI_PROCFS_POWER
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/uaccess.h>
+#endif
+
+#include <linux/acpi.h>
+#include <linux/power_supply.h>
+
+#include "battery.h"
+
+#define PREFIX "ACPI: "
+
+#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
+
+#define ACPI_BATTERY_DEVICE_NAME "Battery"
+
+/* Battery power unit: 0 means mW, 1 means mA */
+#define ACPI_BATTERY_POWER_UNIT_MA 1
+
+#define ACPI_BATTERY_STATE_DISCHARGING 0x1
+#define ACPI_BATTERY_STATE_CHARGING 0x2
+#define ACPI_BATTERY_STATE_CRITICAL 0x4
+
+#define _COMPONENT ACPI_BATTERY_COMPONENT
+
+ACPI_MODULE_NAME("battery_common");
+
+MODULE_AUTHOR("Paul Diefenbaugh");
+MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");
+MODULE_DESCRIPTION("ACPI Battery Driver");
+MODULE_LICENSE("GPL");
+
+int battery_bix_broken_package;
+EXPORT_SYMBOL_GPL(battery_bix_broken_package);
+
+int battery_notification_delay_ms;
+EXPORT_SYMBOL_GPL(battery_notification_delay_ms);
+
+bool battery_registered;
+EXPORT_SYMBOL_GPL(battery_registered);
+
+static unsigned int cache_time = 1000;
+module_param(cache_time, uint, 0644);
+MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
+
+#ifdef CONFIG_ACPI_PROCFS_POWER
+
+enum acpi_battery_files {
+ info_tag = 0,
+ state_tag,
+ alarm_tag,
+ ACPI_BATTERY_NUMFILES,
+};
+
+#endif
+
+enum {
+ ACPI_BATTERY_ALARM_PRESENT,
+ ACPI_BATTERY_XINFO_PRESENT,
+ ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
+ /*
+ * On Lenovo Thinkpad models from 2010 and 2011, the power unit
+ * switches between mWh and mAh depending on whether the system
+ * is running on battery or not. When mAh is the unit, most
+ * reported values are incorrect and need to be adjusted by
+ * 10000/design_voltage. Verified on x201, t410, t410s, and x220.
+ * Pre-2010 and 2012 models appear to always report in mWh and
+ * are thus unaffected (tested with t42, t61, t500, x200, x300,
+ * and x230). Also, in mid-2012 Lenovo issued a BIOS update for
+ * the 2011 models that fixes the issue (tested on x220 with a
+ * post-1.29 BIOS), but as of Nov. 2012, no such update is
+ * available for the 2010 models.
+ */
+ ACPI_BATTERY_QUIRK_THINKPAD_MAH,
+};
+
+struct acpi_battery {
+ struct mutex lock;
+ struct mutex sysfs_lock;
+ struct power_supply *bat;
+ struct power_supply_desc bat_desc;
+ struct acpi_device *device;
+ struct notifier_block pm_nb;
+ unsigned long update_time;
+ int revision;
+ int rate_now;
+ int capacity_now;
+ int voltage_now;
+ int design_capacity;
+ int full_charge_capacity;
+ int technology;
+ 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;
+ char model_number[32];
+ char serial_number[32];
+ char type[32];
+ char oem_info[32];
+ int state;
+ int power_unit;
+ unsigned long flags;
+};
+
+#define to_acpi_battery(x) power_supply_get_drvdata(x)
+
+static inline int acpi_battery_present(struct acpi_battery *battery)
+{
+ return battery->device->status.battery_present;
+}
+
+static int acpi_battery_technology(struct acpi_battery *battery)
+{
+ if (!strcasecmp("NiCd", battery->type))
+ return POWER_SUPPLY_TECHNOLOGY_NiCd;
+ if (!strcasecmp("NiMH", battery->type))
+ return POWER_SUPPLY_TECHNOLOGY_NiMH;
+ if (!strcasecmp("LION", battery->type))
+ return POWER_SUPPLY_TECHNOLOGY_LION;
+ if (!strncasecmp("LI-ION", battery->type, 6))
+ return POWER_SUPPLY_TECHNOLOGY_LION;
+ if (!strcasecmp("LiP", battery->type))
+ return POWER_SUPPLY_TECHNOLOGY_LIPO;
+ return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
+}
+
+static int acpi_battery_get_state(struct acpi_battery *battery);
+
+static int acpi_battery_is_charged(struct acpi_battery *battery)
+{
+ /* charging, discharging or critical low */
+ if (battery->state != 0)
+ return 0;
+
+ /* battery not reporting charge */
+ if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN ||
+ battery->capacity_now == 0)
+ return 0;
+
+ /* good batteries update full_charge as the batteries degrade */
+ if (battery->full_charge_capacity == battery->capacity_now)
+ return 1;
+
+ /* fallback to using design values for broken batteries */
+ if (battery->design_capacity == battery->capacity_now)
+ return 1;
+
+ /* we don't do any sort of metric based on percentages */
+ return 0;
+}
+
+static int acpi_battery_get_property(struct power_supply *psy,
+ enum power_supply_property psp,
+ union power_supply_propval *val)
+{
+ int ret = 0;
+ struct acpi_battery *battery = to_acpi_battery(psy);
+
+ if (acpi_battery_present(battery)) {
+ /* run battery update only if it is present */
+ acpi_battery_get_state(battery);
+ } else if (psp != POWER_SUPPLY_PROP_PRESENT)
+ return -ENODEV;
+ switch (psp) {
+ case POWER_SUPPLY_PROP_STATUS:
+ if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
+ val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+ else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
+ val->intval = POWER_SUPPLY_STATUS_CHARGING;
+ else if (acpi_battery_is_charged(battery))
+ val->intval = POWER_SUPPLY_STATUS_FULL;
+ else
+ val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
+ break;
+ case POWER_SUPPLY_PROP_PRESENT:
+ val->intval = acpi_battery_present(battery);
+ break;
+ 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:
+ if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
+ ret = -ENODEV;
+ else
+ val->intval = battery->design_voltage * 1000;
+ break;
+ case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+ if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)
+ ret = -ENODEV;
+ else
+ val->intval = battery->voltage_now * 1000;
+ break;
+ case POWER_SUPPLY_PROP_CURRENT_NOW:
+ case POWER_SUPPLY_PROP_POWER_NOW:
+ if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
+ ret = -ENODEV;
+ else
+ val->intval = battery->rate_now * 1000;
+ break;
+ case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+ case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+ if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+ ret = -ENODEV;
+ else
+ val->intval = battery->design_capacity * 1000;
+ break;
+ case POWER_SUPPLY_PROP_CHARGE_FULL:
+ case POWER_SUPPLY_PROP_ENERGY_FULL:
+ if (battery->full_charge_capacity ==
+ ACPI_BATTERY_VALUE_UNKNOWN)
+ ret = -ENODEV;
+ else
+ val->intval = battery->full_charge_capacity * 1000;
+ break;
+ case POWER_SUPPLY_PROP_CHARGE_NOW:
+ case POWER_SUPPLY_PROP_ENERGY_NOW:
+ if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
+ ret = -ENODEV;
+ else
+ val->intval = battery->capacity_now * 1000;
+ break;
+ case POWER_SUPPLY_PROP_CAPACITY:
+ if (battery->capacity_now && battery->full_charge_capacity)
+ val->intval = battery->capacity_now * 100/
+ battery->full_charge_capacity;
+ else
+ val->intval = 0;
+ break;
+ case POWER_SUPPLY_PROP_CAPACITY_LEVEL:
+ if (battery->state & ACPI_BATTERY_STATE_CRITICAL)
+ val->intval = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
+ else if (test_bit(ACPI_BATTERY_ALARM_PRESENT,
+ &battery->flags) &&
+ (battery->capacity_now <= battery->alarm))
+ val->intval = POWER_SUPPLY_CAPACITY_LEVEL_LOW;
+ else if (acpi_battery_is_charged(battery))
+ val->intval = POWER_SUPPLY_CAPACITY_LEVEL_FULL;
+ else
+ val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
+ break;
+ case POWER_SUPPLY_PROP_MODEL_NAME:
+ val->strval = battery->model_number;
+ break;
+ case POWER_SUPPLY_PROP_MANUFACTURER:
+ val->strval = battery->oem_info;
+ break;
+ case POWER_SUPPLY_PROP_SERIAL_NUMBER:
+ val->strval = battery->serial_number;
+ break;
+ default:
+ ret = -EINVAL;
+ }
+ return ret;
+}
+
+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,
+ POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+ POWER_SUPPLY_PROP_CHARGE_FULL,
+ POWER_SUPPLY_PROP_CHARGE_NOW,
+ POWER_SUPPLY_PROP_CAPACITY,
+ POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+ POWER_SUPPLY_PROP_MODEL_NAME,
+ POWER_SUPPLY_PROP_MANUFACTURER,
+ POWER_SUPPLY_PROP_SERIAL_NUMBER,
+};
+
+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_POWER_NOW,
+ POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
+ POWER_SUPPLY_PROP_ENERGY_FULL,
+ POWER_SUPPLY_PROP_ENERGY_NOW,
+ POWER_SUPPLY_PROP_CAPACITY,
+ POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+ POWER_SUPPLY_PROP_MODEL_NAME,
+ POWER_SUPPLY_PROP_MANUFACTURER,
+ POWER_SUPPLY_PROP_SERIAL_NUMBER,
+};
+
+/* -----------------Battery Management-------------------*/
+struct acpi_offsets {
+ size_t offset; /* offset inside struct acpi_sbs_battery */
+ u8 mode; /* int or string? */
+};
+
+static const struct acpi_offsets state_offsets[] = {
+ {offsetof(struct acpi_battery, state), 0},
+ {offsetof(struct acpi_battery, rate_now), 0},
+ {offsetof(struct acpi_battery, capacity_now), 0},
+ {offsetof(struct acpi_battery, voltage_now), 0},
+};
+
+static const struct acpi_offsets 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, 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 const struct acpi_offsets extended_info_offsets[] = {
+ {offsetof(struct acpi_battery, revision), 0},
+ {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,
+ const struct acpi_offsets *offsets, int num)
+{
+ int i;
+ union acpi_object *element;
+
+ if (package->type != ACPI_TYPE_PACKAGE)
+ return -EFAULT;
+ for (i = 0; i < num; ++i) {
+ if (package->package.count <= i)
+ return -EFAULT;
+ element = &package->package.elements[i];
+ if (offsets[i].mode) {
+ u8 *ptr = (u8 *)battery + offsets[i].offset;
+
+ if (element->type == ACPI_TYPE_STRING ||
+ element->type == ACPI_TYPE_BUFFER)
+ strncpy(ptr, element->string.pointer, 32);
+ else if (element->type == ACPI_TYPE_INTEGER) {
+ strncpy(ptr, (u8 *)&element->integer.value,
+ sizeof(u64));
+ ptr[sizeof(u64)] = 0;
+ } else
+ *ptr = 0; /* don't have value */
+ } else {
+ int *x = (int *)((u8 *)battery + offsets[i].offset);
+ *x = (element->type == ACPI_TYPE_INTEGER) ?
+ element->integer.value : -1;
+ }
+ }
+ return 0;
+}
+
+static int acpi_battery_get_status(struct acpi_battery *battery)
+{
+ if (acpi_bus_get_status(battery->device)) {
+ ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Evaluating _STA"));
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+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, name,
+ NULL, &buffer);
+ mutex_unlock(&battery->lock);
+
+ if (ACPI_FAILURE(status)) {
+ ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", name));
+ return -ENODEV;
+ }
+
+ if (battery_bix_broken_package)
+ result = extract_package(battery, buffer.pointer,
+ extended_info_offsets + 1,
+ ARRAY_SIZE(extended_info_offsets) - 1);
+ else 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);
+ if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
+ battery->full_charge_capacity = battery->design_capacity;
+ if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
+ battery->power_unit && battery->design_voltage) {
+ battery->design_capacity = battery->design_capacity *
+ 10000 / battery->design_voltage;
+ battery->full_charge_capacity = battery->full_charge_capacity *
+ 10000 / battery->design_voltage;
+ battery->design_capacity_warning =
+ battery->design_capacity_warning *
+ 10000 / battery->design_voltage;
+ /*
+ * Curiously, design_capacity_low, unlike the rest of them,
+ * is correct.
+ * capacity_granularity_* equal 1 on the systems tested, so
+ * it's impossible to tell if they would need an adjustment
+ * or not if their values were higher.
+ */
+ }
+
+ return result;
+}
+
+static int acpi_battery_get_state(struct acpi_battery *battery)
+{
+ int result = 0;
+ acpi_status status = 0;
+ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+
+ if (!acpi_battery_present(battery))
+ return 0;
+
+ if (battery->update_time &&
+ time_before(jiffies, battery->update_time +
+ msecs_to_jiffies(cache_time)))
+ return 0;
+
+ mutex_lock(&battery->lock);
+ status = acpi_evaluate_object(battery->device->handle, "_BST",
+ NULL, &buffer);
+ mutex_unlock(&battery->lock);
+
+ if (ACPI_FAILURE(status)) {
+ ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
+ return -ENODEV;
+ }
+
+ result = extract_package(battery, buffer.pointer,
+ state_offsets, ARRAY_SIZE(state_offsets));
+ battery->update_time = jiffies;
+ kfree(buffer.pointer);
+
+ /* 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.
+ */
+ if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA &&
+ battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&
+ (s16)(battery->rate_now) < 0) {
+ battery->rate_now = abs((s16)battery->rate_now);
+ printk_once(KERN_WARNING FW_BUG
+ "battery: (dis)charge rate invalid.\n");
+ }
+
+ if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
+ && battery->capacity_now >= 0 && battery->capacity_now <= 100)
+ battery->capacity_now = (battery->capacity_now *
+ battery->full_charge_capacity) / 100;
+ if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
+ battery->power_unit && battery->design_voltage) {
+ battery->capacity_now = battery->capacity_now *
+ 10000 / battery->design_voltage;
+ }
+
+ return result;
+}
+
+static int acpi_battery_set_alarm(struct acpi_battery *battery)
+{
+ acpi_status status = 0;
+
+ if (!acpi_battery_present(battery) ||
+ !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))
+ return -ENODEV;
+
+ mutex_lock(&battery->lock);
+ status = acpi_execute_simple_method(battery->device->handle, "_BTP",
+ battery->alarm);
+ mutex_unlock(&battery->lock);
+
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", battery->alarm));
+ return 0;
+}
+
+static int acpi_battery_init_alarm(struct acpi_battery *battery)
+{
+ /* See if alarms are supported, and if so, set default */
+ if (!acpi_has_method(battery->device->handle, "_BTP")) {
+ clear_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags);
+ return 0;
+ }
+ set_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags);
+ if (!battery->alarm)
+ battery->alarm = battery->design_capacity_warning;
+ return acpi_battery_set_alarm(battery);
+}
+
+static ssize_t acpi_battery_alarm_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
+
+ return sprintf(buf, "%d\n", battery->alarm * 1000);
+}
+
+static ssize_t acpi_battery_alarm_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ unsigned long x;
+ struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
+
+ if (sscanf(buf, "%lu\n", &x) == 1)
+ battery->alarm = x/1000;
+ if (acpi_battery_present(battery))
+ acpi_battery_set_alarm(battery);
+ return count;
+}
+
+static struct device_attribute alarm_attr = {
+ .attr = {.name = "alarm", .mode = 0644},
+ .show = acpi_battery_alarm_show,
+ .store = acpi_battery_alarm_store,
+};
+
+static int sysfs_add_battery(struct acpi_battery *battery)
+{
+ struct power_supply_config psy_cfg = { .drv_data = battery, };
+
+ if (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) {
+ battery->bat_desc.properties = charge_battery_props;
+ battery->bat_desc.num_properties =
+ ARRAY_SIZE(charge_battery_props);
+ } else {
+ battery->bat_desc.properties = energy_battery_props;
+ battery->bat_desc.num_properties =
+ ARRAY_SIZE(energy_battery_props);
+ }
+
+ battery->bat_desc.name = acpi_device_bid(battery->device);
+ battery->bat_desc.type = POWER_SUPPLY_TYPE_BATTERY;
+ battery->bat_desc.get_property = acpi_battery_get_property;
+
+ battery->bat = power_supply_register_no_ws(&battery->device->dev,
+ &battery->bat_desc, &psy_cfg);
+
+ if (IS_ERR(battery->bat)) {
+ int result = PTR_ERR(battery->bat);
+
+ battery->bat = NULL;
+ return result;
+ }
+ return device_create_file(&battery->bat->dev, &alarm_attr);
+}
+
+static void sysfs_remove_battery(struct acpi_battery *battery)
+{
+ mutex_lock(&battery->sysfs_lock);
+ if (!battery->bat) {
+ mutex_unlock(&battery->sysfs_lock);
+ return;
+ }
+
+ device_remove_file(&battery->bat->dev, &alarm_attr);
+ power_supply_unregister(battery->bat);
+ battery->bat = NULL;
+ mutex_unlock(&battery->sysfs_lock);
+}
+
+static void find_battery(const struct dmi_header *dm, void *private)
+{
+ struct acpi_battery *battery = (struct acpi_battery *)private;
+
+ /*
+ * Note: the hardcoded offsets below have been extracted from
+ * the source code of dmidecode.
+ */
+ if (dm->type == DMI_ENTRY_PORTABLE_BATTERY && dm->length >= 8) {
+ const u8 *dmi_data = (const u8 *)(dm + 1);
+ int dmi_capacity = get_unaligned((const u16 *)(dmi_data + 6));
+
+ if (dm->length >= 18)
+ dmi_capacity *= dmi_data[17];
+ if (battery->design_capacity * battery->design_voltage / 1000
+ != dmi_capacity &&
+ battery->design_capacity * 10 == dmi_capacity)
+ set_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
+ &battery->flags);
+ }
+}
+
+/*
+ * According to the ACPI spec, some kinds of primary batteries can
+ * report percentage battery remaining capacity directly to OS.
+ * In this case, it reports the Last Full Charged Capacity == 100
+ * and BatteryPresentRate == 0xFFFFFFFF.
+ *
+ * Now we found some battery reports percentage remaining capacity
+ * even if it's rechargeable.
+ * https://bugzilla.kernel.org/show_bug.cgi?id=15979
+ *
+ * Handle this correctly so that they won't break userspace.
+ */
+static void acpi_battery_quirks(struct acpi_battery *battery)
+{
+ if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
+ return;
+
+ if (battery->full_charge_capacity == 100 &&
+ battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN &&
+ battery->capacity_now >= 0 && battery->capacity_now <= 100) {
+ set_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
+ &battery->flags);
+ battery->full_charge_capacity = battery->design_capacity;
+ battery->capacity_now = (battery->capacity_now *
+ battery->full_charge_capacity) / 100;
+ }
+
+ if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
+ return;
+
+ if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
+ const char *s;
+
+ s = dmi_get_system_info(DMI_PRODUCT_VERSION);
+ if (s && !strncasecmp(s, "ThinkPad", 8)) {
+ dmi_walk(find_battery, battery);
+ if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
+ &battery->flags) &&
+ battery->design_voltage) {
+ battery->design_capacity =
+ battery->design_capacity *
+ 10000 / battery->design_voltage;
+ battery->full_charge_capacity =
+ battery->full_charge_capacity *
+ 10000 / battery->design_voltage;
+ battery->design_capacity_warning =
+ battery->design_capacity_warning *
+ 10000 / battery->design_voltage;
+ battery->capacity_now = battery->capacity_now *
+ 10000 / battery->design_voltage;
+ }
+ }
+ }
+}
+
+static int acpi_battery_update(struct acpi_battery *battery, bool resume)
+{
+ int result, old_present = acpi_battery_present(battery);
+
+ result = acpi_battery_get_status(battery);
+ if (result)
+ return result;
+
+ if (!acpi_battery_present(battery)) {
+ sysfs_remove_battery(battery);
+ battery->update_time = 0;
+ return 0;
+ }
+
+ if (resume)
+ return 0;
+
+ if (!battery->update_time ||
+ old_present != acpi_battery_present(battery)) {
+ result = acpi_battery_get_info(battery);
+ if (result)
+ return result;
+ acpi_battery_init_alarm(battery);
+ }
+ if (!battery->bat) {
+ result = sysfs_add_battery(battery);
+ if (result)
+ return result;
+ }
+ result = acpi_battery_get_state(battery);
+ if (result)
+ return result;
+ acpi_battery_quirks(battery);
+
+ /*
+ * Wakeup the system if battery is critical low
+ * or lower than the alarm level
+ */
+ if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||
+ (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&
+ (battery->capacity_now <= battery->alarm)))
+ pm_wakeup_event(&battery->device->dev, 0);
+
+ return result;
+}
+
+static void acpi_battery_refresh(struct acpi_battery *battery)
+{
+ int power_unit;
+
+ if (!battery->bat)
+ return;
+
+ power_unit = battery->power_unit;
+
+ acpi_battery_get_info(battery);
+
+ if (power_unit == battery->power_unit)
+ return;
+
+ /* The battery has changed its reporting units. */
+ sysfs_remove_battery(battery);
+ sysfs_add_battery(battery);
+}
+
+/*------------------------FS Interface (/proc)------------------------------*/
+
+#ifdef CONFIG_ACPI_PROCFS_POWER
+struct proc_dir_entry *acpi_battery_dir;
+EXPORT_SYMBOL_GPL(acpi_battery_dir);
+
+static const char *acpi_battery_units(const struct acpi_battery *battery)
+{
+ return (battery->power_unit == ACPI_BATTERY_POWER_UNIT_MA) ?
+ "mA" : "mW";
+}
+
+static int acpi_battery_print_info(struct seq_file *seq, int result)
+{
+ struct acpi_battery *battery = seq->private;
+
+ if (result)
+ goto end;
+
+ seq_printf(seq, "present: %s\n",
+ acpi_battery_present(battery) ? "yes" : "no");
+ if (!acpi_battery_present(battery))
+ goto end;
+ if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+ seq_puts(seq, "design capacity: unknown\n");
+ else
+ seq_printf(seq, "design capacity: %d %sh\n",
+ battery->design_capacity,
+ acpi_battery_units(battery));
+
+ if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+ seq_puts(seq, "last full capacity: unknown\n");
+ else
+ seq_printf(seq, "last full capacity: %d %sh\n",
+ battery->full_charge_capacity,
+ acpi_battery_units(battery));
+
+ seq_printf(seq, "battery technology: %srechargeable\n",
+ (!battery->technology)?"non-":"");
+
+ if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
+ seq_puts(seq, "design voltage: unknown\n");
+ else
+ seq_printf(seq, "design voltage: %d mV\n",
+ battery->design_voltage);
+ seq_printf(seq, "design capacity warning: %d %sh\n",
+ battery->design_capacity_warning,
+ acpi_battery_units(battery));
+ 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));
+ seq_printf(seq, "capacity granularity 2: %d %sh\n",
+ battery->capacity_granularity_2,
+ acpi_battery_units(battery));
+ seq_printf(seq, "model number: %s\n", battery->model_number);
+ seq_printf(seq, "serial number: %s\n", battery->serial_number);
+ seq_printf(seq, "battery type: %s\n", battery->type);
+ seq_printf(seq, "OEM info: %s\n", battery->oem_info);
+end:
+ if (result)
+ seq_puts(seq, "ERROR: Unable to read battery info\n");
+ return result;
+}
+
+static int acpi_battery_print_state(struct seq_file *seq, int result)
+{
+ struct acpi_battery *battery = seq->private;
+
+ if (result)
+ goto end;
+
+ seq_printf(seq, "present: %s\n",
+ acpi_battery_present(battery) ? "yes" : "no");
+ if (!acpi_battery_present(battery))
+ goto end;
+
+ seq_printf(seq, "capacity state: %s\n",
+ (battery->state & 0x04) ? "critical" : "ok");
+ if ((battery->state & 0x01) && (battery->state & 0x02))
+ seq_printf(seq,
+ "charging state: charging/discharging\n");
+ else if (battery->state & 0x01)
+ seq_puts(seq, "charging state: discharging\n");
+ else if (battery->state & 0x02)
+ seq_puts(seq, "charging state: charging\n");
+ else
+ seq_puts(seq, "charging state: charged\n");
+
+ if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
+ seq_puts(seq, "present rate: unknown\n");
+ else
+ seq_printf(seq, "present rate: %d %s\n",
+ battery->rate_now, acpi_battery_units(battery));
+
+ if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
+ seq_puts(seq, "remaining capacity: unknown\n");
+ else
+ seq_printf(seq, "remaining capacity: %d %sh\n",
+ battery->capacity_now, acpi_battery_units(battery));
+ if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)
+ seq_puts(seq, "present voltage: unknown\n");
+ else
+ seq_printf(seq, "present voltage: %d mV\n",
+ battery->voltage_now);
+end:
+ if (result)
+ seq_puts(seq, "ERROR: Unable to read battery state\n");
+
+ return result;
+}
+
+static int acpi_battery_print_alarm(struct seq_file *seq, int result)
+{
+ struct acpi_battery *battery = seq->private;
+
+ if (result)
+ goto end;
+
+ if (!acpi_battery_present(battery)) {
+ seq_puts(seq, "present: no\n");
+ goto end;
+ }
+ seq_puts(seq, "alarm: ");
+ if (!battery->alarm)
+ seq_puts(seq, "unsupported\n");
+ else
+ seq_printf(seq, "%u %sh\n", battery->alarm,
+ acpi_battery_units(battery));
+end:
+ if (result)
+ seq_puts(seq, "ERROR: Unable to read battery alarm\n");
+ return result;
+}
+
+static ssize_t acpi_battery_write_alarm(struct file *file,
+ const char __user *buffer,
+ size_t count, loff_t *ppos)
+{
+ int result = 0;
+ char alarm_string[12] = { '\0' };
+ struct seq_file *m = file->private_data;
+ struct acpi_battery *battery = m->private;
+
+ if (!battery || (count > sizeof(alarm_string) - 1))
+ return -EINVAL;
+ if (!acpi_battery_present(battery)) {
+ result = -ENODEV;
+ goto end;
+ }
+ if (copy_from_user(alarm_string, buffer, count)) {
+ result = -EFAULT;
+ goto end;
+ }
+ alarm_string[count] = '\0';
+ if (kstrtoint(alarm_string, 0, &battery->alarm)) {
+ result = -EINVAL;
+ goto end;
+ }
+ result = acpi_battery_set_alarm(battery);
+end:
+ if (!result)
+ return count;
+ return result;
+}
+
+typedef int(*print_func)(struct seq_file *seq, int result);
+
+static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = {
+ acpi_battery_print_info,
+ acpi_battery_print_state,
+ acpi_battery_print_alarm,
+};
+
+static int acpi_battery_read(int fid, struct seq_file *seq)
+{
+ struct acpi_battery *battery = seq->private;
+ int result = acpi_battery_update(battery, false);
+ return acpi_print_funcs[fid](seq, result);
+}
+
+#define DECLARE_FILE_FUNCTIONS(_name) \
+static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \
+{ \
+ return acpi_battery_read(_name##_tag, seq); \
+} \
+static int acpi_battery_##_name##_open_fs(struct inode *inode, \
+struct file *file) \
+{ \
+ return single_open(file, acpi_battery_read_##_name, \
+PDE_DATA(inode)); \
+}
+
+DECLARE_FILE_FUNCTIONS(info);
+DECLARE_FILE_FUNCTIONS(state);
+DECLARE_FILE_FUNCTIONS(alarm);
+
+#undef DECLARE_FILE_FUNCTIONS
+
+#define FILE_DESCRIPTION_RO(_name) \
+ { \
+ .name = __stringify(_name), \
+ .mode = S_IRUGO, \
+ .ops = { \
+ .open = acpi_battery_##_name##_open_fs, \
+ .read = seq_read, \
+ .llseek = seq_lseek, \
+ .release = single_release, \
+ .owner = THIS_MODULE, \
+ }, \
+ }
+
+#define FILE_DESCRIPTION_RW(_name) \
+ { \
+ .name = __stringify(_name), \
+ .mode = S_IFREG | S_IRUGO | S_IWUSR, \
+ .ops = { \
+ .open = acpi_battery_##_name##_open_fs, \
+ .read = seq_read, \
+ .llseek = seq_lseek, \
+ .write = acpi_battery_write_##_name, \
+ .release = single_release, \
+ .owner = THIS_MODULE, \
+ }, \
+ }
+
+static const struct battery_file {
+ const struct file_operations ops;
+ umode_t mode;
+ const char *name;
+} acpi_battery_file[] = {
+ FILE_DESCRIPTION_RO(info),
+ FILE_DESCRIPTION_RO(state),
+ FILE_DESCRIPTION_RW(alarm),
+};
+
+#undef FILE_DESCRIPTION_RO
+#undef FILE_DESCRIPTION_RW
+
+static int acpi_battery_add_fs(struct acpi_device *device)
+{
+ struct proc_dir_entry *entry = NULL;
+ int i;
+
+ pr_warn(PREFIX "Deprecated procfs I/F for battery is loaded,");
+ pr_warn("please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
+ if (!acpi_device_dir(device)) {
+ acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
+ acpi_battery_dir);
+ if (!acpi_device_dir(device))
+ return -ENODEV;
+ }
+
+ for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
+ entry = proc_create_data(acpi_battery_file[i].name,
+ acpi_battery_file[i].mode,
+ acpi_device_dir(device),
+ &acpi_battery_file[i].ops,
+ acpi_driver_data(device));
+ if (!entry)
+ return -ENODEV;
+ }
+ return 0;
+}
+
+static void acpi_battery_remove_fs(struct acpi_device *device)
+{
+ int i;
+
+ if (!acpi_device_dir(device))
+ return;
+ for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i)
+ remove_proc_entry(acpi_battery_file[i].name,
+ acpi_device_dir(device));
+
+ remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
+ acpi_device_dir(device) = NULL;
+}
+
+#endif
+
+/* --------------------------Driver Interface--------------------------------*/
+
+void acpi_battery_common_notify(struct acpi_device *device, u32 event)
+{
+ struct acpi_battery *battery = acpi_driver_data(device);
+ struct power_supply *old;
+
+ if (!battery)
+ return;
+ old = battery->bat;
+ /*
+ * On Acer Aspire V5-573G notifications are sometimes triggered too
+ * early. For example, when AC is unplugged and notification is
+ * triggered, battery state is still reported as "Full", and changes to
+ * "Discharging" only after short delay, without any notification.
+ */
+ if (battery_notification_delay_ms > 0)
+ msleep(battery_notification_delay_ms);
+ if (event == ACPI_BATTERY_NOTIFY_INFO)
+ acpi_battery_refresh(battery);
+ acpi_battery_update(battery, false);
+ acpi_bus_generate_netlink_event(device->pnp.device_class,
+ dev_name(&device->dev), event,
+ acpi_battery_present(battery));
+ acpi_notifier_call_chain(device, event, acpi_battery_present(battery));
+ /* acpi_battery_update could remove power_supply object */
+ if (old && battery->bat)
+ power_supply_changed(battery->bat);
+}
+EXPORT_SYMBOL_GPL(acpi_battery_common_notify);
+
+static int battery_notify(struct notifier_block *nb,
+ unsigned long mode, void *_unused)
+{
+ struct acpi_battery *battery = container_of(nb, struct acpi_battery,
+ pm_nb);
+ int result;
+
+ switch (mode) {
+ case PM_POST_HIBERNATION:
+ case PM_POST_SUSPEND:
+ if (!acpi_battery_present(battery))
+ return 0;
+
+ if (!battery->bat) {
+ result = acpi_battery_get_info(battery);
+ if (result)
+ return result;
+
+ result = sysfs_add_battery(battery);
+ if (result)
+ return result;
+ } else
+ acpi_battery_refresh(battery);
+
+ acpi_battery_init_alarm(battery);
+ acpi_battery_get_state(battery);
+ break;
+ }
+
+ return 0;
+}
+
+static int __init
+battery_bix_broken_package_quirk(const struct dmi_system_id *d)
+{
+ battery_bix_broken_package = 1;
+ return 0;
+}
+
+static int __init
+battery_notification_delay_quirk(const struct dmi_system_id *d)
+{
+ battery_notification_delay_ms = 1000;
+ return 0;
+}
+
+static const struct dmi_system_id bat_dmi_table[] __initconst = {
+ {
+ .callback = battery_bix_broken_package_quirk,
+ .ident = "NEC LZ750/LS",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "PC-LZ750LS"),
+ },
+ },
+ {
+ .callback = battery_notification_delay_quirk,
+ .ident = "Acer Aspire V5-573G",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
+ },
+ },
+ {},
+};
+
+/*
+ * Some machines'(E,G Lenovo Z480) ECs are not stable
+ * during boot up and this causes battery driver fails to be
+ * probed due to failure of getting battery information
+ * from EC sometimes. After several retries, the operation
+ * may work. So add retry code here and 20ms sleep between
+ * every retries.
+ */
+static int acpi_battery_update_retry(struct acpi_battery *battery)
+{
+ int retry, ret;
+
+ for (retry = 5; retry; retry--) {
+ ret = acpi_battery_update(battery, false);
+ if (!ret)
+ break;
+
+ msleep(20);
+ }
+ return ret;
+}
+
+int acpi_battery_common_add(struct acpi_device *device)
+{
+ int result = 0;
+ struct acpi_battery *battery = NULL;
+
+ if (!device)
+ return -EINVAL;
+
+ if (device->dep_unmet)
+ return -EPROBE_DEFER;
+
+ battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+ if (!battery)
+ return -ENOMEM;
+ battery->device = device;
+ strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
+ strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
+ device->driver_data = battery;
+ mutex_init(&battery->lock);
+ mutex_init(&battery->sysfs_lock);
+ if (acpi_has_method(battery->device->handle, "_BIX"))
+ set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
+ result = acpi_battery_update_retry(battery);
+ if (result)
+ goto fail;
+
+#ifdef CONFIG_ACPI_PROCFS_POWER
+ result = acpi_battery_add_fs(device);
+#endif
+ if (result) {
+#ifdef CONFIG_ACPI_PROCFS_POWER
+ acpi_battery_remove_fs(device);
+#endif
+ goto fail;
+ }
+ pr_info(PREFIX "%s Slot [%s] (battery %s)\n",
+ ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
+ device->status.battery_present ? "present" : "absent");
+
+ battery->pm_nb.notifier_call = battery_notify;
+ register_pm_notifier(&battery->pm_nb);
+
+ device_init_wakeup(&device->dev, 1);
+ battery_registered = true;
+
+ return result;
+
+fail:
+ sysfs_remove_battery(battery);
+ mutex_destroy(&battery->lock);
+ mutex_destroy(&battery->sysfs_lock);
+ kfree(battery);
+ return result;
+}
+EXPORT_SYMBOL_GPL(acpi_battery_common_add);
+
+int acpi_battery_common_remove(struct acpi_device *device)
+{
+ struct acpi_battery *battery = NULL;
+
+ if (!device || !acpi_driver_data(device))
+ return -EINVAL;
+ device_init_wakeup(&device->dev, 0);
+ battery = acpi_driver_data(device);
+ unregister_pm_notifier(&battery->pm_nb);
+#ifdef CONFIG_ACPI_PROCFS_POWER
+ acpi_battery_remove_fs(device);
+#endif
+ sysfs_remove_battery(battery);
+ mutex_destroy(&battery->lock);
+ mutex_destroy(&battery->sysfs_lock);
+ kfree(battery);
+ battery_registered = false;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_battery_common_remove);
+
+#ifdef CONFIG_PM_SLEEP
+/* this is needed to learn about changes made in suspended state */
+int acpi_battery_common_resume(struct device *dev)
+{
+ struct acpi_battery *battery;
+
+ if (!dev)
+ return -EINVAL;
+
+ battery = acpi_driver_data(to_acpi_device(dev));
+ if (!battery)
+ return -EINVAL;
+
+ battery->update_time = 0;
+ acpi_battery_update(battery, true);
+ return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_battery_common_resume);
+#else
+#define acpi_battery_resume NULL
+#endif
--
2.5.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-23 21:42 [PATCH v3 0/3] DPTF Platform power participant driver Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 1/3] acpi: battery: Split battery driver for reuse by DPTF power participant Srinivas Pandruvada
@ 2016-06-23 21:42 ` Srinivas Pandruvada
2016-06-23 22:31 ` Rafael J. Wysocki
2016-06-23 21:42 ` [PATCH v3 3/3] acpi: battery_common: battery present status for INT3407 Srinivas Pandruvada
2 siblings, 1 reply; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-23 21:42 UTC (permalink / raw)
To: rjw; +Cc: linux-acpi, Srinivas Pandruvada
This driver adds support for Dynamic Platform and Thermal Framework
(DPTF) Platform Power Participant device support.
This participant is responsible for exposing platform telemetry such as
platform Power, battery Information such as state of Charge, estimated
maximum sustainable power (PMax), SMART battery spec information.
This driver is implemented as a platform driver for INT3407 and presented
as power_supply device. Since this has common features with the ACPI
battery, existing interface provide by battery_common driver are reused
to present as a battery power supply device.
When both CONFIG_ACPI_BATTERY and CONFIG_DPTF_POWER are defined and
platform has support for INT3407, then dptf power registration is
delayed for 100ms. In 100 ms, if there is no ACPI battery is registered
then dptf power will be registered. Since both can be modules and
battery driver loads in async thread, there can be race even if we
specify loading order for initialization.
There are two types of objects in INT3407:
- Same as ACPI Battery objects: _BST and _BIX. These are exposed as
standard power supply attributes.
- Specific to INT3407, which are related to platform power
There are some objects, for which it doesn't make sense to enhance
power_supply class and add attributes there. They are represented as
sysfs attribute under acpi device. Here the bid for INT3407 is TPWR
in the following example.
/sys/class/power_supply/TPWR
├── alarm
├── capacity
├── capacity_level
├── cycle_count
├── device -> ../../../INT3407:00
│ ├── dptf_power
│ │ ├── adapter_rating
│ │ ├── battery_steady_power
│ │ ├── charger_type
│ │ ├── max_platform_power
│ │ ├── platform_power_source
│ │ ├── power_sampling_period
For example representing AC/adapter properties as a power_supply
properties will not make sense for a battery device. In some case
when there is an existing property, the meaning is different.
For example charger_type has a equivalent power_supply property,
which has different symantics than INT3407.
ACPI methods description used in this driver:
PSOC: Platform Battery State Of Charge as a percentage.
PMAX: Maximum platform power that can be supported by the battery in mW.
PSRC: System charge source,
0x00 = DC
0x01 = AC
0x02 = USB
0x03 = Wireless Charger
ARTG: Adapter rating in mW (Maximum Adapter power) Must be 0 if no AC
Adaptor is plugged in.
CTYP: Charger Type,
Traditional : 0x01
Hybrid: 0x02
NVDC: 0x03
PBSS: Returns max sustained power for battery in milliWatts.
DPSP: Sets the polling interval in 10ths of seconds. A value of 0 tells
the driver to use event notification for PMAX and PBSS
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/acpi/Kconfig | 1 +
drivers/acpi/Makefile | 1 +
drivers/acpi/dptf/Kconfig | 17 ++++
drivers/acpi/dptf/Makefile | 3 +
drivers/acpi/dptf/dptf_power.c | 184 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 206 insertions(+)
create mode 100644 drivers/acpi/dptf/Kconfig
create mode 100644 drivers/acpi/dptf/Makefile
create mode 100644 drivers/acpi/dptf/dptf_power.c
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 27ae351..da8c575 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -480,6 +480,7 @@ config ACPI_NFIT_DEBUG
issue.
source "drivers/acpi/apei/Kconfig"
+source "drivers/acpi/dptf/Kconfig"
config ACPI_EXTLOG
tristate "Extended Error Log support"
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 950bf8e..8555c14 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -102,3 +102,4 @@ obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o
obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
video-objs += acpi_video.o video_detect.o
+obj-y += dptf/
diff --git a/drivers/acpi/dptf/Kconfig b/drivers/acpi/dptf/Kconfig
new file mode 100644
index 0000000..bce8edf
--- /dev/null
+++ b/drivers/acpi/dptf/Kconfig
@@ -0,0 +1,17 @@
+config DPTF_POWER
+ tristate "DPTF Platform Power Participant"
+ depends on X86
+ select ACPI_BATTERY_COMMON
+ select POWER_SUPPLY
+ default y
+ help
+ This driver adds support for Dynamic Platform and Thermal Framework
+ (DPTF) Platform Power Participant device support.
+ This participant is responsible for exposing platform telemetry such
+ as platform Power, battery Information such as state of Charge,
+ estimated maximum sustainable power (PMax), SMART battery spec
+ information.
+
+ To compile this driver as a module, choose M here:
+ the module will be called dptf_power.
+
diff --git a/drivers/acpi/dptf/Makefile b/drivers/acpi/dptf/Makefile
new file mode 100644
index 0000000..1b6d8bd
--- /dev/null
+++ b/drivers/acpi/dptf/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_DPTF_POWER) += dptf_power.o
+
+ccflags-y += -Idrivers/acpi
diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
new file mode 100644
index 0000000..013b7f3
--- /dev/null
+++ b/drivers/acpi/dptf/dptf_power.c
@@ -0,0 +1,184 @@
+/*
+ * dptf_power: DPTF platform power driver
+ * Copyright (c) 2016, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
+#include <linux/platform_device.h>
+#include "battery.h"
+
+#define DPTF_POWER_SHOW(name, object) \
+static ssize_t name##_show(struct device *dev,\
+ struct device_attribute *attr,\
+ char *buf)\
+{\
+ struct acpi_device *acpi_dev = to_acpi_device(dev);\
+ unsigned long long val;\
+ acpi_status status;\
+\
+ status = acpi_evaluate_integer(acpi_dev->handle, #object,\
+ NULL, &val);\
+ if (ACPI_SUCCESS(status))\
+ return sprintf(buf, "%llu\n", val);\
+ else\
+ return -EINVAL;\
+}
+
+DPTF_POWER_SHOW(max_platform_power, PMAX)
+DPTF_POWER_SHOW(platform_power_source, PSRC)
+DPTF_POWER_SHOW(adapter_rating, ARTG)
+DPTF_POWER_SHOW(charger_type, CTYP)
+DPTF_POWER_SHOW(battery_steady_power, PBSS)
+DPTF_POWER_SHOW(power_sampling_period, DPSP)
+
+
+static DEVICE_ATTR_RO(max_platform_power);
+static DEVICE_ATTR_RO(platform_power_source);
+static DEVICE_ATTR_RO(adapter_rating);
+static DEVICE_ATTR_RO(battery_steady_power);
+static DEVICE_ATTR_RO(power_sampling_period);
+static DEVICE_ATTR_RO(charger_type);
+
+static struct attribute *dptf_power_attrs[] = {
+ &dev_attr_max_platform_power.attr,
+ &dev_attr_platform_power_source.attr,
+ &dev_attr_adapter_rating.attr,
+ &dev_attr_charger_type.attr,
+ &dev_attr_battery_steady_power.attr,
+ &dev_attr_power_sampling_period.attr,
+ NULL
+};
+
+static struct attribute_group dptf_power_attribute_group = {
+ .attrs = dptf_power_attrs,
+ .name = "dptf_power"
+};
+
+struct platform_device *dptf_power_pdev;
+
+static void dptf_power_notify(acpi_handle handle, u32 event, void *data)
+{
+ struct acpi_device *device = data;
+
+ acpi_battery_common_notify(device, event);
+}
+
+static int dptf_power_init(struct platform_device *pdev)
+{
+ struct acpi_device *acpi_dev;
+ acpi_status status;
+ unsigned long long ptype;
+ int result;
+
+ acpi_dev = ACPI_COMPANION(&(pdev->dev));
+ if (!acpi_dev)
+ return -ENODEV;
+
+ status = acpi_evaluate_integer(acpi_dev->handle, "PTYP", NULL, &ptype);
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+
+ if (ptype != 0x11)
+ return -ENODEV;
+
+
+ result = acpi_battery_common_add(acpi_dev);
+ if (result)
+ return result;
+
+ result = sysfs_create_group(&acpi_dev->dev.kobj,
+ &dptf_power_attribute_group);
+ if (result)
+ goto error_remove_battery;
+
+ result = acpi_install_notify_handler(acpi_dev->handle,
+ ACPI_DEVICE_NOTIFY,
+ dptf_power_notify,
+ (void *)acpi_dev);
+ if (result)
+ goto error_remove_sysfs;
+
+ platform_set_drvdata(pdev, acpi_dev);
+
+ return 0;
+
+error_remove_sysfs:
+ sysfs_remove_group(&acpi_dev->dev.kobj, &dptf_power_attribute_group);
+error_remove_battery:
+ acpi_battery_common_remove(acpi_dev);
+
+ return result;
+}
+
+static void dptf_power_init_work_fn(struct work_struct *work)
+{
+ if (!battery_registered)
+ dptf_power_init(dptf_power_pdev);
+}
+
+static DECLARE_DELAYED_WORK(dptf_power_init_work, dptf_power_init_work_fn);
+
+static int dptf_power_add(struct platform_device *pdev)
+{
+ int ret = 0;
+
+#if IS_ENABLED(CONFIG_ACPI_BATTERY)
+ /* Wait for battery driver to initialize and register for 100ms */
+ dptf_power_pdev = pdev;
+ schedule_delayed_work(&dptf_power_init_work, msecs_to_jiffies(100));
+#else
+ ret = dptf_power_init(pdev);
+#endif
+ return ret;
+}
+
+static int dptf_power_remove(struct platform_device *pdev)
+{
+ struct acpi_device *acpi_dev = platform_get_drvdata(pdev);
+
+#if defined(CONFIG_ACPI_BATTERY)
+ cancel_delayed_work_sync(&dptf_power_init_work);
+#endif
+ if (!acpi_dev)
+ return 0;
+
+ acpi_remove_notify_handler(acpi_dev->handle, ACPI_DEVICE_NOTIFY,
+ dptf_power_notify);
+ sysfs_remove_group(&acpi_dev->dev.kobj, &dptf_power_attribute_group);
+ acpi_battery_common_remove(acpi_dev);
+
+ return 0;
+}
+
+static const struct acpi_device_id int3407_device_ids[] = {
+ {"INT3407", 0},
+ {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
+
+static struct platform_driver dptf_power_driver = {
+ .probe = dptf_power_add,
+ .remove = dptf_power_remove,
+ .driver = {
+ .name = "DPTF Platform Power",
+ .acpi_match_table = int3407_device_ids,
+ },
+};
+
+module_platform_driver(dptf_power_driver);
+
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ACPI DPTF platform power driver");
--
2.5.5
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 3/3] acpi: battery_common: battery present status for INT3407
2016-06-23 21:42 [PATCH v3 0/3] DPTF Platform power participant driver Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 1/3] acpi: battery: Split battery driver for reuse by DPTF power participant Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 2/3] acpi: dptf_power: Add " Srinivas Pandruvada
@ 2016-06-23 21:42 ` Srinivas Pandruvada
2 siblings, 0 replies; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-23 21:42 UTC (permalink / raw)
To: rjw; +Cc: linux-acpi, Srinivas Pandruvada
acpi_battery_get_status() will be called often to check if the battery is
present. This call sets status.battery_present field to return the status.
But When enumerated via DPTF power (INT3407), since this field will not be
set as this is not a battery but it will still set the status.present
field. So a check is added when hid is INT3407 check for the presence and
set the status.battery_present flag, so that the rest of the driver calls
don't fail looking for status.battery_present flag.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/acpi/battery_common.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/acpi/battery_common.c b/drivers/acpi/battery_common.c
index 01f221a..c3db6a2 100644
--- a/drivers/acpi/battery_common.c
+++ b/drivers/acpi/battery_common.c
@@ -429,6 +429,11 @@ static int acpi_battery_get_status(struct acpi_battery *battery)
return -ENODEV;
}
+ if (!strcmp(acpi_device_hid(battery->device), "INT3407")) {
+ if (battery->device->status.present)
+ battery->device->status.battery_present = 1;
+ }
+
return 0;
}
--
2.5.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-23 21:42 ` [PATCH v3 2/3] acpi: dptf_power: Add " Srinivas Pandruvada
@ 2016-06-23 22:31 ` Rafael J. Wysocki
2016-06-23 23:19 ` Srinivas Pandruvada
0 siblings, 1 reply; 11+ messages in thread
From: Rafael J. Wysocki @ 2016-06-23 22:31 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: Rafael J. Wysocki, ACPI Devel Maling List
On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
> This driver adds support for Dynamic Platform and Thermal Framework
> (DPTF) Platform Power Participant device support.
> This participant is responsible for exposing platform telemetry such as
> platform Power, battery Information such as state of Charge, estimated
> maximum sustainable power (PMax), SMART battery spec information.
>
> This driver is implemented as a platform driver for INT3407 and presented
> as power_supply device. Since this has common features with the ACPI
> battery, existing interface provide by battery_common driver are reused
> to present as a battery power supply device.
>
> When both CONFIG_ACPI_BATTERY and CONFIG_DPTF_POWER are defined and
> platform has support for INT3407, then dptf power registration is
> delayed for 100ms. In 100 ms, if there is no ACPI battery is registered
> then dptf power will be registered. Since both can be modules and
> battery driver loads in async thread, there can be race even if we
> specify loading order for initialization.
First, does the waiting actually help, though?
Second, to my eyes, even if acpi_battery load first, the dptf_power
thing will still bind to the same device, but via the platform bus
instead of the ACPI bus type. I don't see anything preventing that
from happening in the patch, but maybe I missed something?
Also please put the part of the changelog below into a comment in
dptf_power.c (if you don't want to add a separate doc for that).
> There are two types of objects in INT3407:
> - Same as ACPI Battery objects: _BST and _BIX. These are exposed as
> standard power supply attributes.
> - Specific to INT3407, which are related to platform power
> There are some objects, for which it doesn't make sense to enhance
> power_supply class and add attributes there. They are represented as
> sysfs attribute under acpi device. Here the bid for INT3407 is TPWR
> in the following example.
> /sys/class/power_supply/TPWR
> ├── alarm
> ├── capacity
> ├── capacity_level
> ├── cycle_count
> ├── device -> ../../../INT3407:00
> │ ├── dptf_power
> │ │ ├── adapter_rating
> │ │ ├── battery_steady_power
> │ │ ├── charger_type
> │ │ ├── max_platform_power
> │ │ ├── platform_power_source
> │ │ ├── power_sampling_period
>
> For example representing AC/adapter properties as a power_supply
> properties will not make sense for a battery device. In some case
> when there is an existing property, the meaning is different.
> For example charger_type has a equivalent power_supply property,
> which has different symantics than INT3407.
>
> ACPI methods description used in this driver:
> PSOC: Platform Battery State Of Charge as a percentage.
> PMAX: Maximum platform power that can be supported by the battery in mW.
> PSRC: System charge source,
> 0x00 = DC
> 0x01 = AC
> 0x02 = USB
> 0x03 = Wireless Charger
> ARTG: Adapter rating in mW (Maximum Adapter power) Must be 0 if no AC
> Adaptor is plugged in.
> CTYP: Charger Type,
> Traditional : 0x01
> Hybrid: 0x02
> NVDC: 0x03
> PBSS: Returns max sustained power for battery in milliWatts.
> DPSP: Sets the polling interval in 10ths of seconds. A value of 0 tells
> the driver to use event notification for PMAX and PBSS
>
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-23 22:31 ` Rafael J. Wysocki
@ 2016-06-23 23:19 ` Srinivas Pandruvada
2016-06-24 0:26 ` Rafael J. Wysocki
0 siblings, 1 reply; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-23 23:19 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Rafael J. Wysocki, ACPI Devel Maling List
On Fri, 2016-06-24 at 00:31 +0200, Rafael J. Wysocki wrote:
> On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
> <srinivas.pandruvada@linux.intel.com> wrote:
> >
> > This driver adds support for Dynamic Platform and Thermal Framework
> > (DPTF) Platform Power Participant device support.
> > This participant is responsible for exposing platform telemetry
> > such as
> > platform Power, battery Information such as state of Charge,
> > estimated
> > maximum sustainable power (PMax), SMART battery spec information.
> >
> > This driver is implemented as a platform driver for INT3407 and
> > presented
> > as power_supply device. Since this has common features with the
> > ACPI
> > battery, existing interface provide by battery_common driver are
> > reused
> > to present as a battery power supply device.
> >
> > When both CONFIG_ACPI_BATTERY and CONFIG_DPTF_POWER are defined and
> > platform has support for INT3407, then dptf power registration is
> > delayed for 100ms. In 100 ms, if there is no ACPI battery is
> > registered
> > then dptf power will be registered. Since both can be modules and
> > battery driver loads in async thread, there can be race even if we
> > specify loading order for initialization.
> First, does the waiting actually help, though?
Yes, if the acpi_battery registered then
if (!battery_registered) will be false.
>
> Second, to my eyes, even if acpi_battery load first, the dptf_power
> thing will still bind to the same device, but via the platform bus
> instead of the ACPI bus type. I don't see anything preventing that
> from happening in the patch, but maybe I missed something?
>
The INT3407 object also has battery _BST and _BIX, so driver will bind
to this device not with PNP0C0A battery device. Either of them should
be able to register and provide battery information. But the names are
different (BAT vs TPWR on my platform)
The check if (!battery_registered) will fail, so dptf_power will not
register. So we will not see two batteries registered with power supply
class (and hence no two batteries in desktop UI).
Thanks,
Srinivas
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-23 23:19 ` Srinivas Pandruvada
@ 2016-06-24 0:26 ` Rafael J. Wysocki
2016-06-27 1:31 ` Srinivas Pandruvada
0 siblings, 1 reply; 11+ messages in thread
From: Rafael J. Wysocki @ 2016-06-24 0:26 UTC (permalink / raw)
To: Srinivas Pandruvada
Cc: Rafael J. Wysocki, Rafael J. Wysocki, ACPI Devel Maling List
On Fri, Jun 24, 2016 at 1:19 AM, Srinivas Pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
> On Fri, 2016-06-24 at 00:31 +0200, Rafael J. Wysocki wrote:
>> On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
>> <srinivas.pandruvada@linux.intel.com> wrote:
>> >
>> > This driver adds support for Dynamic Platform and Thermal Framework
>> > (DPTF) Platform Power Participant device support.
>> > This participant is responsible for exposing platform telemetry
>> > such as
>> > platform Power, battery Information such as state of Charge,
>> > estimated
>> > maximum sustainable power (PMax), SMART battery spec information.
>> >
>> > This driver is implemented as a platform driver for INT3407 and
>> > presented
>> > as power_supply device. Since this has common features with the
>> > ACPI
>> > battery, existing interface provide by battery_common driver are
>> > reused
>> > to present as a battery power supply device.
>> >
>> > When both CONFIG_ACPI_BATTERY and CONFIG_DPTF_POWER are defined and
>> > platform has support for INT3407, then dptf power registration is
>> > delayed for 100ms. In 100 ms, if there is no ACPI battery is
>> > registered
>> > then dptf power will be registered. Since both can be modules and
>> > battery driver loads in async thread, there can be race even if we
>> > specify loading order for initialization.
>>
>> First, does the waiting actually help, though?
>
> Yes, if the acpi_battery registered then
> if (!battery_registered) will be false.
>
Ah, so [1/3] adds battery_registered while moving code around and the
changelog in there doesn't mention that. It is added there, but not
really used, only set and reset.
I wouldn't do it that way. Just add it in a separate patch or in
[2/3] itself, because it is the real user of it.
Also this is racy to my eyes, because acpi_battery can register after
you've checked battery_registered in dptf_power_init_work_fn() and
before calling dptf_power_init(). It actually can register just fine
at any time after that AFAICS.
>>
>> Second, to my eyes, even if acpi_battery load first, the dptf_power
>> thing will still bind to the same device, but via the platform bus
>> instead of the ACPI bus type. I don't see anything preventing that
>> from happening in the patch, but maybe I missed something?
>>
> The INT3407 object also has battery _BST and _BIX, so driver will bind
> to this device not with PNP0C0A battery device. Either of them should
> be able to register and provide battery information. But the names are
> different (BAT vs TPWR on my platform)
> The check if (!battery_registered) will fail, so dptf_power will not
> register. So we will not see two batteries registered with power supply
> class (and hence no two batteries in desktop UI).
Ah OK. I thought that the DPTF device had a _CID("PNP0C0A"). If
that's not the case, then the battery driver will not bind to it, so I
misunderstood the problem you wanted to address.
I think what you need is that if acpi_battery is bound to at least one
device, you don't want to bind dptf_power to anything. Conversely, if
dptf_power has been bound to at least one device, you don't want to
bind acpi_battery to anything.
That may be achieved with a lock and two counters, one (A) incremented
only by acpi_battery and the other (B) incremented only by dptf_power
and such that you can't increment A if B is different from 0 and you
can't increment B if A is different from 0. Of course, each driver
would need to specify which counter it wants to use (A or B), so that
would take an additional argument to acpi_battery_common_add() and an
additional field in struct acpi_battery (for the remove operation).
With that, I think it should only be possible to build both
acpi_battery and dptf_power if they are both modules. IOW, DPTF_POWER
should depend on (!ACPI_BATTERY || ACPI_BATTERY=m) or similar. And if
they are both modules, let user space manage that.
And the waiting itself doesn't add any value then IMO.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-24 0:26 ` Rafael J. Wysocki
@ 2016-06-27 1:31 ` Srinivas Pandruvada
2016-06-27 1:45 ` Rafael J. Wysocki
0 siblings, 1 reply; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-27 1:31 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Rafael J. Wysocki, ACPI Devel Maling List
On Fri, 2016-06-24 at 02:26 +0200, Rafael J. Wysocki wrote:
> > > >
> On Fri, Jun 24, 2016 at 1:19 AM, Srinivas Pandruvada
> <srinivas.pandruvada@linux.intel.com> wrote:
> > On Fri, 2016-06-24 at 00:31 +0200, Rafael J. Wysocki wrote:
> > > On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
> > > <srinivas.pandruvada@linux.intel.com> wrote:
[...]
> I think what you need is that if acpi_battery is bound to at least
> one
> device, you don't want to bind dptf_power to anything. Conversely,
> if
> dptf_power has been bound to at least one device, you don't want to
> bind acpi_battery to anything.
>
> That may be achieved with a lock and two counters, one (A)
> incremented
> only by acpi_battery and the other (B) incremented only by dptf_power
> and such that you can't increment A if B is different from 0 and you
> can't increment B if A is different from 0. Of course, each driver
> would need to specify which counter it wants to use (A or B), so that
> would take an additional argument to acpi_battery_common_add() and an
> additional field in struct acpi_battery (for the remove operation).
>
> With that, I think it should only be possible to build both
> acpi_battery and dptf_power if they are both modules. IOW,
> DPTF_POWER
> should depend on (!ACPI_BATTERY || ACPI_BATTERY=m) or similar. And
> if
> they are both modules, let user space manage that.
>
> And the waiting itself doesn't add any value then IMO.
Yes. I think the best solution is not to let define DPTF_POWER when the
ACPI_BATTERY is defined same as my first version of the patch or let
both add as there is no harm as they will show same levels. The reason
is:
We have some devices with two ACPI_BATTERIES (primary and
secondary/backup) and they must be presented as two power supply
devices to user space. In those devices DPTF_POWER may be equivalent to
only one of the ACPI_BATTERY (Will point to same battery for Battery
levels). So we can't simply refuse to add ACPI_BATTERY device addition
because DPTF_POWER device is registered before.
Thanks,
Srinivas
> Thanks,
> Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-27 1:31 ` Srinivas Pandruvada
@ 2016-06-27 1:45 ` Rafael J. Wysocki
2016-06-27 8:42 ` Zheng, Lv
2016-06-27 18:09 ` Srinivas Pandruvada
0 siblings, 2 replies; 11+ messages in thread
From: Rafael J. Wysocki @ 2016-06-27 1:45 UTC (permalink / raw)
To: Srinivas Pandruvada
Cc: Rafael J. Wysocki, Rafael J. Wysocki, ACPI Devel Maling List
On Mon, Jun 27, 2016 at 3:31 AM, Srinivas Pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
> On Fri, 2016-06-24 at 02:26 +0200, Rafael J. Wysocki wrote:
>> > > >
>> On Fri, Jun 24, 2016 at 1:19 AM, Srinivas Pandruvada
>> <srinivas.pandruvada@linux.intel.com> wrote:
>> > On Fri, 2016-06-24 at 00:31 +0200, Rafael J. Wysocki wrote:
>> > > On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
>> > > <srinivas.pandruvada@linux.intel.com> wrote:
> [...]
>
>> I think what you need is that if acpi_battery is bound to at least
>> one
>> device, you don't want to bind dptf_power to anything. Conversely,
>> if
>> dptf_power has been bound to at least one device, you don't want to
>> bind acpi_battery to anything.
>>
>> That may be achieved with a lock and two counters, one (A)
>> incremented
>> only by acpi_battery and the other (B) incremented only by dptf_power
>> and such that you can't increment A if B is different from 0 and you
>> can't increment B if A is different from 0. Of course, each driver
>> would need to specify which counter it wants to use (A or B), so that
>> would take an additional argument to acpi_battery_common_add() and an
>> additional field in struct acpi_battery (for the remove operation).
>>
>> With that, I think it should only be possible to build both
>> acpi_battery and dptf_power if they are both modules. IOW,
>> DPTF_POWER
>> should depend on (!ACPI_BATTERY || ACPI_BATTERY=m) or similar. And
>> if
>> they are both modules, let user space manage that.
>>
>> And the waiting itself doesn't add any value then IMO.
> Yes. I think the best solution is not to let define DPTF_POWER when the
> ACPI_BATTERY is defined same as my first version of the patch or let
> both add as there is no harm as they will show same levels. The reason
> is:
> We have some devices with two ACPI_BATTERIES (primary and
> secondary/backup) and they must be presented as two power supply
> devices to user space. In those devices DPTF_POWER may be equivalent to
> only one of the ACPI_BATTERY (Will point to same battery for Battery
> levels). So we can't simply refuse to add ACPI_BATTERY device addition
> because DPTF_POWER device is registered before.
OK
Say dptf_power points to the same battery device as acpi_battery. Is
there any way to tell when that happens?
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-27 1:45 ` Rafael J. Wysocki
@ 2016-06-27 8:42 ` Zheng, Lv
2016-06-27 18:09 ` Srinivas Pandruvada
1 sibling, 0 replies; 11+ messages in thread
From: Zheng, Lv @ 2016-06-27 8:42 UTC (permalink / raw)
To: Rafael J. Wysocki, Srinivas Pandruvada
Cc: Rafael J. Wysocki, ACPI Devel Maling List
Hi, Rafael
Just an idea that.
According to the ACPI spec, _WAK must be evaluated before resuming the devices.
So it is supposed that the device drivers should be ready to handle notify() during the suspend/resume period, in the same ways as handling an IRQ during this period.
If the driver is not able to do that (handling notify during suspend/resume cycle), should it be done by the driver in the way of explicitly "disabling notify", like what the disable_irq() does?
Maybe do this via a new set of APs from the ACPI subsystem: acpi_disable_notify()/acpi_enable_notify().
Thanks and best regards
-Lv
> From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-
> owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki
> Subject: Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
>
> On Mon, Jun 27, 2016 at 3:31 AM, Srinivas Pandruvada
> <srinivas.pandruvada@linux.intel.com> wrote:
> > On Fri, 2016-06-24 at 02:26 +0200, Rafael J. Wysocki wrote:
> >> > > >
> >> On Fri, Jun 24, 2016 at 1:19 AM, Srinivas Pandruvada
> >> <srinivas.pandruvada@linux.intel.com> wrote:
> >> > On Fri, 2016-06-24 at 00:31 +0200, Rafael J. Wysocki wrote:
> >> > > On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
> >> > > <srinivas.pandruvada@linux.intel.com> wrote:
> > [...]
> >
> >> I think what you need is that if acpi_battery is bound to at least
> >> one
> >> device, you don't want to bind dptf_power to anything. Conversely,
> >> if
> >> dptf_power has been bound to at least one device, you don't want to
> >> bind acpi_battery to anything.
> >>
> >> That may be achieved with a lock and two counters, one (A)
> >> incremented
> >> only by acpi_battery and the other (B) incremented only by dptf_power
> >> and such that you can't increment A if B is different from 0 and you
> >> can't increment B if A is different from 0. Of course, each driver
> >> would need to specify which counter it wants to use (A or B), so that
> >> would take an additional argument to acpi_battery_common_add()
> and an
> >> additional field in struct acpi_battery (for the remove operation).
> >>
> >> With that, I think it should only be possible to build both
> >> acpi_battery and dptf_power if they are both modules. IOW,
> >> DPTF_POWER
> >> should depend on (!ACPI_BATTERY || ACPI_BATTERY=m) or similar.
> And
> >> if
> >> they are both modules, let user space manage that.
> >>
> >> And the waiting itself doesn't add any value then IMO.
> > Yes. I think the best solution is not to let define DPTF_POWER when the
> > ACPI_BATTERY is defined same as my first version of the patch or let
> > both add as there is no harm as they will show same levels. The reason
> > is:
> > We have some devices with two ACPI_BATTERIES (primary and
> > secondary/backup) and they must be presented as two power supply
> > devices to user space. In those devices DPTF_POWER may be equivalent
> to
> > only one of the ACPI_BATTERY (Will point to same battery for Battery
> > levels). So we can't simply refuse to add ACPI_BATTERY device addition
> > because DPTF_POWER device is registered before.
>
> OK
>
> Say dptf_power points to the same battery device as acpi_battery. Is
> there any way to tell when that happens?
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/3] acpi: dptf_power: Add DPTF power participant
2016-06-27 1:45 ` Rafael J. Wysocki
2016-06-27 8:42 ` Zheng, Lv
@ 2016-06-27 18:09 ` Srinivas Pandruvada
1 sibling, 0 replies; 11+ messages in thread
From: Srinivas Pandruvada @ 2016-06-27 18:09 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Rafael J. Wysocki, ACPI Devel Maling List
On Mon, 2016-06-27 at 03:45 +0200, Rafael J. Wysocki wrote:
> On Mon, Jun 27, 2016 at 3:31 AM, Srinivas Pandruvada
> <srinivas.pandruvada@linux.intel.com> wrote:
> >
> > On Fri, 2016-06-24 at 02:26 +0200, Rafael J. Wysocki wrote:
> > >
> > > >
> > > > >
> > > > > >
> > > > > >
> > > On Fri, Jun 24, 2016 at 1:19 AM, Srinivas Pandruvada
> > > <srinivas.pandruvada@linux.intel.com> wrote:
> > > >
> > > > On Fri, 2016-06-24 at 00:31 +0200, Rafael J. Wysocki wrote:
> > > > >
> > > > > On Thu, Jun 23, 2016 at 11:42 PM, Srinivas Pandruvada
> > > > > <srinivas.pandruvada@linux.intel.com> wrote:
> > [...]
> >
> > >
> > > I think what you need is that if acpi_battery is bound to at
> > > least
> > > one
> > > device, you don't want to bind dptf_power to
> > > anything. Conversely,
> > > if
> > > dptf_power has been bound to at least one device, you don't want
> > > to
> > > bind acpi_battery to anything.
> > >
> > > That may be achieved with a lock and two counters, one (A)
> > > incremented
> > > only by acpi_battery and the other (B) incremented only by
> > > dptf_power
> > > and such that you can't increment A if B is different from 0 and
> > > you
> > > can't increment B if A is different from 0. Of course, each
> > > driver
> > > would need to specify which counter it wants to use (A or B), so
> > > that
> > > would take an additional argument to acpi_battery_common_add()
> > > and an
> > > additional field in struct acpi_battery (for the remove
> > > operation).
> > >
> > > With that, I think it should only be possible to build both
> > > acpi_battery and dptf_power if they are both modules. IOW,
> > > DPTF_POWER
> > > should depend on (!ACPI_BATTERY || ACPI_BATTERY=m) or
> > > similar. And
> > > if
> > > they are both modules, let user space manage that.
> > >
> > > And the waiting itself doesn't add any value then IMO.
> > Yes. I think the best solution is not to let define DPTF_POWER when
> > the
> > ACPI_BATTERY is defined same as my first version of the patch or
> > let
> > both add as there is no harm as they will show same levels. The
> > reason
> > is:
> > We have some devices with two ACPI_BATTERIES (primary and
> > secondary/backup) and they must be presented as two power supply
> > devices to user space. In those devices DPTF_POWER may be
> > equivalent to
> > only one of the ACPI_BATTERY (Will point to same battery for
> > Battery
> > levels). So we can't simply refuse to add ACPI_BATTERY device
> > addition
> > because DPTF_POWER device is registered before.
> OK
>
> Say dptf_power points to the same battery device as acpi_battery. Is
> there any way to tell when that happens?
May be we can memcmp the output of _BIX (Battery Information Extended).
If they are same it belongs to same battery.
If there are two ACPI batteries, hope atleast they have difference in
one element in the following package.
Package {
// ASCIIZ is ASCII character string terminated with a 0x00.
Revision
//Integer
Power Unit
//Integer (DWORD)
Design Capacity
//Integer (DWORD)
Last Full Charge Capacity
//Integer (DWORD)
Battery Technology
//Integer (DWORD)
Design Voltage
//Integer (DWORD)
Design Capacity of Warning
//Integer (DWORD)
Design Capacity of Low
//Integer (DWORD)
Cycle Count
//Integer (DWORD)
Measurement Accuracy
Max Sampling Time
Min Sampling Time
Max Averaging Interval
Min Averaging Interval //Integer
//Integer
//Integer
//Integer
//Integer
(DWORD)
(DWORD)
(DWORD)
(DWORD)
(DWORD)
Battery Capacity Granularity 1
Battery Capacity Granularity 2
Model Number
Serial Number
Battery Type
OEM Information
}
Thanks,
Srinivas
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-06-27 18:07 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-23 21:42 [PATCH v3 0/3] DPTF Platform power participant driver Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 1/3] acpi: battery: Split battery driver for reuse by DPTF power participant Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 2/3] acpi: dptf_power: Add " Srinivas Pandruvada
2016-06-23 22:31 ` Rafael J. Wysocki
2016-06-23 23:19 ` Srinivas Pandruvada
2016-06-24 0:26 ` Rafael J. Wysocki
2016-06-27 1:31 ` Srinivas Pandruvada
2016-06-27 1:45 ` Rafael J. Wysocki
2016-06-27 8:42 ` Zheng, Lv
2016-06-27 18:09 ` Srinivas Pandruvada
2016-06-23 21:42 ` [PATCH v3 3/3] acpi: battery_common: battery present status for INT3407 Srinivas Pandruvada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.