From nobody Fri Apr 26 05:49:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+69889+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69889+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1609989052; cv=none; d=zohomail.com; s=zohoarc; b=AgI32lmU4feY2EPAIsBc0IPtFbOBJPKlYgzjTj6foJ2Yaj+ROoYPBx9NRgd4qFG/siJ8vqGhl/WYLrQOakMxKfOB0QbmE2mnD6QGdZxQHblqyvpr1CJ83cjOdrL9LL1u0HqwVgzpT4kvN1YfTFLZOHVkUpdIZp955moPpjKNBl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609989052; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=rcHet8556+tPmlBMfGGguYeHElOiq2CM4R8BIzUnlbs=; b=KvewV5AIaVaVKor8Ry3eoaKwlMOkdfW6/SDRGb06qfm/wHmLa3gjAklP599XGYjfJbEarJp+3vizLTwN+Vb4Vy4J6kJqjENxa3YPra3kCbZW1NuQC/algVQ5y7bhMH0HNXn7iKQoL9WcIXHGPQrOswDYmp3FX3ipnrdcVyjOkjw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69889+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1609989052022603.0495960302; Wed, 6 Jan 2021 19:10:52 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id PcdfYY1788612xD74MlIafzT; Wed, 06 Jan 2021 19:10:51 -0800 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.3388.1609989050662494970 for ; Wed, 06 Jan 2021 19:10:51 -0800 IronPort-SDR: FuBOP1UzCjU6pflAIl052nWVy1Z8cfypxkafgmeV2Wcrlw+egnFVfQUZM7yur5kgPTE35Z1eM+ zhtfJZ2VElSw== X-IronPort-AV: E=McAfee;i="6000,8403,9856"; a="174791105" X-IronPort-AV: E=Sophos;i="5.79,328,1602572400"; d="scan'208";a="174791105" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2021 19:10:49 -0800 IronPort-SDR: 7tM5AJ6DRdWfyXTRpx42VQdGHugjl/Lpw8zDJtjVj8xi8hRLHkx2j7URCsryzMyl/Kn612egWa D5TEsyJtzwyg== X-IronPort-AV: E=Sophos;i="5.79,328,1602572400"; d="scan'208";a="379542571" X-Received: from gdong1-mobl.amr.corp.intel.com ([10.212.83.15]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2021 19:10:48 -0800 From: "Guo Dong" To: devel@edk2.groups.io Cc: eric.dong@intel.com, ray.ni@intel.com, lersek@redhat.com, rahul1.kumar@intel.com Subject: [edk2-devel] [PATCH V2] UefiCpuPkg/CpuDxe: Fix boot error Date: Wed, 6 Jan 2021 20:10:45 -0700 Message-Id: <20210107031045.6760-1-guo.dong@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guo.dong@intel.com X-Gm-Message-State: EVyLjaaV4pBkEZ2BZahqDLZOx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1609989051; bh=ZF3LsBs5L30DiZ5cV0jCnwnXHLsWjN1UIS3udC0rOcI=; h=Cc:Date:From:Reply-To:Subject:To; b=MKusduZ0sGNY3qT5DxVUIvSff0DzcHl9FN+IpZ0u6opzEBYU8wJECCi82zO9PITfmvi IDVaO5C42dzDqLlG+j4vMHVPbgm4GzpE1nkexTHlyOxwRUY4HkYmxBlIJI7yVom2Ljuyh mrW7LQcy8ynC3VzYkbsSQ8i4CzBimvHv6DE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3084 When DXE drivers are dispatched above 4GB memory in 64bit mode, the address setCodeSelectorLongJump in stack will be override by parameter. Jump to Qword is not supported by some processors. So use "o64 retf" instead. Signed-off-by: Guo Dong Acked-by: Laszlo Ersek Reviewed-by: Michael D Kinney Reviewed-by: Ray Ni Tested-by: James Bottomley Tested-by: Tom Lendacky --- UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm b/UefiCpuPkg/CpuDxe/X64/CpuA= sm.nasm index c3489bcc3e..a8216cd56f 100644 --- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm +++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm @@ -20,13 +20,11 @@ ;-------------------------------------------------------------------------= ----- global ASM_PFX(SetCodeSelector) ASM_PFX(SetCodeSelector): - sub rsp, 0x10 + push rcx, lea rax, [setCodeSelectorLongJump] - mov [rsp], rax - mov [rsp+4], cx - jmp dword far [rsp] + push rax + o64 retf setCodeSelectorLongJump: - add rsp, 0x10 ret =20 ;-------------------------------------------------------------------------= ----- --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#69889): https://edk2.groups.io/g/devel/message/69889 Mute This Topic: https://groups.io/mt/79491640/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-