merge mainline into backtrace

grub-core/efiemu/i386/pc/cfgtables.c

@@ -24,7 +24,7 @@
 #include <grub/acpi.h>
 
 grub_err_t
-grub_machine_efiemu_init_tables ()
+grub_machine_efiemu_init_tables (void)
 {
   grub_uint8_t *ptr;
   void *table;

grub-core/efiemu/main.c

@@ -32,6 +32,8 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 /* System table. Two version depending on mode */
 grub_efi_system_table32_t *grub_efiemu_system_table32 = 0;
 grub_efi_system_table64_t *grub_efiemu_system_table64 = 0;
@@ -147,7 +149,8 @@ grub_efiemu_register_configuration_table (grub_efi_guid_t guid,
  if (! get_table && ! data)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
 		       "you must set at least get_table or data");
-  if ((err = grub_efiemu_unregister_configuration_table (guid)))
+ err = grub_efiemu_unregister_configuration_table (guid);
+  if (err)
     return err;
 
   tbl = (struct grub_efiemu_configuration_table *) grub_malloc (sizeof (*tbl));
@@ -191,7 +194,7 @@ grub_efiemu_load_file (const char *filename)
 
   file = grub_file_open (filename);
   if (! file)
-    return 0;
+    return grub_errno;
 
   err = grub_efiemu_mm_init ();
   if (err)
@@ -266,11 +269,13 @@ grub_efiemu_prepare (void)
   if (prepared)
     return GRUB_ERR_NONE;
 
+  err = grub_efiemu_autocore ();
+  if (err)
+    return err;
+
   grub_dprintf ("efiemu", "Preparing %d-bit efiemu\n",
 		8 * grub_efiemu_sizeof_uintn_t ());
 
-  err = grub_efiemu_autocore ();
-
   /* Create NVRAM. */
   grub_efiemu_pnvram ();
 

grub-core/efiemu/mm.c

@@ -29,8 +29,8 @@
 #include <grub/normal.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
-#include <grub/machine/memory.h>
 #include <grub/efiemu/efiemu.h>
+#include <grub/memory.h>
 
 struct grub_efiemu_memrequest
 {
@@ -269,10 +269,11 @@ static grub_err_t
 grub_efiemu_mmap_init (void)
 {
   auto int NESTED_FUNC_ATTR bounds_hook (grub_uint64_t, grub_uint64_t,
-					 grub_uint32_t);
+					 grub_memory_type_t);
   int NESTED_FUNC_ATTR bounds_hook (grub_uint64_t addr __attribute__ ((unused)),
 				    grub_uint64_t size __attribute__ ((unused)),
-				    grub_uint32_t type __attribute__ ((unused)))
+				    grub_memory_type_t type
+				    __attribute__ ((unused)))
     {
       mmap_reserved_size++;
       return 0;
@@ -382,32 +383,30 @@ grub_efiemu_mm_init (void)
 static grub_err_t
 grub_efiemu_mmap_fill (void)
 {
-  auto int NESTED_FUNC_ATTR fill_hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+  auto int NESTED_FUNC_ATTR fill_hook (grub_uint64_t, grub_uint64_t,
+				       grub_memory_type_t);
   int NESTED_FUNC_ATTR fill_hook (grub_uint64_t addr,
 				  grub_uint64_t size,
-				  grub_uint32_t type)
+				  grub_memory_type_t type)
     {
       switch (type)
 	{
-	case GRUB_MACHINE_MEMORY_AVAILABLE:
+	case GRUB_MEMORY_AVAILABLE:
 	  return grub_efiemu_add_to_mmap (addr, size,
 					  GRUB_EFI_CONVENTIONAL_MEMORY);
 
-#ifdef GRUB_MACHINE_MEMORY_ACPI
-	case GRUB_MACHINE_MEMORY_ACPI:
+	case GRUB_MEMORY_ACPI:
 	  return grub_efiemu_add_to_mmap (addr, size,
 					  GRUB_EFI_ACPI_RECLAIM_MEMORY);
-#endif
 
-#ifdef GRUB_MACHINE_MEMORY_NVS
-	case GRUB_MACHINE_MEMORY_NVS:
+	case GRUB_MEMORY_NVS:
 	  return grub_efiemu_add_to_mmap (addr, size,
 					  GRUB_EFI_ACPI_MEMORY_NVS);
-#endif
 
 	default:
-	  grub_printf ("Unknown memory type %d. Marking as unusable\n", type);
-	case GRUB_MACHINE_MEMORY_RESERVED:
+	  grub_dprintf ("efiemu",
+			"Unknown memory type %d. Assuming unusable\n", type);
+	case GRUB_MEMORY_RESERVED:
 	  return grub_efiemu_add_to_mmap (addr, size,
 					  GRUB_EFI_UNUSABLE_MEMORY);
 	}
@@ -421,9 +420,7 @@ grub_efiemu_mmap_fill (void)
 }
 
 grub_err_t
-grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
-							grub_uint64_t,
-							grub_uint32_t))
+grub_efiemu_mmap_iterate (grub_memory_hook_t hook)
 {
   unsigned i;
 
@@ -432,18 +429,22 @@ grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
       {
       case GRUB_EFI_RUNTIME_SERVICES_CODE:
 	hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
-	      GRUB_EFIEMU_MEMORY_CODE);
+	      GRUB_MEMORY_CODE);
+	break;
+
+      case GRUB_EFI_UNUSABLE_MEMORY:
+	hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
+	      GRUB_MEMORY_BADRAM);
 	break;
 
       case GRUB_EFI_RESERVED_MEMORY_TYPE:
       case GRUB_EFI_RUNTIME_SERVICES_DATA:
