SeaBIOS

seabios@seabios.org

5 participants
3802 discussions

[PATCH] bochsvga: fallback to stdvga if dispi interface isn't present
by Gerd Hoffmann 07 Sep '13

07 Sep '13

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- vgasrc/bochsvga.c | 67 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index b0ba1ec..012620b 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -91,6 +91,8 @@ static struct bochsvga_mode { 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } }, }; +static int dispi_found VAR16 = 0; + static int is_bochsvga_mode(struct vgamode_s *vmode_g) { return (vmode_g >= &bochsvga_modes[0].info @@ -100,9 +102,10 @@ static int is_bochsvga_mode(struct vgamode_s *vmode_g) struct vgamode_s *bochsvga_find_mode(int mode) { struct bochsvga_mode *m = bochsvga_modes; - for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) - if (GET_GLOBAL(m->mode) == mode) - return &m->info; + if (GET_GLOBAL(dispi_found)) + for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) + if (GET_GLOBAL(m->mode) == mode) + return &m->info; return stdvga_find_mode(mode); } @@ -110,12 +113,14 @@ void bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) { struct bochsvga_mode *m = bochsvga_modes; - for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) { - u16 mode = GET_GLOBAL(m->mode); - if (mode == 0xffff) - continue; - SET_FARVAR(seg, *dest, mode); - dest++; + if (GET_GLOBAL(dispi_found)) { + for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) { + u16 mode = GET_GLOBAL(m->mode); + if (mode == 0xffff) + continue; + SET_FARVAR(seg, *dest, mode); + dest++; + } } stdvga_list_modes(seg, dest, last); } @@ -128,6 +133,8 @@ bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) int bochsvga_get_window(struct vgamode_s *vmode_g, int window) { + if (!GET_GLOBAL(dispi_found)) + return stdvga_get_window(vmode_g, window); if (window != 0) return -1; return dispi_read(VBE_DISPI_INDEX_BANK); @@ -136,6 +143,8 @@ bochsvga_get_window(struct vgamode_s *vmode_g, int window) int bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) { + if (!GET_GLOBAL(dispi_found)) + return stdvga_set_window(vmode_g, window, val); if (window != 0) return -1; dispi_write(VBE_DISPI_INDEX_BANK, val); @@ -147,6 +156,8 @@ bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) int bochsvga_get_linelength(struct vgamode_s *vmode_g) { + if (!GET_GLOBAL(dispi_found)) + return stdvga_get_linelength(vmode_g); return dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * vga_bpp(vmode_g) / 8; } @@ -154,14 +165,18 @@ int bochsvga_set_linelength(struct vgamode_s *vmode_g, int val) { stdvga_set_linelength(vmode_g, val); - int pixels = (val * 8) / vga_bpp(vmode_g); - dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); + if (GET_GLOBAL(dispi_found)) { + int pixels = (val * 8) / vga_bpp(vmode_g); + dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); + } return 0; } int bochsvga_get_displaystart(struct vgamode_s *vmode_g) { + if (!GET_GLOBAL(dispi_found)) + return stdvga_get_displaystart(vmode_g); int bpp = vga_bpp(vmode_g); int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; int x = dispi_read(VBE_DISPI_INDEX_X_OFFSET); @@ -173,16 +188,20 @@ int bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val) { stdvga_set_displaystart(vmode_g, val); - int bpp = vga_bpp(vmode_g); - int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; - dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp); - dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength); + if (GET_GLOBAL(dispi_found)) { + int bpp = vga_bpp(vmode_g); + int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; + dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp); + dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength); + } return 0; } int bochsvga_get_dacformat(struct vgamode_s *vmode_g) { + if (!GET_GLOBAL(dispi_found)) + return stdvga_get_dacformat(vmode_g); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); return (en & VBE_DISPI_8BIT_DAC) ? 8 : 6; } @@ -190,6 +209,8 @@ bochsvga_get_dacformat(struct vgamode_s *vmode_g) int bochsvga_set_dacformat(struct vgamode_s *vmode_g, int val) { + if (!GET_GLOBAL(dispi_found)) + return stdvga_set_dacformat(vmode_g, val); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); if (val == 6) en &= ~VBE_DISPI_8BIT_DAC; @@ -207,7 +228,7 @@ bochsvga_size_state(int states) int size = stdvga_size_state(states); if (size < 0) return size; - if (states & 8) + if (GET_GLOBAL(dispi_found) && (states & 8)) size += (VBE_DISPI_INDEX_Y_OFFSET-VBE_DISPI_INDEX_XRES+1)*sizeof(u16); return size; } @@ -219,6 +240,8 @@ bochsvga_save_state(u16 seg, void *data, int states) if (ret < 0) return ret; + if (!GET_GLOBAL(dispi_found)) + return 0; if (!(states & 8)) return 0; @@ -245,6 +268,8 @@ bochsvga_restore_state(u16 seg, void *data, int states) if (ret < 0) return ret; + if (!GET_GLOBAL(dispi_found)) + return 0; if (!(states & 8)) return 0; @@ -274,9 +299,12 @@ bochsvga_restore_state(u16 seg, void *data, int states) int bochsvga_set_mode(struct vgamode_s *vmode_g, int flags) { - dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); + if (GET_GLOBAL(dispi_found)) + dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); if (! is_bochsvga_mode(vmode_g)) return stdvga_set_mode(vmode_g, flags); + if (!GET_GLOBAL(dispi_found)) + return -1; u8 depth = GET_GLOBAL(vmode_g->depth); if (depth == 4) @@ -339,11 +367,12 @@ bochsvga_setup(void) /* Sanity checks */ dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID0); if (dispi_read(VBE_DISPI_INDEX_ID) != VBE_DISPI_ID0) { - dprintf(1, "No VBE DISPI interface detected\n"); - return -1; + dprintf(1, "No VBE DISPI interface detected, falling back to stdvga\n"); + return 0; } dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5); + SET_VGA(dispi_found, 1); if (GET_GLOBAL(HaveRunInit)) return 0; -- 1.8.3.1

2 1

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

06 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. cheers, Gerd Gerd Hoffmann (3): Add generic qemu detection Drop coreboot qemu detection Add qemu detection to csm src/coreboot.c | 4 ---- src/csm.c | 2 ++ src/paravirt.c | 42 ++++++++++++++++++++++++++++++++++++------ src/paravirt.h | 1 + 4 files changed, 39 insertions(+), 10 deletions(-) -- 1.8.3.1

4 9

[PATCH v2 0/3] usb: add xhci support
by Gerd Hoffmann 06 Sep '13

06 Sep '13

Hi, Next version of the xhci support patch series. Dropped patch #2. Plugged the leaks in patch #3 (last series, now #2). Gerd Hoffmann (3): uas: add (temporary) superspeed stopgap usb: add usb_update_pipe() usb: add xhci support Makefile | 2 +- src/Kconfig | 6 + src/pci_ids.h | 1 + src/usb-uas.c | 4 + src/usb-xhci.c | 1124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/usb-xhci.h | 144 ++++++++ src/usb.c | 35 +- src/usb.h | 17 +- 8 files changed, 1320 insertions(+), 13 deletions(-) create mode 100644 src/usb-xhci.c create mode 100644 src/usb-xhci.h -- 1.8.3.1

2 5

[PATCH] bochsvga: fallback to stdvga if dispi interface isn't present
by Gerd Hoffmann 05 Sep '13

05 Sep '13

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- vgasrc/bochsvga.c | 67 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index b0ba1ec..9a0479c 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -91,6 +91,8 @@ static struct bochsvga_mode { 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } }, }; +static int dispi_found VAR16 = 0; + static int is_bochsvga_mode(struct vgamode_s *vmode_g) { return (vmode_g >= &bochsvga_modes[0].info @@ -100,9 +102,10 @@ static int is_bochsvga_mode(struct vgamode_s *vmode_g) struct vgamode_s *bochsvga_find_mode(int mode) { struct bochsvga_mode *m = bochsvga_modes; - for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) - if (GET_GLOBAL(m->mode) == mode) - return &m->info; + if (dispi_found) + for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) + if (GET_GLOBAL(m->mode) == mode) + return &m->info; return stdvga_find_mode(mode); } @@ -110,12 +113,14 @@ void bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) { struct bochsvga_mode *m = bochsvga_modes; - for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) { - u16 mode = GET_GLOBAL(m->mode); - if (mode == 0xffff) - continue; - SET_FARVAR(seg, *dest, mode); - dest++; + if (dispi_found) { + for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) { + u16 mode = GET_GLOBAL(m->mode); + if (mode == 0xffff) + continue; + SET_FARVAR(seg, *dest, mode); + dest++; + } } stdvga_list_modes(seg, dest, last); } @@ -128,6 +133,8 @@ bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) int bochsvga_get_window(struct vgamode_s *vmode_g, int window) { + if (!dispi_found) + return stdvga_get_window(vmode_g, window); if (window != 0) return -1; return dispi_read(VBE_DISPI_INDEX_BANK); @@ -136,6 +143,8 @@ bochsvga_get_window(struct vgamode_s *vmode_g, int window) int bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) { + if (!dispi_found) + return stdvga_set_window(vmode_g, window, val); if (window != 0) return -1; dispi_write(VBE_DISPI_INDEX_BANK, val); @@ -147,6 +156,8 @@ bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) int bochsvga_get_linelength(struct vgamode_s *vmode_g) { + if (!dispi_found) + return stdvga_get_linelength(vmode_g); return dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * vga_bpp(vmode_g) / 8; } @@ -154,14 +165,18 @@ int bochsvga_set_linelength(struct vgamode_s *vmode_g, int val) { stdvga_set_linelength(vmode_g, val); - int pixels = (val * 8) / vga_bpp(vmode_g); - dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); + if (dispi_found) { + int pixels = (val * 8) / vga_bpp(vmode_g); + dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); + } return 0; } int bochsvga_get_displaystart(struct vgamode_s *vmode_g) { + if (!dispi_found) + return stdvga_get_displaystart(vmode_g); int bpp = vga_bpp(vmode_g); int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; int x = dispi_read(VBE_DISPI_INDEX_X_OFFSET); @@ -173,16 +188,20 @@ int bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val) { stdvga_set_displaystart(vmode_g, val); - int bpp = vga_bpp(vmode_g); - int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; - dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp); - dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength); + if (dispi_found) { + int bpp = vga_bpp(vmode_g); + int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; + dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp); + dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength); + } return 0; } int bochsvga_get_dacformat(struct vgamode_s *vmode_g) { + if (!dispi_found) + return stdvga_get_dacformat(vmode_g); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); return (en & VBE_DISPI_8BIT_DAC) ? 8 : 6; } @@ -190,6 +209,8 @@ bochsvga_get_dacformat(struct vgamode_s *vmode_g) int bochsvga_set_dacformat(struct vgamode_s *vmode_g, int val) { + if (!dispi_found) + return stdvga_set_dacformat(vmode_g, val); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); if (val == 6) en &= ~VBE_DISPI_8BIT_DAC; @@ -207,7 +228,7 @@ bochsvga_size_state(int states) int size = stdvga_size_state(states); if (size < 0) return size; - if (states & 8) + if (dispi_found && (states & 8)) size += (VBE_DISPI_INDEX_Y_OFFSET-VBE_DISPI_INDEX_XRES+1)*sizeof(u16); return size; } @@ -219,6 +240,8 @@ bochsvga_save_state(u16 seg, void *data, int states) if (ret < 0) return ret; + if (!dispi_found) + return 0; if (!(states & 8)) return 0; @@ -245,6 +268,8 @@ bochsvga_restore_state(u16 seg, void *data, int states) if (ret < 0) return ret; + if (!dispi_found) + return 0; if (!(states & 8)) return 0; @@ -274,9 +299,12 @@ bochsvga_restore_state(u16 seg, void *data, int states) int bochsvga_set_mode(struct vgamode_s *vmode_g, int flags) { - dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); + if (dispi_found) + dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); if (! is_bochsvga_mode(vmode_g)) return stdvga_set_mode(vmode_g, flags); + if (!dispi_found) + return -1; u8 depth = GET_GLOBAL(vmode_g->depth); if (depth == 4) @@ -339,11 +367,12 @@ bochsvga_setup(void) /* Sanity checks */ dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID0); if (dispi_read(VBE_DISPI_INDEX_ID) != VBE_DISPI_ID0) { - dprintf(1, "No VBE DISPI interface detected\n"); - return -1; + dprintf(1, "No VBE DISPI interface detected, falling back to stdvga\n"); + return 0; } dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5); + dispi_found = 1; if (GET_GLOBAL(HaveRunInit)) return 0; -- 1.8.3.1

1 0

[PATCH] bochsvga: fallback to stdvga if dispi interface isn't present
by Gerd Hoffmann 05 Sep '13

05 Sep '13

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- vgasrc/bochsvga.c | 67 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c index b0ba1ec..9a0479c 100644 --- a/vgasrc/bochsvga.c +++ b/vgasrc/bochsvga.c @@ -91,6 +91,8 @@ static struct bochsvga_mode { 0x18c, { MM_DIRECT, 2560, 1600, 32, 8, 16, SEG_GRAPH } }, }; +static int dispi_found VAR16 = 0; + static int is_bochsvga_mode(struct vgamode_s *vmode_g) { return (vmode_g >= &bochsvga_modes[0].info @@ -100,9 +102,10 @@ static int is_bochsvga_mode(struct vgamode_s *vmode_g) struct vgamode_s *bochsvga_find_mode(int mode) { struct bochsvga_mode *m = bochsvga_modes; - for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) - if (GET_GLOBAL(m->mode) == mode) - return &m->info; + if (dispi_found) + for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)]; m++) + if (GET_GLOBAL(m->mode) == mode) + return &m->info; return stdvga_find_mode(mode); } @@ -110,12 +113,14 @@ void bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) { struct bochsvga_mode *m = bochsvga_modes; - for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) { - u16 mode = GET_GLOBAL(m->mode); - if (mode == 0xffff) - continue; - SET_FARVAR(seg, *dest, mode); - dest++; + if (dispi_found) { + for (; m < &bochsvga_modes[ARRAY_SIZE(bochsvga_modes)] && dest<last; m++) { + u16 mode = GET_GLOBAL(m->mode); + if (mode == 0xffff) + continue; + SET_FARVAR(seg, *dest, mode); + dest++; + } } stdvga_list_modes(seg, dest, last); } @@ -128,6 +133,8 @@ bochsvga_list_modes(u16 seg, u16 *dest, u16 *last) int bochsvga_get_window(struct vgamode_s *vmode_g, int window) { + if (!dispi_found) + return stdvga_get_window(vmode_g, window); if (window != 0) return -1; return dispi_read(VBE_DISPI_INDEX_BANK); @@ -136,6 +143,8 @@ bochsvga_get_window(struct vgamode_s *vmode_g, int window) int bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) { + if (!dispi_found) + return stdvga_set_window(vmode_g, window, val); if (window != 0) return -1; dispi_write(VBE_DISPI_INDEX_BANK, val); @@ -147,6 +156,8 @@ bochsvga_set_window(struct vgamode_s *vmode_g, int window, int val) int bochsvga_get_linelength(struct vgamode_s *vmode_g) { + if (!dispi_found) + return stdvga_get_linelength(vmode_g); return dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * vga_bpp(vmode_g) / 8; } @@ -154,14 +165,18 @@ int bochsvga_set_linelength(struct vgamode_s *vmode_g, int val) { stdvga_set_linelength(vmode_g, val); - int pixels = (val * 8) / vga_bpp(vmode_g); - dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); + if (dispi_found) { + int pixels = (val * 8) / vga_bpp(vmode_g); + dispi_write(VBE_DISPI_INDEX_VIRT_WIDTH, pixels); + } return 0; } int bochsvga_get_displaystart(struct vgamode_s *vmode_g) { + if (!dispi_found) + return stdvga_get_displaystart(vmode_g); int bpp = vga_bpp(vmode_g); int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; int x = dispi_read(VBE_DISPI_INDEX_X_OFFSET); @@ -173,16 +188,20 @@ int bochsvga_set_displaystart(struct vgamode_s *vmode_g, int val) { stdvga_set_displaystart(vmode_g, val); - int bpp = vga_bpp(vmode_g); - int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; - dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp); - dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength); + if (dispi_found) { + int bpp = vga_bpp(vmode_g); + int linelength = dispi_read(VBE_DISPI_INDEX_VIRT_WIDTH) * bpp / 8; + dispi_write(VBE_DISPI_INDEX_X_OFFSET, (val % linelength) * 8 / bpp); + dispi_write(VBE_DISPI_INDEX_Y_OFFSET, val / linelength); + } return 0; } int bochsvga_get_dacformat(struct vgamode_s *vmode_g) { + if (!dispi_found) + return stdvga_get_dacformat(vmode_g); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); return (en & VBE_DISPI_8BIT_DAC) ? 8 : 6; } @@ -190,6 +209,8 @@ bochsvga_get_dacformat(struct vgamode_s *vmode_g) int bochsvga_set_dacformat(struct vgamode_s *vmode_g, int val) { + if (!dispi_found) + return stdvga_set_dacformat(vmode_g, val); u16 en = dispi_read(VBE_DISPI_INDEX_ENABLE); if (val == 6) en &= ~VBE_DISPI_8BIT_DAC; @@ -207,7 +228,7 @@ bochsvga_size_state(int states) int size = stdvga_size_state(states); if (size < 0) return size; - if (states & 8) + if (dispi_found && (states & 8)) size += (VBE_DISPI_INDEX_Y_OFFSET-VBE_DISPI_INDEX_XRES+1)*sizeof(u16); return size; } @@ -219,6 +240,8 @@ bochsvga_save_state(u16 seg, void *data, int states) if (ret < 0) return ret; + if (!dispi_found) + return 0; if (!(states & 8)) return 0; @@ -245,6 +268,8 @@ bochsvga_restore_state(u16 seg, void *data, int states) if (ret < 0) return ret; + if (!dispi_found) + return 0; if (!(states & 8)) return 0; @@ -274,9 +299,12 @@ bochsvga_restore_state(u16 seg, void *data, int states) int bochsvga_set_mode(struct vgamode_s *vmode_g, int flags) { - dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); + if (dispi_found) + dispi_write(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); if (! is_bochsvga_mode(vmode_g)) return stdvga_set_mode(vmode_g, flags); + if (!dispi_found) + return -1; u8 depth = GET_GLOBAL(vmode_g->depth); if (depth == 4) @@ -339,11 +367,12 @@ bochsvga_setup(void) /* Sanity checks */ dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID0); if (dispi_read(VBE_DISPI_INDEX_ID) != VBE_DISPI_ID0) { - dprintf(1, "No VBE DISPI interface detected\n"); - return -1; + dprintf(1, "No VBE DISPI interface detected, falling back to stdvga\n"); + return 0; } dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5); + dispi_found = 1; if (GET_GLOBAL(HaveRunInit)) return 0; -- 1.8.3.1

2 1

[PATCH 1/2] move vgahw_* from .h to .c file
by Gerd Hoffmann 05 Sep '13

05 Sep '13

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- Makefile | 2 +- vgasrc/vgahw.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ vgasrc/vgahw.h | 141 +++++++-------------------------------------------------- 3 files changed, 144 insertions(+), 126 deletions(-) create mode 100644 vgasrc/vgahw.c diff --git a/Makefile b/Makefile index 1588522..507d907 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,7 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o scripts/checkrom.py SRCVGA=src/output.c src/util.c src/pci.c \ vgasrc/vgabios.c vgasrc/vgafb.c vgasrc/vgafonts.c vgasrc/vbe.c \ vgasrc/stdvga.c vgasrc/stdvgamodes.c vgasrc/stdvgaio.c \ - vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c + vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c vgasrc/vgahw.c CFLAGS16VGA = $(CFLAGS16INC) -Isrc diff --git a/vgasrc/vgahw.c b/vgasrc/vgahw.c new file mode 100644 index 0000000..fc843c4 --- /dev/null +++ b/vgasrc/vgahw.c @@ -0,0 +1,127 @@ +#include "types.h" // u8 +#include "config.h" // CONFIG_* + +#include "clext.h" // clext_set_mode +#include "bochsvga.h" // bochsvga_set_mode +#include "stdvga.h" // stdvga_set_mode +#include "geodevga.h" // geodevga_setup + +struct vgamode_s *vgahw_find_mode(int mode) { + if (CONFIG_VGA_CIRRUS) + return clext_find_mode(mode); + if (CONFIG_VGA_BOCHS) + return bochsvga_find_mode(mode); + return stdvga_find_mode(mode); +} + +int vgahw_set_mode(struct vgamode_s *vmode_g, int flags) { + if (CONFIG_VGA_CIRRUS) + return clext_set_mode(vmode_g, flags); + if (CONFIG_VGA_BOCHS) + return bochsvga_set_mode(vmode_g, flags); + return stdvga_set_mode(vmode_g, flags); +} + +void vgahw_list_modes(u16 seg, u16 *dest, u16 *last) { + if (CONFIG_VGA_CIRRUS) + clext_list_modes(seg, dest, last); + else if (CONFIG_VGA_BOCHS) + bochsvga_list_modes(seg, dest, last); + else + stdvga_list_modes(seg, dest, last); +} + +int vgahw_setup(void) { + if (CONFIG_VGA_CIRRUS) + return clext_setup(); + if (CONFIG_VGA_BOCHS) + return bochsvga_setup(); + if (CONFIG_VGA_GEODEGX2 || CONFIG_VGA_GEODELX) + return geodevga_setup(); + return stdvga_setup(); +} + +int vgahw_get_window(struct vgamode_s *vmode_g, int window) { + if (CONFIG_VGA_CIRRUS) + return clext_get_window(vmode_g, window); + if (CONFIG_VGA_BOCHS) + return bochsvga_get_window(vmode_g, window); + return stdvga_get_window(vmode_g, window); +} + +int vgahw_set_window(struct vgamode_s *vmode_g, int window + , int val) { + if (CONFIG_VGA_CIRRUS) + return clext_set_window(vmode_g, window, val); + if (CONFIG_VGA_BOCHS) + return bochsvga_set_window(vmode_g, window, val); + return stdvga_set_window(vmode_g, window, val); +} + +int vgahw_get_linelength(struct vgamode_s *vmode_g) { + if (CONFIG_VGA_CIRRUS) + return clext_get_linelength(vmode_g); + if (CONFIG_VGA_BOCHS) + return bochsvga_get_linelength(vmode_g); + return stdvga_get_linelength(vmode_g); +} + +int vgahw_set_linelength(struct vgamode_s *vmode_g, int val) { + if (CONFIG_VGA_CIRRUS) + return clext_set_linelength(vmode_g, val); + if (CONFIG_VGA_BOCHS) + return bochsvga_set_linelength(vmode_g, val); + return stdvga_set_linelength(vmode_g, val); +} + +int vgahw_get_displaystart(struct vgamode_s *vmode_g) { + if (CONFIG_VGA_CIRRUS) + return clext_get_displaystart(vmode_g); + if (CONFIG_VGA_BOCHS) + return bochsvga_get_displaystart(vmode_g); + return stdvga_get_displaystart(vmode_g); +} + +int vgahw_set_displaystart(struct vgamode_s *vmode_g, int val) { + if (CONFIG_VGA_CIRRUS) + return clext_set_displaystart(vmode_g, val); + if (CONFIG_VGA_BOCHS) + return bochsvga_set_displaystart(vmode_g, val); + return stdvga_set_displaystart(vmode_g, val); +} + +int vgahw_get_dacformat(struct vgamode_s *vmode_g) { + if (CONFIG_VGA_BOCHS) + return bochsvga_get_dacformat(vmode_g); + return stdvga_get_dacformat(vmode_g); +} + +int vgahw_set_dacformat(struct vgamode_s *vmode_g, int val) { + if (CONFIG_VGA_BOCHS) + return bochsvga_set_dacformat(vmode_g, val); + return stdvga_set_dacformat(vmode_g, val); +} + +int vgahw_size_state(int states) { + if (CONFIG_VGA_CIRRUS) + return clext_size_state(states); + if (CONFIG_VGA_BOCHS) + return bochsvga_size_state(states); + return stdvga_size_state(states); +} + +int vgahw_save_state(u16 seg, void *data, int states) { + if (CONFIG_VGA_CIRRUS) + return clext_save_state(seg, data, states); + if (CONFIG_VGA_BOCHS) + return bochsvga_save_state(seg, data, states); + return stdvga_save_state(seg, data, states); +} + +int vgahw_restore_state(u16 seg, void *data, int states) { + if (CONFIG_VGA_CIRRUS) + return clext_restore_state(seg, data, states); + if (CONFIG_VGA_BOCHS) + return bochsvga_restore_state(seg, data, states); + return stdvga_restore_state(seg, data, states); +} diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h index f69a5ac..7a82b0d 100644 --- a/vgasrc/vgahw.h +++ b/vgasrc/vgahw.h @@ -2,131 +2,22 @@ #define __VGAHW_H #include "types.h" // u8 -#include "config.h" // CONFIG_* -#include "clext.h" // clext_set_mode -#include "bochsvga.h" // bochsvga_set_mode -#include "stdvga.h" // stdvga_set_mode -#include "geodevga.h" // geodevga_setup - -static inline struct vgamode_s *vgahw_find_mode(int mode) { - if (CONFIG_VGA_CIRRUS) - return clext_find_mode(mode); - if (CONFIG_VGA_BOCHS) - return bochsvga_find_mode(mode); - return stdvga_find_mode(mode); -} - -static inline int vgahw_set_mode(struct vgamode_s *vmode_g, int flags) { - if (CONFIG_VGA_CIRRUS) - return clext_set_mode(vmode_g, flags); - if (CONFIG_VGA_BOCHS) - return bochsvga_set_mode(vmode_g, flags); - return stdvga_set_mode(vmode_g, flags); -} - -static inline void vgahw_list_modes(u16 seg, u16 *dest, u16 *last) { - if (CONFIG_VGA_CIRRUS) - clext_list_modes(seg, dest, last); - else if (CONFIG_VGA_BOCHS) - bochsvga_list_modes(seg, dest, last); - else - stdvga_list_modes(seg, dest, last); -} - -static inline int vgahw_setup(void) { - if (CONFIG_VGA_CIRRUS) - return clext_setup(); - if (CONFIG_VGA_BOCHS) - return bochsvga_setup(); - if (CONFIG_VGA_GEODEGX2 || CONFIG_VGA_GEODELX) - return geodevga_setup(); - return stdvga_setup(); -} - -static inline int vgahw_get_window(struct vgamode_s *vmode_g, int window) { - if (CONFIG_VGA_CIRRUS) - return clext_get_window(vmode_g, window); - if (CONFIG_VGA_BOCHS) - return bochsvga_get_window(vmode_g, window); - return stdvga_get_window(vmode_g, window); -} - -static inline int vgahw_set_window(struct vgamode_s *vmode_g, int window - , int val) { - if (CONFIG_VGA_CIRRUS) - return clext_set_window(vmode_g, window, val); - if (CONFIG_VGA_BOCHS) - return bochsvga_set_window(vmode_g, window, val); - return stdvga_set_window(vmode_g, window, val); -} - -static inline int vgahw_get_linelength(struct vgamode_s *vmode_g) { - if (CONFIG_VGA_CIRRUS) - return clext_get_linelength(vmode_g); - if (CONFIG_VGA_BOCHS) - return bochsvga_get_linelength(vmode_g); - return stdvga_get_linelength(vmode_g); -} - -static inline int vgahw_set_linelength(struct vgamode_s *vmode_g, int val) { - if (CONFIG_VGA_CIRRUS) - return clext_set_linelength(vmode_g, val); - if (CONFIG_VGA_BOCHS) - return bochsvga_set_linelength(vmode_g, val); - return stdvga_set_linelength(vmode_g, val); -} - -static inline int vgahw_get_displaystart(struct vgamode_s *vmode_g) { - if (CONFIG_VGA_CIRRUS) - return clext_get_displaystart(vmode_g); - if (CONFIG_VGA_BOCHS) - return bochsvga_get_displaystart(vmode_g); - return stdvga_get_displaystart(vmode_g); -} - -static inline int vgahw_set_displaystart(struct vgamode_s *vmode_g, int val) { - if (CONFIG_VGA_CIRRUS) - return clext_set_displaystart(vmode_g, val); - if (CONFIG_VGA_BOCHS) - return bochsvga_set_displaystart(vmode_g, val); - return stdvga_set_displaystart(vmode_g, val); -} - -static inline int vgahw_get_dacformat(struct vgamode_s *vmode_g) { - if (CONFIG_VGA_BOCHS) - return bochsvga_get_dacformat(vmode_g); - return stdvga_get_dacformat(vmode_g); -} - -static inline int vgahw_set_dacformat(struct vgamode_s *vmode_g, int val) { - if (CONFIG_VGA_BOCHS) - return bochsvga_set_dacformat(vmode_g, val); - return stdvga_set_dacformat(vmode_g, val); -} - -static inline int vgahw_size_state(int states) { - if (CONFIG_VGA_CIRRUS) - return clext_size_state(states); - if (CONFIG_VGA_BOCHS) - return bochsvga_size_state(states); - return stdvga_size_state(states); -} - -static inline int vgahw_save_state(u16 seg, void *data, int states) { - if (CONFIG_VGA_CIRRUS) - return clext_save_state(seg, data, states); - if (CONFIG_VGA_BOCHS) - return bochsvga_save_state(seg, data, states); - return stdvga_save_state(seg, data, states); -} - -static inline int vgahw_restore_state(u16 seg, void *data, int states) { - if (CONFIG_VGA_CIRRUS) - return clext_restore_state(seg, data, states); - if (CONFIG_VGA_BOCHS) - return bochsvga_restore_state(seg, data, states); - return stdvga_restore_state(seg, data, states); -} +struct vgamode_s *vgahw_find_mode(int mode); +int vgahw_set_mode(struct vgamode_s *vmode_g, int flags); +void vgahw_list_modes(u16 seg, u16 *dest, u16 *last); +int vgahw_setup(void); +int vgahw_get_window(struct vgamode_s *vmode_g, int window); +int vgahw_set_window(struct vgamode_s *vmode_g, int window + , int val); +int vgahw_get_linelength(struct vgamode_s *vmode_g); +int vgahw_set_linelength(struct vgamode_s *vmode_g, int val); +int vgahw_get_displaystart(struct vgamode_s *vmode_g); +int vgahw_set_displaystart(struct vgamode_s *vmode_g, int val); +int vgahw_get_dacformat(struct vgamode_s *vmode_g); +int vgahw_set_dacformat(struct vgamode_s *vmode_g, int val); +int vgahw_size_state(int states); +int vgahw_save_state(u16 seg, void *data, int states); +int vgahw_restore_state(u16 seg, void *data, int states); #endif // vgahw.h -- 1.8.3.1

2 2

[PATCH 0/4] usb: add xhci support
by Gerd Hoffmann 03 Sep '13

03 Sep '13

Hi, Finally found the time to polish the xhci implementation and improve usb core support for xhci. So here we go. cheers, Gerd Gerd Hoffmann (4): uas: add (temporary) superspeed stopgap usb: don't free usbdev usb: add usb_update_pipe() usb: add xhci support Makefile | 2 +- src/Kconfig | 6 + src/pci_ids.h | 1 + src/usb-uas.c | 4 + src/usb-xhci.c | 1124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/usb-xhci.h | 144 ++++++++ src/usb.c | 37 +- src/usb.h | 17 +- 8 files changed, 1320 insertions(+), 15 deletions(-) create mode 100644 src/usb-xhci.c create mode 100644 src/usb-xhci.h -- 1.8.3.1

2 9

[RFC][PATCH] cpu: implement CPEJ method for unpluging cpu
by Chen Fan 29 Aug '13

29 Aug '13

After OS ejecting a vcpu successful, it will call CPEJ method, there communicate the masked vcpu bitmap to QEMU. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/acpi-dsdt-cpu-hotplug.dsl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/acpi-dsdt-cpu-hotplug.dsl b/src/acpi-dsdt-cpu-hotplug.dsl index 0f3e83b..b25963c 100644 --- a/src/acpi-dsdt-cpu-hotplug.dsl +++ b/src/acpi-dsdt-cpu-hotplug.dsl @@ -34,7 +34,11 @@ Scope(\_SB) { } Method(CPEJ, 2, NotSerialized) { // _EJ0 method - eject callback - Sleep(200) + Store(Zero, Index(CPON, ToInteger(Arg0))) + Store(One, Local0) + ShiftLeft(Local0, Arg0, Local0) + Not(Local0, Local0) + And(PRS, Local0, PRS) } /* CPU hotplug notify method */ -- 1.8.1.4

1 0

[PATCH] don't produce overly large images
by Jan Beulich 28 Aug '13

28 Aug '13

In the course of dealing with a problem in Xen's use of SeaBIOS when the resulting image exceeds 128k I found it desirable to not add unnecessarily much padding to the beginning of the image. Going in 64k steps should be sufficient; perhaps one could use even smaller ones, thus increasing the chances of there always being a window of available space at C0000h. Signed-off-by: Jan Beulich <jbeulich(a)suse.com> --- a/tools/checkrom.py +++ b/tools/checkrom.py @@ -32,11 +32,14 @@ def main(): rawdata = f.read() f.close() datasize = len(rawdata) - finalsize = 64*1024 - if datasize > 64*1024: + if datasize > 192*1024: + finalsize = 256*1024 + elif datasize > 128*1024: + finalsize = 192*1024 + elif datasize > 64*1024: finalsize = 128*1024 - if datasize > 128*1024: - finalsize = 256*1024 + else: + finalsize = 64*1024 # Sanity checks start = symbols['code32flat_start'].offset

3 8

Re: [SeaBIOS] [Xen-devel] [Qemu-devel] Cirrus VGA slow screen update, show blank screen last 13s or so for windows XP guest
by Gonglei (Arei) 27 Aug '13

27 Aug '13

Hi all. I got another trouble after I using that patch, which windows 2003 32bit guest VNC display wasn't normal, please see the attached. In addition, windows 2003 64bit guest had a normal display. I couldn't understand it, anyone can help me? Thanks you in advance. The patch is: http://xen.1045712.n5.nabble.com/PATCH-QEMU-Clear-bios-framebuffer-with-min… Best Regards, -Gonglei > -----Original Message----- > Subject: Re: [Xen-devel] [Qemu-devel] Cirrus VGA slow screen update, show > blank screen last 13s or so for windows XP guest > > > On Aug 20, 2013, at 3:45 PM, Konrad Rzeszutek Wilk > <konrad.wilk(a)oracle.com> > wrote: > > > On Sat, Aug 17, 2013 at 09:04:29AM +0000, Gonglei (Arei) wrote: > >> Hi, > >> The fundamental reason is traditional qemu-dm and upstream qemu using a > different vgabios-cirrus.bin, > >> qemu-dm is using xen-4.1.2/tools/firmware/vgabios/ > VGABIOS-lgpl-latest.cirrus.bin, > >> but upstream qemu is using qemu-1.2.2/pc-bios/vgabios-cirrus.bin > >> > >> the pivotal patch is : > >> > >> # HG changeset patch > >> # User Keir Fraser <keir(a)xensource.com> > >> # Date 1193391667 -3600 > >> # Node ID d31f63db5f1e88deadc5461adda07b77c22873d7 > >> # Parent 413107fa49a50e5c61ac390dc1870d8995b2a012 > >> > >> x86, hvm: Allow Cirrus VGA BIOS to clear framebuffer with minimal PIO > writes. > >> > >> Signed-off-by: Ben Guthro <bguthro(a)virtualron.com> > >> Signed-off-by: Gary Grebus <ggrebus(a)virtualiron.com> > > > > Ben's new address is <benjamin.guthro(a)citrix.com>. CC-ing him here. > > FWIW, I took Gary's patch, and made it apply to unstable, at that time. > He was the primary developer, in that case. > > That's how I recall it, anyhow...from 6 years ago. > > I don't have Gary's new contact info. > > Regards, > Ben > > > > >> > >> diff -r 413107fa49a5 -r d31f63db5f1e tools/firmware/vgabios/clext.c > >> --- a/tools/firmware/vgabios/clext.c Fri Oct 26 10:33:12 2007 +0100 > >> +++ b/tools/firmware/vgabios/clext.c Fri Oct 26 10:41:07 2007 +0100 > >> @@ -1489,14 +1489,26 @@ > >> mov dx, #0x3ce > >> out dx, ax > >> push ax > >> - mov cx, #0xa000 > >> - mov es, cx > >> - xor di, di > >> + > >> +;; Windows Vista appears to be emulating this sequence as part of > changing > >> +;; screen resolution, but it generates 4096 writes per iteration. > >> +;; Instead, use a magic register sequence to write the whole bank. > >> +;;mov cx, #0xa000 > >> +;;mov es, cx > >> +;;xor di, di > >> +;;mov ax, si > >> +;;mov cx, #8192 > >> +;;cld > >> +;;rep > >> +;; stosw > >> mov ax, si > >> - mov cx, #8192 > >> - cld > >> - rep > >> - stosw > >> + shl ax, #8 > >> + mov al, #0xfe > >> + out dx, ax ;; Low byte of value to be written to the bank > >> + mov ax, si > >> + mov al, #0xff > >> + out dx, ax ;; High byte and trigger the write > >> + > >> pop ax > >> inc ah > >> cmp ah, bl > >> diff -r 413107fa49a5 -r d31f63db5f1e tools/ioemu/hw/cirrus_vga.c > >> --- a/tools/ioemu/hw/cirrus_vga.c Fri Oct 26 10:33:12 2007 +0100 > >> +++ b/tools/ioemu/hw/cirrus_vga.c Fri Oct 26 10:41:07 2007 +0100 > >> @@ -294,6 +294,7 @@ > >> > >> static void cirrus_bitblt_reset(CirrusVGAState *s); > >> static void cirrus_update_memory_access(CirrusVGAState *s); > >> +static void cirrus_vga_mem_writew(void *opaque, target_phys_addr_t > addr, uint32_t val); > >> > >> /*************************************** > >> * > >> @@ -1497,6 +1498,17 @@ > >> case 0x31: // BLT STATUS/START > >> cirrus_write_bitblt(s, reg_value); > >> break; > >> + > >> + // Extension to allow BIOS to clear 16K VRAM bank in one operation > >> + case 0xFE: > >> + s->gr[reg_index] = reg_value; // Lower byte of value to be written > >> + break; > >> + case 0xFF: { > >> + target_phys_addr_t addr; > >> + for (addr = 0xa0000; addr < 0xa4000; addr += 2) > >> + cirrus_vga_mem_writew(s, addr, (reg_value << 8) | s->gr[0xFE]); > >> + } > >> + break; > >> default: > >> #ifdef DEBUG_CIRRUS > >> printf("cirrus: outport gr_index %02x, gr_value %02x\n", reg_index, > >> > >> By replacing the vgabios-cirrus.bin, the windows XP guest screen updating is > fast with upstream qemu. > >> > >> And I test the latest vgabios-0.7a come from > >> http://www.nongnu.org/vgabios/#DOWNLOAD > >> but the problem of blank screen remain. > >> >> Best Regards! >> -Gonglei >> >> >>> -----Original Message----- >>> From: Gonglei (Arei) >>> Sent: Friday, August 16, 2013 5:10 PM >>> To: Gonglei (Arei); 'Pasi Kärkkäinen' >>> Cc: 'Gerd Hoffmann'; 'Andreas Färber'; Hanweidong; Luonengjun; >>> 'qemu-devel(a)nongnu.org'; 'xen-devel(a)lists.xen.org'; 'Anthony Liguori'; >>> Huangweidong (Hardware); 'Ian.Jackson(a)eu.citrix.com'; 'Anthony Liguori'; >>> Yanqiangjun; Yangxiaowei >>> Subject: RE: [Xen-devel] [Qemu-devel] Cirrus VGA slow screen update, show >>> blank screen last 13s or so for windows XP guest >>> >>> Hi, all >>> I compared the traditional qemu-dm and upstream qemu, >>> and I found the upstream qemu will create the expansion ROM at f3000000, >>> but qemu-dm don't. >>> the details as below (by "lspci -vnnn"): >>> >>> 1) traditional qemu-dm: >>> 00:02.0 VGA compatible controller [0300]: Cirrus Logic GD 5446 [1013:00b8] >>> (prog-if 00 [VGA controller]) >>> Subsystem: XenSource, Inc. Device [5853:0001] >>> Flags: bus master, fast devsel, latency 0, IRQ 11 >>> Memory at f0000000 (32-bit, prefetchable) [size=32M] >>> Memory at f3000000 (32-bit, non-prefetchable) [size=4K] >>> Kernel modules: cirrusfb >>> >>> 2) upstream qemu: >>> 00:02.0 VGA compatible controller [0300]: Cirrus Logic GD 5446 [1013:00b8] >>> (prog-if 00 [VGA controller]) >>> Subsystem: XenSource, Inc. Device [5853:0001] >>> Physical Slot: 2 >>> Flags: bus master, fast devsel, latency 0, IRQ 11 >>> Memory at f0000000 (32-bit, prefetchable) [size=32M] >>> Memory at f3020000 (32-bit, non-prefetchable) [size=4K] >>> Expansion ROM at f3000000 [disabled] [size=64K] >>> Kernel modules: cirrusfb >>> >>> I tried to simply delete the expansion ROM at function pci_add_option_rom, >>> such as >>> >>> //pci_register_bar(pdev, PCI_ROM_SLOT, 0, &pdev->rom); >>> >>> but the VNC viewer only can see black screen, but RDP works well. >>> Any ideas about the cirrus's expansion ROM? >>> Slow screen refresh has any relationship with cirrus's expansion ROM? >>> Thank you in advance！ >>> >>> BTW, I added some log in stdvga.c(xen-4.1.2/xen/arch/x86/hvm): >>> static int stdvga_intercept_mmio(ioreq_t *p) >>> { >>> struct domain *d = current->domain; >>> struct hvm_hw_stdvga *s = &d->arch.hvm_domain.stdvga; >>> int buf = 0, rc; >>> static int count_1 = 0; >>> static int count_2 = 0; >>> >>> if ( p->size > 8 ) >>> { >>> gdprintk(XENLOG_WARNING, "invalid mmio size %d\n", (int)p->size); >>> return X86EMUL_UNHANDLEABLE; >>> } >>> >>> spin_lock(&s->lock); >>> >>> if ( s->stdvga && s->cache ) >>> { >>> switch ( p->type ) >>> { >>> case IOREQ_TYPE_COPY: >>> buf = mmio_move(s, p); >>> count_1++; >>> if (count_1 % 1000 == 0) >>> gdprintk(XENLOG_WARNING, " =uvp= enter mmio_move, >>> count_1=%d\n", count_1); >>> if ( !buf ) >>> s->cache = 0; >>> break; >>> default: >>> gdprintk(XENLOG_WARNING, "unsupported mmio request >>> type:%d " >>> "addr:0x%04x data:0x%04x size:%d count:%d >>> state:%d " >>> "isptr:%d dir:%d df:%d\n", >>> p->type, (int)p->addr, (int)p->data, (int)p->size, >>> (int)p->count, p->state, >>> p->data_is_ptr, p->dir, p->df); >>> s->cache = 0; >>> } >>> } >>> else >>> { >>> buf = (p->dir == IOREQ_WRITE); >>> count_2++; >>> if (count_2 % 5000 == 0) >>> gdprintk(XENLOG_WARNING, " >>> vga mmio count_2=%d\n", >>> count_2); >>> } >>> >>> rc = (buf && hvm_buffered_io_send(p)); >>> >>> spin_unlock(&s->lock); >>> >>> return rc ? X86EMUL_OKAY : X86EMUL_UNHANDLEABLE; >>> } >>> >>> and I got the below result with upstream qemu and tranditional qemu-dm: >>> >>> 1) traditional qemu-dm: >>> (XEN) stdvga.c:152:d2 entering stdvga and caching modes >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=460000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=461000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=462000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=463000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=464000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=465000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=466000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=467000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=468000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=469000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=470000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=471000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=472000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=473000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=474000 >>> (XEN) stdvga.c:577:d2 =uvp= enter mmio_move, count_1=475000 >>> (XEN) stdvga.c:156:d2 leaving stdvga >>> >>> 2) upstream qemu: >>> (XEN) stdvga.c:152:d1 entering stdvga and caching modes >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=233000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=234000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=235000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=236000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=237000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=238000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=239000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=240000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=241000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=242000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=243000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=244000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=245000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=246000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=247000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=248000 >>> (XEN) stdvga.c:577:d1 =uvp= enter mmio_move, count_1=249000 >>> (XEN) stdvga.c:156:d1 leaving stdvga >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8400000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8405000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8410000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=8415000 >>> ... ... //Omit some similar >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12570000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12575000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12580000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12585000 >>> (XEN) stdvga.c:596:d1 >>> vga mmio count_2=12590000 >>> >>> Upstream qemu has lot's of MMIO access Memory region 0xa0000~0xc0000 >>> than traditional qemu-dm. >>> >>> Best Regards! >>> >>> -Gonglei >>> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel(a)lists.xen.org >> http://lists.xen.org/xen-devel

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS