Convert to cbvideo

Use coreboot's framebuffer configuration interfcae so we can be less
intrusive to SeaBIOS code base.

Signed-off-by: Jiaxun Yang <[email protected]>

Author: FlyGoat

bins/vgabios.h

@@ -0,0 +1,62 @@
+#include <uefi.h>
+#include "csmwrap.h"
+
+static UINT16
+CbCheckSum16 (
+  IN UINT16  *Buffer,
+  IN UINTN   Length
+  )
+{
+  UINT32  Sum;
+  UINT32  TmpValue;
+  UINTN   Idx;
+  UINT8   *TmpPtr;
+
+  Sum    = 0;
+  TmpPtr = (UINT8 *)Buffer;
+  for (Idx = 0; Idx < Length; Idx++) {
+    TmpValue = TmpPtr[Idx];
+    if (Idx % 2 == 1) {
+      TmpValue <<= 8;
+    }
+
+    Sum += TmpValue;
+
+    // Wrap
+    if (Sum >= 0x10000) {
+      Sum = (Sum + (Sum >> 16)) & 0xFFFF;
+    }
+  }
+
+  return (UINT16)((~Sum) & 0xFFFF);
+}
+
+int build_coreboot_table(struct csmwrap_priv *priv)
+{
+        void *p = (void *)CB_TABLE_START;
+        void *tables;
+        uint32_t table_entries = 0;
+
+        struct cb_header *header = (struct cb_header *)p;
+        memset(header, 0, sizeof(struct cb_header));
+        header->signature = CB_HEADER_SIGNATURE;
+        header->header_bytes = sizeof(struct cb_header);
+        p += header->header_bytes;
+        tables = p;
+
+        /* cb_framebuffer */
+        struct cb_framebuffer *framebuffer = (struct cb_framebuffer *)p;
+        memcpy(framebuffer, &priv->cb_fb, sizeof(struct cb_framebuffer));
+        framebuffer->tag = CB_TAG_FRAMEBUFFER;
+        framebuffer->size = sizeof(struct cb_framebuffer);
+        p += framebuffer->size;
+        table_entries++;
+
+        /* Last header stuff */
+        header->table_entries = table_entries;
+        header->table_bytes = (uint32_t)((uintptr_t)p - (uintptr_t)tables);
+        header->table_checksum = CbCheckSum16((UINT16*)tables, header->table_bytes);
+        header->header_checksum = CbCheckSum16((UINT16*)header, header->header_bytes);
+
+        return 0;
+}

coreboot.c

@@ -6,6 +6,7 @@
 
 // Generated by: xxd -i Csm16.bin >> Csm16.h
 #include "bins/Csm16.h"
+
 // Generated by: xxd -i vgabios.bin >> vgabios.h
 #include "bins/vgabios.h"
 
@@ -141,12 +142,6 @@ int main(int argc, char_t **argv)
         return -1;
     }
 
-    priv.vga_table = find_table(CSM_VGA_TABLE_SIGNATURE, vgabios_bin, sizeof(vgabios_bin));
-    if (priv.vga_table == NULL) {
-        printf("VGA Table not found\n");
-        return -1;
-    }
-
     copy_rsdt(&priv);
 
     Status = csmwrap_video_init(&priv);
@@ -188,6 +183,7 @@ int main(int argc, char_t **argv)
     priv.low_stub->vga_oprom_table.PciBus = priv.vga_pci_bus;
     priv.low_stub->vga_oprom_table.PciDeviceFunction = priv.vga_pci_devfn;
 
+    build_coreboot_table(&priv);
 
     printf("CALL16 %x:%x\n", priv.csm_efi_table->Compatibility16CallSegment,
             priv.csm_efi_table->Compatibility16CallOffset);

csmwrap.c

@@ -3,6 +3,7 @@
 
 #include <uefi.h>
 #include "edk2/Acpi20.h"
+#include "edk2/Coreboot.h"
 #include "edk2/E820.h"
 #include "edk2/LegacyBios.h"
 #include "edk2/LegacyRegion2.h"
@@ -26,13 +27,13 @@ struct csmwrap_priv {
     EFI_PCI_IO_PROTOCOL *vga_pci_io;
     uint8_t vga_pci_bus;
     uint8_t vga_pci_devfn;
-
-    struct csm_vga_table *vga_table;
+    struct cb_framebuffer cb_fb;
 };
 
 extern int unlock_bios_region();
 extern int csmwrap_video_init(struct csmwrap_priv *priv);
 extern int csmwrap_video_fallback(struct csmwrap_priv *priv);
+extern int build_coreboot_table(struct csmwrap_priv *priv);
 extern int copy_rsdt(struct csmwrap_priv *priv);
 int build_e820_map(struct csmwrap_priv *priv);
 
@@ -62,9 +63,10 @@ struct low_stub {
 
 /* Memory map information */
 /* In low memory */
+#define CB_TABLE_START  0x00000500
 #define CONVEN_START    0x00007E00
 /* We may have some stack here */
-#define LOW_STUB_BASE  0x00020000
+#define LOW_STUB_BASE   0x00020000
 /* Thunk + PMM */
 #define CONVEN_END      0x00080000
 #define EBDA_BASE       CONVEN_END
@@ -75,5 +77,14 @@ struct low_stub {
 /* End of low 1MiB */
 #define HIPMM_SIZE      0x400000 /* Allocated on runtime, can be anywhere in 32bit */
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+
+#define ALIGN(x, a)             __ALIGN_MASK(x, (__typeof__(x))(a)-1UL)
+#define __ALIGN_MASK(x, mask)   (((x)+(mask))&~(mask))
+#define ALIGN_UP(x, a)          ALIGN((x), (a))
+#define ALIGN_DOWN(x, a)        ((x) & ~((__typeof__(x))(a)-1UL))
+#define IS_ALIGNED(x, a)        (((x) & ((__typeof__(x))(a)-1UL)) == 0)
 
 #endif