1 files changed, 107 insertions, 37 deletions

diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c
index 2c41eaece2c1..eb6d4be9e722 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -11,6 +11,10 @@
  */
 #define EFI_READ_CHUNK_SIZE     (1024 * 1024)
 
+/* error code which can't be mistaken for valid address */
+#define EFI_ERROR       (~0UL)
+
+
 struct file_info {
         efi_file_handle_t *handle;
         u64 size;
@@ -33,6 +37,9 @@ static void efi_printk(efi_system_table_t *sys_table_arg, char *str)
         }
 }
 
+#define pr_efi(sys_table, msg)     efi_printk(sys_table, "EFI stub: "msg)
+#define pr_efi_err(sys_table, msg) efi_printk(sys_table, "EFI stub: ERROR: "msg)
+
 
 static efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,
                                        efi_memory_desc_t **map,
@@ -80,6 +87,32 @@ fail:
         return status;
 }
 
+
+static unsigned long __init get_dram_base(efi_system_table_t *sys_table_arg)
+{
+        efi_status_t status;
+        unsigned long map_size;
+        unsigned long membase  = EFI_ERROR;
+        struct efi_memory_map map;
+        efi_memory_desc_t *md;
+
+        status = efi_get_memory_map(sys_table_arg, (efi_memory_desc_t **)&map.map,
+                                    &map_size, &map.desc_size, NULL, NULL);
+        if (status != EFI_SUCCESS)
+                return membase;
+
+        map.map_end = map.map + map_size;
+
+        for_each_efi_memory_desc(&map, md)
+                if (md->attribute & EFI_MEMORY_WB)
+                        if (membase > md->phys_addr)
+                                membase = md->phys_addr;
+
+        efi_call_early(free_pool, map.map);
+
+        return membase;
+}
+
 /*
  * Allocate at the highest possible address that is not above 'max'.
  */
@@ -267,7 +300,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
         struct file_info *files;
         unsigned long file_addr;
         u64 file_size_total;
-        efi_file_handle_t *fh;
+        efi_file_handle_t *fh = NULL;
         efi_status_t status;
         int nr_files;
         char *str;
@@ -310,7 +343,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
         status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
                                 nr_files * sizeof(*files), (void **)&files);
         if (status != EFI_SUCCESS) {
-                efi_printk(sys_table_arg, "Failed to alloc mem for file handle list\n");
+                pr_efi_err(sys_table_arg, "Failed to alloc mem for file handle list\n");
                 goto fail;
         }
 
@@ -374,13 +407,13 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
                 status = efi_high_alloc(sys_table_arg, file_size_total, 0x1000,
                                     &file_addr, max_addr);
                 if (status != EFI_SUCCESS) {
-                        efi_printk(sys_table_arg, "Failed to alloc highmem for files\n");
+                        pr_efi_err(sys_table_arg, "Failed to alloc highmem for files\n");
                         goto close_handles;
                 }
 
                 /* We've run out of free low memory. */
                 if (file_addr > max_addr) {
-                        efi_printk(sys_table_arg, "We've run out of free low memory\n");
+                        pr_efi_err(sys_table_arg, "We've run out of free low memory\n");
                         status = EFI_INVALID_PARAMETER;
                         goto free_file_total;
                 }
@@ -401,7 +434,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
                                                        &chunksize,
                                                        (void *)addr);
                                 if (status != EFI_SUCCESS) {
-                                        efi_printk(sys_table_arg, "Failed to read file\n");
+                                        pr_efi_err(sys_table_arg, "Failed to read file\n");
                                         goto free_file_total;
                                 }
                                 addr += chunksize;
@@ -486,7 +519,7 @@ static efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
                                        &new_addr);
         }
         if (status != EFI_SUCCESS) {
-                efi_printk(sys_table_arg, "ERROR: Failed to allocate usable memory for kernel.\n");
+                pr_efi_err(sys_table_arg, "Failed to allocate usable memory for kernel.\n");
                 return status;
         }
 
