SeaBIOS

seabios@seabios.org

5 participants
3802 discussions

[PATCH v2 0/3] change qemu detection
by Gerd Hoffmann 19 Sep '13

19 Sep '13

Hi, This patch series changes the way SeaBIOS figures whenever it runs on qemu or not. Instead of using different ways for each configuration (CONFIG_QEMU / CONFIG_CSM / CONFIG_COREBOOT) we'll have a generic function which checks the PCI Subsystem ID of the northbridge. v2: - Force PF_QEMU on CONFIG_QEMU, even when no northbridge was found. Needed for isapc and very old qemu versions. - Rebased, applies on top of kevin's include cleanup series. Gerd Hoffmann (3): Add generic qemu detection Drop coreboot qemu detection Add qemu detection to csm src/fw/coreboot.c | 4 ---- src/fw/csm.c | 3 +++ src/fw/paravirt.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 9 deletions(-) -- 1.8.3.1

3 11

[PATCH 00/23] Include file cleanups
by Kevin O'Connor 19 Sep '13

19 Sep '13

This patch series attempts to cleanup some of the include files within SeaBIOS. There are three main goals: split out the complex users of util.h into their own header files, introduce a new directory std/ for header files that just define standard bios interfaces, and make sure no header files (with the exception of util.h) have declarations for more than one c file. At the end of this series util.h, only contains simple function and variable prototypes (ie, no macros, inline code, or struct definitions). This series is also available at: https://github.com/KevinOConnor/seabios/tree/testing -Kevin Kevin O'Connor (23): Split x86 specific functions out of util.c/h to new files x86.c/h. Move keyboard calling code from util.c to boot.c. Rename util.c to string.c and introduce string.h. Move stacks.c definitions from util.h to new file stacks.h. Move stacks.c definitions from util.h to new file stacks.h. Move romfile definitions from util.h to new file romfile.h. Move malloc code from pmm.c to new files malloc.c and malloc.h. Move function definitions for output.c from util.h to new file output.h. Move definition of struct segoff_s from farptr.h to types.h. build: Fix import of gcc dependency files. Move pirtable definitions from hw/pci.h to std/pirtable.h and util.h. Move optionroms.h to std/optionrom.h and util.h. Move vbe.h to std/vbe.h. Move fw/LegacyBios.h to std/LegacyBios.h and remove csm.h. Move fw/smbios.h to std/smbios.h. Move fw/mptable.h to std/mptable.h. Move fw/acpi.h to std/acpi.h. Move pnpbios definition to new file std/pnpbios.h. Move pmm definitions to new file std/pmm.h. Split disk.h into block.h and std/disk.h. Move standard bda type info from biosvar.h to std/bda.h. Merge bmp.h, boot.h, jpeg.h, and post.h into util.h. Sort the sections of util.h. Makefile | 12 +- src/apm.c | 9 +- src/biosvar.h | 161 +--------- src/block.c | 44 ++- src/block.h | 129 ++++++++ src/bmp.c | 18 +- src/bmp.h | 25 -- src/boot.c | 59 +++- src/boot.h | 26 -- src/bootsplash.c | 14 +- src/bregs.h | 21 +- src/byteorder.h | 2 + src/cdrom.c | 25 +- src/clock.c | 9 +- src/disk.c | 38 +-- src/disk.h | 292 ----------------- src/farptr.h | 10 - src/fw/acpi.c | 15 +- src/fw/biostables.c | 13 +- src/fw/coreboot.c | 16 +- src/fw/csm.c | 29 +- src/fw/csm.h | 18 -- src/fw/mptable.c | 9 +- src/fw/mtrr.c | 4 +- src/fw/paravirt.c | 18 +- src/fw/pciinit.c | 12 +- src/fw/pirtable.c | 5 +- src/fw/shadow.c | 10 +- src/fw/smbios.c | 9 +- src/fw/smm.c | 11 +- src/fw/smp.c | 6 +- src/fw/xen.c | 10 +- src/hw/ahci.c | 18 +- src/hw/ahci.h | 3 + src/hw/ata.c | 21 +- src/hw/ata.h | 4 +- src/hw/blockcmd.c | 20 +- src/hw/esp-scsi.c | 17 +- src/hw/floppy.c | 18 +- src/hw/lsi-scsi.c | 17 +- src/hw/megasas.c | 16 +- src/hw/pci.c | 14 +- src/hw/pci.h | 40 --- src/hw/pic.c | 6 +- src/hw/pic.h | 1 - src/hw/ps2port.c | 9 +- src/hw/ramdisk.c | 13 +- src/hw/timer.c | 11 +- src/hw/usb-ehci.c | 14 +- src/hw/usb-hid.c | 9 +- src/hw/usb-hub.c | 6 +- src/hw/usb-msc.c | 15 +- src/hw/usb-ohci.c | 12 +- src/hw/usb-uas.c | 13 +- src/hw/usb-uhci.c | 11 +- src/hw/usb.c | 18 +- src/hw/usb.h | 2 +- src/hw/virtio-blk.c | 13 +- src/hw/virtio-pci.c | 8 +- src/hw/virtio-ring.c | 4 +- src/hw/virtio-scsi.c | 15 +- src/jpeg.c | 3 +- src/jpeg.h | 11 - src/kbd.c | 7 +- src/malloc.c | 529 +++++++++++++++++++++++++++++++ src/malloc.h | 70 +++++ src/memmap.c | 5 +- src/misc.c | 6 +- src/mouse.c | 4 +- src/optionroms.c | 15 +- src/output.c | 6 +- src/output.h | 68 ++++ src/pcibios.c | 10 +- src/pmm.c | 573 ++-------------------------------- src/pnpbios.c | 23 +- src/post.c | 30 +- src/post.h | 10 - src/resume.c | 18 +- src/romfile.c | 5 +- src/romfile.h | 19 ++ src/romlayout.S | 2 +- src/serial.c | 4 +- src/stacks.c | 5 +- src/stacks.h | 34 ++ src/{fw => std}/LegacyBios.h | 0 src/{fw => std}/acpi.h | 10 - src/std/bda.h | 159 ++++++++++ src/std/disk.h | 177 +++++++++++ src/{fw => std}/mptable.h | 3 - src/{optionroms.h => std/optionrom.h} | 3 - src/std/pirtable.h | 35 +++ src/std/pmm.h | 19 ++ src/std/pnpbios.h | 24 ++ src/{fw => std}/smbios.h | 6 +- src/{ => std}/vbe.h | 1 - src/{util.c => string.c} | 67 +--- src/string.h | 30 ++ src/system.c | 11 +- src/types.h | 11 + src/util.h | 557 ++++++++++----------------------- src/vgahooks.c | 8 +- src/x86.c | 23 ++ src/x86.h | 168 ++++++++++ vgasrc/bochsvga.c | 10 +- vgasrc/clext.c | 9 +- vgasrc/geodevga.c | 10 +- vgasrc/stdvga.c | 2 +- vgasrc/stdvgamodes.c | 5 +- vgasrc/vbe.c | 11 +- vgasrc/vgabios.c | 18 +- vgasrc/vgafb.c | 5 +- 111 files changed, 2273 insertions(+), 2013 deletions(-) create mode 100644 src/block.h delete mode 100644 src/bmp.h delete mode 100644 src/boot.h delete mode 100644 src/disk.h delete mode 100644 src/fw/csm.h delete mode 100644 src/jpeg.h create mode 100644 src/malloc.c create mode 100644 src/malloc.h create mode 100644 src/output.h delete mode 100644 src/post.h create mode 100644 src/romfile.h create mode 100644 src/stacks.h rename src/{fw => std}/LegacyBios.h (100%) rename src/{fw => std}/acpi.h (96%) create mode 100644 src/std/bda.h create mode 100644 src/std/disk.h rename src/{fw => std}/mptable.h (96%) rename src/{optionroms.h => std/optionrom.h} (95%) create mode 100644 src/std/pirtable.h create mode 100644 src/std/pmm.h create mode 100644 src/std/pnpbios.h rename src/{fw => std}/smbios.h (97%) rename src/{ => std}/vbe.h (99%) rename src/{util.c => string.c} (76%) create mode 100644 src/string.h create mode 100644 src/x86.c create mode 100644 src/x86.h -- 1.8.3.1

