x86/boot: (mostly) video mode handling adjustments
v3 cover x86/boot: (mostly) video mode handling adjustments
v3 has only some re-basing changes compared to v2. I have to admit that I find it particularly sad that the enhancement done by patch 1 has not made 4.16. This series had been submitted well in time.
1: make "vga=current" work with graphics modes
2: obtain video info from boot loader
3: EFI: retrieve EDID
4: simplify mode_table
5: fold branches in video handling code
6: fold/replace moves in video handling code
7: fold two MOVs into an ADD
Jan
PATCH v3 1/7 x86/boot: make "vga=current" work with graphics modes
GrUB2 can be told to leave the screen in the graphics mode it has been using (or any other one), via "set gfxpayload=keep" (or suitable variants thereof). In this case we can avoid doing another mode switch ourselves. This in particular avoids possibly setting the screen to a less desirable mode: On one of my test systems the set of modes reported available by the VESA BIOS depends on whether the interposed KVM switch has that machine set as the active one. If it's not active, only modes up to 1024x768 get reported, while when active 1280x1024 modes are also included. For things to always work with an explicitly specified mode (via the "vga=" option), that mode therefore needs be a 1024x768 one.
For some reason this only works for me with "multiboot2" (and "module2"); "multiboot" (and "module") still forces the screen into text mode, despite my reading of the sources suggesting otherwise.
For starters I'm limiting this to graphics modes; I do think this ought to also work for text modes, but
- I can't tell whether GrUB2 can set any text mode other than 80x25 (I've only found plain "text" to be valid as a "gfxpayload" setting),
- I'm uncertain whether supporting that is worth it, since I'm uncertain how many people would be running their systems/screens in text mode,
- I'd like to limit the amount of code added to the realmode trampoline.
For starters I'm also limiting mode information retrieval to raw BIOS accesses. This will allow things to work (in principle) also with other boot environments where a graphics mode can be left in place. The downside is that this then still is dependent upon switching back to real mode, so retrieving the needed information from multiboot info is likely going to be desirable down the road.
---
I'm not convinced boot_vid_mode really needs setting here; I'm doing so mainly because setvesabysize also does.
---
v2: Use 0x9b instead of 0x99 for attributes check: I think the value
used by check_vesa also wants to be converted, to match vesa2's. (Perhaps the value wants to become a #define, albeit before doing so I'd question the requirement of the mode to be a color one.)
xen/arch/x86/boot/video.S +33 -1
@@ -575,7 +575,6 @@ set14: movw $0x1111, %ax movb $0x01, %ah # Define cursor scan lines 11-12 movw $0x0b0c, %cx int $0x10 -set_current: stc ret
@@ -693,6 +692,39 @@ vga_modes: .word VIDEO_80x60, 0x50,0x3c,0 # 80x60 vga_modes_end: +# If the current mode is a VESA graphics one, obtain its parameters. +set_current: + leaw vesa_glob_info, %di + movw $0x4f00, %ax + int $0x10 + cmpw $0x004f, %ax + jne .Lsetc_done + + movw $0x4f03, %ax + int $0x10 + cmpw $0x004f, %ax + jne .Lsetc_done + + leaw vesa_mode_info, %di # Get mode information structure + movw %bx, %cx + movw $0x4f01, %ax + int $0x10 + cmpw $0x004f, %ax + jne .Lsetc_done + + movb (%di), %al # Check mode attributes + andb $0x9b, %al + cmpb $0x9b, %al + jne .Lsetc_done # Doh! No linear frame buffer + + movb $1, bootsym(graphic_mode) + movw %bx, bootsym(boot_vid_mode) + movw %bx, bootsym(video_mode) + +.Lsetc_done: + stc + ret + # Detect VESA modes. vesa_modes: movw %di, %bp # BP=original mode table end
PATCH v3 2/7 x86/boot: obtain video info from boot loader
In reply to Jan BeulichWith MB2 the boot loader may provide this information, allowing us to obtain it without needing to enter real mode (assuming we don't need to set a new mode from "vga=", but can instead inherit the one the bootloader may have established).
---
v3: Re-base.
v2: New.
xen/arch/x86/boot/Makefile +1 -1
@@ -6,7 +6,7 @@ CMDLINE_DEPS = $(DEFS_H_DEPS) video.h \ $(BASEDIR)/include/xen/kconfig.h \ $(BASEDIR)/include/generated/autoconf.h -RELOC_DEPS = $(DEFS_H_DEPS) \ +RELOC_DEPS = $(DEFS_H_DEPS) video.h \ $(BASEDIR)/include/generated/autoconf.h \ $(BASEDIR)/include/xen/kconfig.h \ $(BASEDIR)/include/xen/multiboot.h \
xen/arch/x86/boot/defs.h +1 -0
@@ -53,6 +53,7 @@ typedef unsigned int u32;typedef unsigned long long u64 ;typedef unsigned int size_t ;typedef u8 uint8_t ; +typedef u16 uint16_t ;typedef u32 uint32_t ;typedef u64 uint64_t ;
xen/arch/x86/boot/head.S +8 -2
@@ -562,12 +562,18 @@ trampoline_setup: mov %esi, sym_esi(xen_phys_start) mov %esi, sym_esi(trampoline_xen_phys_start) - mov sym_esi(trampoline_phys), %ecx - /* Get bottom-most low-memory stack address. */ + mov sym_esi(trampoline_phys), %ecx add $TRAMPOLINE_SPACE,%ecx +#ifdef CONFIG_VIDEO + lea sym_esi(boot_vid_info), %edx +#else + xor %edx, %edx +#endif + /* Save Multiboot / PVH info struct (after relocation) for later use. */ + push %edx /* Boot video info to be filled from MB2. */ push %ecx /* Bottom-most low-memory stack address. */ push %ebx /* Multiboot / PVH information address. */ push %eax /* Magic number. */
xen/arch/x86/boot/reloc.c +91 -7
143 lines not on this page · raw message
xen/arch/x86/boot/video.h +41 -0
45 lines not on this page · raw message
xen/arch/x86/setup.c +1 -29
@@ -519,35 +519,7 @@ static void __init setup_max_pdx(unsignestatic struct e820map __initdata boot_e820;#ifdef CONFIG_VIDEO -struct boot_video_info { -u8 orig_x;/* 0x00 */ -u8 orig_y;/* 0x01 */ -u8 orig_video_mode;/* 0x02 */ -u8 orig_video_cols;/* 0x03 */ -u8 orig_video_lines;/* 0x04 */ -u8 orig_video_isVGA;/* 0x05 */ -u16 orig_video_points;/* 0x06 */ - -/* VESA graphic mode -- linear frame buffer */ -u32 capabilities;/* 0x08 */ -u16 lfb_linelength;/* 0x0c */ -u16 lfb_width;/* 0x0e */ -u16 lfb_height;/* 0x10 */ -u16 lfb_depth;/* 0x12 */ -u32 lfb_base;/* 0x14 */ -u32 lfb_size;/* 0x18 */ -u8 red_size;/* 0x1c */ -u8 red_pos;/* 0x1d */ -u8 green_size;/* 0x1e */ -u8 green_pos;/* 0x1f */ -u8 blue_size;/* 0x20 */ -u8 blue_pos;/* 0x21 */ -u8 rsvd_size;/* 0x22 */ -u8 rsvd_pos;/* 0x23 */ -u16 vesapm_seg;/* 0x24 */ -u16 vesapm_off;/* 0x26 */ -u16 vesa_attrib;/* 0x28 */ -}; +# include "boot/video.h" extern struct boot_video_info boot_vid_info;#endif
xen/include/xen/multiboot2.h +53 -0
59 lines not on this page · raw message
PATCH v3 3/7 x86/EFI: retrieve EDID
In reply to Jan BeulichWhen booting directly from EFI, obtaining this information from EFI is the only possible way. And even when booting with a boot loader interposed, it's more clean not to use legacy BIOS calls for this purpose. (The downside being that there are no "capabilities" that we can retrieve the EFI way.)
To achieve this we need to propagate the handle used to obtain the EFI_GRAPHICS_OUTPUT_PROTOCOL instance for further obtaining an EFI_EDID_*_PROTOCOL instance, which has been part of the spec since 2.5.
---
Setting boot_edid_caps to zero isn't desirable, but arbitrarily setting one or both of the two low bits also doesn't seem appropriate.
GrUB also checks an "agp-internal-edid" variable. As I haven't been able to find any related documentation, and as GrUB being happy about the variable being any size (rather than at least / precisely 128 bytes), I didn't follow that route.
---
v3: Re-base.
v2: New.
xen/arch/arm/efi/efi-boot.h +4 -0
@@ -478,6 +478,10 @@ static void __init efi_arch_edd(void) { } +static void __init efi_arch_edid (EFI_HANDLE gop_handle) +{ +} +static void __init efi_arch_memory_setup (void ) { }
xen/arch/x86/boot/video.S +8 -1
@@ -922,7 +922,14 @@ store_edid: pushw %dx pushw %di - cmpb $1, bootsym(opt_edid) # EDID disabled on cmdline (edid=no)? + movb bootsym(opt_edid), %al + cmpw $0x1313, bootsym(boot_edid_caps) # Data already retrieved? + je .Lcheck_edid + cmpb $2, %al # EDID forced on cmdline (edid=force)? + jne .Lno_edid + +.Lcheck_edid: + cmpb $1, %al # EDID disabled on cmdline (edid=no)? je .Lno_edid leaw vesa_glob_info, %di
xen/arch/x86/efi/efi-boot.h +49 -1
72 lines not on this page · raw message
xen/common/efi/boot.c +11 -4
@@ -118,7 +118,7 @@ static bool read_section(const EFI_LOADEstatic void efi_init (EFI_HANDLE ImageHandle,EFI_SYSTEM_TABLE *SystemTable);static void efi_console_set_mode (void ); -static EFI_GRAPHICS_OUTPUT_PROTOCOL *efi_get_gop (void ); +static EFI_GRAPHICS_OUTPUT_PROTOCOL *efi_get_gop (EFI_HANDLE *gop_handle);static UINTN efi_find_gop_mode (EFI_GRAPHICS_OUTPUT_PROTOCOL *gop,UINTN cols,UINTN rows,UINTN depth);static void efi_tables (void );
@@ -758,7 +758,7 @@ static void __init efi_console_set_mode( StdOut->SetMode (StdOut, best); } -static EFI_GRAPHICS_OUTPUT_PROTOCOL __init *efi_get_gop (void ) +static EFI_GRAPHICS_OUTPUT_PROTOCOL __init *efi_get_gop (EFI_HANDLE *gop_handle) {EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;EFI_GRAPHICS_OUTPUT_PROTOCOL *gop =NULL ;
@@ -783,7 +783,10 @@ static EFI_GRAPHICS_OUTPUT_PROTOCOL __incontinue ; status = gop->QueryMode (gop, gop->Mode->Mode, &info_size, &mode_info);if ( !EFI_ERROR (status) ) + { + *gop_handle = handles[i];break ; + } }if ( handles ) efi_bs->FreePool (handles);
@@ -1216,6 +1219,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYif ( use_cfg_file ) {EFI_FILE_HANDLE dir_handle; +EFI_HANDLE gop_handle;UINTN depth, cols, rows, size; size = cols = rows = depth =0 ;
@@ -1224,7 +1228,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY &cols, &rows) == EFI_SUCCESS )efi_arch_console_init (cols, rows); - gop =efi_get_gop (); + gop =efi_get_gop (&gop_handle);/* Get the file system interface. */ dir_handle =get_parent_handle (loaded_image, &file_name);
@@ -1354,7 +1358,11 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY dir_handle->Close (dir_handle);if ( gop && !base_video ) + { gop_mode =efi_find_gop_mode (gop, cols, rows, depth); + +efi_arch_edid (gop_handle); + } }/* Get the number of boot modules specified on the DT or an error (<0) */
@@ -1381,7 +1389,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYefi_arch_edd (); -/* XXX Collect EDID info. */ efi_arch_cpu ();efi_tables ();
xen/include/efi/efiprot.h +47 -0
52 lines not on this page · raw message
PATCH v3 4/7 x86/boot: simplify mode_table
In reply to Jan BeulichThere's no point in writing 80x25 text mode information via multiple insns all storing immediate values. The data can simply be included first thing in the vga_modes table, allowing the already present REP MOVSB to take care of everything in one go.
While touching this also correct a related but stale comment.
xen/arch/x86/boot/video.S +4 -8
@@ -655,8 +655,9 @@ outidx: outb %al, %dx # Build the table of video modes (stored after the setup.S code at the # `modelist' label. Each video mode record looks like: # .word MODE-ID (our special mode ID (see above)) -# .byte rows (number of rows) -# .byte columns (number of columns) +# .word rows (number of rows) +# .word columns (number of columns) +# .word 0 (color depth; gfx modes only) # Returns address of the end of the table in DI, the end is marked # with a ASK_VGA ID. mode_table:
@@ -665,12 +666,6 @@ mode_table: jnz mtab1 leaw modelist, %di # Store standard modes: - movw $VIDEO_80x25,(%di) # The 80x25 mode (ALL) - movw $0x50,2(%di) - movw $0x19,4(%di) - movw $0x00,6(%di) - addw $8,%di - leaw bootsym(vga_modes), %si # All modes for std VGA movw $vga_modes_end-vga_modes, %cx rep movsb
@@ -684,6 +679,7 @@ ret0: ret # Modes usable on all standard VGAs vga_modes: + .word VIDEO_80x25, 0x50,0x19,0 # 80x25 .word VIDEO_80x50, 0x50,0x32,0 # 80x50 .word VIDEO_80x43, 0x50,0x2b,0 # 80x43 .word VIDEO_80x28, 0x50,0x1c,0 # 80x28
PATCH v3 5/7 x86/boot: fold branches in video handling code
In reply to Jan BeulichUsing Jcc to branch around a JMP is necessary only in pre-386 code, where Jcc is limited to disp8. Use the opposite Jcc directly in two places. Since it's adjacent, also convert an ORB to TESTB.
xen/arch/x86/boot/video.S +3 -6
@@ -332,8 +332,7 @@ lment: movb $0, (%di) cmpw $0x656d, (%si) # 'me' jnz lmhx cmpw $0x756e, 2(%si) # 'nu' - jnz lmhx - jmp listm + jz listm lmhx: xorw %bx, %bx # Else => mode ID in hex lmhex: lodsb
@@ -401,10 +400,8 @@ mode_set: cmpb $VIDEO_FIRST_VESA>>8, %ah jnc check_vesa - orb %ah, %ah - jnz setbad - - jmp setmenu + testb %ah, %ah + jz setmenu setbad: clc ret
PATCH v3 6/7 x86/boot: fold/replace moves in video handling code
In reply to Jan BeulichReplace (mainly) MOV forms with shorter insns (or sequences thereof).
---
Of course there's more room for improvement. For example there look to be a number of LEAs which really could be MOVs.
xen/arch/x86/boot/video.S +16 -24
@@ -121,8 +121,7 @@ mopar_gr: movw %ax, _param(PARAM_LFB_WIDTH) movw 20(%di), %ax movw %ax, _param(PARAM_LFB_HEIGHT) - movb 25(%di), %al - movb $0, %ah + movzbw 25(%di), %ax movw %ax, _param(PARAM_LFB_DEPTH) movl 40(%di), %eax movl %eax, _param(PARAM_LFB_BASE)
@@ -135,8 +134,7 @@ mopar_gr: # get video mem size leaw vesa_glob_info, %di - xorl %eax, %eax - movw 18(%di), %ax + movzwl 18(%di), %eax movl %eax, _param(PARAM_LFB_SIZE) # store mode capabilities
@@ -144,14 +142,11 @@ mopar_gr: movl %eax, _param(PARAM_CAPABILITIES) # switching the DAC to 8-bit is for <= 8 bpp only - movw _param(PARAM_LFB_DEPTH), %ax - cmpw $8, %ax + cmpw $8, _param(PARAM_LFB_DEPTH) jg dac_done # get DAC switching capability - xorl %eax, %eax - movb 10(%di), %al - testb $1, %al + testb $1, 10(%di) jz dac_set # attempt to switch DAC to 8-bit
@@ -164,17 +159,17 @@ mopar_gr: dac_set: # set color size to DAC size - movb bootsym(dac_size), %al + movzbw bootsym(dac_size), %ax movb %al, _param(PARAM_LFB_COLORS+0) movb %al, _param(PARAM_LFB_COLORS+2) movb %al, _param(PARAM_LFB_COLORS+4) movb %al, _param(PARAM_LFB_COLORS+6) # set color offsets to 0 - movb $0, _param(PARAM_LFB_COLORS+1) - movb $0, _param(PARAM_LFB_COLORS+3) - movb $0, _param(PARAM_LFB_COLORS+5) - movb $0, _param(PARAM_LFB_COLORS+7) + movb %ah, _param(PARAM_LFB_COLORS+1) + movb %ah, _param(PARAM_LFB_COLORS+3) + movb %ah, _param(PARAM_LFB_COLORS+5) + movb %ah, _param(PARAM_LFB_COLORS+7) dac_done: # get protected mode interface information
@@ -504,7 +499,8 @@ setvesabysize: call mode_table leaw modelist,%si 1: add $8,%si - cmpw $ASK_VGA,-8(%si) # End? + movw -8(%si),%bx + cmpw $ASK_VGA,%bx # End? je setbad movw -6(%si),%ax cmpw %ax,bootsym(vesa_size)+0
@@ -515,9 +511,7 @@ setvesabysize: movw -2(%si),%ax cmpw %ax,bootsym(vesa_size)+4 jne 1b - movw -8(%si),%ax - movw %ax,%bx - movw %ax,bootsym(boot_vid_mode) + movw %bx,bootsym(boot_vid_mode) jmp check_vesa # Table of routines for setting of the special modes.
@@ -773,8 +767,7 @@ vesa2: pushw %cx movw %bx, 2(%di) movw 0x14(%di), %bx # Height movw %bx, 4(%di) - xorw %bx, %bx - movb 0x19(%di), %bl # Depth + movzbw 0x19(%di), %bx # Depth movw %bx, 6(%di) addw $8, %di # The mode is valid. Store it.
@@ -901,8 +894,7 @@ gettime: movb %dh, %al # %dh contains the seconds andb $0x0f, %al movb %dh, %ah - movb $0x04, %cl - shrb %cl, %ah + shrb $4, %ah aad popw %cx ret
@@ -959,8 +951,8 @@ store_edid: .Lforce_edid: movw $0x4f15, %ax # do VBE/DDC movw $0x01, %bx - movw $0x00, %cx - movw $0x00, %dx + xorw %cx, %cx + xorw %dx, %dx movw $bootsym(boot_edid_info), %di int $0x10
PATCH v3 7/7 x86/boot: fold two MOVs into an ADD
In reply to Jan BeulichThere's no point going through %ax; the addition can be done directly in %di.
---
v2: New.
xen/arch/x86/boot/mem.S +1 -3
@@ -24,9 +24,7 @@ get_memory_map: cmpw $E820_BIOS_MAX, bootsym(bios_e820nr) # up to this many entries jae .Ldone - movw %di,%ax - addw $20,%ax - movw %ax,%di + addw $20,%di testl %ebx,%ebx # check to see if jnz 1b # %ebx is set to EOF