|
 |
28f7f8 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
39700a |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
39700a |
Date: Fri, 28 Feb 2014 09:47:57 +0100
|
|
|
28f7f8 |
Subject: [PATCH] * grub-core/kern/i386/coreboot/mmap.c: Filter out
|
|
|
23d2ea |
0xa0000-0x100000 region.
|
|
|
39700a |
|
|
|
39700a |
---
|
|
|
39700a |
grub-core/kern/i386/coreboot/mmap.c | 38 +++++++++++++++++++++++++++++++------
|
|
|
28f7f8 |
ChangeLog | 5 +++++
|
|
|
39700a |
2 files changed, 37 insertions(+), 6 deletions(-)
|
|
|
39700a |
|
|
|
39700a |
diff --git a/grub-core/kern/i386/coreboot/mmap.c b/grub-core/kern/i386/coreboot/mmap.c
|
|
|
28f7f8 |
index 11979755144..4d29f6b7d90 100644
|
|
|
39700a |
--- a/grub-core/kern/i386/coreboot/mmap.c
|
|
|
39700a |
+++ b/grub-core/kern/i386/coreboot/mmap.c
|
|
|
39700a |
@@ -44,18 +44,44 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
|
|
|
39700a |
mem_region =
|
|
|
39700a |
(mem_region_t) ((long) table_item +
|
|
|
39700a |
sizeof (struct grub_linuxbios_table_item));
|
|
|
39700a |
- while ((long) mem_region < (long) table_item + (long) table_item->size)
|
|
|
39700a |
+ for (; (long) mem_region < (long) table_item + (long) table_item->size;
|
|
|
39700a |
+ mem_region++)
|
|
|
39700a |
{
|
|
|
39700a |
- if (ctx->hook (mem_region->addr, mem_region->size,
|
|
|
39700a |
+ grub_uint64_t start = mem_region->addr;
|
|
|
39700a |
+ grub_uint64_t end = mem_region->addr + mem_region->size;
|
|
|
39700a |
+ /* Mark region 0xa0000 - 0x100000 as reserved. */
|
|
|
39700a |
+ if (start < 0x100000 && end >= 0xa0000
|
|
|
39700a |
+ && mem_region->type == GRUB_MACHINE_MEMORY_AVAILABLE)
|
|
|
39700a |
+ {
|
|
|
39700a |
+ if (start < 0xa0000
|
|
|
39700a |
+ && ctx->hook (start, 0xa0000 - start,
|
|
|
39700a |
+ /* Multiboot mmaps match with the coreboot mmap
|
|
|
39700a |
+ definition. Therefore, we can just pass type
|
|
|
39700a |
+ through. */
|
|
|
39700a |
+ mem_region->type,
|
|
|
39700a |
+ ctx->hook_data))
|
|
|
39700a |
+ return 1;
|
|
|
39700a |
+ if (start < 0xa0000)
|
|
|
39700a |
+ start = 0xa0000;
|
|
|
39700a |
+ if (start >= end)
|
|
|
39700a |
+ continue;
|
|
|
39700a |
+
|
|
|
39700a |
+ if (ctx->hook (start, (end > 0x100000 ? 0x100000 : end) - start,
|
|
|
39700a |
+ GRUB_MEMORY_RESERVED,
|
|
|
39700a |
+ ctx->hook_data))
|
|
|
39700a |
+ return 1;
|
|
|
39700a |
+ start = 0x100000;
|
|
|
39700a |
+
|
|
|
39700a |
+ if (end <= start)
|
|
|
39700a |
+ continue;
|
|
|
39700a |
+ }
|
|
|
39700a |
+ if (ctx->hook (start, end - start,
|
|
|
39700a |
/* Multiboot mmaps match with the coreboot mmap
|
|
|
39700a |
definition. Therefore, we can just pass type
|
|
|
39700a |
through. */
|
|
|
39700a |
- (((mem_region->type <= GRUB_MACHINE_MEMORY_BADRAM) && (mem_region->type >= GRUB_MACHINE_MEMORY_AVAILABLE))
|
|
|
39700a |
- || mem_region->type == GRUB_MEMORY_COREBOOT_TABLES) ? mem_region->type : GRUB_MEMORY_RESERVED,
|
|
|
39700a |
+ mem_region->type,
|
|
|
39700a |
ctx->hook_data))
|
|
|
39700a |
return 1;
|
|
|
39700a |
-
|
|
|
39700a |
- mem_region++;
|
|
|
39700a |
}
|
|
|
39700a |
|
|
|
39700a |
return 0;
|
|
|
28f7f8 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
28f7f8 |
index be41aa51f65..4f6f6d6d35a 100644
|
|
|
28f7f8 |
--- a/ChangeLog
|
|
|
28f7f8 |
+++ b/ChangeLog
|
|
|
28f7f8 |
@@ -1,3 +1,8 @@
|
|
|
28f7f8 |
+2014-02-28 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
28f7f8 |
+
|
|
|
28f7f8 |
+ * grub-core/kern/i386/coreboot/mmap.c: Filter out 0xa0000-0x100000
|
|
|
28f7f8 |
+ region.
|
|
|
28f7f8 |
+
|
|
|
28f7f8 |
2014-02-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
28f7f8 |
|
|
|
28f7f8 |
* grub-core/disk/ahci.c: Ignore NPORTS field and rely on PI
|