* grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map

	if E820 failed to return any regions.

diff --git a/ChangeLog b/ChangeLog
index 5edbf6728fcb48ef8d93a63ef8873ec3f0d7fe3b..2e98f3961cae9f1f8abed32173b43f0b7173d283 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map
+       if E820 failed to return any regions.
+
 2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/mmap/i386/uppermem.c (lower_hook) [COREBOOT]: Ignore low

diff --git a/grub-core/kern/i386/pc/mmap.c b/grub-core/kern/i386/pc/mmap.c
index 8009e833c1ae3e0258e238bb8e58abe90e8ec5a6..f1375f3e12d1d5004502ee514f992b572f30bbcd 100644 (file)
--- a/grub-core/kern/i386/pc/mmap.c
+++ b/grub-core/kern/i386/pc/mmap.c
@@ -141,33 +141,35 @@ grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
 grub_err_t
 grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
 {
-  grub_uint32_t cont;
+  grub_uint32_t cont = 0;
   struct grub_machine_mmap_entry *entry
     = (struct grub_machine_mmap_entry *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
+  int e820_works = 0;
 
-  grub_memset (entry, 0, sizeof (entry));
+  while (1)
+    {
+      grub_memset (entry, 0, sizeof (entry));
 
-  /* Check if grub_get_mmap_entry works.  */
-  cont = grub_get_mmap_entry (entry, 0);
+      cont = grub_get_mmap_entry (entry, cont);
 
-  if (entry->size)
-    do
-      {
-       if (hook (entry->addr, entry->len,
-                 /* GRUB mmaps have been defined to match with the E820 definition.
-                    Therefore, we can just pass type through.  */
-                 entry->type, hook_data))
-         break;
+      if (!entry->size)
+       break;
 
-       if (! cont)
-         break;
+      if (entry->len)
+       e820_works = 1;
+      if (entry->len
+         && hook (entry->addr, entry->len,
+                  /* GRUB mmaps have been defined to match with
+                     the E820 definition.
+                     Therefore, we can just pass type through.  */
+                  entry->type, hook_data))
+       break;
 
-       grub_memset (entry, 0, sizeof (entry));
+      if (! cont)
+       break;
+    }
 
-       cont = grub_get_mmap_entry (entry, cont);
-      }
-    while (entry->size);
-  else
+  if (!e820_works)
     {
       grub_uint32_t eisa_mmap = grub_get_eisa_mmap ();