Kyösti Mälkki (kyosti.mal...@gmail.com) just uploaded a new patch set to
gerrit, which you can find at http://review.coreboot.org/1246
-gerrit
commit bec2547d461f8e108dc873bfccba56660f630226
Author: Kyösti Mälkki <kyosti.mal...@gmail.com>
Date: Fri Jul 20 08:24:49 2012 +0300
AMD K8 and AMDFAM10, GFXUMA: drop use of uma_memory_base
The code in rs690 or rs780 is always used with K8 or AMDFAM10
northbridge. Without GFXUMA, both of these set the same static value
indirectly using the variable uma_memory_base.
Make the register setting with immediate value, to remove the obscure
use of variable uma_memory_base.
Change-Id: I5354684457a76e73013b4e34a4538a6d122eee8d
Signed-off-by: Kyösti Mälkki <kyosti.mal...@gmail.com>
---
src/northbridge/amd/amdfam10/northbridge.c | 3 ---
src/northbridge/amd/amdk8/northbridge.c | 3 ---
src/southbridge/amd/rs690/cmn.c | 6 ++++++
src/southbridge/amd/rs780/cmn.c | 6 ++++++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/northbridge/amd/amdfam10/northbridge.c
b/src/northbridge/amd/amdfam10/northbridge.c
index c53da22..68e79ad 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -885,9 +885,6 @@ void setup_uma_memory(void)
__func__, uma_memory_size, uma_memory_base);
/* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x8000000; /* 128M recommended UMA */
- uma_memory_base = 0x38000000; /* 1GB system memory supposed */
#endif
}
diff --git a/src/northbridge/amd/amdk8/northbridge.c
b/src/northbridge/amd/amdk8/northbridge.c
index c4a8acd..21f2808 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -879,9 +879,6 @@ void setup_uma_memory(void)
__func__, uma_memory_size, uma_memory_base);
/* TODO: TOP_MEM2 */
-#else
- uma_memory_size = 0x8000000; /* 128M recommended UMA */
- uma_memory_base = 0x38000000; /* 1GB system memory supposed */
#endif
}
diff --git a/src/southbridge/amd/rs690/cmn.c b/src/southbridge/amd/rs690/cmn.c
index 68c46e9..004cf78 100644
--- a/src/southbridge/amd/rs690/cmn.c
+++ b/src/southbridge/amd/rs690/cmn.c
@@ -316,7 +316,13 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
void rs690_set_tom(device_t nb_dev)
{
/* set TOM */
+#if CONFIG_GFXUMA
pci_write_config32(nb_dev, 0x90, uma_memory_base);
nbmc_write_index(nb_dev, 0x1e, uma_memory_base);
+#else
+ /* 1GB system memory supposed */
+ pci_write_config32(nb_dev, 0x90, 0x38000000);
+ nbmc_write_index(nb_dev, 0x1e, 0x38000000);
+#endif
}
diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c
index 5c72a04..30da675 100644
--- a/src/southbridge/amd/rs780/cmn.c
+++ b/src/southbridge/amd/rs780/cmn.c
@@ -357,8 +357,14 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
void rs780_set_tom(device_t nb_dev)
{
/* set TOM */
+#if CONFIG_GFXUMA
pci_write_config32(nb_dev, 0x90, uma_memory_base);
//nbmc_write_index(nb_dev, 0x1e, uma_memory_base);
+#else
+ /* 1GB system memory supposed */
+ pci_write_config32(nb_dev, 0x90, 0x38000000);
+ //nbmc_write_index(nb_dev, 0x1e, 0x38000000);
+#endif
}
// extract single bit
--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
