[coreboot] Patch set updated for coreboot: fbfcdea Move setup_uma_memory() to Agesa Family14 northbridge
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Wed Jul 11 09:39:43 CEST 2012
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1208
-gerrit
commit fbfcdeabf0a20dc9f47474fa07ad6193baec6bbc
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Wed Jul 11 08:02:39 2012 +0300
Move setup_uma_memory() to Agesa Family14 northbridge
Following boards had identical code:
amd/inagua
amd/persimmon
The following had only whitespace or debug level changes
compared to ones above.
amd/union_station
amd/south_station
asrock/e350m1
Change-Id: I11ee46e06e1dd510cba551166189ebcaa144464b
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/mainboard/amd/inagua/mainboard.c | 39 +-------------------
src/mainboard/amd/persimmon/mainboard.c | 39 +-------------------
src/mainboard/amd/south_station/mainboard.c | 40 +--------------------
src/mainboard/amd/union_station/mainboard.c | 41 +--------------------
src/mainboard/asrock/e350m1/mainboard.c | 41 +--------------------
src/northbridge/amd/agesa/family14/northbridge.c | 43 ++++++++++++++++++++++
6 files changed, 48 insertions(+), 195 deletions(-)
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index 41aa907..ed0e0b1 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -79,44 +79,7 @@ static void inagua_enable(device_t dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
-#if CONFIG_GFXUMA
- msr_t msr, msr2;
- uint32_t sys_mem;
-
- /* TOP_MEM: the top of DRAM below 4G */
- msr = rdmsr(TOP_MEM);
- printk
- (BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
- __func__, msr.lo, msr.hi);
-
- /* TOP_MEM2: the top of DRAM above 4G */
- msr2 = rdmsr(TOP_MEM2);
- printk
- (BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
- __func__, msr2.lo, msr2.hi);
-
- /* refer to UMA Size Consideration in Family14h BKDG. */
- sys_mem = msr.lo + 0x1000000; // Ignore 16MB allocated for C6 when finding UMA size, refer MemNGetUmaSizeON()
- if ((msr.hi & 0x0000000F) || (sys_mem >= 0x80000000)) {
- uma_memory_size = 0x18000000; /* >= 2G memory, 384M recommended UMA */
- }
- else {
- if (sys_mem >= 0x40000000) {
- uma_memory_size = 0x10000000; /* >= 1G memory, 256M recommended UMA */
- } else {
- uma_memory_size = 0x4000000; /* <1G memory, 64M recommended UMA */
- }
- }
-
- uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
- __func__, uma_memory_size, uma_memory_base);
-
- /* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x10000000; /* 256M recommended UMA */
- uma_memory_base = 0x30000000; /* 1GB system memory supported */
-#endif
+ setup_uma_memory();
/* Inagua mainboard specific setting */
set_pcie_dereset();
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index c0db1c0..32190bd 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -66,44 +66,7 @@ static void persimmon_enable(device_t dev)
acpi_slp_type = acpi_get_sleep_type();
#endif
-#if CONFIG_GFXUMA
- msr_t msr, msr2;
- uint32_t sys_mem;
-
- /* TOP_MEM: the top of DRAM below 4G */
- msr = rdmsr(TOP_MEM);
- printk
- (BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
- __func__, msr.lo, msr.hi);
-
- /* TOP_MEM2: the top of DRAM above 4G */
- msr2 = rdmsr(TOP_MEM2);
- printk
- (BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
- __func__, msr2.lo, msr2.hi);
-
- /* refer to UMA Size Consideration in Family14h BKDG. */
- sys_mem = msr.lo + 0x1000000; // Ignore 16MB allocated for C6 when finding UMA size, refer MemNGetUmaSizeON()
- if ((msr.hi & 0x0000000F) || (sys_mem >= 0x80000000)) {
- uma_memory_size = 0x18000000; /* >= 2G memory, 384M recommended UMA */
- }
- else {
- if (sys_mem >= 0x40000000) {
- uma_memory_size = 0x10000000; /* >= 1G memory, 256M recommended UMA */
- } else {
- uma_memory_size = 0x4000000; /* <1G memory, 64M recommended UMA */
- }
- }
-
- uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
- __func__, uma_memory_size, uma_memory_base);
-
- /* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x10000000; /* 256M recommended UMA */
- uma_memory_base = 0x30000000; /* 1GB system memory supported */
-#endif
+ setup_uma_memory();
}
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index bb6c522..d595394 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -80,46 +80,8 @@ static void southstation_led_init(void)
static void southstation_enable(device_t dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
+ setup_uma_memory();
-#if CONFIG_GFXUMA
- msr_t msr, msr2;
- uint32_t sys_mem;
-
- /* TOP_MEM: the top of DRAM below 4G */
- msr = rdmsr(TOP_MEM);
- printk
- (BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
- __func__, msr.lo, msr.hi);
-
- /* TOP_MEM2: the top of DRAM above 4G */
- msr2 = rdmsr(TOP_MEM2);
- printk
- (BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
- __func__, msr2.lo, msr2.hi);
-
- /* refer to UMA Size Consideration in Family14h BKDG. */
- sys_mem = msr.lo + 0x1000000; // Ignore 16MB allocated for C6 when finding UMA size, refer MemNGetUmaSizeON()
- if ((msr.hi & 0x0000000F) || (sys_mem >= 0x80000000)) {
- uma_memory_size = 0x18000000; /* >= 2G memory, 384M recommended UMA */
- }
- else {
- if (sys_mem >= 0x40000000) {
- uma_memory_size = 0x10000000; /* >= 1G memory, 256M recommended UMA */
- }
- else {
- uma_memory_size = 0x4000000; /* <1G memory, 64M recommended UMA */
- }
- }
-
- uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
- __func__, uma_memory_size, uma_memory_base);
-
- /* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x10000000; /* 256M recommended UMA */
- uma_memory_base = 0x30000000; /* 1GB system memory supported */
-#endif
southstation_led_init();
}
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index 81777d8..907ddd2 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -55,46 +55,7 @@ static void unionstation_enable(device_t dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
-#if CONFIG_GFXUMA
- msr_t msr, msr2;
- uint32_t sys_mem;
-
- /* TOP_MEM: the top of DRAM below 4G */
- msr = rdmsr(TOP_MEM);
- printk
- (BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
- __func__, msr.lo, msr.hi);
-
- /* TOP_MEM2: the top of DRAM above 4G */
- msr2 = rdmsr(TOP_MEM2);
- printk
- (BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
- __func__, msr2.lo, msr2.hi);
-
- /* refer to UMA Size Consideration in Family14h BKDG. */
- sys_mem = msr.lo + 0x1000000; // Ignore 16MB allocated for C6 when finding UMA size, refer MemNGetUmaSizeON()
- if ((msr.hi & 0x0000000F) || (sys_mem >= 0x80000000)) {
- uma_memory_size = 0x18000000; /* >= 2G memory, 384M recommended UMA */
- }
- else {
- if (sys_mem >= 0x40000000) {
- uma_memory_size = 0x10000000; /* >= 1G memory, 256M recommended UMA */
- }
- else {
- uma_memory_size = 0x4000000; /* <1G memory, 64M recommended UMA */
- }
- }
-
- uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
- __func__, uma_memory_size, uma_memory_base);
-
- /* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x10000000; /* 256M recommended UMA */
- uma_memory_base = 0x30000000; /* 1GB system memory supported */
-#endif
-
+ setup_uma_memory();
}
int add_mainboard_resources(struct lb_memory *mem)
diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index bf13746..abd4b93 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -53,46 +53,7 @@ void set_pcie_dereset(void)
static void e350m1_enable(device_t dev)
{
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
-#if CONFIG_GFXUMA
- msr_t msr, msr2;
- uint32_t sys_mem;
-
- /* TOP_MEM: the top of DRAM below 4G */
- msr = rdmsr(TOP_MEM);
- printk
- (BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
- __func__, msr.lo, msr.hi);
-
- /* TOP_MEM2: the top of DRAM above 4G */
- msr2 = rdmsr(TOP_MEM2);
- printk
- (BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
- __func__, msr2.lo, msr2.hi);
-
- /* refer to UMA Size Consideration in Family14h BKDG. */
- sys_mem = msr.lo + 0x1000000; // Ignore 16MB allocated for C6 when finding UMA size, refer MemNGetUmaSizeON()
- if ((msr.hi & 0x0000000F) || (sys_mem >= 0x80000000)) {
- uma_memory_size = 0x18000000; /* >= 2G memory, 384M recommended UMA */
- }
- else {
- if (sys_mem >= 0x40000000) {
- uma_memory_size = 0x10000000; /* >= 1G memory, 256M recommended UMA */
- }
- else {
- uma_memory_size = 0x4000000; /* <1G memory, 64M recommended UMA */
- }
- }
-
- uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
- __func__, uma_memory_size, uma_memory_base);
-
- /* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x10000000; /* 256M recommended UMA */
- uma_memory_base = 0x30000000; /* 1GB system memory supported */
-#endif
-
+ setup_uma_memory();
}
int add_mainboard_resources(struct lb_memory *mem)
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 021a1db..dbc432a 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -31,6 +31,7 @@
#include <cbmem.h>
#include <cpu/x86/lapic.h>
+#include <cpu/amd/mtrr.h>
#include "agesawrapper.h"
#include "chip.h"
@@ -516,6 +517,48 @@ static void domain_read_resources(device_t dev)
#endif
}
+void setup_uma_memory(void)
+{
+#if CONFIG_GFXUMA
+ msr_t msr, msr2;
+ uint32_t sys_mem;
+
+ /* TOP_MEM: the top of DRAM below 4G */
+ msr = rdmsr(TOP_MEM);
+ printk
+ (BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
+ __func__, msr.lo, msr.hi);
+
+ /* TOP_MEM2: the top of DRAM above 4G */
+ msr2 = rdmsr(TOP_MEM2);
+ printk
+ (BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
+ __func__, msr2.lo, msr2.hi);
+
+ /* refer to UMA Size Consideration in Family14h BKDG. */
+ sys_mem = msr.lo + 0x1000000; // Ignore 16MB allocated for C6 when finding UMA size, refer MemNGetUmaSizeON()
+ if ((msr.hi & 0x0000000F) || (sys_mem >= 0x80000000)) {
+ uma_memory_size = 0x18000000; /* >= 2G memory, 384M recommended UMA */
+ }
+ else {
+ if (sys_mem >= 0x40000000) {
+ uma_memory_size = 0x10000000; /* >= 1G memory, 256M recommended UMA */
+ } else {
+ uma_memory_size = 0x4000000; /* <1G memory, 64M recommended UMA */
+ }
+ }
+
+ uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
+ printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
+ __func__, uma_memory_size, uma_memory_base);
+
+ /* TODO: TOP_MEM2 */
+#else
+ uma_memory_size = 0x10000000; /* 256M recommended UMA */
+ uma_memory_base = 0x30000000; /* 1GB system memory supported */
+#endif
+}
+
static void domain_set_resources(device_t dev)
{
printk(BIOS_DEBUG, "\nFam14h - domain_set_resources.\n");
More information about the coreboot
mailing list