From 4bd41e6bb5b96d7f71bebc03be93c7f7b433569e Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Wed, 16 Mar 2022 09:19:19 +0100 Subject: hwaccess_x86_msr: rename msr function to msr_xxx This eliminates the need to redefine the rdmsr and wrmsr symbols, resulting in more understandable code. The common prefix clarify the relation between the functions. Change-Id: Ie5ad54d198312578e0a1ee719eec67b37d2bf6a4 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/62851 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- board_enable.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'board_enable.c') diff --git a/board_enable.c b/board_enable.c index 9e4ab93c..d7408064 100644 --- a/board_enable.c +++ b/board_enable.c @@ -1310,10 +1310,10 @@ static int board_artecgroup_dbe6x(void) unsigned long boot_loc; /* Geode only has a single core */ - if (setup_cpu_msr(0)) + if (msr_setup(0)) return -1; - msr = rdmsr(DBE6x_MSR_DIVIL_BALL_OPTS); + msr = msr_read(DBE6x_MSR_DIVIL_BALL_OPTS); if ((msr.lo & (DBE6x_BOOT_OP_LATCHED)) == (DBE6x_BOOT_LOC_FWHUB << DBE6x_BOOT_OP_LATCHED_SHIFT)) @@ -1325,9 +1325,9 @@ static int board_artecgroup_dbe6x(void) msr.lo |= ((boot_loc << DBE6x_PRI_BOOT_LOC_SHIFT) | (boot_loc << DBE6x_SEC_BOOT_LOC_SHIFT)); - wrmsr(DBE6x_MSR_DIVIL_BALL_OPTS, msr); + msr_write(DBE6x_MSR_DIVIL_BALL_OPTS, msr); - cleanup_cpu_msr(); + msr_cleanup(); return 0; } -- cgit v1.2.3