-      case GRUB_EFI_UNUSABLE_MEMORY:
       case GRUB_EFI_MEMORY_MAPPED_IO:
       case GRUB_EFI_MEMORY_MAPPED_IO_PORT_SPACE:
       case GRUB_EFI_PAL_CODE:
       case GRUB_EFI_MAX_MEMORY_TYPE:
 	hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
-	      GRUB_EFIEMU_MEMORY_RESERVED);
+	      GRUB_MEMORY_RESERVED);
 	break;
 
       case GRUB_EFI_LOADER_CODE:
@@ -452,17 +453,17 @@ grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
       case GRUB_EFI_BOOT_SERVICES_DATA:
       case GRUB_EFI_CONVENTIONAL_MEMORY:
 	hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
-	      GRUB_EFIEMU_MEMORY_AVAILABLE);
+	      GRUB_MEMORY_AVAILABLE);
 	break;
 
       case GRUB_EFI_ACPI_RECLAIM_MEMORY:
 	hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
-	      GRUB_EFIEMU_MEMORY_ACPI);
+	      GRUB_MEMORY_ACPI);
 	break;
 
       case GRUB_EFI_ACPI_MEMORY_NVS:
 	hook (efiemu_mmap[i].physical_start, efiemu_mmap[i].num_pages * 4096,
-	      GRUB_EFIEMU_MEMORY_NVS);
+	      GRUB_MEMORY_NVS);
 	break;
       }
 

grub-core/efiemu/prepare.c

@@ -20,9 +20,9 @@
 
 #include <grub/err.h>
 #include <grub/mm.h>
-#include <grub/misc.h>
+#include <grub/types.h>
 #include <grub/efiemu/efiemu.h>
-#include <grub/lib/crc.h>
+#include <grub/crypto.h>
 
 grub_err_t
 SUFFIX (grub_efiemu_prepare) (struct grub_efiemu_prepare_hook *prepare_hooks,
@@ -123,6 +123,7 @@ SUFFIX (grub_efiemu_crc) (void)
   int handle;
   grub_off_t off;
   struct SUFFIX (grub_efiemu_runtime_services) *runtime_services;
+  grub_uint8_t crc32_context[GRUB_MD_CRC32->contextsize];
 
   /* compute CRC32 of runtime_services */
   err = grub_efiemu_resolve_symbol ("efiemu_runtime_services",
@@ -132,19 +133,25 @@ SUFFIX (grub_efiemu_crc) (void)
 
   runtime_services = (struct SUFFIX (grub_efiemu_runtime_services) *)
 	((grub_uint8_t *) grub_efiemu_mm_obtain_request (handle) + off);
-  runtime_services->hdr.crc32 = 0;
-  runtime_services->hdr.crc32 = grub_getcrc32
-    (0, runtime_services, runtime_services->hdr.header_size);
+
+  GRUB_MD_CRC32->init(crc32_context);
+  GRUB_MD_CRC32->write(crc32_context, runtime_services, runtime_services->hdr.header_size);
+  GRUB_MD_CRC32->final(crc32_context);
+
+  runtime_services->hdr.crc32 =
+      grub_be_to_cpu32(*(grub_uint32_t*)GRUB_MD_CRC32->read(crc32_context));
 
   err = grub_efiemu_resolve_symbol ("efiemu_system_table", &handle, &off);
   if (err)
     return err;
 
   /* compute CRC32 of system table */
-  SUFFIX (grub_efiemu_system_table)->hdr.crc32 = 0;
-  SUFFIX (grub_efiemu_system_table)->hdr.crc32
-    = grub_getcrc32 (0, SUFFIX (grub_efiemu_system_table),
-		     SUFFIX (grub_efiemu_system_table)->hdr.header_size);
+  GRUB_MD_CRC32->init(crc32_context);
+  GRUB_MD_CRC32->write(crc32_context, SUFFIX (grub_efiemu_system_table),
+		      SUFFIX (grub_efiemu_system_table)->hdr.header_size);
+  GRUB_MD_CRC32->final(crc32_context);
+  SUFFIX (grub_efiemu_system_table)->hdr.crc32 =
+      grub_be_to_cpu32(*(grub_uint32_t*)GRUB_MD_CRC32->read(crc32_context));
 
   grub_dprintf ("efiemu","system_table = %p, runtime_services = %p\n",
 		SUFFIX (grub_efiemu_system_table), runtime_services);