2 25

Re: [SeaBIOS] [PATCH 05/23] Move stacks.c definitions from util.h to new file stacks.h.
by Paolo Bonzini 16 Sep '13

16 Sep '13

Il 15/09/2013 07:08, Kevin O'Connor ha scritto: > Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> > --- > src/stacks.h | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 src/stacks.h > > diff --git a/src/stacks.h b/src/stacks.h > new file mode 100644 > index 0000000..5ee4adc > --- /dev/null > +++ b/src/stacks.h > @@ -0,0 +1,34 @@ > +// Misc function and variable declarations. > +#ifndef __STACKS_H > +#define __STACKS_H > + > +#include "types.h" // u32 > + > +// stacks.c > +extern u8 ExtraStack[], *StackPos; > +u32 stack_hop(u32 eax, u32 edx, void *func); > +u32 stack_hop_back(u32 eax, u32 edx, void *func); > +u32 call32(void *func, u32 eax, u32 errret); > +struct bregs; > +inline void farcall16(struct bregs *callregs); > +inline void farcall16big(struct bregs *callregs); > +inline void __call16_int(struct bregs *callregs, u16 offset); > +#define call16_int(nr, callregs) do { \ > + extern void irq_trampoline_ ##nr (); \ > + __call16_int((callregs), (u32)&irq_trampoline_ ##nr ); \ > + } while (0) > +extern struct thread_info MainThread; > +struct thread_info *getCurThread(void); > +void yield(void); > +void yield_toirq(void); > +void run_thread(void (*func)(void*), void *data); > +void wait_threads(void); > +struct mutex_s { u32 isLocked; }; > +void mutex_lock(struct mutex_s *mutex); > +void mutex_unlock(struct mutex_s *mutex); > +void start_preempt(void); > +void finish_preempt(void); > +int wait_preempt(void); > +void check_preempt(void); > + > +#endif // stacks.h > Should be squashed in previous patch. Paolo

