Commit f34c4f2d authored by Jan Beulich's avatar Jan Beulich Committed by Juergen Gross
Browse files

xen/x86: obtain full video frame buffer address for Dom0 also under EFI 



The initial change would not work when Xen was booted from EFI: There is
an early exit from the case block in that case. Move the necessary code
ahead of that.

Fixes: 335e4dd6 ("xen/x86: obtain upper 32 bits of video frame buffer address for Dom0")
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>

Link: https://lore.kernel.org/r/2501ce9d-40e5-b49d-b0e5-435544d17d4a@suse.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent e25a8d95

arch/x86/xen/vga.c

+8 −8
Original line number Diff line number Diff line
@@ -57,6 +57,14 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size) 
		screen_info->rsvd_size = info->u.vesa_lfb.rsvd_size;

		screen_info->rsvd_pos = info->u.vesa_lfb.rsvd_pos;



		if (size >= offsetof(struct dom0_vga_console_info,

				     u.vesa_lfb.ext_lfb_base)

		    + sizeof(info->u.vesa_lfb.ext_lfb_base)

		    && info->u.vesa_lfb.ext_lfb_base) {

			screen_info->ext_lfb_base = info->u.vesa_lfb.ext_lfb_base;

			screen_info->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;

		}



		if (info->video_type == XEN_VGATYPE_EFI_LFB) {

			screen_info->orig_video_isVGA = VIDEO_TYPE_EFI;

			break;
@@ -66,14 +74,6 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size) 
				     u.vesa_lfb.mode_attrs)

		    + sizeof(info->u.vesa_lfb.mode_attrs))

			screen_info->vesa_attributes = info->u.vesa_lfb.mode_attrs;



		if (size >= offsetof(struct dom0_vga_console_info,

				     u.vesa_lfb.ext_lfb_base)

		    + sizeof(info->u.vesa_lfb.ext_lfb_base)

		    && info->u.vesa_lfb.ext_lfb_base) {

			screen_info->ext_lfb_base = info->u.vesa_lfb.ext_lfb_base;

			screen_info->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;

		}

		break;

	}

}