From a83a4cb90cf5201a6b9635eaa171060549b25583 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 9 Mar 2023 17:37:20 +0100 Subject: soc/amd/common/block/cpu/noncar/write_resume_eip: use raw MSR data Since mst_t is a union of the struct containing the lower and higher 32 bits and the raw 64 bit value, the address of the bootblock_resume_entry can be directly written to the raw value instead of needing to split it into the lower and higher 32 bits and assigning those separately. Signed-off-by: Felix Held Suggested-by: Arthur Heymans Change-Id: I7ebab1784ec592e18c29001b1cf3ee7790615bf8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73635 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/amd/common/block/cpu/noncar/write_resume_eip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c b/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c index 5863917920f1..ea43d7a7b982 100644 --- a/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c +++ b/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c @@ -12,8 +12,7 @@ asmlinkage void bootblock_resume_entry(void); void write_resume_eip(void) { msr_t s3_resume_entry = { - .hi = (uint64_t)(uintptr_t)bootblock_resume_entry >> 32, - .lo = (uintptr_t)bootblock_resume_entry & 0xffffffff, + .raw = (uintptr_t)bootblock_resume_entry, }; /* -- cgit v1.2.3