2 1

[PATCH 2/2] vgabios: Limit the range of the VBE number of "pages" parameter.
by Kevin O'Connor 14 Sep '13

14 Sep '13

Looking at the output of other VGA BIOS implementations, it appears that the number of available video pages reported is always between 1 and 127. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/vbe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index d962333..2c08736 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -144,6 +144,10 @@ vbe_104f01(struct bregs *regs) mode_attr |= VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE; break; } + if (pages > 128) + pages = 128; + if (pages < 2) + pages++; SET_FARVAR(seg, info->mode_attributes, mode_attr); SET_FARVAR(seg, info->planes, planes); SET_FARVAR(seg, info->pages, pages - 1); -- 1.8.3.1

3 3

[PATCH] vga: Don't advertise multiple pages for lfb modes.
by Gerd Hoffmann 13 Sep '13

13 Sep '13

Seems win8 doesn't like it. With this patch win8 guests allow to set the screen resolution to something != 1024x768. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- vgasrc/vbe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c index d962333..b0ee002 100644 --- a/vgasrc/vbe.c +++ b/vgasrc/vbe.c @@ -142,6 +142,7 @@ vbe_104f01(struct bregs *regs) framebuffer = GET_GLOBAL(VBE_framebuffer); if (framebuffer) mode_attr |= VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE; + pages = 1; break; } SET_FARVAR(seg, info->mode_attributes, mode_attr); -- 1.8.3.1

2 5

[RFC][PATCH 0/4] Introduce hw/ and fw/ code subdirectories
by Kevin O'Connor 13 Sep '13

13 Sep '13

The main src/ directory is getting pretty crowded - it has 133 files in the directory. This patch series breaks up the main src/ directory into three directories src/, src/hw/, and src/fw/. The idea is to put "hardware" files (eg, disk drivers, keyboard drivers, etc.) into the hw/ sub-directory and "firmware" files (mainly qemu initialization code) into the fw/ sub-directory. After this series, there remain 52 files in the src/ directory, 49 files in the src/hw/ directory, and 34 files in the src/fw/ directory. There are other ways to split up the code files in the repository, but splitting up by hardware, firmware, and everything else does do a good job of segmenting the files into reasonable buckets. Thoughts? -Kevin Kevin O'Connor (4): build: Don't use vpath makefile directive. Move code centered around specific hardware devices to src/hw/ Move code cenetered around firmware initialization to src/fw/ build: Reorder makefile source list to group like files together. Makefile | 59 ++++++++++++++++++---------------- src/apm.c | 4 +-- src/block.c | 10 +++--- src/boot.c | 10 +++--- src/bootsplash.c | 2 +- src/cdrom.c | 4 +-- src/clock.c | 8 ++--- src/disk.c | 6 ++-- src/{ => fw}/LegacyBios.h | 0 src/{ => fw}/acpi-dsdt-cpu-hotplug.dsl | 0 src/{ => fw}/acpi-dsdt-dbug.dsl | 0 src/{ => fw}/acpi-dsdt-hpet.dsl | 0 src/{ => fw}/acpi-dsdt-isa.dsl | 0 src/{ => fw}/acpi-dsdt-pci-crs.dsl | 0 src/{ => fw}/acpi-dsdt.dsl | 0 src/{ => fw}/acpi.c | 14 ++++---- src/{ => fw}/acpi.h | 0 src/{ => fw}/biostables.c | 2 +- src/{ => fw}/coreboot.c | 2 +- src/{ => fw}/csm.c | 4 +-- src/{ => fw}/csm.h | 2 +- src/{ => fw}/dev-q35.h | 0 src/{ => fw}/lzmadecode.c | 0 src/{ => fw}/lzmadecode.h | 0 src/{ => fw}/mptable.c | 4 +-- src/{ => fw}/mptable.h | 0 src/{ => fw}/mtrr.c | 2 +- src/{ => fw}/paravirt.c | 4 +-- src/{ => fw}/paravirt.h | 0 src/{ => fw}/pciinit.c | 6 ++-- src/{ => fw}/pirtable.c | 2 +- src/{ => fw}/q35-acpi-dsdt.dsl | 0 src/{ => fw}/shadow.c | 6 ++-- src/{ => fw}/smbios.c | 0 src/{ => fw}/smbios.h | 0 src/{ => fw}/smm.c | 6 ++-- src/{ => fw}/smp.c | 2 +- src/{ => fw}/ssdt-misc.dsl | 0 src/{ => fw}/ssdt-pcihp.dsl | 0 src/{ => fw}/ssdt-proc.dsl | 0 src/{ => fw}/xen.c | 0 src/{ => fw}/xen.h | 0 src/{ => hw}/ahci.c | 0 src/{ => hw}/ahci.h | 0 src/{ => hw}/ata.c | 0 src/{ => hw}/ata.h | 0 src/{ => hw}/blockcmd.c | 0 src/{ => hw}/blockcmd.h | 0 src/{ => hw}/cmos.h | 0 src/{ => hw}/esp-scsi.c | 2 +- src/{ => hw}/esp-scsi.h | 0 src/{ => hw}/floppy.c | 0 src/{ => hw}/lsi-scsi.c | 2 +- src/{ => hw}/lsi-scsi.h | 0 src/{ => hw}/megasas.c | 0 src/{ => hw}/megasas.h | 0 src/{ => hw}/pci.c | 0 src/{ => hw}/pci.h | 0 src/{ => hw}/pci_ids.h | 0 src/{ => hw}/pci_regs.h | 0 src/{ => hw}/pic.c | 0 src/{ => hw}/pic.h | 0 src/{ => hw}/pit.h | 0 src/{ => hw}/ps2port.c | 0 src/{ => hw}/ps2port.h | 0 src/{ => hw}/ramdisk.c | 0 src/{ => hw}/timer.c | 0 src/{ => hw}/usb-ehci.c | 0 src/{ => hw}/usb-ehci.h | 0 src/{ => hw}/usb-hid.c | 0 src/{ => hw}/usb-hid.h | 0 src/{ => hw}/usb-hub.c | 0 src/{ => hw}/usb-hub.h | 0 src/{ => hw}/usb-msc.c | 0 src/{ => hw}/usb-msc.h | 0 src/{ => hw}/usb-ohci.c | 0 src/{ => hw}/usb-ohci.h | 0 src/{ => hw}/usb-uas.c | 0 src/{ => hw}/usb-uas.h | 0 src/{ => hw}/usb-uhci.c | 0 src/{ => hw}/usb-uhci.h | 0 src/{ => hw}/usb.c | 0 src/{ => hw}/usb.h | 0 src/{ => hw}/virtio-blk.c | 0 src/{ => hw}/virtio-blk.h | 0 src/{ => hw}/virtio-pci.c | 0 src/{ => hw}/virtio-pci.h | 0 src/{ => hw}/virtio-ring.c | 0 src/{ => hw}/virtio-ring.h | 0 src/{ => hw}/virtio-scsi.c | 0 src/{ => hw}/virtio-scsi.h | 0 src/kbd.c | 4 +-- src/misc.c | 2 +- src/mouse.c | 4 +-- src/optionroms.c | 6 ++-- src/output.c | 2 +- src/pcibios.c | 4 +-- src/post.c | 26 +++++++-------- src/resume.c | 10 +++--- src/romlayout.S | 2 +- src/system.c | 2 +- src/util.h | 16 ++++----- src/vgahooks.c | 6 ++-- vgasrc/bochsvga.c | 4 +-- vgasrc/clext.c | 4 +-- vgasrc/geodevga.c | 4 +-- vgasrc/vgabios.c | 4 +-- 107 files changed, 133 insertions(+), 130 deletions(-) rename src/{ => fw}/LegacyBios.h (100%) rename src/{ => fw}/acpi-dsdt-cpu-hotplug.dsl (100%) rename src/{ => fw}/acpi-dsdt-dbug.dsl (100%) rename src/{ => fw}/acpi-dsdt-hpet.dsl (100%) rename src/{ => fw}/acpi-dsdt-isa.dsl (100%) rename src/{ => fw}/acpi-dsdt-pci-crs.dsl (100%) rename src/{ => fw}/acpi-dsdt.dsl (100%) rename src/{ => fw}/acpi.c (98%) rename src/{ => fw}/acpi.h (100%) rename src/{ => fw}/biostables.c (98%) rename src/{ => fw}/coreboot.c (99%) rename src/{ => fw}/csm.c (99%) rename src/{ => fw}/csm.h (94%) rename src/{ => fw}/dev-q35.h (100%) rename src/{ => fw}/lzmadecode.c (100%) rename src/{ => fw}/lzmadecode.h (100%) rename src/{ => fw}/mptable.c (99%) rename src/{ => fw}/mptable.h (100%) rename src/{ => fw}/mtrr.c (98%) rename src/{ => fw}/paravirt.c (99%) rename src/{ => fw}/paravirt.h (100%) rename src/{ => fw}/pciinit.c (99%) rename src/{ => fw}/pirtable.c (98%) rename src/{ => fw}/q35-acpi-dsdt.dsl (100%) rename src/{ => fw}/shadow.c (97%) rename src/{ => fw}/smbios.c (100%) rename src/{ => fw}/smbios.h (100%) rename src/{ => fw}/smm.c (97%) rename src/{ => fw}/smp.c (98%) rename src/{ => fw}/ssdt-misc.dsl (100%) rename src/{ => fw}/ssdt-pcihp.dsl (100%) rename src/{ => fw}/ssdt-proc.dsl (100%) rename src/{ => fw}/xen.c (100%) rename src/{ => fw}/xen.h (100%) rename src/{ => hw}/ahci.c (100%) rename src/{ => hw}/ahci.h (100%) rename src/{ => hw}/ata.c (100%) rename src/{ => hw}/ata.h (100%) rename src/{ => hw}/blockcmd.c (100%) rename src/{ => hw}/blockcmd.h (100%) rename src/{ => hw}/cmos.h (100%) rename src/{ => hw}/esp-scsi.c (99%) rename src/{ => hw}/esp-scsi.h (100%) rename src/{ => hw}/floppy.c (100%) rename src/{ => hw}/lsi-scsi.c (99%) rename src/{ => hw}/lsi-scsi.h (100%) rename src/{ => hw}/megasas.c (100%) rename src/{ => hw}/megasas.h (100%) rename src/{ => hw}/pci.c (100%) rename src/{ => hw}/pci.h (100%) rename src/{ => hw}/pci_ids.h (100%) rename src/{ => hw}/pci_regs.h (100%) rename src/{ => hw}/pic.c (100%) rename src/{ => hw}/pic.h (100%) rename src/{ => hw}/pit.h (100%) rename src/{ => hw}/ps2port.c (100%) rename src/{ => hw}/ps2port.h (100%) rename src/{ => hw}/ramdisk.c (100%) rename src/{ => hw}/timer.c (100%) rename src/{ => hw}/usb-ehci.c (100%) rename src/{ => hw}/usb-ehci.h (100%) rename src/{ => hw}/usb-hid.c (100%) rename src/{ => hw}/usb-hid.h (100%) rename src/{ => hw}/usb-hub.c (100%) rename src/{ => hw}/usb-hub.h (100%) rename src/{ => hw}/usb-msc.c (100%) rename src/{ => hw}/usb-msc.h (100%) rename src/{ => hw}/usb-ohci.c (100%) rename src/{ => hw}/usb-ohci.h (100%) rename src/{ => hw}/usb-uas.c (100%) rename src/{ => hw}/usb-uas.h (100%) rename src/{ => hw}/usb-uhci.c (100%) rename src/{ => hw}/usb-uhci.h (100%) rename src/{ => hw}/usb.c (100%) rename src/{ => hw}/usb.h (100%) rename src/{ => hw}/virtio-blk.c (100%) rename src/{ => hw}/virtio-blk.h (100%) rename src/{ => hw}/virtio-pci.c (100%) rename src/{ => hw}/virtio-pci.h (100%) rename src/{ => hw}/virtio-ring.c (100%) rename src/{ => hw}/virtio-ring.h (100%) rename src/{ => hw}/virtio-scsi.c (100%) rename src/{ => hw}/virtio-scsi.h (100%) -- 1.8.3.1

1 5

[PATCH] README: directory was renamed s/tools/scripts/
by Sylvain 'ythier' Hitier 13 Sep '13

13 Sep '13

Hello, README: directory was renamed s/tools/scripts/ Signed-off-by: Sylvain "ythier" Hitier <sylvain.hitier(a)gmail.com> diff --git a/README b/README index 554db0d..60434a5 100644 --- a/README +++ b/README @@ -32,7 +32,7 @@ files are compiled twice - once for 16bit mode and once for 32bit mode. (The build system will remove code that is not needed for a particular mode.) -The tools/ directory contains helper utilities for manipulating and +The scripts/ directory contains helper utilities for manipulating and building the final rom. The out/ directory is created by the build process - it contains all Regards, Sylvain "ythier" Hitier -- Business is about being busy, not being rich... Lived 777 days in a Debian package => http://en.wikipedia.org/wiki/Apt,_Vaucluse There's THE room for ideals in this mechanical place!

2 1

[PATCH 1/2] vgabios: Rename stdvga_bpp_factor to stdvga_vram_ratio.
by Kevin O'Connor 13 Sep '13

13 Sep '13

Invert the values returned by stdvga_bpp_factor and rename it. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/bochsvga.c | 2 +- vgasrc/clext.c | 13 ++++++------- vgasrc/stdvga.c | 20 ++++++++++---------- vgasrc/stdvga.h | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index 2002118..7ea49ff 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -383,7 +383,7 @@ bochsvga_setup(void) u16 height = GET_GLOBAL(m->info.height); u8 depth = GET_GLOBAL(m->info.depth); u32 mem = (height * DIV_ROUND_UP(width * vga_bpp(&m->info), 8) - * 4 / stdvga_bpp_factor(&m->info)); + * stdvga_vram_ratio(&m->info)); if (width > max_xres || depth > max_bpp || mem > totalmem) { dprintf(1, "Removing mode %x\n", GET_GLOBAL(m->mode)); diff --git a/vgasrc/clext.c b/vgasrc/clext.c index 012e2b1..8377da1 100644 --- a/vgasrc/clext.c +++ b/vgasrc/clext.c @@ -328,17 +328,16 @@ clext_get_linelength(struct vgamode_s *vmode_g) u16 crtc_addr = stdvga_get_crtc(); u8 reg13 = stdvga_crtc_read(crtc_addr, 0x13); u8 reg1b = stdvga_crtc_read(crtc_addr, 0x1b); - return (((reg1b & 0x10) << 4) + reg13) * stdvga_bpp_factor(vmode_g) * 2; + return (((reg1b & 0x10) << 4) + reg13) * 8 / stdvga_vram_ratio(vmode_g); } int clext_set_linelength(struct vgamode_s *vmode_g, int val) { u16 crtc_addr = stdvga_get_crtc(); - int factor = stdvga_bpp_factor(vmode_g) * 2; - int new_line_offset = DIV_ROUND_UP(val, factor); - stdvga_crtc_write(crtc_addr, 0x13, new_line_offset); - stdvga_crtc_mask(crtc_addr, 0x1b, 0x10, (new_line_offset & 0x100) >> 4); + val = DIV_ROUND_UP(val * stdvga_vram_ratio(vmode_g), 8); + stdvga_crtc_write(crtc_addr, 0x13, val); + stdvga_crtc_mask(crtc_addr, 0x1b, 0x10, (val & 0x100) >> 4); return 0; } @@ -352,14 +351,14 @@ clext_get_displaystart(struct vgamode_s *vmode_g) u8 b4 = stdvga_crtc_read(crtc_addr, 0x1d); int val = (b1 | (b2<<8) | ((b3 & 0x01) << 16) | ((b3 & 0x0c) << 15) | ((b4 & 0x80) << 12)); - return val * stdvga_bpp_factor(vmode_g); + return val * 4 / stdvga_vram_ratio(vmode_g); } int clext_set_displaystart(struct vgamode_s *vmode_g, int val) { u16 crtc_addr = stdvga_get_crtc(); - val /= stdvga_bpp_factor(vmode_g); + val = val * stdvga_vram_ratio(vmode_g) / 4; stdvga_crtc_write(crtc_addr, 0x0d, val); stdvga_crtc_write(crtc_addr, 0x0c, val >> 8); stdvga_crtc_mask(crtc_addr, 0x1d, 0x80, (val & 0x0800) >> 4); diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c index 1dd947e..3c92eec 100644 --- a/vgasrc/stdvga.c +++ b/vgasrc/stdvga.c @@ -212,19 +212,19 @@ stdvga_get_crtc(void) return VGAREG_MDA_CRTC_ADDRESS; } -// Return the multiplication factor needed for the vga offset register. +// Ratio between system visible framebuffer ram and the actual videoram used. int -stdvga_bpp_factor(struct vgamode_s *vmode_g) +stdvga_vram_ratio(struct vgamode_s *vmode_g) { switch (GET_GLOBAL(vmode_g->memmodel)) { case MM_TEXT: return 2; case MM_CGA: - return GET_GLOBAL(vmode_g->depth); + return 4 / GET_GLOBAL(vmode_g->depth); case MM_PLANAR: - return 1; - default: return 4; + default: + return 1; } } @@ -278,14 +278,14 @@ int stdvga_get_linelength(struct vgamode_s *vmode_g) { u8 val = stdvga_crtc_read(stdvga_get_crtc(), 0x13); - return val * stdvga_bpp_factor(vmode_g) * 2; + return val * 8 / stdvga_vram_ratio(vmode_g); } int stdvga_set_linelength(struct vgamode_s *vmode_g, int val) { - int factor = stdvga_bpp_factor(vmode_g) * 2; - stdvga_crtc_write(stdvga_get_crtc(), 0x13, DIV_ROUND_UP(val, factor)); + val = DIV_ROUND_UP(val * stdvga_vram_ratio(vmode_g), 8); + stdvga_crtc_write(stdvga_get_crtc(), 0x13, val); return 0; } @@ -295,14 +295,14 @@ stdvga_get_displaystart(struct vgamode_s *vmode_g) u16 crtc_addr = stdvga_get_crtc(); int addr = (stdvga_crtc_read(crtc_addr, 0x0c) << 8 | stdvga_crtc_read(crtc_addr, 0x0d)); - return addr * stdvga_bpp_factor(vmode_g); + return addr * 4 / stdvga_vram_ratio(vmode_g); } int stdvga_set_displaystart(struct vgamode_s *vmode_g, int val) { u16 crtc_addr = stdvga_get_crtc(); - val /= stdvga_bpp_factor(vmode_g); + val = val * stdvga_vram_ratio(vmode_g) / 4; stdvga_crtc_write(crtc_addr, 0x0c, val >> 8); stdvga_crtc_write(crtc_addr, 0x0d, val); return 0; diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h index d712a32..bb8b8d8 100644 --- a/vgasrc/stdvga.h +++ b/vgasrc/stdvga.h @@ -90,7 +90,7 @@ void stdvga_planar4_plane(int plane); void stdvga_load_font(u16 seg, void *src_far, u16 count , u16 start, u8 destflags, u8 fontsize); u16 stdvga_get_crtc(void); -int stdvga_bpp_factor(struct vgamode_s *vmode_g); +int stdvga_vram_ratio(struct vgamode_s *vmode_g); void stdvga_set_cursor_shape(u8 start, u8 end); void stdvga_set_cursor_pos(int address); void stdvga_set_scan_lines(u8 lines); -- 1.8.3.1

1 0

Re: [SeaBIOS] [PATCH] q35: fix GPE method for cpu hotplug
by Gerd Hoffmann 10 Sep '13

10 Sep '13

Hi, > Method(_L01) { > + } > + Method(_E02) { > // CPU hotplug event > \_SB.PRSC() > } > - Method(_L02) { > - } E02? Typo? cheers, Gerd

2 1

[PATCH] ahci: add missing check for allocation failure
by Gerd Hoffmann 09 Sep '13

09 Sep '13

Triggerable by creating a virtual machine with *lots* of ahci controllers and disks. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/ahci.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/ahci.c b/src/ahci.c index 0e99d14..e2729a9 100644 --- a/src/ahci.c +++ b/src/ahci.c @@ -379,12 +379,26 @@ ahci_port_alloc(struct ahci_ctrl_s *ctrl, u32 pnr) return port; } +static void ahci_port_release(struct ahci_port_s *port) +{ + ahci_port_reset(port->ctrl, port->pnr); + free(port->list); + free(port->fis); + free(port->cmd); + free(port); +} + static struct ahci_port_s* ahci_port_realloc(struct ahci_port_s *port) { struct ahci_port_s *tmp; u32 cmd; tmp = malloc_fseg(sizeof(*port)); + if (!tmp) { + warn_noalloc(); + ahci_port_release(port); + return NULL; + } *tmp = *port; free(port); port = tmp; @@ -408,15 +422,6 @@ static struct ahci_port_s* ahci_port_realloc(struct ahci_port_s *port) return port; } -static void ahci_port_release(struct ahci_port_s *port) -{ - ahci_port_reset(port->ctrl, port->pnr); - free(port->list); - free(port->fis); - free(port->cmd); - free(port); -} - #define MAXMODEL 40 /* See ahci spec chapter 10.1 "Software Initialization of HBA" */ @@ -551,6 +556,8 @@ ahci_port_detect(void *data) ahci_port_release(port); else { port = ahci_port_realloc(port); + if (port == NULL) + return; dprintf(1, "AHCI/%d: registering: \"%s\"\n", port->pnr, port->desc); if (!port->atapi) { // Register with bcv system. -- 1.8.3.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS