shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-09 12:58:26 +03:00
Code

Merge pull request #25310 from jlinton/fpdt_dev_mem_alt

Browse Source 
acpi-fpdt: Use kernel fpdt parsing
This commit is contained in:
Lennart Poettering 2022-11-16 14:55:17 +01:00 committed by GitHub
commit 1282fec93f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -115,6 +115,10 @@ Deprecations and removals:
* H2 2023: remove support for unmerged-usr
* Remove /dev/mem ACPI FPDT parsing when /sys/firmware/acpi/fpdt is ubiquitous.
That requires distros to enable CONFIG_ACPI_FPDT, and have kernels v5.12 for
x86 and v6.2 for arm.
Features:
* sd-boot: add a new PE section .bls or so that carries a cpio with additional

35
src/shared/acpi-fpdt.c
View File

@ -61,6 +61,37 @@ struct acpi_fpdt_boot {
uint64_t exit_services_exit;
} _packed;
/* /dev/mem is deprecated on many systems, try using /sys/firmware/acpi/fpdt parsing instead.
* This code requires kernel version 5.12 on x86 based machines or 6.2 for arm64 */
static int acpi_get_boot_usec_kernel_parsed(usec_t *ret_loader_start, usec_t *ret_loader_exit) {
usec_t start, end;
int r;
r = read_timestamp_file("/sys/firmware/acpi/fpdt/boot/exitbootservice_end_ns", &end);
if (r < 0)
return r;
if (end == 0)
/* Non-UEFI compatible boot. */
return -ENODATA;
r = read_timestamp_file("/sys/firmware/acpi/fpdt/boot/bootloader_launch_ns", &start);
if (r < 0)
return r;
if (start == 0 || end < start)
return -EINVAL;
if (end > NSEC_PER_HOUR)
return -EINVAL;
if (ret_loader_start)
*ret_loader_start = start / 1000;
if (ret_loader_exit)
*ret_loader_exit = end / 1000;
return 0;
}
int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit) {
_cleanup_free_ char *buf = NULL;
struct acpi_table_header *tbl;
@ -73,6 +104,10 @@ int acpi_get_boot_usec(usec_t *ret_loader_start, usec_t *ret_loader_exit) {
struct acpi_fpdt_boot_header hbrec;
struct acpi_fpdt_boot brec;
r = acpi_get_boot_usec_kernel_parsed(ret_loader_start, ret_loader_exit);
if (r != -ENOENT) /* fallback to /dev/mem hack only if kernel doesn't support the new sysfs files */
return r;
r = read_full_virtual_file("/sys/firmware/acpi/tables/FPDT", &buf, &l);
if (r < 0)
return r;