From patchwork Thu Jun 1 13:05:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13263692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C466EC77B7E for ; Thu, 1 Jun 2023 13:06:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.542474.846387 (Exim 4.92) (envelope-from ) id 1q4hzv-0007hX-JO; Thu, 01 Jun 2023 13:05:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542474.846387; Thu, 01 Jun 2023 13:05:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4hzv-0007hO-GC; Thu, 01 Jun 2023 13:05:47 +0000 Received: by outflank-mailman (input) for mailman id 542474; Thu, 01 Jun 2023 13:05:46 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4hzu-000791-TG for xen-devel@lists.xenproject.org; Thu, 01 Jun 2023 13:05:46 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 04ac05f0-007d-11ee-8611-37d641c3527e; Thu, 01 Jun 2023 15:05:44 +0200 (CEST) Received: from mail-co1nam11lp2175.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.175]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 01 Jun 2023 09:05:42 -0400 Received: from SJ0PR03MB6423.namprd03.prod.outlook.com (2603:10b6:a03:38d::21) by BY5PR03MB5347.namprd03.prod.outlook.com (2603:10b6:a03:218::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.23; Thu, 1 Jun 2023 13:05:41 +0000 Received: from SJ0PR03MB6423.namprd03.prod.outlook.com ([fe80::192:6bdf:b105:64dd]) by SJ0PR03MB6423.namprd03.prod.outlook.com ([fe80::192:6bdf:b105:64dd%3]) with mapi id 15.20.6433.024; Thu, 1 Jun 2023 13:05:40 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 04ac05f0-007d-11ee-8611-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1685624743; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=2n4arSTk5wOc7VPil1Qh67QOY54kclXss/Gd1eaIT84=; b=HlUFtaGJGvRgRZWVHAA3HTH9Iv7o0U0r0yDTSKyRHRzeyXR+LZzv1Twy REWeNSXWQ2gQES1ek+PquAvt5S9g2AQk+cmtoue+4ZSdmkV/UdvNuKDU9 wH3UgsZ7a9jdEuKJRiCDJiGT/84INuSJFdbBau1MrCLVcGPAA7gDlFSx7 Q=; X-IronPort-RemoteIP: 104.47.56.175 X-IronPort-MID: 111630318 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:NIAHTqzQXJ+7ggatqHN6t+cRxyrEfRIJ4+MujC+fZmUNrF6WrkUFy mcdD2nSbP7ZNjP8KtoiO9zl8RkCuZ6BnIVqSQA+qCAxQypGp/SeCIXCJC8cHc8wwu7rFxs7s ppEOrEsCOhuExcwcz/0auCJQUFUjP3OHfykTrafYEidfCc8IA85kxVvhuUltYBhhNm9Emult Mj75sbSIzdJ4RYtWo4vw/zF8EsHUMja4mtC5QRgPakT5zcyqlFOZH4hDfDpR5fHatE88t6SH 47r0Ly/92XFyBYhYvvNfmHTKxBirhb6ZGBiu1IOM0SQqkEqSh8ai87XAME0e0ZP4whlqvgqo Dl7WT5cfi9yVkHEsLx1vxC1iEiSN4UekFPMCSDXXcB+UyQq2pYjqhljJBheAGEWxgp4KUwS0 fcjNT8zVDqoo/iy7LSrZK50ne12eaEHPKtH0p1h5RfwKK9/BLvkGuDN79Ie2yosjMdTG/qYf 9AedTdkcBXHZVtIJ0sTD5U92uyvgxETcRUB8A7T+fVxvjaVlVMsuFTuGIO9ltiiX8Jak1zev mvb12/4HgsbJJqUzj/tHneE37aWw3ijA9tCfFG+3sZxo0WOnCs1MhkLCX/8h76AiVa8Y+sKf iT4/QJr98De7neDXtT7GhG1vnOAlhodQMZLVf037hmXzajZ6BrfAXILJhZDYtE7sM49RRQxy 0SE2djuAFRHr7m9WX+bsLCOoluP1TM9KGYDYWoPSlID6ty6+YUr1EuQE5BkDbK/icDzFXfo2 TeWoSMihrIVy8kWy6G8+lOBiDWpznTUcjMICszsdjrNxmtEiESNPORENXCzAS58Ebuk IronPort-HdrOrdr: A9a23:U1H52K/Rb0+nZ4nv6sZuk+C7I+orL9Y04lQ7vn2ZKCY0TiX8ra uTdZsguCMc5Ax6ZJhCo7G90de7Lk80nKQdibX5Vo3PYOCJggWVEL0= X-Talos-CUID: 9a23:XJ8zdmvdWRy9gSpIsYDcSOnG6IsILlnW92rfHXWSIkJzTJGTWXHX4LhNxp8= X-Talos-MUID: 9a23:iD3Hiw0VmtDthnDaEU/45BrWzjUj27+NEF1X1rM8v9TYEWtWfA6elDaPe9py X-IronPort-AV: E=Sophos;i="6.00,210,1681185600"; d="scan'208";a="111630318" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZdFP7Y4KfV+NDzPLGrYPLd3tIQIw9IhQg3Yt0C2jGP7Hi8sdafseRjTGTiVl7NfuxYYqYBwuTMgr4Am769ufQ4wrwf+HO+wD44d/3BX7QG6YdAjgsIk2qW7oIWBxCnDGJCecAEOyFyT3u1jNgQeMcQdfzRQR6GpmiWJ2R4gcYdNrB74qfsm1mNid/DSU39+4izrFHOMuex06IHmxfAJnpo8lNCgyqifgQhK/iRzMLqgpk0b6JDaW5n0CPx9zF7KBOmtNtNgww8CbAnEL753EXy/FR3sqFayWAPaL7sCCSzouv49HB+7P1xeGZ2/ycgn668ZyoAOpHEGmBuOswsp7EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=acbPmQOHVXpOvt2zjOfNJijiZJW8uhg4HOcOyYQ+YRY=; b=UaLR9SfeSKKw0YbAec20gg/R/NGc5xZKGYgSnj5y1Rxag7tuGs3v0FER87TpePVPbzgfxu9dZP0I4FFgJUcJcQh5x20svgcB7aO8cz1r67quAasVZf5qE4CxErAkGgr4slIaihjcHG5fBHAjmDZK7tZxfoNSZz1Jfo+1oCDpTUHSz2xtcVFd3Jj+in46dQNvrOGoNzzTkz4KiMzgl+yy0CdxNzIzPB/VqDjdoLqdHy1hY4cyw4PLHqBWcwqVgOxjt1ITbQY8BJRwKAIhwqwhNl5D/1o0JQ9DRYRpzTb7MNLF8xoKArqpUESoWKjmEEzk8PojR1YEZI5umEzIp/W1OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=acbPmQOHVXpOvt2zjOfNJijiZJW8uhg4HOcOyYQ+YRY=; b=YNh3q+3stYWEbKxGJlxFnptpKng2ulBvt4icQN/t8ZhKEPWa6BSlwjOHVgmu1v8+2CBa/z+rXeepxPQ3ycrRMXwlm3nbUqlqp40jzVWn6caHsmF+l45ZLXfRLcti5M7ykOUlLA0nvZH7bgFt1Hr6Q+bHulS5Sl5NTwhr67+fX1g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH v3 2/3] multiboot2: do not set StdOut mode unconditionally Date: Thu, 1 Jun 2023 15:05:17 +0200 Message-Id: <20230601130518.48874-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230601130518.48874-1-roger.pau@citrix.com> References: <20230601130518.48874-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P265CA0274.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a1::22) To SJ0PR03MB6423.namprd03.prod.outlook.com (2603:10b6:a03:38d::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6423:EE_|BY5PR03MB5347:EE_ X-MS-Office365-Filtering-Correlation-Id: 13ae71b5-56d6-459a-ee07-08db62a0e630 X-LD-Processed: 335836de-42ef-43a2-b145-348c2ee9ca5b,ExtAddr,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 63UdwiJ1BfwMcMUnQegRv/Yzb4xrnaM2F+VGfruMePiq1PRQxr+YuEZKbV4Ac/5V7AMYxXFEGX3WJnOi9OFEaX7Us0LNTaMbOyNilc/Xbt/13Md1sBkxaDOyp7KzPYVg59g2k9wx89VXHmeGOkBc77JCjqH9Q4vBw7b43JN17RoDTBA0YQBNJtOjk5PH7ZQxM/oVSXGO9N4VJ0zTD1zsU20Q9TtXuUwRGjqEXurQdR1iJKopAQnyk1GXH63LDw1lzpdLlGG/+Uz4zpJbE4LJ2SjoSpEBbzvZDaPRDr5no0x71XlOSWDJ3wIgucTOAS9kexck0cZ0OuRI4cea5rBdioNoxr0ppp0tSDHrz1EAJEIf7pmLJKy/Ou/HiTvJbaXE8TIm3kZUyLjibqviXmHPpAMHtaDDTXmatwhf+mpwaCPJBoBkUR3rMoQwzT11/V8P5nT71qRTp+7iSH6lrYOdAG2MulTDcgSmMGSCsbAX2e+aTaWxrzJE+A9Je1MIQN0pUvBvVuFHwnvxw73hVBCBfpssQFN2GEiHSqWUqVNuFFd6Yut3SkEMRQP2x0uoKe4J X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6423.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(396003)(136003)(39860400002)(346002)(366004)(451199021)(83380400001)(66556008)(6506007)(66946007)(66476007)(6916009)(6512007)(26005)(6666004)(1076003)(54906003)(2616005)(186003)(86362001)(6486002)(2906002)(8936002)(5660300002)(478600001)(8676002)(36756003)(82960400001)(4326008)(41300700001)(38100700002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?UODnvBvS6Zih61JCqrzB60ZH4Eus?= =?utf-8?q?xcajo66Fu0m7i36Nn0vreKpjkOE5r/QYoQBW4co4JHKwbNaN9z5T4y4wyW/xcA15z?= =?utf-8?q?P6Zh2eyGoJMf2H5g4q3OF/2W4RChFSotE7LUm4zP0/WnNZek8mcdOCQN/RTvIhY1V?= =?utf-8?q?KgByYKydjrR/ssQUz/980gczdtJYznBYKpqB5FElRbQBYR7tZPot3dmfz7iXxW9lr?= =?utf-8?q?XpSiggAVcYU54e9WBJ0FBnw9MXLPf3p1+EoypOmH/6Rd0GHFQS3TnlFu4cNGTtJe4?= =?utf-8?q?NdlydU4FMVPDORwtVebuOFmgPj2V2P0ByXjWjEVtM0dBChOZvQLMvVaVZP9olO3kV?= =?utf-8?q?WcyQ2LwRTOiKcUOOt0OAMK72c8+3fh+mCc3FxsHOwIRA1NE55/MPVMsDcQKBAjnZh?= =?utf-8?q?8yXRfnNek1M3/3vWhtxPoP0uqIvo1lTAGN7/nEoJ/8J88IcU2LzeN9YXSHTko9OtX?= =?utf-8?q?Of9ZdvRTs1keZYBo+XmN2IkC79rqkLIe5LENQSNlDwenVKQiyZ4trqJt0qHI04RBN?= =?utf-8?q?hCD/VaarDYcD2nkygVMuIuhCs3rDnbGkT83CI1I0l3fh72zQApwuIwZKfNmIVuO3t?= =?utf-8?q?bSLnuTmsRssTUiUOEGxpS3k9E1sl42Xx4Kvp61QPZhY9byZmbgOj8YbO18dUhNyck?= =?utf-8?q?alnhjb9qrGSs+nsmr63tFlVhdVxC5sOwfKXDyRaw3kPVR9r1nbctZ3zznBZdT/QUq?= =?utf-8?q?hoULbLIh8s8dUktdnZmdxKvd4hyPPoJTTV+l0m7SJ7aEV6HTePLh5n35oMHuh39aC?= =?utf-8?q?WpuZoJjh0I76wlHzfJ7vR615yURH/ctyEXzbrjog1eLR91/WBgLF7YTUFzGv5pXp7?= =?utf-8?q?g2ncj4KHl0GXHwRcxN5mpJHeCLMOKscrDWBSs7yEQmKftUPd6NIurxWjowE0JXm+1?= =?utf-8?q?m0jqnbdk09QN9k3DmiE3M6uG/K0a+XAEjPyiY0VAXux8mIy8Y4py2eBFKBaWKH/Mj?= =?utf-8?q?FrBxSOeDCALZBztvo2xzCJqu9fYlYn+WfgkggCkod3D57bn076+0Bosol6Q2PBu0Q?= =?utf-8?q?wsuGWCAKybWymIvAQ7XHiU9I37KjDI4W25Cd53+Wiw4QaEr4qByYDp0v9qgvt+qGp?= =?utf-8?q?Iw/+8Wocj95Uxi+fzXlz6N+r01onR30lxsin23FeCTWQLcwcjLPYD7GdrZg+QJYl0?= =?utf-8?q?r+EyPy43dtwwJIwVwRiRQ8by5eZKfkQBUI6HgVb6OfDujpACFcPspV5Y64lUsP7Dt?= =?utf-8?q?jWTxe9kOZCBuBdBY5SVmebk0IPKGUbUZW4Q9HzlcjDFMghjHRPckMc6XTfJMBjcH4?= =?utf-8?q?OmEZIOKbcubmKI/LkqOJypZ1W1X1Fj+US7KPChIiYq/NcCiUOJ084USACARld4YFc?= =?utf-8?q?XJ9T4ogR8kox3+Ol4abRjyKH4Htl8X/12tJyQRg715DEi113nHN5f5IyYwEsm779Z?= =?utf-8?q?oOOvCgYbqkVvKv+qg9lbO85vpfKaaYhIGXmiwmNfh1bbGJTEDx/WhNmHL47YxVb7D?= =?utf-8?q?fL/arPQjSgxjo9rNMj968vOgyzFCVeeNWn74s/Piah/QJAfFsHTkli26dO7Iu8g/l?= =?utf-8?q?k8l0KyjkSoxnm4OfTTEtTp7DVSkM+RefMg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: vHlw5jpgioz598SzX6YV7Qvz20IQ7BBIxFEn/HYVXsTL5FWfjLu15x9Pgv8zAOFBdsO4TijaCtzK/336rnh4VWt7btMpD2Cf15pOMkRob+O8biLGZIoZCCPbDurmnwTfVFC7oWdgLyfDCGBFiRshdoOzKImgdtfQDngiuinrnxbgoL0m8q+MUmT350KExhgZaNiajQgSu+2W46bOQUu7WyvfquBm1pYGgLh/vdbs6nC/tDJUnb37owNNjn2gQoXr/+8/8p5gf9KOPZUrBFCHP9o/+oCS2SVszqQffKJS0OqX9UgCzsPhb6ZNqZ+IN+jgqq0nx2qh1eu5PxYrpFXQOluRCVQLCoEctnbQnhSmrEns/yKfgyMXsa4MPXd+WOEiJFWhiInythg25k27lcCxMZcrwaY8xOzf6v+DbTBmZWJUNM7LaXRTdjnYVoyMfQ96E50hVyvdg5PUWT8CJKLdp2jedSLxT/Os0hpEMAOGqfNb0W8UkVHMO/RF6LKvfYAFoklzqezNV9TivBIb6qxmkh+g/BW8XgfFIo5PbxAh5SJgqpBjqltg46LHlabMevEM7wcnzpBn5jI12LekWD7t9slyYp0n3TEiPvxeVToiJBT/koeSF9BZN+fAD9kpQh5FCQiWy6AjgXntI2ThbKdMv0Hc1ga/oYSYy4PBzXzbzx2f9B/0M9l4dvKzbCMNm3CSddYAiB2um6wDHJsPmGHUAbysZiInRUQUxus/fTNQ+ixljlXeIkogcrLTzWC7b2mRX0rHSDSYUBzjQMYGVZ4f0VXarbQuCaVZe5ZBbqKOmMZYk/6WPfSkjskK/H8NMpYN X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13ae71b5-56d6-459a-ee07-08db62a0e630 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6423.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 13:05:40.2056 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xRY98+i0MpgKWAaI4sHeg6W1oeMN3t8NFgssOeX5Ooy/Ow3AtNRBezt4DM5zWz5rRWeW3ZhzLqQ3g7ixCYv/rw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR03MB5347 Only initialize StdOut if the current StdOut mode is unusable. This avoids forcefully switching StdOut to the maximum supported resolution, and thus very likely changing the GOP mode without having first parsed the command line options. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- The code is very similar to the approach suggested by Jan, please let me know if you would be OK with your suggested-by tag added. --- Changes since v2: - Use approach suggested by Jan. Changes since v1: - New in this version. --- xen/arch/x86/efi/efi-boot.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 003ef037bf07..5314f4293b12 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -820,7 +820,13 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable efi_init(ImageHandle, SystemTable); - efi_console_set_mode(); + if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, + &cols, &rows) != EFI_SUCCESS ) + /* + * If active StdOut mode is invalid init ConOut (StdOut) to the max + * supported size. + */ + efi_console_set_mode(); if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, &cols, &rows) == EFI_SUCCESS )