Commit be553754 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to follow upstream revision
  20180313 which includes fixes related to the so-called module-level
  AML (mostly "if" type of statements outside of any methods) that
  should improve the handling of systems that load alternative SSDTs
  depending on the current configuration, for example, and event
  handling fixes related to disabling and enabling GPEs on system
  startup and on suspend/resume.

  Moreover, the ACPICA license boilerplate is replaced with SPDX license
  IDs which alone reduces the number of lines of ACPICA code in the
  kernel quite a bit.

  Also added is a new driver for the generic ACPI Time and Alarm Device
  (TAD). At the moment it only handles the most basic capabilities of
  the TAD, however.

  In addition to that the ACPI battery driver is improved to handle
  battery thresholds on ThinkPads, among other things, some bugs are
  fixed, a new backlight quirk is added and some documentation is
  updated.

  Specifics:

   - Update the in-kernel ACPICA code to upstream revision 20180313
     including:
      * Module-level AML code handling fixes and simplifications (Bob
        Moore, Erik Schmauss).
      * Fixes and cleanups related to messaging (Bob Moore).
      * Events handling fixes related to disabling and enabling GPEs
        (Erik Schmauss).
      * Introduction of SPDX license identifiers and removal of license
        boilerplate in multiple files (Erik Schmauss).
      * Assorted fixes and cleanups (Bob Moore, Erik Schmauss, Hans de
        Goede, Seunghun Han).

   - Add new basic driver for the ACPI Time and Alarm Device (Rafael
     Wysocki).

   - Modify the ACPI battery driver to support battery thresholds on
     Lenovo ThinkPads (Ognjen Galic, Colin Ian King).

   - Avoid reporting battery capacity over 100 in the ACPI battery
     driver in some cases (Laszlo Toth).

   - Make the kernel recognize an OEM _OSI string from Dell to avoid
     power management issues with NVidia GPUs in Dell platforms (Alex
     Hung).

   - Make the PCI IRQ management code handle missing _PRS cleanly (Alex
     Hung).

   - Fix uevent notifications related to device hotplut (Lee, Chun-Yi).

   - Prevent the ACPI PAD driver from leaking memory (Lenny Szubowicz).

   - Update the ACPI CPPC library code to include subspace IDs in the
     kernel messages logged by it (George Cherian).

   - Add backlight quirk for Samsung 670Z5E (Hans de Goede).

   - Add the NFIT and HMAT tables to the list of ACPI tables that can be
     overridden via initrd (Dan Williams).

   - Fix and clean up some ACPI documentation and Kconfig help language
     (Aishwarya Pant, Randy Dunlap).

   - Replace license boilerplate with an SPDX license ID in the ACPI
     PMIC operation region handling code (Rajmohan Mani)"

* tag 'acpi-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (39 commits)
  ACPI: acpi_pad: Fix memory leak in power saving threads
  ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E
  ACPI: Add Time and Alarm Device (TAD) driver
  ACPI / scan: Send change uevent with offine environmental data
  ACPI / Kconfig: Update ACPI_PROCFS_POWER help text
  ACPI / OSI: Add OEM _OSI strings to disable NVidia RTD3
  ACPICA: Update version to 20180313
  ACPICA: Cleanup/simplify module-level code support
  ACPICA: Events: add a return on failure from acpi_hw_register_read
  ACPICA: adding SPDX headers
  ACPICA: Rename a global for clarity, no functional change
  ACPICA: macros: fix ACPI_ERROR_NAMESPACE macro
  ACPICA: Change a compile-time option to a runtime option
  ACPICA: Remove calling of _STA from acpi_get_object_info()
  ACPICA: AML Debug Object: Don't ignore output of zero-length strings
  ACPICA: Fix memory leak on unusual memory leak
  ACPICA: Events: Dispatch GPEs after enabling for the first time
  ACPICA: Events: Add parallel GPE handling support to fix potential redundant _Exx evaluations
  ACPICA: Events: Stop unconditionally clearing ACPI IRQs during suspend/resume
  ACPICA: acpi: acpica: fix acpi operand cache leak in nseval.c
  ...
parents 642e7fd2 49076b2c
......@@ -56,3 +56,40 @@ Description:
Writing 1 to this attribute will trigger hot removal of
this device object. This file exists for every device
object that has _EJ0 method.
What: /sys/bus/acpi/devices/.../status
Date: Jan, 2014
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
(RO) Returns the ACPI device status: enabled, disabled or
functioning or present, if the method _STA is present.
The return value is a decimal integer representing the device's
status bitmap:
Bit [0] – Set if the device is present.
Bit [1] – Set if the device is enabled and decoding its
resources.
Bit [2] – Set if the device should be shown in the UI.
Bit [3] – Set if the device is functioning properly (cleared if
device failed its diagnostics).
Bit [4] – Set if the battery is present.
Bits [31:5] – Reserved (must be cleared)
If bit [0] is clear, then bit 1 must also be clear (a device
that is not present cannot be enabled).
Bit 0 can be clear (not present) with bit [3] set (device is
functional). This case is used to indicate a valid device for
which no device driver should be loaded.
More special cases are covered in the ACPI specification.
What: /sys/bus/acpi/devices/.../hrv
Date: Apr, 2016
Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description:
(RO) Allows users to read the hardware version of non-PCI
hardware, if the _HRV control method is present. It is mostly
useful for non-PCI devices because lspci can list the hardware
version for PCI devices.
ACPI Time and Alarm (TAD) device attributes.
What: /sys/bus/platform/devices/ACPI000E:00/caps
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RO) Hexadecimal bitmask of the TAD attributes are reported by
the platform firmware (see ACPI 6.2, section 9.18.2):
BIT(0): AC wakeup implemented if set
BIT(1): DC wakeup implemented if set
BIT(2): Get/set real time features implemented if set
BIT(3): Real time accuracy in milliseconds if set
BIT(4): Correct status reported for wakeups from S4/S5 if set
BIT(5): The AC timer wakes up from S4 if set
BIT(6): The AC timer wakes up from S5 if set
BIT(7): The DC timer wakes up from S4 if set
BIT(8): The DC timer wakes up from S5 if set
The other bits are reserved.
What: /sys/bus/platform/devices/ACPI000E:00/ac_alarm
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RW) The AC alarm timer value.
Reads return the current AC alarm timer value in seconds or
"disabled", if the AC alarm is not set to wake up the system.
Write a new AC alarm timer value in seconds or "disabled" to it
to set the AC alarm timer or to disable it, respectively.
If the AC alarm timer is set through this attribute and it
expires, it will immediately wake up the system from the S3
sleep state (and from S4/S5 too if supported) until its status
is explicitly cleared via the ac_status attribute.
What: /sys/bus/platform/devices/ACPI000E:00/ac_policy
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RW) The AC alarm expired timer wake policy (see ACPI 6.2,
Section 9.18 for details).
Reads return the current expired timer wake delay for the AC
alarm timer or "never", if the policy is to discard AC timer
wakeups if the system is on DC power.
Write a new expired timer wake delay for the AC alarm timer in
seconds or "never" to it to set the expired timer wake delay for
the AC alarm timer or to set its expired wake policy to discard
wakeups if the system is on DC power, respectively.
What: /sys/bus/platform/devices/ACPI000E:00/ac_status
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RW) The AC alarm status.
Reads return a hexadecimal bitmask representing the AC alarm
timer status with the following meaning of bits (see ACPI 6.2,
Section 9.18.5):
Bit(0): The timer has expired if set.
Bit(1): The timer has woken up the system from a sleep state
(S3 or S4/S5 if supported) if set.
The other bits are reserved.
Reads also cause the AC alarm timer status to be reset.
Another way to reset the the status of the AC alarm timer is to
write (the number) 0 to this file.
If the status return value indicates that the timer has expired,
it will immediately wake up the system from the S3 sleep state
(and from S4/S5 too if supported) until its status is explicitly
cleared through this attribute.
What: /sys/bus/platform/devices/ACPI000E:00/dc_alarm
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RW,optional) The DC alarm timer value.
This attribute is only present if the TAD supports a separate
DC timer.
It is analogous to the ac_alarm attribute.
What: /sys/bus/platform/devices/ACPI000E:00/dc_policy
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RW,optional) The DC alarm expired timer wake policy.
This attribute is only present if the TAD supports a separate
DC timer.
It is analogous to the ac_policy attribute.
What: /sys/bus/platform/devices/ACPI000E:00/dc_status
Date: March 2018
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Description:
(RW,optional) The DC alarm status.
This attribute is only present if the TAD supports a separate
DC timer.
It is analogous to the ac_status attribute.
......@@ -105,14 +105,14 @@ config ACPI_PROCFS_POWER
deprecated power /proc/acpi/ directories to exist, even when
they have been replaced by functions in /sys.
The deprecated directories (and their replacements) include:
/proc/acpi/battery/* (/sys/class/power_supply/*)
/proc/acpi/ac_adapter/* (sys/class/power_supply/*)
/proc/acpi/battery/* (/sys/class/power_supply/*) and
/proc/acpi/ac_adapter/* (sys/class/power_supply/*).
This option has no effect on /proc/acpi/ directories
and functions, which do not yet exist in /sys
and functions which do not yet exist in /sys.
This option, together with the proc directories, will be
deleted in the future.
Say N to delete power /proc/acpi/ directories that have moved to /sys/
Say N to delete power /proc/acpi/ directories that have moved to /sys.
config ACPI_REV_OVERRIDE_POSSIBLE
bool "Allow supported ACPI revision to be overridden"
......@@ -217,6 +217,19 @@ config ACPI_FAN
To compile this driver as a module, choose M here:
the module will be called fan.
config ACPI_TAD
tristate "ACPI Time and Alarm (TAD) Device Support"
depends on SYSFS && PM_SLEEP
help
The ACPI Time and Alarm (TAD) device is an alternative to the Real
Time Clock (RTC). Its wake timers allow the system to transition from
the S3 (or optionally S4/S5) state to S0 state after a time period
elapses. In comparison with the RTC Alarm, the TAD provides a larger
scale of flexibility in the wake timers. The time capabilities of the
TAD maintain the time of day information across platform power
transitions, and keep track of time even when the platform is turned
off.
config ACPI_DOCK
bool "Dock"
help
......
......@@ -70,6 +70,7 @@ obj-$(CONFIG_ACPI_AC) += ac.o
obj-$(CONFIG_ACPI_BUTTON) += button.o
obj-$(CONFIG_ACPI_FAN) += fan.o
obj-$(CONFIG_ACPI_VIDEO) += video.o
obj-$(CONFIG_ACPI_TAD) += acpi_tad.o
obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
obj-$(CONFIG_ACPI) += container.o
......
......@@ -33,7 +33,7 @@
#include <linux/platform_device.h>
#include <linux/power_supply.h>
#include <linux/acpi.h>
#include "battery.h"
#include <acpi/battery.h>
#define PREFIX "ACPI: "
......
......@@ -110,6 +110,7 @@ static void round_robin_cpu(unsigned int tsk_index)
cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus);
if (cpumask_empty(tmp)) {
mutex_unlock(&round_robin_lock);
free_cpumask_var(tmp);
return;
}
for_each_cpu(cpu, tmp) {
......@@ -127,6 +128,8 @@ static void round_robin_cpu(unsigned int tsk_index)
mutex_unlock(&round_robin_lock);
set_cpus_allowed_ptr(current, cpumask_of(preferred_cpu));
free_cpumask_var(tmp);
}
static void exit_round_robin(unsigned int tsk_index)
......
// SPDX-License-Identifier: GPL-2.0
/*
* ACPI Time and Alarm (TAD) Device Driver
*
* Copyright (C) 2018 Intel Corporation
* Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
*
* This driver is based on Section 9.18 of the ACPI 6.2 specification revision.
*
* It only supports the system wakeup capabilities of the TAD.
*
* Provided are sysfs attributes, available under the TAD platform device,
* allowing user space to manage the AC and DC wakeup timers of the TAD:
* set and read their values, set and check their expire timer wake policies,
* check and clear their status and check the capabilities of the TAD reported
* by AML. The DC timer attributes are only present if the TAD supports a
* separate DC alarm timer.
*
* The wakeup events handling and power management of the TAD is expected to
* be taken care of by the ACPI PM domain attached to its platform device.
*/
#include <linux/acpi.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/suspend.h>
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Rafael J. Wysocki");
/* ACPI TAD capability flags (ACPI 6.2, Section 9.18.2) */
#define ACPI_TAD_AC_WAKE BIT(0)
#define ACPI_TAD_DC_WAKE BIT(1)
#define ACPI_TAD_RT BIT(2)
#define ACPI_TAD_RT_IN_MS BIT(3)
#define ACPI_TAD_S4_S5__GWS BIT(4)
#define ACPI_TAD_AC_S4_WAKE BIT(5)
#define ACPI_TAD_AC_S5_WAKE BIT(6)
#define ACPI_TAD_DC_S4_WAKE BIT(7)
#define ACPI_TAD_DC_S5_WAKE BIT(8)
/* ACPI TAD alarm timer selection */
#define ACPI_TAD_AC_TIMER (u32)0
#define ACPI_TAD_DC_TIMER (u32)1
/* Special value for disabled timer or expired timer wake policy. */
#define ACPI_TAD_WAKE_DISABLED (~(u32)0)
struct acpi_tad_driver_data {
u32 capabilities;
};
static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
u32 value)
{
acpi_handle handle = ACPI_HANDLE(dev);
union acpi_object args[] = {
{ .type = ACPI_TYPE_INTEGER, },
{ .type = ACPI_TYPE_INTEGER, },
};
struct acpi_object_list arg_list = {
.pointer = args,
.count = ARRAY_SIZE(args),
};
unsigned long long retval;
acpi_status status;
args[0].integer.value = timer_id;
args[1].integer.value = value;
pm_runtime_get_sync(dev);
status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
pm_runtime_put_sync(dev);
if (ACPI_FAILURE(status) || retval)
return -EIO;
return 0;
}
static int acpi_tad_wake_write(struct device *dev, const char *buf, char *method,
u32 timer_id, const char *specval)
{
u32 value;
if (sysfs_streq(buf, specval)) {
value = ACPI_TAD_WAKE_DISABLED;
} else {
int ret = kstrtou32(buf, 0, &value);
if (ret)
return ret;
if (value == ACPI_TAD_WAKE_DISABLED)
return -EINVAL;
}
return acpi_tad_wake_set(dev, method, timer_id, value);
}
static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method,
u32 timer_id, const char *specval)
{
acpi_handle handle = ACPI_HANDLE(dev);
union acpi_object args[] = {
{ .type = ACPI_TYPE_INTEGER, },
};
struct acpi_object_list arg_list = {
.pointer = args,
.count = ARRAY_SIZE(args),
};
unsigned long long retval;
acpi_status status;
args[0].integer.value = timer_id;
pm_runtime_get_sync(dev);
status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
pm_runtime_put_sync(dev);
if (ACPI_FAILURE(status))
return -EIO;
if ((u32)retval == ACPI_TAD_WAKE_DISABLED)
return sprintf(buf, "%s\n", specval);
return sprintf(buf, "%u\n", (u32)retval);
}
static const char *alarm_specval = "disabled";
static int acpi_tad_alarm_write(struct device *dev, const char *buf,
u32 timer_id)
{
return acpi_tad_wake_write(dev, buf, "_STV", timer_id, alarm_specval);
}
static ssize_t acpi_tad_alarm_read(struct device *dev, char *buf, u32 timer_id)
{
return acpi_tad_wake_read(dev, buf, "_TIV", timer_id, alarm_specval);
}
static const char *policy_specval = "never";
static int acpi_tad_policy_write(struct device *dev, const char *buf,
u32 timer_id)
{
return acpi_tad_wake_write(dev, buf, "_STP", timer_id, policy_specval);
}
static ssize_t acpi_tad_policy_read(struct device *dev, char *buf, u32 timer_id)
{
return acpi_tad_wake_read(dev, buf, "_TIP", timer_id, policy_specval);
}
static int acpi_tad_clear_status(struct device *dev, u32 timer_id)
{
acpi_handle handle = ACPI_HANDLE(dev);
union acpi_object args[] = {
{ .type = ACPI_TYPE_INTEGER, },
};
struct acpi_object_list arg_list = {
.pointer = args,
.count = ARRAY_SIZE(args),
};
unsigned long long retval;
acpi_status status;
args[0].integer.value = timer_id;
pm_runtime_get_sync(dev);
status = acpi_evaluate_integer(handle, "_CWS", &arg_list, &retval);
pm_runtime_put_sync(dev);
if (ACPI_FAILURE(status) || retval)
return -EIO;
return 0;
}
static int acpi_tad_status_write(struct device *dev, const char *buf, u32 timer_id)
{
int ret, value;
ret = kstrtoint(buf, 0, &value);
if (ret)
return ret;
if (value)
return -EINVAL;
return acpi_tad_clear_status(dev, timer_id);
}
static ssize_t acpi_tad_status_read(struct device *dev, char *buf, u32 timer_id)
{
acpi_handle handle = ACPI_HANDLE(dev);
union acpi_object args[] = {
{ .type = ACPI_TYPE_INTEGER, },
};
struct acpi_object_list arg_list = {
.pointer = args,
.count = ARRAY_SIZE(args),
};
unsigned long long retval;
acpi_status status;
args[0].integer.value = timer_id;
pm_runtime_get_sync(dev);
status = acpi_evaluate_integer(handle, "_GWS", &arg_list, &retval);
pm_runtime_put_sync(dev);
if (ACPI_FAILURE(status))
return -EIO;
return sprintf(buf, "0x%02X\n", (u32)retval);
}
static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct acpi_tad_driver_data *dd = dev_get_drvdata(dev);
return sprintf(buf, "0x%02X\n", dd->capabilities);
}
static DEVICE_ATTR_RO(caps);
static ssize_t ac_alarm_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
int ret = acpi_tad_alarm_write(dev, buf, ACPI_TAD_AC_TIMER);
return ret ? ret : count;
}
static ssize_t ac_alarm_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return acpi_tad_alarm_read(dev, buf, ACPI_TAD_AC_TIMER);
}
static DEVICE_ATTR(ac_alarm, S_IRUSR | S_IWUSR, ac_alarm_show, ac_alarm_store);
static ssize_t ac_policy_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
int ret = acpi_tad_policy_write(dev, buf, ACPI_TAD_AC_TIMER);
return ret ? ret : count;
}
static ssize_t ac_policy_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return acpi_tad_policy_read(dev, buf, ACPI_TAD_AC_TIMER);
}
static DEVICE_ATTR(ac_policy, S_IRUSR | S_IWUSR, ac_policy_show, ac_policy_store);
static ssize_t ac_status_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
int ret = acpi_tad_status_write(dev, buf, ACPI_TAD_AC_TIMER);
return ret ? ret : count;
}
static ssize_t ac_status_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return acpi_tad_status_read(dev, buf, ACPI_TAD_AC_TIMER);
}
static DEVICE_ATTR(ac_status, S_IRUSR | S_IWUSR, ac_status_show, ac_status_store);
static struct attribute *acpi_tad_attrs[] = {
&dev_attr_caps.attr,
&dev_attr_ac_alarm.attr,
&dev_attr_ac_policy.attr,
&dev_attr_ac_status.attr,
NULL,
};
static const struct attribute_group acpi_tad_attr_group = {
.attrs = acpi_tad_attrs,
};
static ssize_t dc_alarm_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
int ret = acpi_tad_alarm_write(dev, buf, ACPI_TAD_DC_TIMER);
return ret ? ret : count;
}
static ssize_t dc_alarm_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return acpi_tad_alarm_read(dev, buf, ACPI_TAD_DC_TIMER);
}
static DEVICE_ATTR(dc_alarm, S_IRUSR | S_IWUSR, dc_alarm_show, dc_alarm_store);
static ssize_t dc_policy_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
int ret = acpi_tad_policy_write(dev, buf, ACPI_TAD_DC_TIMER);
return ret ? ret : count;
}
static ssize_t dc_policy_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return acpi_tad_policy_read(dev, buf, ACPI_TAD_DC_TIMER);
}
static DEVICE_ATTR(dc_policy, S_IRUSR | S_IWUSR, dc_policy_show, dc_policy_store);
static ssize_t dc_status_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
int ret = acpi_tad_status_write(dev, buf, ACPI_TAD_DC_TIMER);
return ret ? ret : count;
}
static ssize_t dc_status_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
return acpi_tad_status_read(dev, buf, ACPI_TAD_DC_TIMER);
}
static DEVICE_ATTR(dc_status, S_IRUSR | S_IWUSR, dc_status_show, dc_status_store);
static struct attribute *acpi_tad_dc_attrs[] = {
&dev_attr_dc_alarm.attr,
&dev_attr_dc_policy.attr,
&dev_attr_dc_status.attr,
NULL,
};
static const struct attribute_group acpi_tad_dc_attr_group = {
.attrs = acpi_tad_dc_attrs,
};
static int acpi_tad_disable_timer(struct device *dev, u32 timer_id)
{
return acpi_tad_wake_set(dev, "_STV", timer_id, ACPI_TAD_WAKE_DISABLED);
}
static int acpi_tad_remove(struct platform_device *pdev)