* [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments
@ 2021-12-06 14:15 Jan Beulich
2021-12-06 14:16 ` [PATCH v3 1/7] x86/boot: make "vga=current" work with graphics modes Jan Beulich
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:15 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/7] x86/boot: make "vga=current" work with graphics modes
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
@ 2021-12-06 14:16 ` Jan Beulich
2021-12-06 14:17 ` [PATCH v3 2/7] x86/boot: obtain video info from boot loader Jan Beulich
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:16 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
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.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
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.)
--- a/xen/arch/x86/boot/video.S
+++ b/xen/arch/x86/boot/video.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 2/7] x86/boot: obtain video info from boot loader
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
2021-12-06 14:16 ` [PATCH v3 1/7] x86/boot: make "vga=current" work with graphics modes Jan Beulich
@ 2021-12-06 14:17 ` Jan Beulich
2021-12-06 14:18 ` [PATCH v3 3/7] x86/EFI: retrieve EDID Jan Beulich
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:17 UTC (permalink / raw)
To: xen-devel
Cc: Roger Pau Monné,
Andrew Cooper, George Dunlap, Ian Jackson, Julien Grall,
Stefano Stabellini, Wei Liu
With 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).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v3: Re-base.
v2: New.
--- a/xen/arch/x86/boot/Makefile
+++ b/xen/arch/x86/boot/Makefile
@@ -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 \
--- a/xen/arch/x86/boot/defs.h
+++ b/xen/arch/x86/boot/defs.h
@@ -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;
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -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. */
--- a/xen/arch/x86/boot/reloc.c
+++ b/xen/arch/x86/boot/reloc.c
@@ -14,9 +14,10 @@
/*
* This entry point is entered from xen/arch/x86/boot/head.S with:
- * - 0x4(%esp) = MAGIC,
- * - 0x8(%esp) = INFORMATION_ADDRESS,
- * - 0xc(%esp) = TOPMOST_LOW_MEMORY_STACK_ADDRESS.
+ * - 0x04(%esp) = MAGIC,
+ * - 0x08(%esp) = INFORMATION_ADDRESS,
+ * - 0x0c(%esp) = TOPMOST_LOW_MEMORY_STACK_ADDRESS.
+ * - 0x10(%esp) = BOOT_VIDEO_INFO_ADDRESS.
*/
asm (
" .text \n"
@@ -32,6 +33,39 @@ asm (
#include "../../../include/xen/kconfig.h"
#include <public/arch-x86/hvm/start_info.h>
+#ifdef CONFIG_VIDEO
+# include "video.h"
+
+/* VESA control information */
+struct __packed vesa_ctrl_info {
+ uint8_t signature[4];
+ uint16_t version;
+ uint32_t oem_name;
+ uint32_t capabilities;
+ uint32_t mode_list;
+ uint16_t mem_size;
+ /* We don't use any further fields. */
+};
+
+/* VESA 2.0 mode information */
+struct vesa_mode_info {
+ uint16_t attrib;
+ uint8_t window[14]; /* We don't use the individual fields. */
+ uint16_t bytes_per_line;
+ uint16_t width;
+ uint16_t height;
+ uint8_t cell_width;
+ uint8_t cell_height;
+ uint8_t nr_planes;
+ uint8_t depth;
+ uint8_t memory[5]; /* We don't use the individual fields. */
+ struct boot_video_colors colors;
+ uint8_t direct_color;
+ uint32_t base;
+ /* We don't use any further fields. */
+};
+#endif /* CONFIG_VIDEO */
+
#define get_mb2_data(tag, type, member) (((multiboot2_tag_##type##_t *)(tag))->member)
#define get_mb2_string(tag, type, member) ((u32)get_mb2_data(tag, type, member))
@@ -146,7 +180,7 @@ static multiboot_info_t *mbi_reloc(u32 m
return mbi_out;
}
-static multiboot_info_t *mbi2_reloc(u32 mbi_in)
+static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out)
{
const multiboot2_fixed_t *mbi_fix = _p(mbi_in);
const multiboot2_memory_map_t *mmap_src;
@@ -154,6 +188,9 @@ static multiboot_info_t *mbi2_reloc(u32
module_t *mbi_out_mods = NULL;
memory_map_t *mmap_dst;
multiboot_info_t *mbi_out;
+#ifdef CONFIG_VIDEO
+ struct boot_video_info *video = NULL;
+#endif
u32 ptr;
unsigned int i, mod_idx = 0;
@@ -254,17 +291,64 @@ static multiboot_info_t *mbi2_reloc(u32
++mod_idx;
break;
+#ifdef CONFIG_VIDEO
+ case MULTIBOOT2_TAG_TYPE_VBE:
+ if ( video_out )
+ {
+ const struct vesa_ctrl_info *ci;
+ const struct vesa_mode_info *mi;
+
+ video = _p(video_out);
+ ci = (void *)get_mb2_data(tag, vbe, vbe_control_info);
+ mi = (void *)get_mb2_data(tag, vbe, vbe_mode_info);
+
+ if ( ci->version >= 0x0200 && (mi->attrib & 0x9b) == 0x9b )
+ {
+ video->capabilities = ci->capabilities;
+ video->lfb_linelength = mi->bytes_per_line;
+ video->lfb_width = mi->width;
+ video->lfb_height = mi->height;
+ video->lfb_depth = mi->depth;
+ video->lfb_base = mi->base;
+ video->lfb_size = ci->mem_size;
+ video->colors = mi->colors;
+ video->vesa_attrib = mi->attrib;
+ }
+
+ video->vesapm.seg = get_mb2_data(tag, vbe, vbe_interface_seg);
+ video->vesapm.off = get_mb2_data(tag, vbe, vbe_interface_off);
+ }
+ break;
+
+ case MULTIBOOT2_TAG_TYPE_FRAMEBUFFER:
+ if ( (get_mb2_data(tag, framebuffer, framebuffer_type) !=
+ MULTIBOOT2_FRAMEBUFFER_TYPE_RGB) )
+ {
+ video_out = 0;
+ video = NULL;
+ }
+ break;
+#endif /* CONFIG_VIDEO */
+
case MULTIBOOT2_TAG_TYPE_END:
- return mbi_out;
+ goto end; /* Cannot "break;" here. */
default:
break;
}
+ end:
+
+#ifdef CONFIG_VIDEO
+ if ( video )
+ video->orig_video_isVGA = 0x23;
+#endif
+
return mbi_out;
}
-void * __stdcall reloc(u32 magic, u32 in, u32 trampoline)
+void *__stdcall reloc(uint32_t magic, uint32_t in, uint32_t trampoline,
+ uint32_t video_info)
{
alloc = trampoline;
@@ -274,7 +358,7 @@ void * __stdcall reloc(u32 magic, u32 in
return mbi_reloc(in);
case MULTIBOOT2_BOOTLOADER_MAGIC:
- return mbi2_reloc(in);
+ return mbi2_reloc(in, video_info);
case XEN_HVM_START_MAGIC_VALUE:
if ( IS_ENABLED(CONFIG_PVH_GUEST) )
--- a/xen/arch/x86/boot/video.h
+++ b/xen/arch/x86/boot/video.h
@@ -28,4 +28,45 @@
/* The "recalculate timings" flag */
#define VIDEO_RECALC 0x8000
+#ifndef __ASSEMBLY__
+struct boot_video_info {
+ uint8_t orig_x; /* 0x00 */
+ uint8_t orig_y; /* 0x01 */
+ uint8_t orig_video_mode; /* 0x02 */
+ uint8_t orig_video_cols; /* 0x03 */
+ uint8_t orig_video_lines; /* 0x04 */
+ uint8_t orig_video_isVGA; /* 0x05 */
+ uint16_t orig_video_points; /* 0x06 */
+
+ /* VESA graphic mode -- linear frame buffer */
+ uint32_t capabilities; /* 0x08 */
+ uint16_t lfb_linelength; /* 0x0c */
+ uint16_t lfb_width; /* 0x0e */
+ uint16_t lfb_height; /* 0x10 */
+ uint16_t lfb_depth; /* 0x12 */
+ uint32_t lfb_base; /* 0x14 */
+ uint32_t lfb_size; /* 0x18 */
+ union {
+ struct {
+ uint8_t red_size; /* 0x1c */
+ uint8_t red_pos; /* 0x1d */
+ uint8_t green_size; /* 0x1e */
+ uint8_t green_pos; /* 0x1f */
+ uint8_t blue_size; /* 0x20 */
+ uint8_t blue_pos; /* 0x21 */
+ uint8_t rsvd_size; /* 0x22 */
+ uint8_t rsvd_pos; /* 0x23 */
+ };
+ struct boot_video_colors {
+ uint8_t rgbr[8];
+ } colors;
+ };
+ struct {
+ uint16_t seg; /* 0x24 */
+ uint16_t off; /* 0x26 */
+ } vesapm;
+ uint16_t vesa_attrib; /* 0x28 */
+};
+#endif /* __ASSEMBLY__ */
+
#endif /* __BOOT_VIDEO_H__ */
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -519,35 +519,7 @@ static void __init setup_max_pdx(unsigne
static 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
--- a/xen/include/xen/multiboot2.h
+++ b/xen/include/xen/multiboot2.h
@@ -158,6 +158,59 @@ typedef struct {
multiboot2_memory_map_t entries[];
} multiboot2_tag_mmap_t;
+typedef struct
+{
+ uint32_t type;
+ uint32_t size;
+ uint16_t vbe_mode;
+ uint16_t vbe_interface_seg;
+ uint16_t vbe_interface_off;
+ uint16_t vbe_interface_len;
+ uint8_t vbe_control_info[512];
+ uint8_t vbe_mode_info[256];
+} multiboot2_tag_vbe_t;
+
+typedef struct
+{
+ uint8_t red;
+ uint8_t green;
+ uint8_t blue;
+} multiboot2_color_t;
+
+typedef struct
+{
+ uint32_t type;
+ uint32_t size;
+ uint64_t framebuffer_addr;
+ uint32_t framebuffer_pitch;
+ uint32_t framebuffer_width;
+ uint32_t framebuffer_height;
+ uint8_t framebuffer_bpp;
+#define MULTIBOOT2_FRAMEBUFFER_TYPE_INDEXED 0
+#define MULTIBOOT2_FRAMEBUFFER_TYPE_RGB 1
+#define MULTIBOOT2_FRAMEBUFFER_TYPE_EGA_TEXT 2
+ uint8_t framebuffer_type;
+ uint16_t reserved;
+
+ union
+ {
+ struct
+ {
+ uint16_t framebuffer_palette_num_colors;
+ multiboot2_color_t framebuffer_palette[];
+ };
+ struct
+ {
+ uint8_t framebuffer_red_field_position;
+ uint8_t framebuffer_red_mask_size;
+ uint8_t framebuffer_green_field_position;
+ uint8_t framebuffer_green_mask_size;
+ uint8_t framebuffer_blue_field_position;
+ uint8_t framebuffer_blue_mask_size;
+ };
+ };
+} multiboot2_tag_framebuffer_t;
+
typedef struct {
u32 type;
u32 size;
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 3/7] x86/EFI: retrieve EDID
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
2021-12-06 14:16 ` [PATCH v3 1/7] x86/boot: make "vga=current" work with graphics modes Jan Beulich
2021-12-06 14:17 ` [PATCH v3 2/7] x86/boot: obtain video info from boot loader Jan Beulich
@ 2021-12-06 14:18 ` Jan Beulich
2021-12-06 14:19 ` [PATCH v3 4/7] x86/boot: simplify mode_table Jan Beulich
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:18 UTC (permalink / raw)
To: xen-devel
Cc: Roger Pau Monné,
Andrew Cooper, George Dunlap, Ian Jackson, Julien Grall,
Stefano Stabellini, Wei Liu
When 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.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
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.
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -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)
{
}
--- a/xen/arch/x86/boot/video.S
+++ b/xen/arch/x86/boot/video.S
@@ -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
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -568,6 +568,49 @@ static void __init efi_arch_video_init(E
#endif
}
+#ifdef CONFIG_VIDEO
+static bool __init copy_edid(const void *buf, unsigned int size)
+{
+ /*
+ * Be conservative - for both undersized and oversized blobs it is unclear
+ * what to actually do with them. The more that unlike the VESA BIOS
+ * interface we also have no associated "capabilities" value (which might
+ * carry a hint as to possible interpretation).
+ */
+ if ( size != ARRAY_SIZE(boot_edid_info) )
+ return false;
+
+ memcpy(boot_edid_info, buf, size);
+ boot_edid_caps = 0;
+
+ return true;
+}
+#endif
+
+static void __init efi_arch_edid(EFI_HANDLE gop_handle)
+{
+#ifdef CONFIG_VIDEO
+ static EFI_GUID __initdata active_guid = EFI_EDID_ACTIVE_PROTOCOL_GUID;
+ static EFI_GUID __initdata discovered_guid = EFI_EDID_DISCOVERED_PROTOCOL_GUID;
+ EFI_EDID_ACTIVE_PROTOCOL *active_edid;
+ EFI_EDID_DISCOVERED_PROTOCOL *discovered_edid;
+ EFI_STATUS status;
+
+ status = efi_bs->OpenProtocol(gop_handle, &active_guid,
+ (void **)&active_edid, efi_ih, NULL,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+ if ( status == EFI_SUCCESS &&
+ copy_edid(active_edid->Edid, active_edid->SizeOfEdid) )
+ return;
+
+ status = efi_bs->OpenProtocol(gop_handle, &discovered_guid,
+ (void **)&discovered_edid, efi_ih, NULL,
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+ if ( status == EFI_SUCCESS )
+ copy_edid(discovered_edid->Edid, discovered_edid->SizeOfEdid);
+#endif
+}
+
static void __init efi_arch_memory_setup(void)
{
unsigned int i;
@@ -729,6 +772,7 @@ static void __init efi_arch_flush_dcache
void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
{
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
+ EFI_HANDLE gop_handle;
UINTN cols, gop_mode = ~0, rows;
__set_bit(EFI_BOOT, &efi_flags);
@@ -742,11 +786,15 @@ void __init efi_multiboot2(EFI_HANDLE Im
&cols, &rows) == EFI_SUCCESS )
efi_arch_console_init(cols, rows);
- gop = efi_get_gop();
+ gop = efi_get_gop(&gop_handle);
if ( gop )
+ {
gop_mode = efi_find_gop_mode(gop, 0, 0, 0);
+ efi_arch_edid(gop_handle);
+ }
+
efi_arch_edd();
efi_arch_cpu();
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -118,7 +118,7 @@ static bool read_section(const EFI_LOADE
static 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 __in
continue;
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_SY
if ( 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_SY
efi_arch_edd();
- /* XXX Collect EDID info. */
efi_arch_cpu();
efi_tables();
--- a/xen/include/efi/efiprot.h
+++ b/xen/include/efi/efiprot.h
@@ -724,5 +724,52 @@ struct _EFI_GRAPHICS_OUTPUT_PROTOCOL {
EFI_GRAPHICS_OUTPUT_PROTOCOL_BLT Blt;
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode;
};
+
+/*
+ * EFI EDID Discovered Protocol
+ * UEFI Specification Version 2.5 Section 11.9
+ */
+#define EFI_EDID_DISCOVERED_PROTOCOL_GUID \
+ { 0x1C0C34F6, 0xD380, 0x41FA, { 0xA0, 0x49, 0x8a, 0xD0, 0x6C, 0x1A, 0x66, 0xAA} }
+
+typedef struct _EFI_EDID_DISCOVERED_PROTOCOL {
+ UINT32 SizeOfEdid;
+ UINT8 *Edid;
+} EFI_EDID_DISCOVERED_PROTOCOL;
+
+/*
+ * EFI EDID Active Protocol
+ * UEFI Specification Version 2.5 Section 11.9
+ */
+#define EFI_EDID_ACTIVE_PROTOCOL_GUID \
+ { 0xBD8C1056, 0x9F36, 0x44EC, { 0x92, 0xA8, 0xA6, 0x33, 0x7F, 0x81, 0x79, 0x86} }
+
+typedef struct _EFI_EDID_ACTIVE_PROTOCOL {
+ UINT32 SizeOfEdid;
+ UINT8 *Edid;
+} EFI_EDID_ACTIVE_PROTOCOL;
+
+/*
+ * EFI EDID Override Protocol
+ * UEFI Specification Version 2.5 Section 11.9
+ */
+#define EFI_EDID_OVERRIDE_PROTOCOL_GUID \
+ { 0x48ECB431, 0xFB72, 0x45C0, { 0xA9, 0x22, 0xF4, 0x58, 0xFE, 0x04, 0x0B, 0xD5} }
+
+INTERFACE_DECL(_EFI_EDID_OVERRIDE_PROTOCOL);
+
+typedef
+EFI_STATUS
+(EFIAPI *EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID) (
+ IN struct _EFI_EDID_OVERRIDE_PROTOCOL *This,
+ IN EFI_HANDLE *ChildHandle,
+ OUT UINT32 *Attributes,
+ IN OUT UINTN *EdidSize,
+ IN OUT UINT8 **Edid);
+
+typedef struct _EFI_EDID_OVERRIDE_PROTOCOL {
+ EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID GetEdid;
+} EFI_EDID_OVERRIDE_PROTOCOL;
+
#endif
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/7] x86/boot: simplify mode_table
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
` (2 preceding siblings ...)
2021-12-06 14:18 ` [PATCH v3 3/7] x86/EFI: retrieve EDID Jan Beulich
@ 2021-12-06 14:19 ` Jan Beulich
2021-12-06 14:19 ` [PATCH v3 5/7] x86/boot: fold branches in video handling code Jan Beulich
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:19 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
There'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.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/boot/video.S
+++ b/xen/arch/x86/boot/video.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 5/7] x86/boot: fold branches in video handling code
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
` (3 preceding siblings ...)
2021-12-06 14:19 ` [PATCH v3 4/7] x86/boot: simplify mode_table Jan Beulich
@ 2021-12-06 14:19 ` Jan Beulich
2021-12-06 14:20 ` [PATCH v3 6/7] x86/boot: fold/replace moves " Jan Beulich
2021-12-06 14:20 ` [PATCH v3 7/7] x86/boot: fold two MOVs into an ADD Jan Beulich
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:19 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
Using 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.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/boot/video.S
+++ b/xen/arch/x86/boot/video.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 6/7] x86/boot: fold/replace moves in video handling code
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
` (4 preceding siblings ...)
2021-12-06 14:19 ` [PATCH v3 5/7] x86/boot: fold branches in video handling code Jan Beulich
@ 2021-12-06 14:20 ` Jan Beulich
2021-12-06 14:20 ` [PATCH v3 7/7] x86/boot: fold two MOVs into an ADD Jan Beulich
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:20 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
Replace (mainly) MOV forms with shorter insns (or sequences thereof).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
Of course there's more room for improvement. For example there look to
be a number of LEAs which really could be MOVs.
--- a/xen/arch/x86/boot/video.S
+++ b/xen/arch/x86/boot/video.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 7/7] x86/boot: fold two MOVs into an ADD
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
` (5 preceding siblings ...)
2021-12-06 14:20 ` [PATCH v3 6/7] x86/boot: fold/replace moves " Jan Beulich
@ 2021-12-06 14:20 ` Jan Beulich
6 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2021-12-06 14:20 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Roger Pau Monné
There's no point going through %ax; the addition can be done directly in
%di.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v2: New.
--- a/xen/arch/x86/boot/mem.S
+++ b/xen/arch/x86/boot/mem.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-12-06 14:27 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-06 14:15 [PATCH v3 0/7] x86/boot: (mostly) video mode handling adjustments Jan Beulich
2021-12-06 14:16 ` [PATCH v3 1/7] x86/boot: make "vga=current" work with graphics modes Jan Beulich
2021-12-06 14:17 ` [PATCH v3 2/7] x86/boot: obtain video info from boot loader Jan Beulich
2021-12-06 14:18 ` [PATCH v3 3/7] x86/EFI: retrieve EDID Jan Beulich
2021-12-06 14:19 ` [PATCH v3 4/7] x86/boot: simplify mode_table Jan Beulich
2021-12-06 14:19 ` [PATCH v3 5/7] x86/boot: fold branches in video handling code Jan Beulich
2021-12-06 14:20 ` [PATCH v3 6/7] x86/boot: fold/replace moves " Jan Beulich
2021-12-06 14:20 ` [PATCH v3 7/7] x86/boot: fold two MOVs into an ADD Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.