From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web12.10499.1575896162878810455 for ; Mon, 09 Dec 2019 04:56:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f13yKzmh; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575896161; 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=/m4A51hqq5j2vaEn4WVmo1fACGOYwq3MgqTmqUE2Vw0=; b=f13yKzmhocPzymd10jN33OYxw1l0+2y8qtpUBe0N5wrrH9nKWUNZxHgW4g7G6G1eEo8Ibp KMlRDdeyGJV1ZuRW7kY+T1XcO7weyUxl2BVFBsr3TkSsvtsyMZzv5wEvxOkYUttyoQmiga lK0L40lRqUn2RAh4a4G3Frtf2Ns+DjA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-YXL5X3_KP8iAdWU3TShhwQ-1; Mon, 09 Dec 2019 07:55:59 -0500 Received: by mail-wr1-f72.google.com with SMTP id w6so7410688wrm.16 for ; Mon, 09 Dec 2019 04:55:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/m4A51hqq5j2vaEn4WVmo1fACGOYwq3MgqTmqUE2Vw0=; b=ifqwKxBOOIQEMSM1zWNs+OAxAIepRlsusyubZa9Cj6He5v0JWcYDTtc9cXWSTcUI9j X4gk59pue9bBnBTWhtIQWPorid1B9txg44pLO935co+RNbf0vs+/Yj1CFMQWMiAMaUIl AYrlMrYRUBQVQuzjYPW+6pBjyjRIrItpIBfMCWEqUEPFulT0PoHvh4r3Cq+/5wGQJZUw Vp4P/MkWI2Gb+Cb9yUYEITmyYWi+lwEapBrZNsnZStWJRXwyUXBA+FVy9EwFZSiO0W/7 8u0dF8JGdvE+oy5a7SwUuprBUI6dRxC5ReSjU0Mn9IPO1RESFfMkKwmHC4gECMyYr+FP pO2w== X-Gm-Message-State: APjAAAWer/lP7iaMU6Q3MsAjCM/l0EbpqlZgB5rdtUEnY4eiZY5Rm9QA 5sJpuQ5QPvBSaMHrEks+XSC7X74EsbyIxDoFjCXMT6Ed8pQ/IZBHAU6XKfAA30bYvJZ1VlhfdM2 8OBxMsJ0LvSk11g== X-Received: by 2002:a05:600c:2409:: with SMTP id 9mr23056815wmp.109.1575896158511; Mon, 09 Dec 2019 04:55:58 -0800 (PST) X-Google-Smtp-Source: APXvYqzvit46B4O30Zt0df7WmkY9UK+GJAh/KL2soB0jtq5xe3j+hCsDhDwu7Ed5UjfCXCffTU9ZHw== X-Received: by 2002:a05:600c:2409:: with SMTP id 9mr23056794wmp.109.1575896158214; Mon, 09 Dec 2019 04:55:58 -0800 (PST) Return-Path: Received: from [192.168.50.32] (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243]) by smtp.gmail.com with ESMTPSA id l4sm12946889wml.33.2019.12.09.04.55.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Dec 2019 04:55:57 -0800 (PST) Subject: Re: [PATCH 58/79] OvmfPkg/Qemu: Fix various typos To: Laszlo Ersek , devel@edk2.groups.io Cc: Antoine Coeur , Jordan Justen , Ard Biesheuvel , Gerd Hoffmann References: <20191203161602.15969-1-philmd@redhat.com> <20191203161602.15969-59-philmd@redhat.com> <45bfbd81-3c44-048f-327e-3c8c3fe3009c@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <516728a5-c9db-cb14-dd6b-2f74d0166b67@redhat.com> Date: Mon, 9 Dec 2019 13:55:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <45bfbd81-3c44-048f-327e-3c8c3fe3009c@redhat.com> X-MC-Unique: YXL5X3_KP8iAdWU3TShhwQ-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi Laszlo, On 12/3/19 10:00 PM, Laszlo Ersek wrote: > On 12/03/19 17:15, Philippe Mathieu-Daude wrote: >> From: Antoine Coeur >> >> Fix various typos in comments and documentation. >> >> Cc: Jordan Justen >> Cc: Laszlo Ersek >> Cc: Ard Biesheuvel >> Reviewed-by: Philippe Mathieu-Daude >> Signed-off-by: Philippe Mathieu-Daude >> --- >> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf | 4 ++-- >> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf | 4 ++-- >> OvmfPkg/AcpiPlatformDxe/Qemu.c | 4 ++-- >> OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 2 +- >> OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c | 4 ++-- >> OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c | 2 +- >> OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c | 2 +- >> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 4 ++-- >> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c | 8 ++++---- >> OvmfPkg/QemuVideoDxe/Driver.c | 2 +- >> OvmfPkg/QemuVideoDxe/VbeShim.asm | 14 +++++++------- >> 11 files changed, 25 insertions(+), 25 deletions(-) >> [...]>> diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm >> index cb2a60d8278d..1d284b264124 100644 >> --- a/OvmfPkg/QemuVideoDxe/VbeShim.asm >> +++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm >> @@ -49,7 +49,7 @@ Handler: >> je ReadEdid >> cmp ah, 0x00 >> je SetModeLegacy >> - DebugLog StrUnkownFunction >> + DebugLog StrUnknownFunction >> Hang: >> jmp Hang >> >> @@ -93,7 +93,7 @@ GetModeInfo: >> and cx, ~0x4000 ; clear potentially set LFB bit in mode number >> cmp cx, 0x00f1 >> je KnownMode1 >> - DebugLog StrUnkownMode >> + DebugLog StrUnknownMode >> jmp Hang >> KnownMode1: >> ; target (es:di) set on input >> @@ -155,7 +155,7 @@ SetMode: >> >> cmp bx, 0x40f1 >> je KnownMode2 >> - DebugLog StrUnkownMode >> + DebugLog StrUnknownMode >> jmp Hang >> KnownMode2: >> >> @@ -203,7 +203,7 @@ SetModeLegacy: >> je KnownMode3 >> cmp al, 0x12 >> je KnownMode4 >> - DebugLog StrUnkownMode >> + DebugLog StrUnknownMode >> jmp Hang >> KnownMode3: >> mov al, 0x30 >> @@ -252,7 +252,7 @@ StrExitSuccess: >> StrExitUnsupported: >> db 'Unsupported', 0x0a, 0 >> >> -StrUnkownFunction: >> +StrUnknownFunction: >> db 'Unknown Function', 0x0a, 0 >> >> StrEnterGetInfo: >> @@ -270,8 +270,8 @@ StrEnterSetMode: >> StrEnterSetModeLegacy: >> db 'SetModeLegacy', 0x0a, 0 >> >> -StrUnkownMode: >> - db 'Unkown Mode', 0x0a, 0 >> +StrUnknownMode: >> + db 'Unknown Mode', 0x0a, 0 >> >> StrGetPmCapabilities: >> db 'GetPmCapabilities', 0x0a, 0 >> > > If you modify "VbeShim.asm", then please re-run "VbeShim.sh", for > updating "VbeShim.h". The DEBUG macro at the head of VbeShim.asm is commented out: ;%define DEBUG So the string "Unknown Mode" is not used. Side note, running VbeShim.sh on Fedora 30 I get: $ git diff --word-diff --- a/OvmfPkg/QemuVideoDxe/VbeShim.h +++ b/OvmfPkg/QemuVideoDxe/VbeShim.h @@ -523,13 +523,13 @@ STATIC CONST UINT8 mVbeShim[] = { /* 0000020A cmp ax,0x4f02 */ 0x3D, 0x02, 0x4F, /* 0000020D jz 0x269 */ 0x74, 0x5A, /* 0000020F cmp ax,0x4f03 */ 0x3D, 0x03, 0x4F, /* 00000212 jz [-word-]{+near+} 0x331 */ 0x0F, 0x84, 0x1B, 0x01, /* 00000216 cmp ax,0x4f10 */ 0x3D, 0x10, 0x4F, /* 00000219 jz [-word-]{+near+} 0x336 */ 0x0F, 0x84, 0x19, 0x01, /* 0000021D cmp ax,0x4f15 */ 0x3D, 0x15, 0x4F, /* 00000220 jz [-word-]{+near+} 0x338 */ 0x0F, 0x84, 0x14, 0x01, /* 00000224 cmp ah,0x0 */ 0x80, 0xFC, 0x00, /* 00000227 jz [-word-]{+near+} 0x33a */ 0x0F, 0x84, 0x0F, 0x01, /* 0000022B jmp short 0x22b */ 0xEB, 0xFE, /* 0000022D push es */ 0x06, /* 0000022E push di */ 0x57, @@ -547,7 +547,7 @@ STATIC CONST UINT8 mVbeShim[] = { /* 0000023F pop ds */ 0x1F, /* 00000240 pop di */ 0x5F, /* 00000241 pop es */ 0x07, /* 00000242 jmp[-word-] 0x34c */ 0xE9, 0x07, 0x01, /* 00000245 push es */ 0x06, /* 00000246 push di */ 0x57, /* 00000247 push ds */ 0x1E, @@ -568,7 +568,7 @@ STATIC CONST UINT8 mVbeShim[] = { /* 00000263 pop ds */ 0x1F, /* 00000264 pop di */ 0x5F, /* 00000265 pop es */ 0x07, /* 00000266 jmp[-word-] 0x34c */ 0xE9, 0xE3, 0x00, /* 00000269 push dx */ 0x52, /* 0000026A push ax */ 0x50, /* 0000026B cmp bx,0x40f1 */ 0x81, 0xFB, 0xF1, 0x40, @@ -688,14 +688,14 @@ STATIC CONST UINT8 mVbeShim[] = { /* 0000033C jz 0x345 */ 0x74, 0x07, /* 0000033E cmp al,0x12 */ 0x3C, 0x12, /* 00000340 jz 0x349 */ 0x74, 0x07, /* 00000342 jmp[-word-] 0x22b */ 0xE9, 0xE6, 0xFE, /* 00000345 mov al,0x30 */ 0xB0, 0x30, /* 00000347 jmp short 0x34b */ 0xEB, 0x02, /* 00000349 mov al,0x20 */ 0xB0, 0x20, /* 0000034B [-iretw-]{+iret+} */ 0xCF, /* 0000034C mov ax,0x4f */ 0xB8, 0x4F, 0x00, /* 0000034F [-iretw-]{+iret+} */ 0xCF, /* 00000350 mov ax,0x14f */ 0xB8, 0x4F, 0x01, /* 00000353 [-iretw-]{+iret+} */ 0xCF, }; #endif The nasm packaged is: $ nasm -v NASM version 2.13.03 compiled on Feb 2 2019 While NASM 2.12 is documented here: https://github.com/tianocore/tianocore.github.io/wiki/Nasm-Setup Should I downgrade it?