Additional ACPI updates for v5.12-rc1
- Rearrange Kconfig handling of ACPI_PLATFORM_PROFILE, add
"balanced-performance" to the list of supported platform profiles
and fix up some file references in a comment (Maximilian Luz).
- Add support for parsing the ACPI Firmware Performance Data Table
(FPDT) and exposing the data from there via sysfs (Zhang Rui).
-----BEGIN PGP SIGNATURE-----
iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmA36iESHHJqd0Byand5
c29ja2kubmV0AAoJEILEb/54YlRxWdAP/Ra83W7V/9kuSSQvYGcWIpS/LsfR0Fol
hlUZYDAwxCEKNMQ7A35phR7GUVjeGc3Y+yvUngz+OMDFMW367I9PMZauEK7a/Iic
ytTIsJ7sAWuhx6vzJZfUrEADDpJKi3Uc6Ipr7DZ624vfWAeVJQejZ0i+LvZUbSXm
SCHiNzOKMdcmjvrFU3SELVnTKN0lCO5EunMADKtIlMBs+7JUtoSLb7CWr0uaiMX0
zVgmjYyOdGGcy6BeKlBTkeBTX3FeMZujzAIl1M/e5qcoslPT+dJCwIPHRu+9cvtV
IcfweOU8rU0Zm1QBPmpa8sHcFsSUI9lcYHse6MsbUt6MZcwJgtrOP52u9GFWRz9T
4gEi3+EMwL/YsPMdi3iiZST/SaCqqjft7a8rcFdUhdylCTCMFhotXjsZo/8xnwj3
rRwBdD1rsrhk/TUyNx9CU6zvETeRyPv8CQoVAc1huaRNwDDKQ3gHgsKLlE2t9zQP
HN1flPtA9cV9amrBpqXNZ+ynZUGZ0NZtRq2Pjb0nJSUnXS8g/Nscg7FRofr8hQds
op6CrpV68wZ+oQFeW+E0UClD9/Ky1BL0zJ/nlm34yYL0hQpblBZRpFmNGe10RBwd
7yHtKTWP5ZFb1uR0GuDadJeUAS1DgSOJf8M8JOJx3KsJsZ1QcJeU6PlS8PZptSJ2
TXSvU1smeMKQ
=uIpI
-----END PGP SIGNATURE-----
Merge tag 'acpi-5.12-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"These make additional changes to the platform profile interface merged
recently and add support for the FPDT ACPI table.
Specifics:
- Rearrange Kconfig handling of ACPI_PLATFORM_PROFILE, add
"balanced-performance" to the list of supported platform profiles
and fix up some file references in a comment (Maximilian Luz).
- Add support for parsing the ACPI Firmware Performance Data Table
(FPDT) and exposing the data from there via sysfs (Zhang Rui)"
* tag 'acpi-5.12-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: platform: Add balanced-performance platform profile
ACPI: platform: Fix file references in comment
ACPI: platform: Hide ACPI_PLATFORM_PROFILE option
ACPI: tables: introduce support for FPDT table
master
Linus Torvalds
commit
268f77b525
|
|
@ -1,3 +1,46 @@
|
|||
What: /sys/firmware/acpi/fpdt/
|
||||
Date: Jan 2021
|
||||
Contact: Zhang Rui <rui.zhang@intel.com>
|
||||
Description:
|
||||
ACPI Firmware Performance Data Table (FPDT) provides
|
||||
information for firmware performance data for system boot,
|
||||
S3 suspend and S3 resume. This sysfs entry contains the
|
||||
performance data retrieved from the FPDT.
|
||||
|
||||
boot:
|
||||
firmware_start_ns: Timer value logged at the beginning
|
||||
of firmware image execution. In nanoseconds.
|
||||
bootloader_load_ns: Timer value logged just prior to
|
||||
loading the OS boot loader into memory.
|
||||
In nanoseconds.
|
||||
bootloader_launch_ns: Timer value logged just prior to
|
||||
launching the currently loaded OS boot loader
|
||||
image. In nanoseconds.
|
||||
exitbootservice_start_ns: Timer value logged at the
|
||||
point when the OS loader calls the
|
||||
ExitBootServices function for UEFI compatible
|
||||
firmware. In nanoseconds.
|
||||
exitbootservice_end_ns: Timer value logged at the point
|
||||
just prior to the OS loader gaining control
|
||||
back from the ExitBootServices function for
|
||||
UEFI compatible firmware. In nanoseconds.
|
||||
suspend:
|
||||
suspend_start_ns: Timer value recorded at the previous
|
||||
OS write to SLP_TYP upon entry to S3. In
|
||||
nanoseconds.
|
||||
suspend_end_ns: Timer value recorded at the previous
|
||||
firmware write to SLP_TYP used to trigger
|
||||
hardware entry to S3. In nanoseconds.
|
||||
resume:
|
||||
resume_count: A count of the number of S3 resume cycles
|
||||
since the last full boot sequence.
|
||||
resume_avg_ns: Average timer value of all resume cycles
|
||||
logged since the last full boot sequence,
|
||||
including the most recent resume. In nanoseconds.
|
||||
resume_prev_ns: Timer recorded at the end of the previous
|
||||
platform runtime firmware S3 resume, just prior to
|
||||
handoff to the OS waking vector. In nanoseconds.
|
||||
|
||||
What: /sys/firmware/acpi/bgrt/
|
||||
Date: January 2012
|
||||
Contact: Matthew Garrett <mjg@redhat.com>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,17 @@ Description: This file contains a space-separated list of profiles supported for
|
|||
|
||||
Drivers must use the following standard profile-names:
|
||||
|
||||
============ ============================================
|
||||
low-power Low power consumption
|
||||
cool Cooler operation
|
||||
quiet Quieter operation
|
||||
balanced Balance between low power consumption and performance
|
||||
performance High performance operation
|
||||
============ ============================================
|
||||
==================== ========================================
|
||||
low-power Low power consumption
|
||||
cool Cooler operation
|
||||
quiet Quieter operation
|
||||
balanced Balance between low power consumption
|
||||
and performance
|
||||
balanced-performance Balance between performance and low
|
||||
power consumption with a slight bias
|
||||
towards performance
|
||||
performance High performance operation
|
||||
==================== ========================================
|
||||
|
||||
Userspace may expect drivers to offer more than one of these
|
||||
standard profile names.
|
||||
|
|
|
|||
|
|
@ -87,6 +87,14 @@ config ACPI_SPCR_TABLE
|
|||
This table provides information about the configuration of the
|
||||
earlycon console.
|
||||
|
||||
config ACPI_FPDT
|
||||
bool "ACPI Firmware Performance Data Table (FPDT) support"
|
||||
depends on X86_64
|
||||
help
|
||||
Enable support for the Firmware Performance Data Table (FPDT).
|
||||
This table provides information on the timing of the system
|
||||
boot, S3 suspend and S3 resume firmware code paths.
|
||||
|
||||
config ACPI_LPIT
|
||||
bool
|
||||
depends on X86_64
|
||||
|
|
@ -327,21 +335,7 @@ config ACPI_THERMAL
|
|||
the module will be called thermal.
|
||||
|
||||
config ACPI_PLATFORM_PROFILE
|
||||
tristate "ACPI Platform Profile Driver"
|
||||
default m
|
||||
help
|
||||
This driver adds support for platform-profiles on platforms that
|
||||
support it.
|
||||
|
||||
Platform-profiles can be used to control the platform behaviour. For
|
||||
example whether to operate in a lower power mode, in a higher
|
||||
power performance mode or between the two.
|
||||
|
||||
This driver provides the sysfs interface and is used as the registration
|
||||
point for platform specific drivers.
|
||||
|
||||
Which profiles are supported is determined on a per-platform basis and
|
||||
should be obtained from the platform specific driver.
|
||||
tristate
|
||||
|
||||
config ACPI_CUSTOM_DSDT_FILE
|
||||
string "Custom DSDT Table file to include"
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ acpi-$(CONFIG_X86) += x86/utils.o
|
|||
acpi-$(CONFIG_X86) += x86/s2idle.o
|
||||
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
|
||||
acpi-y += acpi_lpat.o
|
||||
acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o
|
||||
acpi-$(CONFIG_ACPI_LPIT) += acpi_lpit.o
|
||||
acpi-$(CONFIG_ACPI_GENERIC_GSI) += irq.o
|
||||
acpi-$(CONFIG_ACPI_WATCHDOG) += acpi_watchdog.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,264 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
/*
|
||||
* FPDT support for exporting boot and suspend/resume performance data
|
||||
*
|
||||
* Copyright (C) 2021 Intel Corporation. All rights reserved.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) "ACPI FPDT: " fmt
|
||||
|
||||
#include <linux/acpi.h>
|
||||
|
||||
/*
|
||||
* FPDT contains ACPI table header and a number of fpdt_subtable_entries.
|
||||
* Each fpdt_subtable_entry points to a subtable: FBPT or S3PT.
|
||||
* Each FPDT subtable (FBPT/S3PT) is composed of a fpdt_subtable_header
|
||||
* and a number of fpdt performance records.
|
||||
* Each FPDT performance record is composed of a fpdt_record_header and
|
||||
* performance data fields, for boot or suspend or resume phase.
|
||||
*/
|
||||
enum fpdt_subtable_type {
|
||||
SUBTABLE_FBPT,
|
||||
SUBTABLE_S3PT,
|
||||
};
|
||||
|
||||
struct fpdt_subtable_entry {
|
||||
u16 type; /* refer to enum fpdt_subtable_type */
|
||||
u8 length;
|
||||
u8 revision;
|
||||
u32 reserved;
|
||||
u64 address; /* physical address of the S3PT/FBPT table */
|
||||
};
|
||||
|
||||
struct fpdt_subtable_header {
|
||||
u32 signature;
|
||||
u32 length;
|
||||
};
|
||||
|
||||
enum fpdt_record_type {
|
||||
RECORD_S3_RESUME,
|
||||
RECORD_S3_SUSPEND,
|
||||
RECORD_BOOT,
|
||||
};
|
||||
|
||||
struct fpdt_record_header {
|
||||
u16 type; /* refer to enum fpdt_record_type */
|
||||
u8 length;
|
||||
u8 revision;
|
||||
};
|
||||
|
||||
struct resume_performance_record {
|
||||
struct fpdt_record_header header;
|
||||
u32 resume_count;
|
||||
u64 resume_prev;
|
||||
u64 resume_avg;
|
||||
} __attribute__((packed));
|
||||
|
||||
struct boot_performance_record {
|
||||
struct fpdt_record_header header;
|
||||
u32 reserved;
|
||||
u64 firmware_start;
|
||||
u64 bootloader_load;
|
||||
u64 bootloader_launch;
|
||||
u64 exitbootservice_start;
|
||||
u64 exitbootservice_end;
|
||||
} __attribute__((packed));
|
||||
|
||||
struct suspend_performance_record {
|
||||
struct fpdt_record_header header;
|
||||
u64 suspend_start;
|
||||
u64 suspend_end;
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
static struct resume_performance_record *record_resume;
|
||||
static struct suspend_performance_record *record_suspend;
|
||||
static struct boot_performance_record *record_boot;
|
||||
|
||||
#define FPDT_ATTR(phase, name) \
|
||||
static ssize_t name##_show(struct kobject *kobj, \
|
||||
struct kobj_attribute *attr, char *buf) \
|
||||
{ \
|
||||
return sprintf(buf, "%llu\n", record_##phase->name); \
|
||||
} \
|
||||
static struct kobj_attribute name##_attr = \
|
||||
__ATTR(name##_ns, 0444, name##_show, NULL)
|
||||
|
||||
FPDT_ATTR(resume, resume_prev);
|
||||
FPDT_ATTR(resume, resume_avg);
|
||||
FPDT_ATTR(suspend, suspend_start);
|
||||
FPDT_ATTR(suspend, suspend_end);
|
||||
FPDT_ATTR(boot, firmware_start);
|
||||
FPDT_ATTR(boot, bootloader_load);
|
||||
FPDT_ATTR(boot, bootloader_launch);
|
||||
FPDT_ATTR(boot, exitbootservice_start);
|
||||
FPDT_ATTR(boot, exitbootservice_end);
|
||||
|
||||
static ssize_t resume_count_show(struct kobject *kobj,
|
||||
struct kobj_attribute *attr, char *buf)
|
||||
{
|
||||
return sprintf(buf, "%u\n", record_resume->resume_count);
|
||||
}
|
||||
|
||||
static struct kobj_attribute resume_count_attr =
|
||||
__ATTR_RO(resume_count);
|
||||
|
||||
static struct attribute *resume_attrs[] = {
|
||||
&resume_count_attr.attr,
|
||||
&resume_prev_attr.attr,
|
||||
&resume_avg_attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group resume_attr_group = {
|
||||
.attrs = resume_attrs,
|
||||
.name = "resume",
|
||||
};
|
||||
|
||||
static struct attribute *suspend_attrs[] = {
|
||||
&suspend_start_attr.attr,
|
||||
&suspend_end_attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group suspend_attr_group = {
|
||||
.attrs = suspend_attrs,
|
||||
.name = "suspend",
|
||||
};
|
||||
|
||||
static struct attribute *boot_attrs[] = {
|
||||
&firmware_start_attr.attr,
|
||||
&bootloader_load_attr.attr,
|
||||
&bootloader_launch_attr.attr,
|
||||
&exitbootservice_start_attr.attr,
|
||||
&exitbootservice_end_attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group boot_attr_group = {
|
||||
.attrs = boot_attrs,
|
||||
.name = "boot",
|
||||
};
|
||||
|
||||
static struct kobject *fpdt_kobj;
|
||||
|
||||
static int fpdt_process_subtable(u64 address, u32 subtable_type)
|
||||
{
|
||||
struct fpdt_subtable_header *subtable_header;
|
||||
struct fpdt_record_header *record_header;
|
||||
char *signature = (subtable_type == SUBTABLE_FBPT ? "FBPT" : "S3PT");
|
||||
u32 length, offset;
|
||||
int result;
|
||||
|
||||
subtable_header = acpi_os_map_memory(address, sizeof(*subtable_header));
|
||||
if (!subtable_header)
|
||||
return -ENOMEM;
|
||||
|
||||
if (strncmp((char *)&subtable_header->signature, signature, 4)) {
|
||||
pr_info(FW_BUG "subtable signature and type mismatch!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
length = subtable_header->length;
|
||||
acpi_os_unmap_memory(subtable_header, sizeof(*subtable_header));
|
||||
|
||||
subtable_header = acpi_os_map_memory(address, length);
|
||||
if (!subtable_header)
|
||||
return -ENOMEM;
|
||||
|
||||
offset = sizeof(*subtable_header);
|
||||
while (offset < length) {
|
||||
record_header = (void *)subtable_header + offset;
|
||||
offset += record_header->length;
|
||||
|
||||
switch (record_header->type) {
|
||||
case RECORD_S3_RESUME:
|
||||
if (subtable_type != SUBTABLE_S3PT) {
|
||||
pr_err(FW_BUG "Invalid record %d for subtable %s\n",
|
||||
record_header->type, signature);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (record_resume) {
|
||||
pr_err("Duplicate resume performance record found.\n");
|
||||
continue;
|
||||
}
|
||||
record_resume = (struct resume_performance_record *)record_header;
|
||||
result = sysfs_create_group(fpdt_kobj, &resume_attr_group);
|
||||
if (result)
|
||||
return result;
|
||||
break;
|
||||
case RECORD_S3_SUSPEND:
|
||||
if (subtable_type != SUBTABLE_S3PT) {
|
||||
pr_err(FW_BUG "Invalid %d for subtable %s\n",
|
||||
record_header->type, signature);
|
||||
continue;
|
||||
}
|
||||
if (record_suspend) {
|
||||
pr_err("Duplicate suspend performance record found.\n");
|
||||
continue;
|
||||
}
|
||||
record_suspend = (struct suspend_performance_record *)record_header;
|
||||
result = sysfs_create_group(fpdt_kobj, &suspend_attr_group);
|
||||
if (result)
|
||||
return result;
|
||||
break;
|
||||
case RECORD_BOOT:
|
||||
if (subtable_type != SUBTABLE_FBPT) {
|
||||
pr_err(FW_BUG "Invalid %d for subtable %s\n",
|
||||
record_header->type, signature);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (record_boot) {
|
||||
pr_err("Duplicate boot performance record found.\n");
|
||||
continue;
|
||||
}
|
||||
record_boot = (struct boot_performance_record *)record_header;
|
||||
result = sysfs_create_group(fpdt_kobj, &boot_attr_group);
|
||||
if (result)
|
||||
return result;
|
||||
break;
|
||||
|
||||
default:
|
||||
pr_err(FW_BUG "Invalid record %d found.\n", record_header->type);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __init acpi_init_fpdt(void)
|
||||
{
|
||||
acpi_status status;
|
||||
struct acpi_table_header *header;
|
||||
struct fpdt_subtable_entry *subtable;
|
||||
u32 offset = sizeof(*header);
|
||||
|
||||
status = acpi_get_table(ACPI_SIG_FPDT, 0, &header);
|
||||
|
||||
if (ACPI_FAILURE(status))
|
||||
return 0;
|
||||
|
||||
fpdt_kobj = kobject_create_and_add("fpdt", acpi_kobj);
|
||||
if (!fpdt_kobj)
|
||||
return -ENOMEM;
|
||||
|
||||
while (offset < header->length) {
|
||||
subtable = (void *)header + offset;
|
||||
switch (subtable->type) {
|
||||
case SUBTABLE_FBPT:
|
||||
case SUBTABLE_S3PT:
|
||||
fpdt_process_subtable(subtable->address,
|
||||
subtable->type);
|
||||
break;
|
||||
default:
|
||||
pr_info(FW_BUG "Invalid subtable type %d found.\n",
|
||||
subtable->type);
|
||||
break;
|
||||
}
|
||||
offset += sizeof(*subtable);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
fs_initcall(acpi_init_fpdt);
|
||||
|
|
@ -17,6 +17,7 @@ static const char * const profile_names[] = {
|
|||
[PLATFORM_PROFILE_COOL] = "cool",
|
||||
[PLATFORM_PROFILE_QUIET] = "quiet",
|
||||
[PLATFORM_PROFILE_BALANCED] = "balanced",
|
||||
[PLATFORM_PROFILE_BALANCED_PERFORMANCE] = "balanced-performance",
|
||||
[PLATFORM_PROFILE_PERFORMANCE] = "performance",
|
||||
};
|
||||
static_assert(ARRAY_SIZE(profile_names) == PLATFORM_PROFILE_LAST);
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ config IDEAPAD_LAPTOP
|
|||
depends on BACKLIGHT_CLASS_DEVICE
|
||||
depends on ACPI_VIDEO || ACPI_VIDEO = n
|
||||
depends on ACPI_WMI || ACPI_WMI = n
|
||||
depends on ACPI_PLATFORM_PROFILE
|
||||
select ACPI_PLATFORM_PROFILE
|
||||
select INPUT_SPARSEKMAP
|
||||
select NEW_LEDS
|
||||
select LEDS_CLASS
|
||||
|
|
@ -484,7 +484,7 @@ config THINKPAD_ACPI
|
|||
depends on RFKILL || RFKILL = n
|
||||
depends on ACPI_VIDEO || ACPI_VIDEO = n
|
||||
depends on BACKLIGHT_CLASS_DEVICE
|
||||
depends on ACPI_PLATFORM_PROFILE
|
||||
select ACPI_PLATFORM_PROFILE
|
||||
select HWMON
|
||||
select NVRAM
|
||||
select NEW_LEDS
|
||||
|
|
|
|||
|
|
@ -12,9 +12,8 @@
|
|||
#include <linux/bitops.h>
|
||||
|
||||
/*
|
||||
* If more options are added please update profile_names
|
||||
* array in platform-profile.c and sysfs-platform-profile.rst
|
||||
* documentation.
|
||||
* If more options are added please update profile_names array in
|
||||
* platform_profile.c and sysfs-platform_profile documentation.
|
||||
*/
|
||||
|
||||
enum platform_profile_option {
|
||||
|
|
@ -22,6 +21,7 @@ enum platform_profile_option {
|
|||
PLATFORM_PROFILE_COOL,
|
||||
PLATFORM_PROFILE_QUIET,
|
||||
PLATFORM_PROFILE_BALANCED,
|
||||
PLATFORM_PROFILE_BALANCED_PERFORMANCE,
|
||||
PLATFORM_PROFILE_PERFORMANCE,
|
||||
PLATFORM_PROFILE_LAST, /*must always be last */
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue