[PATCH 0/7] seabios: 1.11.2 update
by Gerd Hoffmann
Hi folks,
So, here is the current state of the seabios update for the upcoming
qemu 3.0 release. This time it is a bit more than just the usual
"update submodule and binaries".
seabios 1.11.2 is not released yet. The plan is to cherry-pick the
changes needed to support the new qemu 3.0 display devices
(bochs-display and ramfb) into the 1.11-stable branch for the 1.11.2
release. Current state is here:
https://git.kraxel.org/cgit/seabios/log/?h=1.11-stable-testing
Changes in this patch series:
- seabios submodule update (to the testing branch).
- new vgabios configs for bochs-display and ramfb.
- update the bios config to enables ide dma (for qnx).
- drop (old) vgabios submodule and build rules.
- seabios binary update.
- make bochs-display and ramfb load the new vgabios roms.
Git branch for this series is here:
https://git.kraxel.org/cgit/qemu/log/?h=seabios-1.11.2
cheers,
Gerd
Gerd Hoffmann (7):
seabios: update submodule to 1.11.2-testing
seabios: add vga configs for bochs-display and ramfb
seabios: enable ide dma
vgabios: remove submodule and build rules.
seabios: update binaries
bochs-display: enable vgabios
ramfb: enable vgabios
hw/display/bochs-display.c | 1 +
hw/display/ramfb.c | 1 +
.gitmodules | 3 ---
pc-bios/bios-256k.bin | Bin 262144 -> 262144 bytes
pc-bios/bios.bin | Bin 131072 -> 131072 bytes
pc-bios/vgabios-cirrus.bin | Bin 38400 -> 38400 bytes
pc-bios/vgabios-qxl.bin | Bin 38912 -> 38912 bytes
pc-bios/vgabios-stdvga.bin | Bin 38912 -> 38912 bytes
pc-bios/vgabios-virtio.bin | Bin 38912 -> 38912 bytes
pc-bios/vgabios-vmware.bin | Bin 38912 -> 38912 bytes
pc-bios/vgabios.bin | Bin 38400 -> 38400 bytes
roms/Makefile | 20 +++-----------------
roms/config.seabios-128k | 1 +
roms/config.seabios-256k | 1 +
roms/config.vga-bochs-display | 3 +++
roms/config.vga-ramfb | 3 +++
roms/seabios | 2 +-
roms/vgabios | 1 -
18 files changed, 14 insertions(+), 22 deletions(-)
create mode 100644 roms/config.vga-bochs-display
create mode 100644 roms/config.vga-ramfb
delete mode 160000 roms/vgabios
--
2.9.3
6 months, 3 weeks
seabios issue
by Roger Lawhorn
Hello,
Recently my qemu with gpu passthrough setup quit working.
I think it is seabios related.
i have turned on debugging for seabios.
Here is the output from seabios from a successful windows 10 boot using
an emulated vga adapter:
https://pastebin.com/f3DCqTbc
Here is the output when using my nvidia gtx 880m 8gb gaming card:
https://pastebin.com/GpWKZadh
when seabios runs the option rom for nvidia it just halts.
i have never debuged seabios before so i dont know what would normally
show up at this point.
i.e. is this normal or is something wrong.
during the vga boot all 8 cpus go to 100% for a short time then drop.
during the failed boot with nvidia 1 cpu goes to 100% and stays there
forever. i have let it run all night at times.
i am seeking to figure out if i have a seabios issue.
i am running linux mint 18.3 and the repo copy of seabios is 1.8.2.
i have booted this 100's of times and never had an issue before.
thanks
6 months, 3 weeks
ACPI OEM Table ID length
by coypu＠sdf.org
Hi folks,
I ran into this problem while building Xen. unfortunately, I have
trouble building the same files with seabios git, and have even more
limited ability to test the changes.
Apparently ACPI says that the OEM Table Id must be length 8. Some of the
tables in seabios use longer. newer iASL rejects this and fails to
build the code. Most likely things handle it as if it was truncated, but
perhaps it overran to the next field.
I've used this diff, for your consideration.
diff --git a/src/fw/ssdt-misc.dsl b/src/fw/ssdt-misc.dsl
index acc850e..d1d2c9e 100644
--- a/src/fw/ssdt-misc.dsl
+++ b/src/fw/ssdt-misc.dsl
@@ -1,6 +1,6 @@
ACPI_EXTRACT_ALL_CODE ssdp_misc_aml
-DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1)
+DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSU", 0x1)
{
/****************************************************************
diff --git a/src/fw/ssdt-pcihp.dsl b/src/fw/ssdt-pcihp.dsl
index cb24c11..518a5eb 100644
--- a/src/fw/ssdt-pcihp.dsl
+++ b/src/fw/ssdt-pcihp.dsl
@@ -1,6 +1,6 @@
ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml
-DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1)
+DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPC", 0x1)
{
/****************************************************************
6 months, 3 weeks
[PATCH] cbvga_set_mode: refine clear display logic
by Gerd Hoffmann
There is no need to skip text mode clearing.
Clearing the framebuffer should be safe on legacy calls too.
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
vgasrc/cbvga.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
index f6ebe71242..859524cb23 100644
--- a/vgasrc/cbvga.c
+++ b/vgasrc/cbvga.c
@@ -201,18 +201,20 @@ cbvga_set_mode(struct vgamode_s *vmode_g, int flags)
*/
u8 extra_stack = GET_BDA_EXT(flags) & BF_EXTRA_STACK;
MASK_BDA_EXT(flags, BF_EMULATE_TEXT, emul ? BF_EMULATE_TEXT : 0);
- if (!(flags & MF_NOCLEARMEM) && extra_stack) {
+ if (!(flags & MF_NOCLEARMEM)) {
if (GET_GLOBAL(CBmodeinfo.memmodel) == MM_TEXT) {
memset16_far(SEG_CTEXT, (void*)0, 0x0720, 80*25*2);
return 0;
}
- struct gfx_op op;
- init_gfx_op(&op, &CBmodeinfo);
- op.x = op.y = 0;
- op.xlen = GET_GLOBAL(CBmodeinfo.width);
- op.ylen = GET_GLOBAL(CBmodeinfo.height);
- op.op = GO_MEMSET;
- handle_gfx_op(&op);
+ if (extra_stack || flags & MF_LEGACY) {
+ struct gfx_op op;
+ init_gfx_op(&op, &CBmodeinfo);
+ op.x = op.y = 0;
+ op.xlen = GET_GLOBAL(CBmodeinfo.width);
+ op.ylen = GET_GLOBAL(CBmodeinfo.height);
+ op.op = GO_MEMSET;
+ handle_gfx_op(&op);
+ }
}
return 0;
}
--
2.9.3
6 months, 3 weeks
Re: [SeaBIOS] [PATCH v2 6/6] cbvga_set_mode: disable clearmem in windows x86 emulator.
by Patrick Rudolph
On Mon, 2018-06-04 at 09:31 -0400, Kevin O'Connor wrote:
> On Mon, Jun 04, 2018 at 09:29:17AM +0200, Gerd Hoffmann wrote:
> > Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
> > ---
> > vgasrc/cbvga.c | 10 +++++++++-
> > 1 file changed, 9 insertions(+), 1 deletion(-)
> >
> > diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
> > index 3f16bee10c..f6ebe71242 100644
> > --- a/vgasrc/cbvga.c
> > +++ b/vgasrc/cbvga.c
> > @@ -192,8 +192,16 @@ int
> > cbvga_set_mode(struct vgamode_s *vmode_g, int flags)
> > {
> > u8 emul = vmode_g == &CBemulinfo || GET_GLOBAL(CBmode) == 0x03;
> > + /*
> > + * The extra_stack flag is false when running in windows x86
> > + * emulator, to avoid stack switching triggering bugs. Using the
> > + * same flag here to skip screen clearing, because the windows
> > + * emulator seems to have problems to handle the int 1587 call
> > + * too, and GO_MEMSET uses that.
> > + */
> > + u8 extra_stack = GET_BDA_EXT(flags) & BF_EXTRA_STACK;
> > MASK_BDA_EXT(flags, BF_EMULATE_TEXT, emul ? BF_EMULATE_TEXT : 0);
> > - if (!(flags & MF_NOCLEARMEM)) {
> > + if (!(flags & MF_NOCLEARMEM) && extra_stack) {
>
> FYI, extra_stack will only be true if CONFIG_VGA_ALLOCATE_EXTRA_STACK
> is set, but I guess that's okay.
>
> Thanks, the series looks good to me.
> -Kevin
This commit breaks SeaBIOS' menu when used with coreboot's native
graphic init in text mode. Payloads are not affacted (tested NTLDR and
coreinfo).
Everything works fine with native graphic init in high resolution
framebuffer mode. I've got no debug log at hand, but I'll investigate
asap.
Tested on Lenovo T500 using libgfxinit with latest coreboot master.
Regards,
Patrick
>
> _______________________________________________
> SeaBIOS mailing list
> SeaBIOS(a)seabios.org
> https://mail.coreboot.org/mailman/listinfo/seabios
6 months, 3 weeks
Re: [SeaBIOS] [PATCH v2 6/6] cbvga_set_mode: disable clearmem in windows x86 emulator.
by Patrick Rudolph
On Fri, 2018-06-22 at 10:14 -0400, Kevin O'Connor wrote:
> On Fri, Jun 22, 2018 at 08:42:50AM +0200, Gerd Hoffmann wrote:
> > On Wed, Jun 20, 2018 at 08:00:28PM +0200, Patrick Rudolph wrote:
> > > This commit breaks SeaBIOS' menu when used with coreboot's native
> > > graphic init in text mode. Payloads are not affacted (tested NTLDR and
> > > coreinfo).
> > > Everything works fine with native graphic init in high resolution
> > > framebuffer mode. I've got no debug log at hand, but I'll investigate
> > > asap.
> > > Tested on Lenovo T500 using libgfxinit with latest coreboot master.
> >
> > Hmm, no clue what could cause this. But clearing the memory is only
> > problematic for the framebuffer case, so maybe the patch below helps?
> >
> > diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c
> > index f6ebe71242..a48f4dc885 100644
> > --- a/vgasrc/cbvga.c
> > +++ b/vgasrc/cbvga.c
> > @@ -201,18 +201,20 @@ cbvga_set_mode(struct vgamode_s *vmode_g, int flags)
> > */
> > u8 extra_stack = GET_BDA_EXT(flags) & BF_EXTRA_STACK;
> > MASK_BDA_EXT(flags, BF_EMULATE_TEXT, emul ? BF_EMULATE_TEXT : 0);
> > - if (!(flags & MF_NOCLEARMEM) && extra_stack) {
> > + if (!(flags & MF_NOCLEARMEM)) {
> > if (GET_GLOBAL(CBmodeinfo.memmodel) == MM_TEXT) {
> > memset16_far(SEG_CTEXT, (void*)0, 0x0720, 80*25*2);
> > return 0;
> > }
> > - struct gfx_op op;
> > - init_gfx_op(&op, &CBmodeinfo);
> > - op.x = op.y = 0;
> > - op.xlen = GET_GLOBAL(CBmodeinfo.width);
> > - op.ylen = GET_GLOBAL(CBmodeinfo.height);
> > - op.op = GO_MEMSET;
> > - handle_gfx_op(&op);
> > + if (extra_stack) {
>
> I'm also not sure on the cause, but I think it should be safe to
> change this to:
>
> if (extra_stack || flags & MF_LEGACY) {
>
Seems to be the correct solution, as BF_EXTRA_STACK is set after
cbvga_set_mode and thus extra_stack is 0 on first cbvga_set_mode call.
> because if this is a legacy call then it should be safe to write to
> highmem even if the last call was a vesa modeset.
>
> -Kevin
7 months
[PATCH v2 0/3] qemu: add qemu ramfb support
by Gerd Hoffmann
Hi,
Second version of the ramfb series. Turned out the previous version
didn't work at all, appearently I've tested by accident with an older
rom version which had a copy of the fw_cfg code instead of linking
paravirt.o. Making the linked paravirt.o work turned out to be
difficuilt due to dependencies on stuff like threads which isn't present
in the vgabios builds. So I'm back to the version with the (stripped
down) copy of the fw_cfg code ...
Gerd Hoffmann (3):
pmm: use tmp zone on oom
vgasrc: add allocate_pmm()
qemu: add qemu ramfb support
Makefile | 2 +-
vgasrc/vgahw.h | 28 +++++-----
vgasrc/vgautil.h | 4 ++
src/pmm.c | 13 +++++
vgasrc/ramfb.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
vgasrc/vgainit.c | 48 ++++++++++------
vgasrc/Kconfig | 7 +++
7 files changed, 235 insertions(+), 30 deletions(-)
create mode 100644 vgasrc/ramfb.c
--
2.9.3
7 months
[PATCH] bochs_display_setup: return error on failure
by Gerd Hoffmann
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
vgasrc/bochsdisplay.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vgasrc/bochsdisplay.c b/vgasrc/bochsdisplay.c
index e1f90f9678..6a75f3787e 100644
--- a/vgasrc/bochsdisplay.c
+++ b/vgasrc/bochsdisplay.c
@@ -38,7 +38,7 @@ bochs_display_setup(void)
dprintf(1, "bochs-display: id is 0x%x, %s\n", id
, id == VBE_DISPI_ID5 ? "good" : "FAIL");
if (id != VBE_DISPI_ID5)
- return 0;
+ return -1;
dprintf(1, "bochs-display: using %dx%d, %d bpp (%d stride)\n"
, FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT
--
2.9.3
7 months, 1 week
Re: [SeaBIOS] [PATCH 3/3] qemu: add qemu ramfb support
by Kevin O'Connor
On Wed, Jun 13, 2018 at 10:51:57AM +0200, Gerd Hoffmann wrote:
> Add support for qemu ramfb. This is a simple boot framebuffer device,
> with normal ram being used to back the framebuffer and fw_cfg being used
> to configure the device.
>
> Use case (on x86): boot display for vgpu devices (which neither emulate
> vga nor have a vgabios).
[...]
> --- /dev/null
> +++ b/vgasrc/ramfb.c
> @@ -0,0 +1,123 @@
> +#include "biosvar.h" // GET_BDA
> +#include "output.h" // dprintf
> +#include "string.h" // memset16_far
> +#include "vgautil.h" // VBE_total_memory
> +#include "std/pmm.h" // struct pmmheader
> +#include "byteorder.h"
> +#include "fw/paravirt.h"
> +
> +#define FRAMEBUFFER_WIDTH 1024
> +#define FRAMEBUFFER_HEIGHT 768
> +#define FRAMEBUFFER_BPP 4
> +#define FRAMEBUFFER_STRIDE (FRAMEBUFFER_BPP * FRAMEBUFFER_WIDTH)
> +#define FRAMEBUFFER_SIZE (FRAMEBUFFER_STRIDE * FRAMEBUFFER_HEIGHT)
> +
> +struct QemuRAMFBCfg {
> + u64 addr;
> + u32 fourcc;
> + u32 flags;
> + u32 width;
> + u32 height;
> + u32 stride;
> +};
> +
> +#define fourcc_code(a, b, c, d) ((u32)(a) | ((u32)(b) << 8) | \
> + ((u32)(c) << 16) | ((u32)(d) << 24))
> +
> +#define DRM_FORMAT_RGB565 fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */
> +#define DRM_FORMAT_RGB888 fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */
> +#define DRM_FORMAT_XRGB8888 fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */
> +
> +static u32
> +allocate_framebuffer(void)
> +{
> + u32 pmmscan;
> + for (pmmscan=0; pmmscan < BUILD_BIOS_SIZE; pmmscan+=16) {
> + struct pmmheader *pmm = (void*)pmmscan;
> + if (GET_FARVAR(SEG_BIOS, pmm->signature) != PMM_SIGNATURE)
> + continue;
> + if (checksum_far(SEG_BIOS, pmm, GET_FARVAR(SEG_BIOS, pmm->length)))
> + continue;
> + struct segoff_s entry = GET_FARVAR(SEG_BIOS, pmm->entry);
> + dprintf(1, "ramfb: alloc framebuffer via pmm call to %04x:%04x\n"
> + , entry.seg, entry.offset);
> + u16 res1, res2;
> + asm volatile(
> + "pushl %0\n"
> + "pushw $(8|2)\n" // Permanent high memory request
> + "pushl $0xffffffff\n" // Anonymous handle
> + "pushl $" __stringify(FRAMEBUFFER_SIZE / 16) "\n"
> + "pushw $0x00\n" // PMM allocation request
> + "lcallw *12(%%esp)\n"
> + "addl $16, %%esp\n"
> + "cli\n"
> + "cld\n"
> + : "+r" (entry.segoff), "=a" (res1), "=d" (res2) : : "cc", "memory");
> + u32 res = res1 | (res2 << 16);
> + if (!res || res == PMM_FUNCTION_NOT_SUPPORTED)
> + return 0;
> + dprintf(1, "ramfb: framebuffer allocated at %x\n", res);
> + return res;
> + }
> + return 0;
> +}
It would be preferable to re-factor allocate_extra_stack() so there is
just one pmm allocation function.
> +int
> +ramfb_setup(void)
> +{
> + dprintf(1, "ramfb: init\n");
> +
> + if (GET_GLOBAL(HaveRunInit))
> + return 0;
> +
> + u32 count;
> + qemu_cfg_read_entry(&count, QEMU_CFG_FILE_DIR, sizeof(count));
> + count = be32_to_cpu(count);
> + u32 select, e, fb;
> + for (select = 0, e = 0; e < count; e++) {
> + struct QemuCfgFile qfile;
> + qemu_cfg_read(&qfile, sizeof(qfile));
> + if (memcmp_far(GET_SEG(SS), qfile.name,
> + GET_SEG(CS), "etc/ramfb", 10) == 0)
> + select = be16_to_cpu(qfile.select);
> + }
Could this be moved into a new qemu_cfg_scan_file() function in
paravirt.c, and thus avoid patch 2?
> + if (select == 0) {
> + dprintf(1, "ramfb: fw_cfg (etc/ramfb) file not found\n");
> + return -1;
> + }
> +
> + dprintf(1, "ramfb: fw_cfg (etc/ramfb) file at slot 0x%x\n", select);
> + fb = allocate_framebuffer();
> + if (!fb) {
> + dprintf(1, "ramfb: allocating framebuffer failed\n");
> + return -1;
> + }
> +
> + u64 addr = fb;
> + u8 bpp = FRAMEBUFFER_BPP * 8;
> + u32 xlines = FRAMEBUFFER_WIDTH;
> + u32 ylines = FRAMEBUFFER_HEIGHT;
> + u32 linelength = FRAMEBUFFER_STRIDE;
> + dprintf(1, "Found FB @ %llx %dx%d with %d bpp (%d stride)\n"
> + , addr, xlines, ylines, bpp, linelength);
> +
> + if (!addr || addr > 0xffffffff
> + || (bpp != 15 && bpp != 16 && bpp != 24 && bpp != 32)) {
> + dprintf(1, "Unable to use FB\n");
> + return -1;
> + }
> +
> + cbvga_setup_modes(addr, bpp, xlines, ylines, linelength);
> +
> + struct QemuRAMFBCfg cfg = {
> + .addr = cpu_to_be64(fb),
> + .fourcc = cpu_to_be32(DRM_FORMAT_XRGB8888),
> + .flags = cpu_to_be32(0),
> + .width = cpu_to_be32(FRAMEBUFFER_WIDTH),
> + .height = cpu_to_be32(FRAMEBUFFER_HEIGHT),
> + .stride = cpu_to_be32(FRAMEBUFFER_STRIDE),
> + };
> + qemu_cfg_write_entry(&cfg, select, sizeof(cfg));
> +
> + return 0;
> +}
> diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
> index 4443c0b37a..1933b0e23f 100644
> --- a/vgasrc/Kconfig
> +++ b/vgasrc/Kconfig
> @@ -70,6 +70,13 @@ menu "VGA ROM"
> v3.0+. The vgabios works with the qemu stdvga too (use
> "qemu -device VGA,romfile=/path/to/vgabios.bin")".
>
> + config VGA_RAMFB
> + depends on QEMU
> + bool "qemu ram framebuffer (experimental)"
> + select VGA_EMULATE_TEXT
> + help
> + qemu ram framebuffer (experimental)
I see it is marked as experimental - is this a proof of concept patch
or is this feature ready for a merge into qemu and seabios?
Thanks,
-Kevin
7 months, 1 week
