vmmplatsupport, vesa: fix vesa mapping

The previous behavior would only attempt to map the vesa framebuffer and set the screen info struct if the vbe protection mode interface was successfully mapped in. This removes the dependency on the vbe protected mode interface. It is not clear that it is needed as vesa framebuffer passthrough works without it. Signed-off-by: Chris Guikema <[email protected]>
seL4 · Nov 3, 2023 · 8d71a8a · 8d71a8a
1 parent e219913
commit 8d71a8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/libsel4vmmplatsupport/CMakeLists.txt b/libsel4vmmplatsupport/CMakeLists.txt
@@ -65,4 +65,5 @@ target_link_libraries(
     sel4_autoconf
     sel4vm_Config
     usbdrivers_Config
+    sel4vmmplatsupport_Config
 )
diff --git a/libsel4vmmplatsupport/src/arch/x86/guest_boot_init.c b/libsel4vmmplatsupport/src/arch/x86/guest_boot_init.c
@@ -8,6 +8,7 @@
 
 #include <autoconf.h>
 #include <sel4vm/gen_config.h>
+#include <sel4vmmplatsupport/gen_config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -91,19 +92,20 @@ static void make_guest_screen_info(vm_t *vm, struct screen_info *info)
             }
         }
         if (error) {
-            ZF_LOGE("Failed to map vbe protected mode interface for VESA frame buffer. Disabling");
+            ZF_LOGE("Failed to map vbe protected mode interface for VESA frame buffer. Not disabling");
+        }
+
+        fbuffer_size = vmm_plat_vesa_fbuffer_size(&vbeinfo.vbeModeInfoBlock);
+        ZF_LOGI("VESA Frame buffer size: 0x%x\n", fbuffer_size);
+        vm_memory_reservation_t *reservation = vm_reserve_anon_memory(vm, fbuffer_size, 0x1000,
+                                                                      default_error_fault_callback, NULL, &base);
+        if (!reservation) {
+            ZF_LOGE("Failed to reserve base pointer for VESA frame buffer. Not Disabling\n");
         } else {
-            fbuffer_size = vmm_plat_vesa_fbuffer_size(&vbeinfo.vbeModeInfoBlock);
-            vm_memory_reservation_t *reservation = vm_reserve_anon_memory(vm, fbuffer_size, 0x1000,
-                                                                          default_error_fault_callback, NULL, &base);
-            if (!reservation) {
-                ZF_LOGE("Failed to reserve base pointer for VESA frame buffer. Disabling");
-            } else {
-                error = map_ut_alloc_reservation_with_base_paddr(vm, vbeinfo.vbeModeInfoBlock.vbe20.physBasePtr, reservation);
-                if (error) {
-                    ZF_LOGE("Failed to map base pointer for VESA frame buffer. Disabling");
-                    base = 0;
-                }
+            error = map_ut_alloc_reservation_with_base_paddr(vm, vbeinfo.vbeModeInfoBlock.vbe20.physBasePtr, reservation);
+            if (error) {
+                ZF_LOGE("Failed to map base pointer for VESA frame buffer. Disabling");
+                base = 0;
             }
         }
     }