[coreboot-gerrit] Change in coreboot[master]: libpayload: Cache physical CMOS option table location

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43576 )

Change subject: libpayload: Cache physical CMOS option table location
......................................................................

libpayload: Cache physical CMOS option table location

In the presence of self-relocating payloads, it's safer to keep
physical addresses in `libsysinfo`.

Change-Id: I64a37bef263022edb504086c02a3fd22ce068ba4
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43576
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Julius Werner 
---
M payloads/libpayload/drivers/options.c
M payloads/libpayload/include/sysinfo.h
M payloads/libpayload/libc/coreboot.c
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c
index 3a14d77..9e437f9 100644
--- a/payloads/libpayload/drivers/options.c
+++ b/payloads/libpayload/drivers/options.c
@@ -53,7 +53,7 @@

struct cb_cmos_option_table *get_system_option_table(void)
 {
-	return lib_sysinfo.option_table;
+	return phys_to_virt(lib_sysinfo.cmos_option_table);
 }

int options_checksum_valid(const struct nvram_accessor *nvram)
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index 3b1b9c9..c3d8c7f 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -63,7 +63,7 @@
    	unsigned int type;
    } memrange[SYSINFO_MAX_MEM_RANGES];

-	struct cb_cmos_option_table *option_table;
+	uintptr_t cmos_option_table;
    u32 cmos_range_start;
    u32 cmos_range_end;
    u32 cmos_checksum_location;
diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c
index 25812e5..cb47a83 100644
--- a/payloads/libpayload/libc/coreboot.c
+++ b/payloads/libpayload/libc/coreboot.c
@@ -170,8 +170,8 @@
 #if CONFIG(LP_NVRAM)
 static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info)
 {
-	/* ptr points to a coreboot table entry and is already virtual */
-	info->option_table = ptr;
+	/* ptr is already virtual, but we want to keep physical addresses */
+	info->cmos_option_table = virt_to_phys(ptr);
 }

static void cb_parse_checksum(void *ptr, struct sysinfo_t *info)