GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload/x86: Fix boot_device_read() and hook it up 

Casts from integer to pointer are usually a case for phys_to_virt().

Change-Id: I861d435ff2361cdc26a2abd46d43b9346fa67ccc
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62246
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Nico Huber 2022-02-22 02:06:51 +01:00
parent 22372f4ac9
commit 4fa9f2ae8b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
payloads/libpayload/arch/x86/Makefile.inc
View File

@ -42,6 +42,7 @@ libc-$(CONFIG_LP_GPL) += string.c
libgdb-y += gdb.c libgdb-y += gdb.c
libcbfs-$(CONFIG_LP_CBFS) += rom_media.c libcbfs-$(CONFIG_LP_CBFS) += rom_media.c
libcbfs-$(CONFIG_LP_CBFS) += boot_media.c
# Multiboot support is configurable # Multiboot support is configurable
libc-$(CONFIG_LP_MULTIBOOT) += multiboot.c libc-$(CONFIG_LP_MULTIBOOT) += multiboot.c

3
payloads/libpayload/arch/x86/boot_media.c
View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause */ /* SPDX-License-Identifier: BSD-3-Clause */
#include <arch/virtual.h>
#include <boot_device.h> #include <boot_device.h>
#include <commonlib/bsd/cb_err.h> #include <commonlib/bsd/cb_err.h>
#include <stddef.h> #include <stddef.h>
@ -11,7 +12,7 @@ __attribute__((weak)) ssize_t boot_device_read(void *buf, size_t offset, size_t
/* Memory-mapping usually only works for the top 16MB. */ /* Memory-mapping usually only works for the top 16MB. */
if (!lib_sysinfo.boot_media_size || lib_sysinfo.boot_media_size - offset > 16 * MiB) if (!lib_sysinfo.boot_media_size || lib_sysinfo.boot_media_size - offset > 16 * MiB)
return CB_ERR_ARG; return CB_ERR_ARG;
void *ptr = (void *)(uintptr_t)(0 - lib_sysinfo.boot_media_size + offset); const void *const ptr = phys_to_virt(0 - lib_sysinfo.boot_media_size + offset);
memcpy(buf, ptr, size); memcpy(buf, ptr, size);
return size; return size;
} }