[coreboot-gerrit] Change in ...coreboot[master]: mrc_alloc
Iru Cai (Code Review)
gerrit at coreboot.org
Wed Dec 12 10:58:32 CET 2018
Iru Cai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30192
Change subject: mrc_alloc
......................................................................
mrc_alloc
Change-Id: I4fd6d50f8a9c45b9204f39954bd3dfc3a2951a11
Signed-off-by: Iru Cai <mytbk920423 at gmail.com>
---
M src/northbridge/intel/haswell/mrc.asm
M src/northbridge/intel/haswell/mrc_main.c
2 files changed, 45 insertions(+), 67 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/30192/1
diff --git a/src/northbridge/intel/haswell/mrc.asm b/src/northbridge/intel/haswell/mrc.asm
index 9bb6b28..a38e385 100644
--- a/src/northbridge/intel/haswell/mrc.asm
+++ b/src/northbridge/intel/haswell/mrc.asm
@@ -4,7 +4,6 @@
global mrc_entry
global do_raminit
-global heap_check
extern mrc_printk
extern mrc_setmem
@@ -14,6 +13,7 @@
extern mrc_zeromem
extern mrc_highest_bit
extern mrc_main
+extern mrc_alloc
mrc_entry:
mov ecx, esp
@@ -2485,57 +2485,6 @@
pop ebp
ret
-heap_check:
-push ebp
-lea edx, [eax + 3]
-and edx, 0xfffffffc
-mov ebp, esp
-lea esp, [esp - 8]
-mov eax, dword [0xff7d0000]
-test eax, eax
-jne short loc_fffa2959 ; jne 0xfffa2959
-mov dword [0xff7d0004], 0xff7d0008
-jmp short loc_fffa297f ; jmp 0xfffa297f
-
-loc_fffa2959:
-mov ecx, dword [0xff7d0004]
-cmp dword [ecx + eax], 0x900ddea1
-je short loc_fffa297f ; je 0xfffa297f
-push edx
-push 0x35
-push ref_fffc9e88 ; push 0xfffc9e88
-push ref_fffcc48b ; push 0xfffcc48b
-call mrc_printk ; call 0xfffa1253
-add esp, 0x10
-
-loc_fffa297d:
-jmp short loc_fffa297d ; jmp 0xfffa297d
-
-loc_fffa297f:
-lea ecx, [edx + eax]
-cmp ecx, 0x752c
-ja short loc_fffa29a1 ; ja 0xfffa29a1
-mov edx, dword [0xff7d0004]
-mov dword [0xff7d0000], ecx
-add eax, edx
-mov dword [edx + ecx], 0x900ddea1
-jmp short loc_fffa29b8 ; jmp 0xfffa29b8
-
-loc_fffa29a1:
-push edx
-push 0x43
-push ref_fffc9e88 ; push 0xfffc9e88
-push ref_fffcc4ab ; push 0xfffcc4ab
-call mrc_printk ; call 0xfffa1253
-add esp, 0x10
-
-loc_fffa29b6:
-jmp short loc_fffa29b6 ; jmp 0xfffa29b6
-
-loc_fffa29b8:
-leave
-ret
-
fcn_fffa29ba: ; not directly referenced
push ebp
mov ebp, esp
@@ -2553,7 +2502,7 @@
jne short loc_fffa29f2 ; jne 0xfffa29f2
add eax, 4
mov dword [ebp - 0x1c], edx
-call heap_check ; call 0xfffa2937
+call mrc_alloc
test eax, eax
mov edx, dword [ebp - 0x1c]
jne short loc_fffa29f4 ; jne 0xfffa29f4
@@ -3761,14 +3710,14 @@
mov eax, ebx
call fcn_fffc7c9d ; call 0xfffc7c9d
mov eax, 0xc
-call heap_check ; call 0xfffa2937
+call mrc_alloc
test eax, eax
mov esi, eax
je short loc_fffa3d32 ; je 0xfffa3d32
mov edx, 0xc
call mrc_zeromem
mov eax, 0x28
-call heap_check ; call 0xfffa2937
+call mrc_alloc
test eax, eax
mov edi, eax
je short loc_fffa3d32 ; je 0xfffa3d32
@@ -3817,7 +3766,7 @@
call mrc_printk ; call 0xfffa1253
mov eax, 0x10f
mov esi, dword [0xff7d7538]
-call heap_check ; call 0xfffa2937
+call mrc_alloc
add esp, 0x10
test eax, eax
mov ebx, eax
@@ -53484,9 +53433,6 @@
dd fcn_fffc5b27
dd fcn_fffc5b14
-ref_fffc9e88:
-db 'GlueAllocatePool',0x00,0x00,0x00,0x00
-
ref_fffc9eec:
db 'install_ppi',0x00
@@ -56083,12 +56029,6 @@
ref_fffcc46a:
db 'Copy SPD for Channel %d Dimm %d',0x0a,0x00
-ref_fffcc48b:
-db '%s:%d pool cookie corrupted...',0x0a,0x00
-
-ref_fffcc4ab:
-db '%s:%d failed to allocate %d bytes...',0x0a,0x00
-
ref_fffcc4d1:
db '{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}',0x0a,0x00
diff --git a/src/northbridge/intel/haswell/mrc_main.c b/src/northbridge/intel/haswell/mrc_main.c
index a00abf2..7c2de35 100644
--- a/src/northbridge/intel/haswell/mrc_main.c
+++ b/src/northbridge/intel/haswell/mrc_main.c
@@ -17,8 +17,18 @@
static int *STACK_TOP = (int *)0xff800000;
static int *STACK_BTM = (int *)0xff7d7544;
+struct mrc_heap {
+ size_t sz;
+ void *start;
+ int data[0];
+};
+
+static struct mrc_heap *HEAP = (struct mrc_heap *)0xff7d0000;
+#define MAX_HEAP_SIZE ((void *)STACK_BTM - (void *)HEAP->data - 16)
+#define POOL_COOKIE 0x900ddea1
+
int __attribute((regparm(1))) do_raminit(struct pei_data *pd);
-int __attribute((regparm(1))) heap_check(int n);
+void *__attribute((regparm(1))) mrc_alloc(int n);
int mrc_main(struct pei_data *pd);
int mrc_main(struct pei_data *pd)
@@ -51,6 +61,34 @@
}
mrc_printk("Sanity checking heap.\n");
- heap_check(8);
+ mrc_alloc(8);
return rv;
}
+
+void *__attribute((regparm(1))) mrc_alloc(int n)
+{
+ size_t alloc = (n + 3) & (-4);
+ size_t sz = HEAP->sz;
+
+ if (sz == 0) {
+ HEAP->start = HEAP->data;
+ } else {
+ if (*((uint32_t *)(HEAP->start + sz)) != POOL_COOKIE) {
+ mrc_printk("%s:%d pool cookie corrupted...\n",
+ "GlueAllocatePool", 0x35);
+ while (1)
+ ;
+ }
+ }
+
+ size_t newsz = alloc + sz;
+ if (newsz <= MAX_HEAP_SIZE) {
+ HEAP->sz = newsz;
+ *((uint32_t *)(HEAP->start + newsz)) = POOL_COOKIE;
+ return HEAP->start + sz;
+ }
+ mrc_printk("%s:%d failed to allocate %d bytes...\n",
+ "GlueAllocatePool", 0x43);
+ while (1)
+ ;
+}
--
To view, visit https://review.coreboot.org/c/coreboot/+/30192
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4fd6d50f8a9c45b9204f39954bd3dfc3a2951a11
Gerrit-Change-Number: 30192
Gerrit-PatchSet: 1
Gerrit-Owner: Iru Cai <mytbk920423 at gmail.com>
Gerrit-Reviewer: Iru Cai <mytbk920423 at gmail.com>
Gerrit-Reviewer: Patrick Rudolph <siro at das-labor.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181212/3c470ffb/attachment-0001.html>
More information about the coreboot-gerrit
mailing list