Changes in boot/arch/ia64/src/main.c [7e752b2:699f3bc] in mainline

File:

• boot/arch/ia64/src/main.c (modified) (3 diffs)

boot/arch/ia64/src/main.c

@@ -30 +30 @@
 
 #include <arch/main.h>
+#include <arch/types.h>
 #include <arch/arch.h>
 #include <arch/asm.h>
 #include <arch/_components.h>
+#include <genarch/efi.h>
+#include <arch/sal.h>
+#include <arch/pal.h>
 #include <halt.h>
 #include <printf.h>
@@ -51 +55 @@
 #define DEFAULT_SYS_FREQ                100000000ULL            /* 100MHz */
 
-#define EFI_MEMMAP_FREE_MEM             0
-#define EFI_MEMMAP_IO                   1
-#define EFI_MEMMAP_IO_PORTS             2
+#define MEMMAP_FREE_MEM         0
+#define MEMMAP_IO               1
+#define MEMMAP_IO_PORTS         2
+
+extern boot_param_t *bootpar;
 
 static bootinfo_t bootinfo;
+
+static void read_efi_memmap(void)
+{
+        memmap_item_t *memmap = bootinfo.memmap;
+        size_t items = 0;
+        
+        if (!bootpar) {
+                /* Fake-up a memory map for simulators. */
+                memmap[items].base = DEFAULT_MEMORY_BASE;
+                memmap[items].size = DEFAULT_MEMORY_SIZE;
+                memmap[items].type = MEMMAP_FREE_MEM;
+                items++;
+
+                memmap[items].base = DEFAULT_LEGACY_IO_BASE;
+                memmap[items].size = DEFAULT_LEGACY_IO_SIZE;
+                memmap[items].type = MEMMAP_IO_PORTS;
+                items++;                 
+        } else {
+                char *cur, *mm_base = (char *) bootpar->efi_memmap;
+                size_t mm_size = bootpar->efi_memmap_sz;
+                size_t md_size = bootpar->efi_memdesc_sz;
+                
+                /*
+                 * Walk the EFI memory map using the V1 memory descriptor
+                 * format. The actual memory descriptor can use newer format,
+                 * but it must always be backwards compatible with the V1
+                 * format.
+                 */
+                for (cur = mm_base;
+                    (cur < mm_base + (mm_size - md_size)) &&
+                    (items < MEMMAP_ITEMS);
+                    cur += md_size) {
+                        efi_v1_memdesc_t *md = (efi_v1_memdesc_t *) cur;
+
+                        switch ((efi_memory_type_t) md->type) {
+                        case EFI_CONVENTIONAL_MEMORY:
+                                memmap[items].type = MEMMAP_FREE_MEM;
+                                break;
+                        case EFI_MEMORY_MAPPED_IO:
+                                memmap[items].type = MEMMAP_IO;
+                                break;
+                        case EFI_MEMORY_MAPPED_IO_PORT_SPACE:
+                                memmap[items].type = MEMMAP_IO_PORTS;
+                                break;
+                        default:
+                                continue;
+                        }
+                        
+                        memmap[items].base = md->phys_start;
+                        memmap[items].size = md->pages * EFI_PAGE_SIZE;
+                        items++;
+                }
+        }
+        
+        bootinfo.memmap_items = items;
+}
+
+static void read_pal_configuration(void)
+{
+        if (bootpar) {
+                bootinfo.freq_scale = pal_proc_freq_ratio();
+        } else {
+                /* Configure default values for simulators. */
+                bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
+        }
+}
+
+static void read_sal_configuration(void)
+{
+        if (bootpar && bootpar->efi_system_table) {
+                efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID;
+                sal_system_table_header_t *sal_st;
+                
+                sal_st = efi_vendor_table_find(
+                    (efi_system_table_t *) bootpar->efi_system_table, sal_guid);
+
+                sal_system_table_parse(sal_st);
+                
+                bootinfo.sys_freq = sal_base_clock_frequency();
+        } else {
+                /* Configure default values for simulators. */
+                bootinfo.sys_freq = DEFAULT_SYS_FREQ;
+        }
+}
 
 void bootstrap(void)
@@ -113 +203 @@
         
         printf(".\n");
-        
-        if (!bootinfo.hello_configured) {       /* XXX */
-                /*
-                 * Load configuration defaults for simulators.
-                 */
-                 bootinfo.memmap_items = 0;
-                 
-                 bootinfo.memmap[bootinfo.memmap_items].base =
-                     DEFAULT_MEMORY_BASE;
-                 bootinfo.memmap[bootinfo.memmap_items].size =
-                     DEFAULT_MEMORY_SIZE;
-                 bootinfo.memmap[bootinfo.memmap_items].type =
-                     EFI_MEMMAP_FREE_MEM;
-                 bootinfo.memmap_items++;
-
-                 bootinfo.memmap[bootinfo.memmap_items].base =
-                     DEFAULT_LEGACY_IO_BASE;
-                 bootinfo.memmap[bootinfo.memmap_items].size =
-                     DEFAULT_LEGACY_IO_SIZE;
-                 bootinfo.memmap[bootinfo.memmap_items].type =
-                     EFI_MEMMAP_IO_PORTS;
-                 bootinfo.memmap_items++;
-                 
-                 bootinfo.freq_scale = DEFAULT_FREQ_SCALE;
-                 bootinfo.sys_freq = DEFAULT_SYS_FREQ;
-        }
-        
+
+        read_efi_memmap();
+        read_sal_configuration();
+        read_pal_configuration();
         
         printf("Booting the kernel ...\n");