ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'acpi-utils' and 'acpi-docs'

Browse Source 
Merge ACPI utilities and documentation updates for 6.4-rc1:

 - Fix acpi_evaluate_dsm_typed() redefinition error (Kiran K).

 - Update the pm_profile sysfs attribute documentation (Rafael Wysocki).

* acpi-utils:
  ACPI: utils: Fix acpi_evaluate_dsm_typed() redefinition error

* acpi-docs:
  ACPI: docs: Update the pm_profile sysfs attribute documentation
This commit is contained in:
Rafael J. Wysocki
2023-04-24 18:07:56 +02:00
parent 21fc506cf5 2c5a06e550 55f4f6ead4
commit 4f810294e0
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Documentation/ABI/stable/sysfs-acpi-pmprofile
View File

@@ -2,16 +2,17 @@ What: /sys/firmware/acpi/pm_profile
Date: 03-Nov-2011 Date: 03-Nov-2011
KernelVersion: v3.2 KernelVersion: v3.2
Contact: linux-acpi@vger.kernel.org Contact: linux-acpi@vger.kernel.org
Description: The ACPI pm_profile sysfs interface exports the platform Description: The ACPI pm_profile sysfs interface exposes the preferred
power management (and performance) requirement expectations power management (and performance) profile of the platform
as provided by BIOS. The integer value is directly passed as as provided in the ACPI FADT Preferred_PM_Profile field.
retrieved from the FADT ACPI table.
Values: For possible values see ACPI specification: The integer value is directly passed as retrieved from the FADT.
5.2.9 Fixed ACPI Description Table (FADT)
Field: Preferred_PM_Profile
Currently these values are defined by spec: Values: For the possible values refer to the Preferred_PM_Profile field
definition in Table 5.9 "FADT Format", Section 5.2.9 "Fixed ACPI
Description Table (FADT)" of the ACPI specification.
As of ACPI 6.5, the following values are defined:
== ================= == =================
0 Unspecified 0 Unspecified
@@ -22,5 +23,6 @@ Values: For possible values see ACPI specification:
5 SOHO Server 5 SOHO Server
6 Appliance PC 6 Appliance PC
7 Performance Server 7 Performance Server
>7 Reserved 8 Tablet
>8 Reserved
== ================= == =================

3
include/acpi/acpi_bus.h
View File

@@ -52,7 +52,7 @@ bool acpi_dock_match(acpi_handle handle);
bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs); bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs);
union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid, union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid,
u64 rev, u64 func, union acpi_object *argv4); u64 rev, u64 func, union acpi_object *argv4);
#ifdef CONFIG_ACPI
static inline union acpi_object * static inline union acpi_object *
acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev, acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
u64 func, union acpi_object *argv4, u64 func, union acpi_object *argv4,
@@ -68,6 +68,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
return obj; return obj;
} }
#endif
#define ACPI_INIT_DSM_ARGV4(cnt, eles) \ #define ACPI_INIT_DSM_ARGV4(cnt, eles) \
{ \ { \