From nobody Fri Apr 26 23:31:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1631107425; cv=pass; d=zohomail.com; s=zohoarc; b=MZD2L67CCA18G2kK7d73PYHW9jg802m0C70N7kbwaA9RgCmmpYg9B6h3wU2Ko55lcxBrJRxzv2Ob2R7LjUffC5sd2wtwvSmvosmJxP1LqjothikN9L8xiygvG5wL5Xtc90lGwCD6Qrr1rX2yeQXtmyqWWm7oFfzmbTk3B3+oioo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631107425; 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=ce7dFYXhAhhqvbLlY4RJBNyNUGpZQ938LDFfj9KUbSw=; b=RhXsZIY5aaYKSDat35U6R4IAPr0ikZKFOsOyVoC6TwHAwnVDXK3hCEimu+7Zzh9rORgQNAQxKvlAn3WzELqvvpLu/qPcuflbfwHT8zlvYOeBCHIr7VaTgGtyOlO///wVrYiYX/4OgK+Kkdhbwu79Zl7Bg+LHUVOUEY9t2OKMwLA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631107425747694.7495299798696; Wed, 8 Sep 2021 06:23:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.182011.329401 (Exim 4.92) (envelope-from ) id 1mNxY0-00085g-P6; Wed, 08 Sep 2021 13:23:28 +0000 Received: by outflank-mailman (output) from mailman id 182011.329401; Wed, 08 Sep 2021 13:23:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNxY0-00085Z-Li; Wed, 08 Sep 2021 13:23:28 +0000 Received: by outflank-mailman (input) for mailman id 182011; Wed, 08 Sep 2021 13:23:26 +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.92) (envelope-from ) id 1mNxXy-00085T-Lr for xen-devel@lists.xenproject.org; Wed, 08 Sep 2021 13:23:26 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f220a6dc-10a7-11ec-b152-12813bfff9fa; Wed, 08 Sep 2021 13:23:25 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-17-k5LQGFm3N8CDHAhoG7Mksw-1; Wed, 08 Sep 2021 15:23:23 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4350.eurprd04.prod.outlook.com (2603:10a6:803:3e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Wed, 8 Sep 2021 13:23:22 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4500.014; Wed, 8 Sep 2021 13:23:22 +0000 Received: from [10.156.60.236] (37.24.206.209) by FR0P281CA0086.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Wed, 8 Sep 2021 13:23:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: f220a6dc-10a7-11ec-b152-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631107404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ce7dFYXhAhhqvbLlY4RJBNyNUGpZQ938LDFfj9KUbSw=; b=SlkQ5wwGEQBHUVdeQbox1I3K3lrHnow0UrdUWGY5+irl5Z1f5yFC7h3E5XgYl1WdpjjWNv 5RVwNhHuvvPCesUmwNWWGF6Pp3r+8ec8O/QX/A9JnH+rUtXqI5uv4H1oXKLwzdkNw7eAwL 8pTlAbSYV5C00ES/DbltK9y4oImjASE= X-MC-Unique: k5LQGFm3N8CDHAhoG7Mksw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bHyy9P5qsEeujhaNHiyaRkY+YNhmJ4Af0vq14OimSn9WyiVMFLrDvYLKMPDYNvXz9N4nqyRdUVSL3GUh3JXQW3WUHBqXENOBtYLtQhWqIN5pJ1DU9/xdItJS4mlscHcyV2IWdoszaUd1DRnjKWyUklbNQ7yS9c2hXoZq6N/QjGkZSqel9XlIoEMt14rvf9ZIIte36zYno0BUQyl4BdQr/rTrrLiqAHhfNj/nZP4nLpbQL67FH6WUsXcuH/nQ1kLDqNnQZBbJm31jczt0kTmXYkavrIXpd5LGn9azOzk3gz2ksngQ64pOkawuYsDUmkd0dCotl6i+VFyiq4qQ4xPVGg== 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; bh=ce7dFYXhAhhqvbLlY4RJBNyNUGpZQ938LDFfj9KUbSw=; b=DJJLNs97/ESU6hTYdrs8w5axNNnvKDleYCSlnJjA5awRfqJOHafhagqzyK3eFqze6xdXLTLWdzmWhp3YU7iJZGcpyjmc5Qy9ONEb7lmrSWtv0MOrJbD7p8yBqMH2ftyB+kxsOZL3sdAi4Y/I+cRLBCgUXCq85cQnPh3PU0PXHAVar4mzQyFChvlYQg1jsXVHL6TRoGbuvLh8Dauo446WjgY3V9dg/+ybrgAptnX+qZNIzoekPSbjKSLQp06HWNgdgAIt23+idMfnbZtWOVCu1QnX7yxky4Y7ueGiYa5Qnwqpvwiz2geFTdG1S425JSBuwGGQ8I3Js//CdbCamQ7hAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 1/3] x86/boot: make "vga=current" work with graphics modes From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <20bf2b1c-9c4b-bf9e-bf57-d0ba18e6458c@suse.com> Message-ID: <0603984c-36aa-8964-630d-2afc632738d9@suse.com> Date: Wed, 8 Sep 2021 15:23:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <20bf2b1c-9c4b-bf9e-bf57-d0ba18e6458c@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0086.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::22) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 868a2554-3579-476c-5edd-08d972cbd4b5 X-MS-TrafficTypeDiagnostic: VI1PR04MB4350: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cHf4GGo4K157HRFscRfs080e9eun85zF1ynp3Sd+H5jGL/scIVROoEqOUZx7o/W709enSkHsHbhSccqmMJKWoyZMh4kWk1PMVdrA753IURDZtTB6yz3vCQinjmy8AMQU3QN1sdpYxCBsnjAvgj/2Ev7hsFCqw4RV6mevvrXhp+c1vLwP4qeIrVPvwHCBLgy86x4WZja8RqJS91g1G3jzU+X6tvcb+Lkq+rkyMn0EID73NW5ABj6MTYfiKN1QvWkcKS1yO6UktNUByj3wBqTh7Gi5PVeIGsRWf2szD8g5aW3t+uo4ZK/TeuvpEfISWOvJzS4682+VBsVGtneF9/zfUWShSTMtpoz86muDlu7e8cmAHYCb71T2uFlv8HYEoOWU4y789RMBf6GfR1uUoT38juXck6KuAfWv+v+XfZGWhL9RF85lRt426L1L5Aw52Zx6wx+Fc1x1uo28vMmW0XeMrtdtktcEhcsipcrUICTTvH009njjzhzQDri+po4cLfG7TzwuS1TVvZ3/mVS/Zr5Sqpaj6PY197tXTiCYTKvTWHP+pS9FQm4dxzjX1zIazjjXi9Ir0Sfiulz5DJoAfuHW+HWi3bqoc8lWOkZAiYIClj5a4atZdw6JfypERBhnR8XLDTvFGp/BkeoZerYnU/7RsRbhGw7tLaPkJgB5TDaGs9l4CiZoirH5GA17avpWPPGZ4SNUlBZf4/H7mPke+BuA3/zIIqg007/VQbuPGPe1swlJSKkGnCPw0SgxKGY0zGim X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66556008)(31686004)(66476007)(26005)(66946007)(54906003)(2616005)(8936002)(508600001)(6486002)(956004)(16576012)(316002)(2906002)(36756003)(5660300002)(6666004)(31696002)(86362001)(83380400001)(8676002)(38100700002)(4326008)(186003)(6916009)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VmlpbDl1M1M4dE5FVlQ3VklCU1pUNnkxU1RHN09La0xKLzJnTUFNaXRXSmd2?= =?utf-8?B?QlcxNHNNekhyc2JlNEdCSnAxTU9pYmcwTHZYMnZyam1rRXQ0VVhSVGRvS1Jt?= =?utf-8?B?Q3VUNGFINDNuRlVuekNBelJzbHJyRjRacGVIVnBKckpxSzliOTZlelNuakw1?= =?utf-8?B?RW5RMnIzd2o2T2ZKTDFSVndSQ2U3NjFNSGs0UCtaZ3Azc3hxR3J2Sk9IeVhM?= =?utf-8?B?VVc5aGtEMkxKN1BVN3pJRXFzOUhCUEttc0laOGlNYVBIVW1zMCtDdnlyTW4w?= =?utf-8?B?ZFlvRVE1WkgzSVdSOWdieUNBQkg4VWVWSGdPTmRMZzRvS1FWS2dEM3JqL1hX?= =?utf-8?B?bGY3bVEyR2hlM3QrUEpWNXI3UzlodXAzbTFrUGtOQytBMjlqNlhxcmZadW1m?= =?utf-8?B?OG85VzFEcEo3RFFOSjJKWDQ3RkE3RG5rTkhhVWlZUlArOVVDYTBObnlXKzFp?= =?utf-8?B?d0JqWVpuU256OHZMWkVQbzY0bHl4cmZaalFwOXBxUDduZVNEOFNVc3NXc3VP?= =?utf-8?B?ZTFnRWs1QXkxSkJoYVpYTTZEMWtNREtVc1BpaTBjVjF1eVRkZnF2c0t0NVB1?= =?utf-8?B?Y1pSanFMUXpsTHBOaGlyNjROSFpYYWNGSDZUL2EzVXhwRHViYTBCSW9pcGtN?= =?utf-8?B?OUoxVUFPSDZZWU5uOUdVWW1lNnU2a1R6MkVGTWtQT0ZrVzNWMmxYSk9ybjNR?= =?utf-8?B?aS9jWG9aWkY5WlBmMExhcmtLak5JYlA3YWFiU0Y5aXNLY0hyK092SVoza2k4?= =?utf-8?B?eE9EeFN6ejY1bnJBZXFaOWphRHJSb1B6ZTR0NXJVTjNIMmVkMlFUdHdKRFJn?= =?utf-8?B?YmxVQkM3d0ZCSEMwYUdzMDBWaWFWbjVCMjR2REorejFpMW5QdVE2Tm1MMlNT?= =?utf-8?B?UTdqU3N2LzVHQkJyVkp6eVBnY0dmblRLNDdlWU9GN0lDQzhrSlZuaGVJMXRN?= =?utf-8?B?OXJ4dTJQazZ4WjJwalE4VzY4Zm5jSkIzSWkyaHgyNGJlZmF5RlM4K2ZWSSsr?= =?utf-8?B?K3lTdDZhYUNYelZoU2FMYkhWWkpreUFkVGo0ZUVFSVhSQ01WaFl2TkZTYjBa?= =?utf-8?B?T3VjZ0JvRmV2aTdlbHFkUndzeStOYUlxSjEvUXNNR0pjU2NsMHFBTDhxcXpr?= =?utf-8?B?L010Ukc1T1g2RTV5K0lrdks2R0hMNzJTejZUN3pMRjBWdDRVeTlHNW1vMVdG?= =?utf-8?B?MmRjNEp3S1RSZG16alZoYTl1MTVyZVRsN3c1VEJTL2IvakVXSXVkb214eXMz?= =?utf-8?B?SjZOeURibUIrc1hDc2RZanhHSE1QOEZaaDZOSlJwSDU2SGdqcE82QTd3cXRt?= =?utf-8?B?ajNtMGVYUnUyMm53T3h4bm05Skg1a0ttdWFJWGpuWk9scnV5YzJFVGhKZGhX?= =?utf-8?B?ZE5ZcVc3OUhFaXBCUW85dUl5OHVLdm03NmxWS25IV2RidG5xZjNMeGNRV0Ux?= =?utf-8?B?eERnaW1GMWNWdjM0aElTZ3I4c2dmTVRPMllWZ3QxS3EzNUJtWEZYaFVrTHFO?= =?utf-8?B?SDc5TDVxSmNnQ0hNL1Bsa3c3b2xnb2lEZGdUY1oxM1lZV1c5Z08xczA0VEt4?= =?utf-8?B?bWxVMXcxTkgvYlhzNFFWejJDb2VDdjVzaVhLaURsN3NuQ20vd0FUMTdTTzZv?= =?utf-8?B?cGh0TmxFenlXcjBCS0FKdTh3UUJWeGlhYUJqWUMyZXZ4Rkl0RVZ5Tk9nMzNR?= =?utf-8?B?SkN3YmxhU3RrSCtMeXN3Vk1tN01Yb0FOZitPeXpXZWZueFFWZmFiTWovRDdP?= =?utf-8?Q?Jp2Jg8+6kUlNLqPqp/U/cdZvwg/SrmuW0ypaQGq?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 868a2554-3579-476c-5edd-08d972cbd4b5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2021 13:23:22.3278 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: smT9nnczqjjekncBFjwGgTqKsUngducdjmoTPiITfSDOqhSg5B2dOgJX5qpC1zC3Y86QyJHHoY3wiWlxfhPzVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4350 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631107427908100001 Content-Type: text/plain; charset="utf-8" GrUB2 can be told to leave the screen in the graphics mode it has been using (or any other one), via "set gfxpayload=3Dkeep" (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=3D" 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, - we're pretty close to needing a 4th trampoline page, so I'd like to limit the amount of added code. 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 --- I'm not convinced boot_vid_mode really needs setting here; I'm doing so mainly because setvesabysize also does. --- 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 =20 @@ -693,6 +692,39 @@ vga_modes: .word VIDEO_80x60, 0x50,0x3c,0 # 80x60 vga_modes_end: =20 +# 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 $0x99, %al + cmpb $0x99, %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=3Doriginal mode table end From nobody Fri Apr 26 23:31:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1631107446; cv=pass; d=zohomail.com; s=zohoarc; b=TxmK5GqmgI+r55eXAKAHnuAY07w1LJCTttoiOVT44wtrNb6oJ6ET7G6wHziwFHSk9OaWbMFo4KtO2tDYS8pZuM8S9VPzCxMZw1sxBZFJyHQt+XY617bjR/4Vi8rnKKVktkYXvsZSUS/hOKITMJkqu2Kwer4wWDgdg/PSnKZPprE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631107446; 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=+iOZotKkLcJY4CXebIky0sg+x0ejVE7dgfMqo24AelE=; b=Rr5EHkbyq3u3lH07Irj2VKHV95aa9TfbHQDWhF7K+jkKv0yeGAmD6pFzeMWoVYGOhgya9tL25boxXQzBO3L4ETY6/hFXhtOyGgXfdpiLOCdkw7aiuRIm8K+RlDFrvqeATVcIOY4hoGI4Xd/c1ufb83T8qMFfDVwn6CWMN7XnkmE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631107446739135.3450692327508; Wed, 8 Sep 2021 06:24:06 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.182017.329412 (Exim 4.92) (envelope-from ) id 1mNxYP-0000Co-53; Wed, 08 Sep 2021 13:23:53 +0000 Received: by outflank-mailman (output) from mailman id 182017.329412; Wed, 08 Sep 2021 13:23:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNxYP-0000Ch-22; Wed, 08 Sep 2021 13:23:53 +0000 Received: by outflank-mailman (input) for mailman id 182017; Wed, 08 Sep 2021 13:23:52 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNxYO-00007S-0O for xen-devel@lists.xenproject.org; Wed, 08 Sep 2021 13:23:52 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1861d1b7-16ed-4190-ae91-5a0a250ac00d; Wed, 08 Sep 2021 13:23:51 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2054.outbound.protection.outlook.com [104.47.5.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-9-I29Mg1gZMG6aBADZ8qyFjg-1; Wed, 08 Sep 2021 15:23:49 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4350.eurprd04.prod.outlook.com (2603:10a6:803:3e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Wed, 8 Sep 2021 13:23:48 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4500.014; Wed, 8 Sep 2021 13:23:48 +0000 Received: from [10.156.60.236] (37.24.206.209) by FR0P281CA0083.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.4 via Frontend Transport; Wed, 8 Sep 2021 13:23:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 1861d1b7-16ed-4190-ae91-5a0a250ac00d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631107430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+iOZotKkLcJY4CXebIky0sg+x0ejVE7dgfMqo24AelE=; b=UgG38ulEC2trvHJ2tw1OqAo/VNWjSjeKDIv++qqAFuZpLEg48mnBUWQDsFeP57zkKIMsda 2QFAN6xLmg/W48HecRHyPZEOh7entoK58R+Hb4ol6lsxlUjEhjXB4PgIsx2esXNJdsJNW1 ec1EaDybCcAMV2fLJFiOPs3JAuu7fC8= X-MC-Unique: I29Mg1gZMG6aBADZ8qyFjg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TBClx6+dHssJUsF+DMg4mZgZ5RgYHpSiSQuQtBJK5aayQtD5cK+iaBxaMMBVznBi9d39YM8aXqYkgewS1yk/4J2FUN7YlFwb9msoxARHp7cqcZuOqQ7xg9FUuYGQjusQpP8qsEQTUv3AoEuKNihoaJYiTTLywEMfeXkw76bkDDOEUyHEHZEzExMyxBwUaNlLyQTIg6h5puGitNfsFEfmD7eGE+xHf4To2UI5eo+Pj2um9OyiSPPij5PWs9FCQfccHAnr5dEk0WCZ9p/9YNAkqN33fPZOE/kNpziyL8cbwXJg1BzjEcChY875IX9fkczMqouzs6ANnaoYdGinSRi6Mw== 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; bh=+iOZotKkLcJY4CXebIky0sg+x0ejVE7dgfMqo24AelE=; b=WBYGlDUPGe63F7i17EzUGyVBfTQXoFhDmoqlfhUwiMUq7FF9dxHSSNF1jRDLQXs9Cp7Igv69/y1BHeq/tlFUVifhp34+QbgMr7owlRPEHRoRqfNFAbysc7Qnt+xd0SRRqxg95Liw+BMINDVjxRG/4MRfnGypeb1Ud4QTFNJVVPgUiHL9nr9un13Qw0P0/zdSsRoeZ+PhJ4pdvO8cclXLJhYW2xpjixzQPZJk6BMrJGKPTmJN0jzxVHyUJGvVm5eC43MdVTpX1m/tPWUfiky6Sddss2N4wGWBjGlODXyRDOr6gzpYbPRODhRMB32yyJmUYKjWUtYtROyGv3jcUEJy4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 2/3] x86/boot: simplify mode_table From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <20bf2b1c-9c4b-bf9e-bf57-d0ba18e6458c@suse.com> Message-ID: <30f0c220-8d19-e8ff-1a8f-dc4e5db890bb@suse.com> Date: Wed, 8 Sep 2021 15:23:46 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <20bf2b1c-9c4b-bf9e-bf57-d0ba18e6458c@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0083.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::18) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 70c691f6-7e6b-44c1-c3d3-08d972cbe3f8 X-MS-TrafficTypeDiagnostic: VI1PR04MB4350: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x33esPvjYEUxqgnmH0K4KiUKgwC5rfIyeAdOahu3nN++PnhoyJ1mmOc+byF6xr2w4Ssx/JnfEhzSTwzWLGWY5BAyBIHvIXrmbJ8kCXsWycg4cRGHAwT9lZGeeZFeWned1deBJJDo1KJw2ODTQg8Z28fMNbXShGsEpQmt5IJqBmO3mPcbYx85LwasppbjlUTppoy9QjQM2SainYdIrH+hTCdwG4wXNM5gqzygSNopU/zUloDkc+oQRtgnV7SCANYuPxlLrWCwiJsVDx7UsU4gB99HWelLeoPRgXY9v0oiqeXVZwoHgCpm7OC9smHw8zW1PZCb90znDbxn0I6yRHFwgpqNulit17tiNOI6Rw5cMX++lG8bt3YTSj4KxRQKR4rrV3yvi2zwKw0ElaVzIiMfNqGe2kzpFOycby3tExhU7cI6Exnm11UXxulKID7QTnXzdJcAskvW1cdSAWtuYa7IR6J4ktAmTQ+MNf0mbk5V8wiDTY0vYVTWopWjvevnr0QhaFJX0o07cFFxTmSEu0yiXJpMKCUO6EIXVT8oxY6BhlUtWcoQFk47W5naSGumU5p5qOFsgHD0KKdYwFnhM7lv6Kwt8f/2p+GLWJbVpb0kFoLhjtFHKbyvmA/wOUDGH1MoPV7oNFHkEH2d+mafs9B6bHO63402Byb3PPohRelhnIVzyRceU+b4gFonjNbfSYGrTV5ziVm4+IuabNhLED03o0m/UwymGxxKhOIME/H//mg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66556008)(31686004)(66476007)(26005)(66946007)(54906003)(2616005)(8936002)(508600001)(6486002)(956004)(16576012)(316002)(2906002)(36756003)(5660300002)(31696002)(86362001)(8676002)(38100700002)(4326008)(186003)(6916009)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VGk5QnBFT0c1TDFQbVZvQ1hoeHNsQXRScTAvT2JJSXN0andWaGJZR29QRFZj?= =?utf-8?B?LzdRTi8vbjk3KzdCZnJyMnNJbVlBTmRBcVROc0JqWVdOV1NSRXZvRVlubHZB?= =?utf-8?B?ekJLeFJDUWpYOWF0clducDkxRzhNWTU2UngyOGYvWldSY2p6bG5oN0x1QWw3?= =?utf-8?B?bU5TQlplU0JUelhxb0tIb0EvZGVaaGZKZ0R0SHVzbXhab1V1eDU4Z0FzZW5V?= =?utf-8?B?cVVuTTZ4dTJJV0VXbWdHUWVpSFAxK2lVUlU3YzhXaWZyWG5kYmpOeVR2Nndm?= =?utf-8?B?ZDZ6eFVRdTh4ZXRHMU5OajhLMFNkcDJqMWtiazFDTEcrV0pmZzlPQys4eTY2?= =?utf-8?B?dElqMC9KQjgwZHB3Nm0zWlk5L00xVDI0eUgrdnZ5UlFpT0FCcTZ2U1RLdmsx?= =?utf-8?B?bkh3QTd6K3lqZ09NMHNKK1dTNmZTbDRIa3RYNUp4RDhUcTlKQjFLQ05neFVz?= =?utf-8?B?Y2lwRkhZT3E3MWNhanVkTG1kMWtXZy9WZmEwVVJwdXorSUtGQkhsVlVEMHJH?= =?utf-8?B?eG8xVVV2Wmt3OWx4WS9BOG5kRyt0enlVbVlpSUIrd3c4YWpkN1NRMmUwZmw2?= =?utf-8?B?RmVyU084TmRvaFUvaElYVFRWM0FDaHk0STN2cHQ3enBBcFlIaVRhR1JmRzJw?= =?utf-8?B?SmdxWkQxZytDMmFaY25jUVMrQjdrck9ubjd6T1JvZmpMNUdPRVZydGNxNTZS?= =?utf-8?B?RG4rbitWeGF5T2JnZzUweTZnQW5pcUNJSjI3UTRRYzRtNGNwdUR1VUdVSGJp?= =?utf-8?B?YU1pNUFETlptZlpPUkVaTCtIdzZNMFpTM1UvNW9XbWZtZlFRUzdkWUM0dVVw?= =?utf-8?B?YWVLYlBmQmIwSllYVm1qeHJtZUNTWkpvbnYwS0dnWkFqZDgzbHRrL1doNlQ4?= =?utf-8?B?YjQzSEpCK2N4VEVHZzgzWjEzWWVNN0hhL3dZNkx3NitCQVpycVZkZWJzT3Z6?= =?utf-8?B?R1QxUjIwTWxLbXJDcE91cm1oS2NNV1hYMDVLQVFWUS9SeDB5MVAzNS92dURj?= =?utf-8?B?RmZVYlZyWGk0bWVGczRDdWdzblE1MEdIZUlMNWN1NzdLci95TDVmRExhbHdm?= =?utf-8?B?ODZ6S2NTRUMrQTUyeGdkN1FJaFYrbnMrbThQZ1Q4TVBXdmUwVHBuUHhCL09K?= =?utf-8?B?QVdvdTlFTlJUSXlUa1hJV1g2Slg4WDBiZUcwRUpJV09McHZJOHljbWN5dXFM?= =?utf-8?B?UC9pcXJkUmNsMXJQN2NXSERqUWo2Q1ZMWEx6TWNtVnRxVzNmUEhBak45eFcw?= =?utf-8?B?V0l6ZDZPelZlQ0R0MUo3d0JaVm45bjB5S05YRTQxS1dmdGNRN2VxU1BNYlRh?= =?utf-8?B?NG9JQngvLytsb2VtYXFLb2VDY1FoYTVDUnpYSGRvUjllOEVhK0V1TVB0ZFli?= =?utf-8?B?c0hCSGVFQmlkdVBDbmlPVjBxWnJCS000aUZVR0ZKOWQxV2Z5Sll0cTV2K1dM?= =?utf-8?B?bGNkRThXUmg3NkxhdFBxd0owdW5DckVNZ205Ujl0R1M4SnVwQ2RyUHd6RkJI?= =?utf-8?B?cDNLVmNsM0Y2dGhoaDFFZ0ozcUxZcUVOeEtDczVCKzdTTnRLbVJiUzlaSmVC?= =?utf-8?B?UzBHc3ZRMlB6SmhyVGZYU2EwSU12ZThTdTFJTlIyTnlmVzhxdlJCZHd0ZzVk?= =?utf-8?B?M1E2dWVuaXJkMHdzQ2ltdExnTWRtRENPZzZxbkxqL2N6QWZCOUVicjF2U3BR?= =?utf-8?B?dnR6cGhkcmdLMStuVFU2ZVJxMXd5MUhmRXpveUxmNDhNcFkveFFYNmJtTDlM?= =?utf-8?Q?RL0Zv52yxqjsFzLGyJ1/w7fsYouxuKU8SZeXzD0?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70c691f6-7e6b-44c1-c3d3-08d972cbe3f8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2021 13:23:47.9363 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MLZcz5k95xbQ0WQLZsq2UJp9gcZbkGZx/g8UVPoxo1p5yOuwFGmzK8//hSb5uoccjcWtW0p8DC+XCT1VPMjSWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4350 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631107448838100001 Content-Type: text/plain; charset="utf-8" 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 --- 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 =20 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 =20 # 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 From nobody Fri Apr 26 23:31:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1631107474; cv=pass; d=zohomail.com; s=zohoarc; b=lEI4xyz+zzCw4FLPUBfCVptEu/dNDqgHrLG6wzxpvYtQ0abQlSQ7IgtAV3U7YSvAR7XpWWXnf90r6TIvdlMBpqNBgrIXWGrDYg/2/eLZb7N4phbpQRAv75k2A3Ka0AGfTz94fQ/0rDyv5DyEHzeh2/7tR8WSkwgpZ0KOTZ9IvVc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631107474; 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=J7205OxPodD00LxNwAZNGY+4ROFN3Gj6YfOBp01MwvY=; b=clPVtzGBhO7p4E6H4mpdVP4xxUM93YdVXTcWhMLAO82U3HZoTUuzmqrI5xe1wdSwIcA0rfq/hDM+7BXcuH3l8i6aWgkvXNCyZ1jF5aWKz7sSX1EAGfpOKoHxZeiDecduS03GLNf0l7GhsB+leOHXzMB9Eiq6SpEr2d3lQLV+WmA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631107474029189.05228937496975; Wed, 8 Sep 2021 06:24:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.182026.329422 (Exim 4.92) (envelope-from ) id 1mNxYq-0000r7-FL; Wed, 08 Sep 2021 13:24:20 +0000 Received: by outflank-mailman (output) from mailman id 182026.329422; Wed, 08 Sep 2021 13:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNxYq-0000r0-CO; Wed, 08 Sep 2021 13:24:20 +0000 Received: by outflank-mailman (input) for mailman id 182026; Wed, 08 Sep 2021 13:24:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNxYp-0000oA-IN for xen-devel@lists.xenproject.org; Wed, 08 Sep 2021 13:24:19 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ad47221e-1c2a-4667-93a8-040045733c19; Wed, 08 Sep 2021 13:24:18 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2104.outbound.protection.outlook.com [104.47.18.104]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-16-wwpW5kiPO_GK1N_zeZd9Yw-1; Wed, 08 Sep 2021 15:24:16 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB6304.eurprd04.prod.outlook.com (2603:10a6:803:fd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Wed, 8 Sep 2021 13:24:15 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4500.014; Wed, 8 Sep 2021 13:24:15 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR3PR09CA0015.eurprd09.prod.outlook.com (2603:10a6:102:b7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Wed, 8 Sep 2021 13:24:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: ad47221e-1c2a-4667-93a8-040045733c19 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631107457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J7205OxPodD00LxNwAZNGY+4ROFN3Gj6YfOBp01MwvY=; b=B7Qk1rwKzQrJUuLsdzJ8HI3ujMUSYD2p+z8Z1ZAPq5wzqFsiwYFqLmRfw8pbgTg7E0F8/x pEY2GQqTB6cOXVgSz0f4Mt9jBgbFYet+mUbTmdDbZ/hfhWtoJuuBK5pakE067DMzo2dZjR 1csXkdI+J/2vtnFYdeeMBP+5+O1kAcw= X-MC-Unique: wwpW5kiPO_GK1N_zeZd9Yw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VIP/5zXDu66XxYAvSMmlJnEGwVejDrOAIIVPvE7yTQLlg+b9bpEhWm6S23eYH/AbEU3U+UAlfpw33Hv0ocvGWPx5n+uGDkUUeB/8R+apkkwNzAdPVYx/w4XwBdZZxQyDuePkL3tQzta8Mgicgz2Dmak55mKDRvvJPysAbh/nTTImp4Ma2rSnJNdvViuI0iEWOgTwIZUj+b8w5S3cEj2Dbi7gLfm2Vg3G2T7MfXOeh1qsO4JRMUP24EZj4+EWrS6VZuz0gdtboXR7HouSJd0ffNS/9rreDMOiXTnqR093akGDgpxc9moEitBs/rsVEzh10p8VdjO/nnvm8zqb+YoVDg== 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; bh=J7205OxPodD00LxNwAZNGY+4ROFN3Gj6YfOBp01MwvY=; b=iHAbpLehg3Bgaj2ZoRxL1VyG2NTeRLgGeVT5BUVofh7yUWW6J3aD4Z3E5xCa+idoXUGTSgVV18h6CEkBnxAwBDHQQzNtFY/n2L2O1UpYZkXWysmENsBzXjhRXQ/ZIM0YTjJE9IJKFxTG2VfBsbJQYs18+oG+JTFELNo+1C3iKrInItHhFpmObB7th1qBf4jty5/BDDKNkw8f4ocqhIDeTxa2OQx7u77Dz7c+lMbaSV5JbktFbD1yH5ZhJZt7bGfN3tsancPHiGsyUdBzFHVqIZOP1TFCJcyVqYWoWq8GYKzFkLwDB1+mQyd92cvTbDM1K+JD2WY0Hdq+DhXv5lZhJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 3/3] x86/boot: fold branches in video handling code From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <20bf2b1c-9c4b-bf9e-bf57-d0ba18e6458c@suse.com> Message-ID: <33dc91cf-1c80-b386-f9e0-6cdb8e32d5d0@suse.com> Date: Wed, 8 Sep 2021 15:24:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <20bf2b1c-9c4b-bf9e-bf57-d0ba18e6458c@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PR3PR09CA0015.eurprd09.prod.outlook.com (2603:10a6:102:b7::20) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8993c5b-e677-44ad-01a6-08d972cbf439 X-MS-TrafficTypeDiagnostic: VI1PR04MB6304: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FKDFgccG75koD33zy5xgGuLGH60kMjSbkr3Y1cTXm3nTFnSkRWz66FWmPwxNGPvHEAAQuShyn3hslcXct5GP8sS46c7oT2VvjHBL1RvOustCw/WL489JubmHjUQKVg7z0eM0VzLdr0IiSgTqopsmyVnZf1suPpOI+tm/Hrtpih2T1rHn31aYo3EwzGO6TYLFY0h6L75CtaBHiuFb07bkJQt0clLPrm21ogQWMb/9nHj0es3N1tqwjwpJRdy8fJdJiY+1WFgIe0eywdZF1BNjNnrH/KfApWpL9VyNb12gIu3FTfA/wZl72XRY6RYHu92WMV5DpHsPyPIItQip3O91mq+GB4g6oFFX00J13ZZ3wyf2VxWI10DD7MFfQWoQKDeKu2pP3CYRyCL2yAxjcru8tT2bKI4rYaI7MleBJ1T4qGwk3jt+MiDSJvesmDETqo16igcSYepdEUe3z3xwTDwRdQ4CdLzSBhnyYSYP1hvERymqMC0u8fRyqbQ72L2P9GLuDx270ncoqcAVaguD1RAgnAHozt0b0Kbo4IJAv+zgXtxIrh/067VtKvs2pvASCV7JLvI1vQGP5dGZSkZubf88sH3P1T7CUTKftBLGATN92djXiwu4fIyjSnuz8rCuN6OCcR1inNiLZ4SUOsGI7bRNMUwcT3qzE1rWmKLA6JdYbyAJzUGhteGHKyqrl21zJMCQoJ7kQjxQGt0ByWDbB7LRa/OcqXrNGJh0DphPbOOGDYQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(396003)(366004)(39860400002)(346002)(376002)(8676002)(66476007)(54906003)(4326008)(66556008)(31686004)(478600001)(66946007)(31696002)(83380400001)(186003)(956004)(6916009)(26005)(38100700002)(16576012)(86362001)(316002)(4744005)(2616005)(6486002)(2906002)(5660300002)(36756003)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c3h1b3N3OE5uZDVRS3hJV2FYMWg5TFlYOGFrTDAzQVR2ZE1xNVFNc2Z4UVl0?= =?utf-8?B?L0VMZURGbXpBV0JSMDBEekRPblhIZE9LUXN6cVYzYlVlVm9FcVQzVUlKWm51?= =?utf-8?B?Q2lSUkZmaVBpYmUyNzRaWitNTTZtcERTekZxV3Zab1RWWm5qdUszbGMveHVx?= =?utf-8?B?b3pOMkJiWTVyOWxpZ2xOc1JVSnNaNE1KQit2UFA3RmZ5bHRxaHV2YTl2QlIx?= =?utf-8?B?NWlUSm81dFRZN1RwazhMN2FLYXNDbm1yMHBscTJSektYczRCaUNrMThMemg3?= =?utf-8?B?eXl2WWI1QWNFNFFEamdNL2kxTDdlbjU5ZnhFVnYyNEhqcGxMaFdqNThCQ1Fi?= =?utf-8?B?ckdJYm5VdndRU0RHaGhXYm51eFoxMEJBU3o5TEFKZXhqekdEYS9GUE5LSDdi?= =?utf-8?B?R3lCdm9xakdmYjlCYWRlN2VIL3VDcjZycGRNN1phQUVhQThuRDR4T2Y3dUdk?= =?utf-8?B?SHk5cmd6YlprR3N2OUtvTWRxaXVHODdra2lJL3BsTjdSVVJWRER4dFgwWUJy?= =?utf-8?B?UzA1bXdHZkFQQzlFRFFWNVlNYmJFWjZ6YVZLT2JpV1UraktOYUd4NVBobmUr?= =?utf-8?B?RDFxOHVVWS82bGNPSjhqWDhKTVBBZS9leUNQS0dNTUVDQzFWekJUVVNNUTJr?= =?utf-8?B?VTFhbEMyZDVsc21QSVVNSitWK2V3Q2FObjJ1SzZYbk5DS2tzc2VxVkFZZ1FZ?= =?utf-8?B?eXpXMWtpaUY2WGdCc3dLQ0hidnRoR0F1UlVPRWQ1OVhDZ0JqcFVqUDkwdW9i?= =?utf-8?B?UTNEdEMrUkc1WkUyc0ZOdlZ3aElLZTdrWnpYOEZPcTZrL1hHWU9JSFJvbTRo?= =?utf-8?B?ZWRZY2cwRW5SSTQ1OFF2NThQenBjUFFFMHFlUENnU0s0U0xkMUJkdG9qSWU5?= =?utf-8?B?K1R0clpCRkpaczk0Y281ajlUQzdNUXlpT2sxUGhWdnFKVjUwWWtpRzNoenpX?= =?utf-8?B?MnBkS1lSR1AwN1NYMzBWdzkxNjlIZnZjYkZCWnJTb2FmWTNjVHMxNzdLQjhG?= =?utf-8?B?bGpIVFFudll0U1hKZnZIdi9BczZpeU1nMWtIaGFZRW5tU3BjYXFZaVJnSUlu?= =?utf-8?B?Kzc4anozNHZIVzFCdlVCYllmOWc4TjM1ZGNPVExZS3RHcmlPcUhDSHZhM2w2?= =?utf-8?B?S04yVGtwYVRQV1Jja2VKUFFueG9ubkt4eUZVdlpQYVJDVkE2SGp2ZzNqdUNF?= =?utf-8?B?ZE40WWl4TzBsWUpQcXdUdGRHaHM1TFBSYkR6cEk0MzYwakhSMi9Da0lOSncx?= =?utf-8?B?VmhwNHB1eXB3OXZkVHB0V1NaQ0ozTXdVaC9SL2R1WG9aaFlhVnI3amxZdnpz?= =?utf-8?B?UWxBUCtUZnU5SWF6M1pYSC9uQkN2TGNzK1V0bEdiWHVIdTJFSGV5aWhGa3pR?= =?utf-8?B?Rm1GK0ZQSCtkTndnM1loaXA2aHFBZUFBaitIQW5ncmduNERWbTBsT0xHL3Ns?= =?utf-8?B?Z1IreGdyLzNIOFpWMXZXY2hET2FlczlKRFZ6clRvaDQ5b1VRMlNwenE0ZHVx?= =?utf-8?B?RFNXY2xWTnNBUkZuTWsyMVNPM2JwRTh5ZnE3RTZ0RC9GZlU2R0tCRktpcGgv?= =?utf-8?B?SGxKNUlaRXZFaCtGUWljcDc4a2pZbHlXOXFTdTlEbnFObkk4QUVJL3ZweHBU?= =?utf-8?B?WXl2aG9BZW9mWTRETjRONDA5L0JseUJJS2M1MlBsaE9rbVQweFdoUmpVMUR1?= =?utf-8?B?TSthMHhXSDNURTVxSTlHODZQQ3R2TS9DbTIzaUdTblZYaUd0THMvYUIwODE2?= =?utf-8?Q?Z7n9MgOfJxTavl24HijFShvLFFHae/9lItJWKSW?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8993c5b-e677-44ad-01a6-08d972cbf439 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2021 13:24:15.1799 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IbfrS1LMEkPJ6ZgBkIZGOo0awUX2ws4DRB5M6V9AwVPH3CAXZaO5IuB8/XVJ+ikNsa1O3vMHbxQQBXltMNuqJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6304 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1631107474935100001 Content-Type: text/plain; charset="utf-8" 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 --- This is an easy change reducing the overall trampoline size a little. We're pretty close to needing a 4th page, which I'd prefer to avoid for as long as we can. --- 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 =20 lmhx: xorw %bx, %bx # Else =3D> mode ID in hex lmhex: lodsb @@ -401,10 +400,8 @@ mode_set: cmpb $VIDEO_FIRST_VESA>>8, %ah jnc check_vesa =20 - orb %ah, %ah - jnz setbad - - jmp setmenu + testb %ah, %ah + jz setmenu =20 setbad: clc ret