projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix AMD Fam15 CBMEM allocation
[coreboot.git]
/
src
/
northbridge
/
amd
/
agesa
/
family15
/
northbridge.c
diff --git
a/src/northbridge/amd/agesa/family15/northbridge.c
b/src/northbridge/amd/agesa/family15/northbridge.c
index b0fc91d7a517e2062f4561557e41a60687cdea66..d1a322ca6c507eca01b7ad7ebb970fed13cd6468 100644
(file)
--- a/
src/northbridge/amd/agesa/family15/northbridge.c
+++ b/
src/northbridge/amd/agesa/family15/northbridge.c
@@
-28,6
+28,7
@@
#include <string.h>
#include <bitops.h>
#include <cpu/cpu.h>
#include <string.h>
#include <bitops.h>
#include <cpu/cpu.h>
+#include <cbmem.h>
#include <cpu/x86/lapic.h>
#include <cpu/x86/lapic.h>
@@
-624,10
+625,7
@@
static struct hw_mem_hole_info get_hw_mem_hole_info(void)
return mem_hole;
}
#endif
return mem_hole;
}
#endif
-#if CONFIG_WRITE_HIGH_TABLES==1
-#define HIGH_TABLES_SIZE 64 // maximum size of high tables in KB
-extern uint64_t high_tables_base, high_tables_size;
-#endif
+
#if CONFIG_GFXUMA == 1
extern uint64_t uma_memory_base, uma_memory_size;
static void add_uma_resource(struct device *dev, int index)
#if CONFIG_GFXUMA == 1
extern uint64_t uma_memory_base, uma_memory_size;
static void add_uma_resource(struct device *dev, int index)
@@
-779,13
+777,13
@@
static void domain_set_resources(device_t dev)
if (high_tables_base==0) {
/* Leave some space for ACPI, PIRQ and MP tables */
#if CONFIG_GFXUMA == 1
if (high_tables_base==0) {
/* Leave some space for ACPI, PIRQ and MP tables */
#if CONFIG_GFXUMA == 1
- high_tables_base = uma_memory_base -
(HIGH_TABLES_SIZE * 1024)
;
+ high_tables_base = uma_memory_base -
HIGH_MEMORY_SIZE
;
#else
#else
- high_tables_base = (mmio_basek
- HIGH_TABLES_SIZE) * 1024
;
+ high_tables_base = (mmio_basek
* 1024) - HIGH_MEMORY_SIZE
;
#endif
#endif
- high_tables_size = HIGH_
TABLES_SIZE * 1024
;
+ high_tables_size = HIGH_
MEMORY_SIZE
;
printk(BIOS_DEBUG, " split: %dK table at =%08llx\n",
printk(BIOS_DEBUG, " split: %dK table at =%08llx\n",
-
HIGH_TABLES_SIZE
, high_tables_base);
+
(u32)(high_tables_size / 1024)
, high_tables_base);
}
#endif
}
}
#endif
}
@@
-813,11
+811,11
@@
static void domain_set_resources(device_t dev)
if (high_tables_base==0) {
/* Leave some space for ACPI, PIRQ and MP tables */
#if CONFIG_GFXUMA == 1
if (high_tables_base==0) {
/* Leave some space for ACPI, PIRQ and MP tables */
#if CONFIG_GFXUMA == 1
- high_tables_base = uma_memory_base -
(HIGH_TABLES_SIZE * 1024)
;
+ high_tables_base = uma_memory_base -
HIGH_MEMORY_SIZE
;
#else
#else
- high_tables_base = (limitk
- HIGH_TABLES_SIZE) * 1024
;
+ high_tables_base = (limitk
* 1024) - HIGH_MEMORY_SIZE
;
#endif
#endif
- high_tables_size = HIGH_
TABLES_SIZE * 1024
;
+ high_tables_size = HIGH_
MEMORY_SIZE
;
}
#endif
}
}
#endif
}