From nobody Sat Apr 20 12:03:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1570653677; cv=none; d=zoho.com; s=zohoarc; b=EgOCiWaZO3R+Oc0idlttnGZ9DyNZoLewaAn6CQ7dx7e/w+Ad8r6TyEQuSvPbZpJATykGw15xeCQQYGmc5yIokvhBaTA/o3K2t38xO9trhB8jZdBo2o6NitWkSwWSU9Ge8ACPfgB+FTzW7wR1eyXWQ21MN8jRQHOj1KMcuusG2iI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570653677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SYprARxnmijN5dc3Xugv5QBnkXrXRnAPfKx9V4SuQ1g=; b=Z1aqk9mbKB+DxR7uJm3sj0XJV0xWSoE+YN1qX6HU4g3cPqngnZeLQAi0wKvQHSXqHJzBGr71a+jtPSvoDauADiLakzgB11kVvzERjF/DGTcSqiItoEuWtq8p13IV6YwgRqmJ9T/+ZF0VL36OROdkdxNqdDCixmcbmfoV0TLVZTM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1570653677961130.43644058478617; Wed, 9 Oct 2019 13:41:17 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIIkl-0000is-V0; Wed, 09 Oct 2019 20:40:11 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIIkl-0000ih-4s for xen-devel@lists.xenproject.org; Wed, 09 Oct 2019 20:40:11 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fbbb3cd4-ead4-11e9-80e3-bc764e2007e4; Wed, 09 Oct 2019 20:40:09 +0000 (UTC) X-Inumbo-ID: fbbb3cd4-ead4-11e9-80e3-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570653610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=z+VNBLUi3XEHXWcHeR3frN4H9JqggtLkkXxnjeplxoU=; b=ayzsks2bxnrCnAdwRjzS/PXmjWNyUmW9eRAZy/5A2x/MMWV55b1fUKAG a4hpWVDLMJkIUahuYdvwvygEvvOi1/9Wp8TSpuc21cEAiU1v4M8bqhp/1 1lx0tkCXjMKsplJJ4X7vl9I/Y1AlXNx18L4xodPHXnTACQhzKQmMIfpu0 k=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=igor.druzhinin@citrix.com; spf=Pass smtp.mailfrom=igor.druzhinin@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of igor.druzhinin@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of igor.druzhinin@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: DCdr9JH8oeTIVNRtF28HA8FXjlvjsleQalPb5sUHLh5qu5ESvQJzBSBekZR9Uo1xEuUCHfVPUD VYAhoOZhPD8mNGQofQCCn+bdpZJ2HGmMG1lc2U7bD7rqaAWzewgzJkrX8tGjZ6IDcYKwZqYzGl p9AeelH8Kn8IQ1VH0r/sq+P0N5p1YQ4b7+nm8yaOQMsjvq+htwfZ9Fpd9wwpL4qUjtt1erfAUg RW3ZBDcyLTZw9J9FryHGlGkywSPjQ3Mhk6+UGJhi6uAhrXYR7n5mS3vBUJu1mT8O42tm4acyIW e+k= X-SBRS: 2.7 X-MesageID: 6684886 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,277,1566878400"; d="scan'208";a="6684886" From: Igor Druzhinin To: Date: Wed, 9 Oct 2019 21:40:01 +0100 Message-ID: <1570653603-9889-2-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570653603-9889-1-git-send-email-igor.druzhinin@citrix.com> References: <1570653603-9889-1-git-send-email-igor.druzhinin@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13 v2 1/3] efi/boot: add missing pointer dereference in set_color X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: jgross@suse.com, Igor Druzhinin , wl@xen.org, andrew.cooper3@citrix.com, jbeulich@suse.com, roger.pau@citrix.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich --- xen/common/efi/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 9a89414..6cef429 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1116,7 +1116,7 @@ static int __init __maybe_unused set_color(u32 mask, = int bpp, u8 *pos, u8 *sz) return -EINVAL; for ( *pos =3D 0; !(mask & 1); ++*pos ) mask >>=3D 1; - for ( *sz =3D 0; mask & 1; ++sz) + for ( *sz =3D 0; mask & 1; ++*sz) mask >>=3D 1; if ( mask ) return -EINVAL; --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat Apr 20 12:03:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1570653677; cv=none; d=zoho.com; s=zohoarc; b=dSpan8tW/2kMft8h2dF4XGUOb8FBoZMEuxw/SGBP3WhvLoDfNFDCAmStnF4xIhtsR3g+2UtD6WoXT6jMCf39C5WjB/ZJfxVkSuFAzB3tClmUBHC4/EAoPtcxMmNxQOWaWiFVw/xMkcHXqW6nyB7SXiiH/yxH/nlbYe0E5vEkZeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570653677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rMOQ2RKdPlP7WP91PkZXlOtW0x8maNGS8PkLw8R4tdc=; b=bbLq3Eg0FUVAgCd9M3b08n2Al4JksVJ5kBy0PqcwrxeVAGOk+vuGWQoOEsuedEAg/CKkDu5QfUR0eCU/XikDoOzwRdszHtFogotVTZ3+wzm0nJouCvrclvlXE724RIzPkJ4sNTCFaMKjwX3fb2Yr8j8hZiU2kGzhzjuVLMaYs2Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1570653677911303.6094246886315; Wed, 9 Oct 2019 13:41:17 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIIkr-0000jA-9R; Wed, 09 Oct 2019 20:40:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIIkp-0000j4-Az for xen-devel@lists.xenproject.org; Wed, 09 Oct 2019 20:40:15 +0000 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fbe99643-ead4-11e9-97f9-12813bfff9fa; Wed, 09 Oct 2019 20:40:10 +0000 (UTC) X-Inumbo-ID: fbe99643-ead4-11e9-97f9-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570653610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=31JjDne/MzQxNLXoK/dZSbJK1J09a1RW3vYMZ8axP38=; b=NC7aViGWTwlZ6XrSevCQp3CPVkcf6dXPMJEMhxg0/PDK1k+VzGze9iKk UEEYRCz0rgkKdkGCQOKaJTKw5AW/EYbSpTwaoylaRKIdUa2Zw1p94xv4E iO77HNXq3jZZHFD4ZHDP8Ez2KdEQuCf0ynpYRiyzHMZjGXqlxtoS9yk8B k=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=igor.druzhinin@citrix.com; spf=Pass smtp.mailfrom=igor.druzhinin@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of igor.druzhinin@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of igor.druzhinin@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: P83oaYzqYcFtmqdshcBkAiDtJwsrlAASVJXCt4JWFOJBpVL5j1CRzkqcUovtTVnZAiGgbUBB7x LojNCmmRHnlKrdJHThAxMfSGuKL7FsShSC9sg7CXg15+Y75Ft+w9S5RPEvS/RODFOSfB/hpLCs jzxFBloLayppfL1arbFnnPMF9I7P2yXL9hNivRUc20weG40WjGMwSrnYcWa2AjJoz2q80b05zW JbDT4KTGrYLK9j9FStpzOo0PzXzf1EKxGVqi8awEaf0WRkQzY3wf0OBeym8ZbdGUtaYwUqhCqM nsA= X-SBRS: 2.7 X-MesageID: 6994176 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,277,1566878400"; d="scan'208";a="6994176" From: Igor Druzhinin To: Date: Wed, 9 Oct 2019 21:40:02 +0100 Message-ID: <1570653603-9889-3-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570653603-9889-1-git-send-email-igor.druzhinin@citrix.com> References: <1570653603-9889-1-git-send-email-igor.druzhinin@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13 v2 2/3] x86/efi: properly handle 0 in pixel reserved bitmask X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: jgross@suse.com, Igor Druzhinin , wl@xen.org, andrew.cooper3@citrix.com, jbeulich@suse.com, roger.pau@citrix.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In some graphics modes firmware is allowed to return 0 in pixel reserved bitmask which doesn't go against UEFI Spec 2.8 (12.9 Graphics Output Protoc= ol). Without this change non-TrueColor modes won't work which will cause GOP init to fail - observed while trying to boot EFI Xen with Cirrus VGA. Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich --- xen/arch/x86/efi/efi-boot.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index a0737f9..4af6314 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -528,9 +528,15 @@ static void __init efi_arch_video_init(EFI_GRAPHICS_OU= TPUT_PROTOCOL *gop, bpp =3D set_color(mode_info->PixelInformation.BlueMask, bpp, &vga_console_info.u.vesa_lfb.blue_pos, &vga_console_info.u.vesa_lfb.blue_size); - bpp =3D set_color(mode_info->PixelInformation.ReservedMask, bpp, - &vga_console_info.u.vesa_lfb.rsvd_pos, - &vga_console_info.u.vesa_lfb.rsvd_size); + if ( !mode_info->PixelInformation.ReservedMask ) + { + vga_console_info.u.vesa_lfb.rsvd_pos =3D 0; + vga_console_info.u.vesa_lfb.rsvd_size =3D 0; + } + else + bpp =3D set_color(mode_info->PixelInformation.ReservedMask, bp= p, + &vga_console_info.u.vesa_lfb.rsvd_pos, + &vga_console_info.u.vesa_lfb.rsvd_size); if ( bpp > 0 ) break; /* fall through */ --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sat Apr 20 12:03:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1570653687; cv=none; d=zoho.com; s=zohoarc; b=NU672BN2SM9gbaFe/ht+Vtz90KSchFWC7EXu2l4lvN1d/6sn93QdBcpmlXFyLHsggk1EmHjMldp48YHomurDidWbQNkgEhpmPV4tFjY4C1itUp+nd3vA61N5j/WfaMVU2ZQ3PfCcAuSRRMXoeiUmCPggGUf6yRojDIDm5BFKKNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570653687; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FvDd0/p0EX0jYlQFIyb910HwMy5JudeOdO6y29VxQO8=; b=I3TRnOe4GR8gmpxNGiEjW5QxrICfdtJXsRMKrBLrMpeAwURvDPwKbfl1p1wMj+jXbmSR1efMXCxYIe4v9yUgBvfUV9cwkxVfLnbrQRq3z6wh/LzawWIwT8pJGRhV4ntvCs1MZ32/6eK0hB9YRrdOhcOzs0GvteauSqwoinTHY1U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1570653687768669.9005513644796; Wed, 9 Oct 2019 13:41:27 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIIkv-0000kg-R5; Wed, 09 Oct 2019 20:40:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIIku-0000kI-BW for xen-devel@lists.xenproject.org; Wed, 09 Oct 2019 20:40:20 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fcb423a8-ead4-11e9-97f9-12813bfff9fa; Wed, 09 Oct 2019 20:40:11 +0000 (UTC) X-Inumbo-ID: fcb423a8-ead4-11e9-97f9-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570653611; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=3yZ+qX2raC25cFSjaFhjUelclgLPU8erspmvsYEsNS4=; b=VVggxNDJvqdnkBQ3HChiSCvf+YKfQhA2p/6uc/s2Lml+AJ66HJOtzxv7 VQmJiV8dxrvFrXOxlM3sttfimaPyHO9aJQ8HQ7R77eVr8bDxm+CIDdBzE cn0OMbHs59Hm/J9l/xVlYup11Nke4bIM8aLaJwhm0NG93dqOg3+uM7H0t 0=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=igor.druzhinin@citrix.com; spf=Pass smtp.mailfrom=igor.druzhinin@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of igor.druzhinin@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of igor.druzhinin@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: ttgu0X3XqvrCWE/ECLqmST/sVuA+DDT4DqhYmuZh4+6ID8971R9PIM2O+pbKZUQk4rhnR1h7Xg 1qkUm5OvRvLPYi9KhAcGqEFQpz1BgzWXsKkH/pTc4zotqIlle+LyVHFdmSd3iHuApOnMt+EcKj lBxPp+EIKEvV/mPbYBHuLmadqMVewFWNgGVNg42J8XJdOy8aN+U7ooMyUyYQS6CCjIbUOOrRe/ mO+tveP0yGLQZ76gBavX2K1OJb/NKjJD/qBwx+bGqXXTSOihKbYiALJU8xCo5PGPqGZgE7bms4 obU= X-SBRS: 2.7 X-MesageID: 6761495 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,277,1566878400"; d="scan'208";a="6761495" From: Igor Druzhinin To: Date: Wed, 9 Oct 2019 21:40:03 +0100 Message-ID: <1570653603-9889-4-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570653603-9889-1-git-send-email-igor.druzhinin@citrix.com> References: <1570653603-9889-1-git-send-email-igor.druzhinin@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13 v2 3/3] efi/boot: make sure graphics mode is set while booting through MB2 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: jgross@suse.com, Igor Druzhinin , wl@xen.org, andrew.cooper3@citrix.com, jbeulich@suse.com, roger.pau@citrix.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) If a bootloader is using native driver instead of EFI GOP it might reset graphics mode to be different from what has been originally set by firmware. While booting through MB2 Xen either need to parse video setting passed by MB2 and use them instead of what GOP reports or reset the mode to synchronise it with firmware - prefer the latter. Observed while booting Xen using MB2 with EFI GRUB2 compiled with all possible video drivers where native drivers take priority over firmware. Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich --- xen/common/efi/boot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 6cef429..6b069c4 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1051,8 +1051,12 @@ static void __init efi_set_gop_mode(EFI_GRAPHICS_OUT= PUT_PROTOCOL *gop, UINTN gop EFI_STATUS status; UINTN info_size; =20 - /* Set graphics mode. */ - if ( gop_mode < gop->Mode->MaxMode && gop_mode !=3D gop->Mode->Mode ) + /* + * Set graphics mode to a selected one and reset it if we didn't come + * directly from EFI loader as video settings might have been already = modified. + */ + if ( gop_mode < gop->Mode->MaxMode && + (gop_mode !=3D gop->Mode->Mode || !efi_enabled(EFI_LOADER)) ) gop->SetMode(gop, gop_mode); =20 /* Get graphics and frame buffer info. */ --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel