SeaBIOS

seabios@seabios.org

2 participants
3799 discussions

[PATCH v2] vgasrc: round up save/restore size
by Daniel Verkamp 15 Mar '24

15 Mar '24

When calculating the size of the buffer required for the VGA/VBE state, round up rather than truncating when dividing the number of bytes to get the number of 64-byte blocks. Without this modification, the save state function will write past the end of a buffer of the size requested. Signed-off-by: Daniel Verkamp <daniel(a)drv.nu> --- V2: apply the fix to VGA function 101c as well vgasrc/vbe.c | 2 +- vgasrc/vgabios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 66afb011..1a0948cf 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -242,7 +242,7 @@ vbe_104f04(struct bregs *regs) if (ret < 0) goto fail; if (cmd == 0) - regs->bx = ret / 64; + regs->bx = DIV_ROUND_UP(ret, 64); regs->ax = 0x004f; return; fail: diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 198ee555..73ba1c3d 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -1081,7 +1081,7 @@ handle_101c(struct bregs *regs) if (ret < 0) goto fail; if (cmd == 0) - regs->bx = ret / 64; + regs->bx = DIV_ROUND_UP(ret, 64); regs->al = 0x1c; fail: return; -- 2.43.0

3 3

[PATCH] vbe: implement function 09h (get/set palette data)
by Daniel Verkamp 12 Mar '24

12 Mar '24

Since the VBE mode attributes indicate that all modes are not VGA compatible, applications must use VBE function 09h to manipulate the palette rather than directly accessing the VGA registers. This implementation uses the standard VGA registers for all hardware, which may not be appropriate; I only verified qemu -device VGA. Without this patch, the get/set palette function returns an error code, so programs that use 8-bit indexed color modes fail. For example, Quake (DOS) printed "Error: Unable to load VESA palette" and exited when trying to set a SVGA mode like 640x480, but with the patch it succeeds. This fixes qemu issue #251 and #1862. <https://gitlab.com/qemu-project/qemu/-/issues/251> <https://gitlab.com/qemu-project/qemu/-/issues/1862> Signed-off-by: Daniel Verkamp <daniel(a)drv.nu> --- src/std/vbe.h | 7 +++++++ vgasrc/stdvga.h | 3 +++ vgasrc/stdvgaio.c | 30 ++++++++++++++++++++++++++++++ vgasrc/vbe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ vgasrc/vgahw.h | 8 ++++++++ 5 files changed, 90 insertions(+) diff --git a/src/std/vbe.h b/src/std/vbe.h index fe96f5ec..fddaa4fd 100644 --- a/src/std/vbe.h +++ b/src/std/vbe.h @@ -88,6 +88,13 @@ struct vbe_crtc_info { u8 reserved[40]; } PACKED; +struct vbe_palette_entry { + u8 blue; + u8 green; + u8 red; + u8 align; +} PACKED; + /* VBE Return Status Info */ /* AL */ #define VBE_RETURN_STATUS_SUPPORTED 0x4F diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h index 4184c600..af10fd78 100644 --- a/vgasrc/stdvga.h +++ b/vgasrc/stdvga.h @@ -74,6 +74,9 @@ int stdvga_get_displaystart(struct vgamode_s *vmode_g); int stdvga_set_displaystart(struct vgamode_s *vmode_g, int val); int stdvga_get_dacformat(struct vgamode_s *vmode_g); int stdvga_set_dacformat(struct vgamode_s *vmode_g, int val); +struct vbe_palette_entry; +int stdvga_set_palette_colors(u16 seg, struct vbe_palette_entry *pal_far, u8 start, int count); +int stdvga_get_palette_colors(u16 seg, struct vbe_palette_entry *pal_far, u8 start, int count); int stdvga_save_restore(int cmd, u16 seg, void *data); void stdvga_enable_video_addressing(u8 disable); int stdvga_setup(void); diff --git a/vgasrc/stdvgaio.c b/vgasrc/stdvgaio.c index 77fcecdf..ec22c4a1 100644 --- a/vgasrc/stdvgaio.c +++ b/vgasrc/stdvgaio.c @@ -6,6 +6,7 @@ #include "farptr.h" // GET_FARVAR #include "stdvga.h" // VGAREG_PEL_MASK +#include "std/vbe.h" // vbe_palette_entry #include "vgautil.h" // stdvga_pelmask_read #include "x86.h" // inb @@ -184,3 +185,32 @@ stdvga_dac_write(u16 seg, u8 *data_far, u8 start, int count) count--; } } + +int +stdvga_set_palette_colors(u16 seg, struct vbe_palette_entry *pal_far, u8 start, int count) +{ + outb(start, VGAREG_DAC_WRITE_ADDRESS); + while (count) { + outb(GET_FARVAR(seg, pal_far->red), VGAREG_DAC_DATA); + outb(GET_FARVAR(seg, pal_far->green), VGAREG_DAC_DATA); + outb(GET_FARVAR(seg, pal_far->blue), VGAREG_DAC_DATA); + pal_far++; + count--; + } + return 0; +} + +int +stdvga_get_palette_colors(u16 seg, struct vbe_palette_entry *pal_far, u8 start, int count) +{ + outb(start, VGAREG_DAC_READ_ADDRESS); + while (count) { + SET_FARVAR(seg, pal_far->red, inb(VGAREG_DAC_DATA)); + SET_FARVAR(seg, pal_far->green, inb(VGAREG_DAC_DATA)); + SET_FARVAR(seg, pal_far->blue, inb(VGAREG_DAC_DATA)); + SET_FARVAR(seg, pal_far->align, 0); + pal_far++; + count--; + } + return 0; +} diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 91abc9ab..0ac88805 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -376,6 +376,47 @@ fail: regs->ax = 0x014f; } +static void +vbe_104f09(struct bregs *regs) +{ + struct vgamode_s *vmode_g = get_current_mode(); + if (! vmode_g) + goto fail; + u8 memmodel = GET_GLOBAL(vmode_g->memmodel); + u8 depth = GET_GLOBAL(vmode_g->depth); + if (memmodel == MM_DIRECT || memmodel == MM_YUV || depth > 8) { + regs->ax = 0x034f; + return; + } + if (regs->dh) + goto fail; + u8 start = regs->dl; + int count = regs->cx; + int max_colors = 1 << depth; + if (start + count > max_colors) + goto fail; + u16 seg = regs->es; + struct vbe_palette_entry *pal = (void*)(regs->di+0); + int ret; + switch (regs->bl) { + case 0x80: + case 0x00: + ret = vgahw_set_palette_colors(seg, pal, start, count); + break; + case 0x01: + ret = vgahw_get_palette_colors(seg, pal, start, count); + break; + default: + goto fail; + } + if (ret < 0) + goto fail; + regs->ax = 0x004f; + return; +fail: + regs->ax = 0x014f; +} + static void vbe_104f0a(struct bregs *regs) { @@ -456,6 +497,7 @@ handle_104f(struct bregs *regs) case 0x06: vbe_104f06(regs); break; case 0x07: vbe_104f07(regs); break; case 0x08: vbe_104f08(regs); break; + case 0x09: vbe_104f09(regs); break; case 0x0a: vbe_104f0a(regs); break; case 0x10: vbe_104f10(regs); break; case 0x15: vbe_104f15(regs); break; diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h index 8b64660e..684530d6 100644 --- a/vgasrc/vgahw.h +++ b/vgasrc/vgahw.h @@ -141,6 +141,14 @@ static inline int vgahw_set_dacformat(struct vgamode_s *vmode_g, int val) { return stdvga_set_dacformat(vmode_g, val); } +static inline int vgahw_set_palette_colors(u16 seg, struct vbe_palette_entry *pal_far, u8 start, int count) { + return stdvga_set_palette_colors(seg, pal_far, start, count); +} + +static inline int vgahw_get_palette_colors(u16 seg, struct vbe_palette_entry *pal_far, u8 start, int count) { + return stdvga_get_palette_colors(seg, pal_far, start, count); +} + static inline int vgahw_save_restore(int cmd, u16 seg, void *data) { if (CONFIG_VGA_CIRRUS) return clext_save_restore(cmd, seg, data); -- 2.43.0

2 3

[PATCH] vbe: round up save/restore size
by Daniel Verkamp 11 Mar '24

11 Mar '24

When calculating the size of the buffer required for the VBE state, round up rather than truncating when dividing the number of bytes to get the number of 64-byte blocks. Without this modification, the save state function will write past the end of a buffer of the size requested. Signed-off-by: Daniel Verkamp <daniel(a)drv.nu> --- vgasrc/vbe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 66afb011..1a0948cf 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -242,7 +242,7 @@ vbe_104f04(struct bregs *regs) if (ret < 0) goto fail; if (cmd == 0) - regs->bx = ret / 64; + regs->bx = DIV_ROUND_UP(ret, 64); regs->ax = 0x004f; return; fail: -- 2.43.0

3 2

[PATCH v2] vbe: Add VBE 2.0+ OemData field to struct vbe_info
by Daniel Verkamp 10 Mar '24

10 Mar '24

Per the VBE 2.0 specification, the VBE controller information is 512 bytes long when the "VBE2" signature is provided, instead of the original 256 bytes. src/bootsplash.c uses the original pre-VBE-2.0 256-byte structure while also filling in the "VBE2" signature, so a video BIOS that makes use of the VBE2 OemData area could write past the end of the allocated region. The original bootsplash code did not have this bug; it was introduced when the bootsplash VBE structures were merged with the VGA ROM struct definitions. Fixes: 69e941c159ed ("Merge bootsplash and VGA ROM vbe structure definitions") Signed-off-by: Daniel Verkamp <daniel(a)drv.nu> --- v2 fixes the inverse bug introduced by the original patch - the vgabios would memset too much data if the caller did not request VBE2 data. src/std/vbe.h | 2 ++ vgasrc/vbe.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/std/vbe.h b/src/std/vbe.h index 94b4ad86..fe96f5ec 100644 --- a/src/std/vbe.h +++ b/src/std/vbe.h @@ -18,6 +18,8 @@ struct vbe_info { struct segoff_s oem_product_string; struct segoff_s oem_revision_string; u8 reserved[222]; + /* VBE 2.0 */ + u8 oem_data[256]; } PACKED; struct vbe_mode_info { diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index 66afb011..91abc9ab 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -32,16 +32,18 @@ vbe_104f00(struct bregs *regs) { u16 seg = regs->es; struct vbe_info *info = (void*)(regs->di+0); + size_t info_size = offsetof(struct vbe_info, oem_data); if (GET_FARVAR(seg, info->signature) == VBE2_SIGNATURE) { dprintf(4, "Get VBE Controller: VBE2 Signature found\n"); + info_size = sizeof(*info); } else if (GET_FARVAR(seg, info->signature) == VESA_SIGNATURE) { dprintf(4, "Get VBE Controller: VESA Signature found\n"); } else { dprintf(4, "Get VBE Controller: Invalid Signature\n"); } - memset_far(seg, info, 0, sizeof(*info)); + memset_far(seg, info, 0, info_size); SET_FARVAR(seg, info->signature, VESA_SIGNATURE); -- 2.43.0

2 1

[PATCH] vbe: Add VBE 2.0+ OemData field to struct vbe_info
by Daniel Verkamp 06 Mar '24

06 Mar '24

1 0

[PATCH] fix smbios blob length overflow
by Igor Mammedov 03 Mar '24

03 Mar '24

When tables are more than 64K, size of copied tables will be truncated due to cast from u32 to u16, and as result only a small portion of the tables will be copied in the end. That leads to corrupted tables (a part from QEMU and remainder is whatever was in memory block allocated for the tables). Fix it by making qtables_len 32bit int. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- src/fw/biostables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fw/biostables.c b/src/fw/biostables.c index 1c09a785..90712d4b 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -499,7 +499,7 @@ smbios_build_tables(struct romfile_s *f_tables, u16 *number_of_structures) { struct smbios_type_0 *t0; - u16 qtables_len, need_t0 = 1; + u32 qtables_len, need_t0 = 1; u8 *qtables, *tables; if (f_tables->size != *length) -- 2.39.3

2 2

[PATCH v2 2/2] Add basic MXM 3.0 interrupt support
by Riku Viitanen 27 Feb '24

27 Feb '24

VGAROMs on MXM graphics cards need certain int15h functions present, to function properly. On HP EliteBook 8560w with coreboot and Quadro 2000M, this warning is displayed for 30 seconds, making every boot extremely slow: ERROR: Valid MXM Structure not found POST halted for 30 seconds, P-state limited to P10... This patch implements the minimum functionality to get rid of it: the functions 0 and 1, version 3.0 of the specification [1]. Older version 2.1 is not implemented. Functions are enabled only if romfile "mxm-30-sis" exists. These functios are specific to the MXM revision, but not the board or GPU. Some boards might require more of the optional functions to be implemented, however. - Function 0 returns information about supported functions and revision. - Function 1 returns a pointer to a MXM configuration structure in low memory. This is copied from romfile "mxm-30-sis". TEST: HP EliteBook 8560w boots without error and delay, graphics work. [1]: MXM Graphics Module Software Specification Version 3.0, Revision 1.1 [2]: https://codeberg.org/Riku_V/mxmdump/ Signed-off-by: Riku Viitanen <riku.viitanen(a)protonmail.com> --- src/optionroms.c | 8 ++++++ src/vgahooks.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ src/vgahooks.h | 8 ++++++ 3 files changed, 86 insertions(+) create mode 100644 src/vgahooks.h diff --git a/src/optionroms.c b/src/optionroms.c index e906ab97..4e6a1ad1 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -22,6 +22,7 @@ #include "string.h" // memset #include "util.h" // get_pnp_offset #include "tcgbios.h" // tpm_* +#include "vgahooks.h" // MXM30SIS static int EnforceChecksum, S3ResumeVga, RunPCIroms; @@ -463,6 +464,13 @@ vgarom_setup(void) RunPCIroms = romfile_loadint("etc/pci-optionrom-exec", 2); ScreenAndDebug = romfile_loadint("etc/screen-and-debug", 1); + // Load MXM 3.0 System Information Structure, if it exists + void *mxm_sis = romfile_loadfile_low("mxm-30-sis", NULL); + if (mxm_sis) + MXM30SIS = (u32)mxm_sis; + else + MXM30SIS = 0; + // Clear option rom memory memset((void*)BUILD_ROM_START, 0, rom_get_max() - BUILD_ROM_START); diff --git a/src/vgahooks.c b/src/vgahooks.c index 1f149532..25e91f20 100644 --- a/src/vgahooks.c +++ b/src/vgahooks.c @@ -18,8 +18,10 @@ #define VH_VIA 1 #define VH_INTEL 2 #define VH_SMI 3 +#define VH_MXM 4 int VGAHookHandlerType VARFSEG; +u32 MXM30SIS VARFSEG; static void handle_155fXX(struct bregs *regs) @@ -296,6 +298,71 @@ winent_mb6047_setup(struct pci_device *pci) SmiBootDisplay = 0x02; } +/**************************************************************** + * MXM VGA hooks + ****************************************************************/ + +// Function 0: Return Specification Support Level +static void +mxm_V30_F00(struct bregs *regs) +{ + regs->ax = 0x005f; // Success + regs->bl = 0x30; // MXM 3.0 + regs->cx = 0x0003; // Supported Functions + set_success(regs); +} + +// Function 1: Return a Pointer to the MXM Structure +static void +mxm_V30_F01(struct bregs *regs) +{ + switch (regs->cx) { + case 0x0030: + regs->ax = 0x005f; // Success + regs->es = GET_GLOBAL(MXM30SIS)/16; + regs->di = GET_GLOBAL(MXM30SIS)%16; + set_success(regs); + break; + default: + handle_155fXX(regs); + break; + } +} + +static void +mxm_V30(struct bregs *regs) +{ + switch (regs->bx) { + case 0xff00: mxm_V30_F00(regs); break; + case 0xff01: mxm_V30_F01(regs); break; + default: handle_155fXX(regs); break; + } +} + +static void +mxm_155f80(struct bregs *regs) +{ + // TODO: implement other versions, like 2.1 + mxm_V30(regs); +} + +static void +mxm_155f(struct bregs *regs) +{ + switch (regs->al) { + case 0x80: mxm_155f80(regs); break; + default: handle_155fXX(regs); break; + } +} + +void +mxm_setup(void) +{ + VGAHookHandlerType = VH_MXM; +} + + + /**************************************************************** * Entry and setup ****************************************************************/ @@ -313,6 +380,7 @@ handle_155f(struct bregs *regs) switch (htype) { case VH_VIA: via_155f(regs); break; case VH_INTEL: intel_155f(regs); break; + case VH_MXM: mxm_155f(regs); break; default: handle_155fXX(regs); break; } } @@ -352,4 +420,6 @@ vgahook_setup(struct pci_device *pci) via_setup(pci); else if (pci->vendor == PCI_VENDOR_ID_INTEL) intel_setup(pci); + else if (GET_GLOBAL(MXM30SIS)) + mxm_setup(); } diff --git a/src/vgahooks.h b/src/vgahooks.h new file mode 100644 index 00000000..c9113714 --- /dev/null +++ b/src/vgahooks.h @@ -0,0 +1,8 @@ +#ifndef __VGAHOOKS_H +#define __VGAHOOKS_H + +#include "types.h" // u32 + +extern u32 MXM30SIS; + +#endif // vgahooks.h -- 2.43.2

3 6

[PATCH v2 1/2] Add romfile_loadfile_low
by Riku Viitanen 23 Feb '24

23 Feb '24

Useful for MXM structures for example: it needs to be in low memory, since the VGA BIOS needs to access it in real mode. Signed-off-by: Riku Viitanen <riku.viitanen(a)protonmail.com> --- src/romfile.c | 30 ++++++++++++++++++++++++++++++ src/romfile.h | 1 + 2 files changed, 31 insertions(+) diff --git a/src/romfile.c b/src/romfile.c index b598274e..5d80d809 100644 --- a/src/romfile.c +++ b/src/romfile.c @@ -78,6 +78,36 @@ romfile_loadfile(const char *name, int *psize) return data; } +// Helper function to find, malloc_low, and copy a romfile. +void * +romfile_loadfile_low(const char *name, int *psize) +{ + struct romfile_s *file = romfile_find(name); + if (!file) + return NULL; + + int filesize = file->size; + if (!filesize) + return NULL; + + char *data = malloc_low(filesize); + if (!data) { + warn_noalloc(); + return NULL; + } + + dprintf(5, "Copying romfile '%s' (len %d) to low memory\n", + name, filesize); + int ret = file->copy(file, data, filesize); + if (ret < 0) { + free(data); + return NULL; + } + if (psize) + *psize = filesize; + return data; +} + // Attempt to load an integer from the given file - return 'defval' // if unsuccessful. u64 diff --git a/src/romfile.h b/src/romfile.h index 3e0f8200..70111ac2 100644 --- a/src/romfile.h +++ b/src/romfile.h @@ -14,6 +14,7 @@ void romfile_add(struct romfile_s *file); struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev); struct romfile_s *romfile_find(const char *name); void *romfile_loadfile(const char *name, int *psize); +void *romfile_loadfile_low(const char *name, int *psize); u64 romfile_loadint(const char *name, u64 defval); void const_romfile_add_int(char *name, u32 value); -- 2.43.2

1 0

an issue with win10 boot and different compiler versions
by Michael Tokarev 21 Feb '24

21 Feb '24

Hi! I come across an old qemu issue today, https://gitlab.com/qemu-project/qemu/-/issues/1115 . It seemed interesting, and since I do have several test win10 guests handy, I tested it with qemu built from tag v7.1.0. And observed the described behavior. After digging deeper, it turns out the same bios, compiled using different gcc, produces either good or broken binaries. It is not the seabios itself, the diff is the gcc version. In particular, on debian bookworm, gcc-12 produces seabios which breaks win10 boot. While on debian sid, gcc-13 produces working seabios from the same source. Everything else can be anything - any qemu version, any seabios version, - any combination. Giving any combination, compile bios with gcc from bookworm - win10 does not boot; compile this same bios using gcc from sid - it works. The binary in question is vgabios-stdvga.bin. I tried compiling vgabios-stdvga.bin with gcc-11, - this one produces broken binary too. This goes up to qemu version 8.1.0, and from where, version of compiler used to build seabios does not matter anymore. This is a past already, yet it's a quite interesting (to me anyway) observation. Something was (or maybe still is?) quite fragile here. Maybe it's a good idea to do some bisections, at least to find out when qemu started working again with "broken" bios, to understand the issue better. FWIW. Thanks, /mjt

6 12

Re: [PATCH 1/2] romfile: implement a generic loader
by Riku Viitanen 14 Feb '24

14 Feb '24

> I'd suggest to add a romfile_loadfile_low() I can definitely do that. > or add a 'struct zone_s' > parameter instead of passing in a function pointer. Sounds sensible. I see there's a malloc that takes zone as argument. > Also: What the trailing bytes are used for? Only for re-implementing the existing loadfile function, to reduce copy-pasted code.

1 0

← Newer
1
2
3
4
5
6
7
8
...
380
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS