Finish finding the SKL module

Signed-off-by: Ross Philipson <[email protected]>

trenchboot/skboot/common/loader.c

@@ -864,13 +864,8 @@ get_loader_ctx_end(loader_ctx *lctx)
  * launch.
  */
 bool
-find_skl_module(loader_ctx *lctx, void **base, uint32_t *size)
+find_skl_module(loader_ctx *lctx)
 {
-    if ( base != NULL )
-        *base = NULL;
-    if ( size != NULL )
-        *size = 0;
-
     if ( 0 == get_module_count(lctx)) {
         printk(SKBOOT_ERR"no module info\n");
         return false;
@@ -887,13 +882,11 @@ find_skl_module(loader_ctx *lctx, void **base, uint32_t *size)
                    "checking if module %s is an SKL module...\n",
                    (const char *)&(m->string));
 
-        void *base2 = (void *)m->mod_start;
-        uint32_t size2 = m->mod_end - (unsigned long)(base2);
-        if ( is_skl_module(base2, size2) ){
-            if ( base != NULL )
-                *base = base2;
-            if ( size != NULL )
-                *size = size2;
+        void *base = (void *)m->mod_start;
+        uint32_t size = m->mod_end - (unsigned long)(base);
+        if ( is_skl_module(base, size) ){
+            g_skl_module = (sl_header_t *)base;
+            g_skl_size = size;
             printk(SKBOOT_DETA"SKL module found\n");
             return true;
         }
@@ -1003,33 +996,6 @@ void print_loader_ctx(loader_ctx *lctx)
     }
 }
 
-uint8_t
-*get_loader_rsdp(loader_ctx *lctx, uint32_t *length)
-{
-    struct mb2_tag *start;
-    struct mb2_tag_new_acpi *new_acpi;
-
-    if (LOADER_CTX_BAD(lctx))
-        return NULL;
-    if (lctx->type != MB2_ONLY)
-        return NULL;
-    if (length == NULL)
-        return NULL;
-
-    start = (struct mb2_tag *) (lctx->addr + 8);
-    new_acpi = (struct mb2_tag_new_acpi *)
-        find_mb2_tag_type(start, MB2_TAG_TYPE_ACPI_NEW);
-    if (new_acpi == NULL){
-        /* we'll try the old type--the tag structs are the same */
-        new_acpi = (struct mb2_tag_new_acpi *)
-            find_mb2_tag_type(start, MB2_TAG_TYPE_ACPI_OLD);
-        if (new_acpi == NULL)
-            return NULL;
-    }
-    *length = new_acpi->size - 8;
-    return new_acpi->rsdp;
-}
-
 bool
 get_loader_efi_ptr(loader_ctx *lctx, uint32_t *address, uint64_t *long_address)
 {

trenchboot/skboot/common/skboot.c

@@ -57,6 +57,9 @@
 __data loader_ctx g_loader_ctx = { NULL, 0 };
 __data loader_ctx *g_ldr_ctx = &g_loader_ctx;
 
+__data sl_header_t *g_skl_module = NULL;
+__data uint32_t g_skl_size = 0;
+
 static uint32_t g_default_error_action = SK_SHUTDOWN_HALT;
 static unsigned int g_cpuid_ext_feat_info;
 static bool is_powercycle_required = true;

trenchboot/skboot/common/skl.c

@@ -20,20 +20,26 @@ lz_info_t lz_info = {
 
 bool is_skl_module(const void *skl_base, uint32_t skl_size)
 {
-    sl_header_t *header = (sl_header_t*)skl_base;
+    sl_header_t *header = (sl_header_t *)skl_base;
     lz_info_t *info;
 
     if (skl_size < (16*PAGE_SIZE)) {
         printk(SKBOOT_INFO"Possible SKL module too small\n");
         return false;
     }
 
-    info = (lz_info_t*)(header + header->skl_info_offset);
+    info = (lz_info_t *)(header + header->skl_info_offset);
     if (info->version != SKL_VERSION) {
         printk(SKBOOT_INFO"Possible SKL module incorrect version\n");
         return false;
     }
 
+    if (tb_memcmp(info->uuid, lz_info.uuid, 16)) {
+        printk(SKBOOT_INFO"Possible SKL module incorrect UUID\n");
+        return false;
+    }
+
+    /* Otherwise it looks like the SKL module */
 
     return true;
 }

trenchboot/skboot/include/linux.h

@@ -93,7 +93,7 @@ typedef struct __attribute__ ((packed)) {
     uint8_t  relocatable_kernel;       /* Whether kernel is relocatable
                                           or not */
     uint8_t  min_alignment;            /* Boot Protocol: 2.10+ */
-    uint16_t xloadflags;               /* Boot Protocol: 2.12+ */  
+    uint16_t xloadflags;               /* Boot Protocol: 2.12+ */
     uint32_t cmdline_size;             /* Maximum size of the kernel
                                           command line */
     uint32_t hardware_subarch;         /* Hardware subarchitecture */
@@ -158,7 +158,7 @@ typedef struct __attribute__ ((packed)) {
         u16 lfb_depth;												/* 0x16 */
         u32 lfb_base;												/* 0x18 */
         u32 lfb_size;												/* 0x1c */
-        
+
         u16 cl_magic;												/* 0x20 */
         u16 cl_offset;												/* 0x22 */
 

trenchboot/skboot/include/loader.h

@@ -83,9 +83,8 @@ extern char *get_module_cmd(loader_ctx *lctx, module_t *mod);
 extern char *get_cmdline(loader_ctx *lctx);
 extern void determine_loader_type(void *addr, uint32_t magic);
 extern unsigned long get_loader_ctx_end(loader_ctx *lctx);
-extern bool find_skl_module(loader_ctx *lctx, void **base, uint32_t *size);
+extern bool find_skl_module(loader_ctx *lctx);
 extern void replace_e820_map(loader_ctx *lctx);
-extern uint8_t *get_loader_rsdp(loader_ctx *lctx, uint32_t *length);
 extern bool is_loader_launch_efi(loader_ctx *lctx);
 extern bool get_loader_efi_ptr(loader_ctx *lctx, uint32_t *address, 
                                uint64_t *long_address);

trenchboot/skboot/include/skl.h

@@ -63,7 +63,7 @@ typedef struct __packed {
 typedef struct __packed {
     skl_tag_hdr_t hdr;
     uint32_t zero_page;
-} skl_tag_boot_linux_t {
+} skl_tag_boot_linux_t;
 
 typedef struct __packed {
     skl_tag_hdr_t hdr;
@@ -85,6 +85,9 @@ typedef struct __packed {
     setup_indirect_t indirect;
 } skl_tag_setup_indirect_t;
 
+extern sl_header_t *g_skl_module;
+extern uint32_t g_skl_size;
+
 extern bool is_skl_module(const void *skl_base, uint32_t skl_size);
 
 #endif /* _SKL_H */