diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-03-25 12:48:49 +0200 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2013-04-04 04:52:18 +0200 |
| commit | 190011e47c6187479db69344ccf87762009af444 (patch) | |
| tree | 9fa99d7b08f37a734bcd4fd10e17ff94a78a6626 /src/cpu/amd/model_fxx | |
| parent | 4d6ab4e2ae25c8148e699e3821b71991ac4d80dc (diff) | |
| download | coreboot-190011e47c6187479db69344ccf87762009af444.tar.xz | |
AMD: Drop six copies of wrmsr_amd and rdmsr_amd
Based on comments in cpu/x86/msr.h for wrmsr/rdmsr, and for symmetry,
I have added __attribute__((always_inline)) for these.
Change-Id: Ia0a34c15241f9fbc8c78763386028ddcbe6690b1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/2898
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/cpu/amd/model_fxx')
| -rw-r--r-- | src/cpu/amd/model_fxx/model_fxx_init.c | 20 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/processor_name.c | 12 |
2 files changed, 1 insertions, 31 deletions
diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 4ad28a74a6..d053894d68 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -80,26 +80,6 @@ int is_cpu_f0_in_bsp(int nodeid) #define MCI_STATUS 0x401 -static inline msr_t rdmsr_amd(u32 index) -{ - msr_t result; - __asm__ __volatile__( - "rdmsr" - :"=a"(result.lo), "=d"(result.hi) - :"c"(index), "D"(0x9c5a203a) - ); - return result; -} - -static inline void wrmsr_amd(u32 index, msr_t msr) -{ - __asm__ __volatile__( - "wrmsr" - : /* No outputs */ - :"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a) - ); -} - #define MTRR_COUNT 8 #define ZERO_CHUNK_KB 0x800UL /* 2M */ #define TOLM_KB 0x400000UL diff --git a/src/cpu/amd/model_fxx/processor_name.c b/src/cpu/amd/model_fxx/processor_name.c index 6f45b0f8cd..766cf92954 100644 --- a/src/cpu/amd/model_fxx/processor_name.c +++ b/src/cpu/amd/model_fxx/processor_name.c @@ -35,6 +35,7 @@ #include <console/console.h> #include <string.h> #include <cpu/x86/msr.h> +#include <cpu/amd/mtrr.h> #include <cpu/amd/model_fxx_rev.h> /* The maximum length of CPU names is 48 bytes, including the final NULL byte. @@ -100,17 +101,6 @@ static const char *processor_names[]={ }; #endif -/* wrmsr_amd() is from yhlu's changes to model_fxx_init.c */ - -static inline void wrmsr_amd(unsigned index, msr_t msr) -{ - __asm__ __volatile__ ( - "wrmsr" - : /* No outputs */ - : "c" (index), "a" (msr.lo), "d" (msr.hi), "D" (0x9c5a203a) - ); -} - int init_processor_name(void) { #if !CONFIG_K8_REV_F_SUPPORT |