Commit 4f810294 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

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
parents 21fc506c 2c5a06e5 55f4f6ea

Documentation/ABI/stable/sysfs-acpi-pmprofile

+11 −9
Original line number Diff line number Diff line
@@ -2,16 +2,17 @@ What: /sys/firmware/acpi/pm_profile 
Date:		03-Nov-2011

KernelVersion:	v3.2

Contact:	linux-acpi@vger.kernel.org

Description:	The ACPI pm_profile sysfs interface exports the platform

		power management (and performance) requirement expectations

		as provided by BIOS. The integer value is directly passed as

		retrieved from the FADT ACPI table.

Description:	The ACPI pm_profile sysfs interface exposes the preferred

		power management (and performance) profile of the platform

		as provided in the ACPI FADT Preferred_PM_Profile field.



Values:	        For possible values see ACPI specification:

		5.2.9 Fixed ACPI Description Table (FADT)

		Field: Preferred_PM_Profile

		The integer value is directly passed as retrieved from the FADT.



		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
@@ -22,5 +23,6 @@ Values: For possible values see ACPI specification: 
		5  SOHO Server

		6  Appliance PC

		7  Performance Server

		>7 Reserved

		8  Tablet

		>8 Reserved

		== =================

include/acpi/acpi_bus.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid,

			u64 rev, u64 func, union acpi_object *argv4);



#ifdef CONFIG_ACPI

static inline union acpi_object *

acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,

			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;

}

#endif



#define	ACPI_INIT_DSM_ARGV4(cnt, eles)			\

	{						\