From 190011e47c6187479db69344ccf87762009af444 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Mon, 25 Mar 2013 12:48:49 +0200
Subject: AMD: Drop six copies of wrmsr_amd and rdmsr_amd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/cpu/amd/agesa/family10/model_10_init.c   | 20 --------------------
 src/cpu/amd/agesa/family12/model_12_init.c   | 20 --------------------
 src/cpu/amd/agesa/family14/model_14_init.c   | 20 --------------------
 src/cpu/amd/agesa/family15/model_15_init.c   | 20 --------------------
 src/cpu/amd/agesa/family15tn/model_15_init.c | 20 --------------------
 5 files changed, 100 deletions(-)

(limited to 'src/cpu/amd/agesa')

diff --git a/src/cpu/amd/agesa/family10/model_10_init.c b/src/cpu/amd/agesa/family10/model_10_init.c
index 1f098eb904..899a3c4d32 100644
--- a/src/cpu/amd/agesa/family10/model_10_init.c
+++ b/src/cpu/amd/agesa/family10/model_10_init.c
@@ -35,26 +35,6 @@
 
 #define MCI_STATUS 0x401
 
-static 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 void wrmsr_amd(u32 index, msr_t msr)
-{
-	__asm__ __volatile__(
-			"wrmsr"
-			: /* No outputs */
-			:"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a)
-			);
-}
-
 static void model_10_init(device_t dev)
 {
 	printk(BIOS_DEBUG, "Model 10 Init - a no-op.\n");
diff --git a/src/cpu/amd/agesa/family12/model_12_init.c b/src/cpu/amd/agesa/family12/model_12_init.c
index 3450b99f14..0dae912614 100644
--- a/src/cpu/amd/agesa/family12/model_12_init.c
+++ b/src/cpu/amd/agesa/family12/model_12_init.c
@@ -36,26 +36,6 @@
 
 #define MCI_STATUS 0x401
 
-msr_t rdmsr_amd(u32 index)
-{
-  msr_t result;
-  __asm__ __volatile__(
-    "rdmsr"
-    :"=a"(result.lo), "=d"(result.hi)
-    :"c"(index), "D"(0x9c5a203a)
-  );
-  return result;
-}
-
-void wrmsr_amd(u32 index, msr_t msr)
-{
-  __asm__ __volatile__(
-    "wrmsr"
-    : /* No outputs */
-    :"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a)
-  );
-}
-
 static void model_12_init(device_t dev)
 {
   printk(BIOS_DEBUG, "Model 12 Init - a no-op.\n");
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c
index 277f974f35..7ae2b2405e 100644
--- a/src/cpu/amd/agesa/family14/model_14_init.c
+++ b/src/cpu/amd/agesa/family14/model_14_init.c
@@ -39,26 +39,6 @@
 
 #define MCI_STATUS 0x401
 
-msr_t rdmsr_amd(u32 index)
-{
-	msr_t result;
-	__asm__ __volatile__(
-		"rdmsr"
-		:"=a"(result.lo), "=d"(result.hi)
-		:"c"(index), "D"(0x9c5a203a)
-		);
-	return result;
-}
-
-void wrmsr_amd(u32 index, msr_t msr)
-{
-	__asm__ __volatile__(
-		"wrmsr"
-		: /* No outputs */
-		:"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a)
-		);
-}
-
 static void model_14_init(device_t dev)
 {
 	u32 i;
diff --git a/src/cpu/amd/agesa/family15/model_15_init.c b/src/cpu/amd/agesa/family15/model_15_init.c
index ba1d9a4e1f..ea7e663d03 100644
--- a/src/cpu/amd/agesa/family15/model_15_init.c
+++ b/src/cpu/amd/agesa/family15/model_15_init.c
@@ -32,26 +32,6 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/amdfam15.h>
 
-msr_t rdmsr_amd(u32 index)
-{
-	msr_t result;
-	__asm__ __volatile__(
-			"rdmsr"
-			:"=a"(result.lo), "=d"(result.hi)
-			:"c"(index), "D"(0x9c5a203a)
-			);
-	return result;
-}
-
-void wrmsr_amd(u32 index, msr_t msr)
-{
-	__asm__ __volatile__(
-			"wrmsr"
-			: /* No outputs */
-			:"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a)
-			);
-}
-
 static void model_15_init(device_t dev)
 {
 	printk(BIOS_DEBUG, "Model 15 Init.\n");
diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c
index 938e9c96cd..aebc27bd41 100644
--- a/src/cpu/amd/agesa/family15tn/model_15_init.c
+++ b/src/cpu/amd/agesa/family15tn/model_15_init.c
@@ -37,26 +37,6 @@
 #include <cpu/amd/agesa/s3_resume.h>
 #endif
 
-msr_t rdmsr_amd(u32 index)
-{
-	msr_t result;
-	__asm__ __volatile__(
-		"rdmsr"
-		:"=a"(result.lo), "=d"(result.hi)
-		:"c"(index), "D"(0x9c5a203a)
-		);
-	return result;
-}
-
-void wrmsr_amd(u32 index, msr_t msr)
-{
-	__asm__ __volatile__(
-		"wrmsr"
-		: /* No outputs */
-		:"c"(index), "a"(msr.lo), "d"(msr.hi), "D"(0x9c5a203a)
-		);
-}
-
 static void model_15_init(device_t dev)
 {
 	printk(BIOS_DEBUG, "Model 15 Init.\n");
-- 
cgit v1.2.3