@@ -503,62 +536,99 @@ static efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
 }
 
 /*
+ * Get the number of UTF-8 bytes corresponding to an UTF-16 character.
+ * This overestimates for surrogates, but that is okay.
+ */
+static int efi_utf8_bytes(u16 c)
+{
+        return 1 + (c >= 0x80) + (c >= 0x800);
+}
+
+/*
+ * Convert an UTF-16 string, not necessarily null terminated, to UTF-8.
+ */
+static u8 *efi_utf16_to_utf8(u8 *dst, const u16 *src, int n)
+{
+        unsigned int c;
+
+        while (n--) {
+                c = *src++;
+                if (n && c >= 0xd800 && c <= 0xdbff &&
+                    *src >= 0xdc00 && *src <= 0xdfff) {
+                        c = 0x10000 + ((c & 0x3ff) << 10) + (*src & 0x3ff);
+                        src++;
+                        n--;
+                }
+                if (c >= 0xd800 && c <= 0xdfff)
+                        c = 0xfffd; /* Unmatched surrogate */
+                if (c < 0x80) {
+                        *dst++ = c;
+                        continue;
+                }
+                if (c < 0x800) {
+                        *dst++ = 0xc0 + (c >> 6);
+                        goto t1;
+                }
+                if (c < 0x10000) {
+                        *dst++ = 0xe0 + (c >> 12);
+                        goto t2;
+                }
+                *dst++ = 0xf0 + (c >> 18);
+                *dst++ = 0x80 + ((c >> 12) & 0x3f);
+        t2:
+                *dst++ = 0x80 + ((c >> 6) & 0x3f);
+        t1:
+                *dst++ = 0x80 + (c & 0x3f);
+        }
+
+        return dst;
+}
+
+/*
  * Convert the unicode UEFI command line to ASCII to pass to kernel.
  * Size of memory allocated return in *cmd_line_len.
  * Returns NULL on error.
  */
-static char *efi_convert_cmdline_to_ascii(efi_system_table_t *sys_table_arg,
-                                      efi_loaded_image_t *image,
-                                      int *cmd_line_len)
+static char *efi_convert_cmdline(efi_system_table_t *sys_table_arg,
+                                 efi_loaded_image_t *image,
+                                 int *cmd_line_len)
 {
-        u16 *s2;
+        const u16 *s2;
         u8 *s1 = NULL;
         unsigned long cmdline_addr = 0;
-        int load_options_size = image->load_options_size / 2; /* ASCII */
-        void *options = image->load_options;
-        int options_size = 0;
+        int load_options_chars = image->load_options_size / 2; /* UTF-16 */
+        const u16 *options = image->load_options;
+        int options_bytes = 0;  /* UTF-8 bytes */
+        int options_chars = 0;  /* UTF-16 chars */
         efi_status_t status;
-        int i;
         u16 zero = 0;
 
         if (options) {
                 s2 = options;
-                while (*s2 && *s2 != '\n' && options_size < load_options_size) {
-                        s2++;
-                        options_size++;
+                while (*s2 && *s2 != '\n'
+                       && options_chars < load_options_chars) {
+                        options_bytes += efi_utf8_bytes(*s2++);
+                        options_chars++;
                 }
         }
 
-        if (options_size == 0) {
+        if (!options_chars) {
                 /* No command line options, so return empty string*/
-                options_size = 1;
                 options = &zero;
         }
 
-        options_size++;  /* NUL termination */
-#ifdef CONFIG_ARM
-        /*
-         * For ARM, allocate at a high address to avoid reserved
-         * regions at low addresses that we don't know the specfics of
-         * at the time we are processing the command line.
-         */
-        status = efi_high_alloc(sys_table_arg, options_size, 0,
-                            &cmdline_addr, 0xfffff000);
-#else
-        status = efi_low_alloc(sys_table_arg, options_size, 0,
-                            &cmdline_addr);
-#endif
+        options_bytes++;        /* NUL termination */
+
+        status = efi_low_alloc(sys_table_arg, options_bytes, 0, &cmdline_addr);
         if (status != EFI_SUCCESS)
                 return NULL;
 
         s1 = (u8 *)cmdline_addr;
-        s2 = (u16 *)options;
-
-        for (i = 0; i < options_size - 1; i++)
-                *s1++ = *s2++;
+        s2 = (const u16 *)options;
 
+        s1 = efi_utf16_to_utf8(s1, s2, options_chars);
         *s1 = '\0';
 
-        *cmd_line_len = options_size;
+        *cmd_line_len = options_bytes;
         return (char *)cmdline_addr;
 }