From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.6899.1606979344206383562 for ; Wed, 02 Dec 2020 23:09:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ndFkOUyg; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: eric.dong@intel.com) IronPort-SDR: krH3mqIh8oDDpsUjakqQgTL2TvQK6SifYBV/IX/S8yOBPwYn3Jjhc2hC+l2pXyTcE5QrVN8+8w xjewVAOz0Gog== X-IronPort-AV: E=McAfee;i="6000,8403,9823"; a="160915024" X-IronPort-AV: E=Sophos;i="5.78,388,1599548400"; d="scan'208";a="160915024" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2020 23:09:03 -0800 IronPort-SDR: v3c52OvG9S2TXNu01suX82bK88QTa3yIeTgX/o48LKPoiCC7WrUdg7S4x3NOsSywCqZSNB82LK B8fh6/OCod3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,388,1599548400"; d="scan'208";a="550380721" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga005.jf.intel.com with ESMTP; 02 Dec 2020 23:09:03 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 2 Dec 2020 23:09:03 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 2 Dec 2020 23:09:02 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 2 Dec 2020 23:09:02 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.104) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 2 Dec 2020 23:08:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=am0MP96Zra/2hdjt3PyTdLL3qooMMhio4YgrlYs9yTh+dkdlAib2fnVAUigmE+qpTKBizkoEAF1U5GQokgVxMi/iZZlnM7QqukwpoEWt6RyMbiJrMXJXGZog/y0J7/uAivnG+q5ES6gMcl/B8qn4o+/sklwPs66XDmmcAPxdcEzxk1ZN3e3rlt2y2DJwZDdoJ4YUYQqL9WC14Bpmnhi6DF7qcSCW2sNyZqkh9jJiyWz5qc86tBTlyi95hzAkN0Gwo3Q0qQ4OWk/Ouzgq4CGQoN6RSmLD4kDL85fRIXmRalhscoLuFQ4BuWV9EMigryzOI63XoO7w9+P7ADPYlH0pHg== 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-SenderADCheck; bh=Qd2dRmJlU7+/S6K/CGIGjZH2AvDy/vo/U0N588ENhhU=; b=YUV52UP9evb06e9iiHI1WuliLSxlHNBJF+HllV7sSc+gChy4he0lv5ut/cmW6eBm/io8Hehq/PI2Jm0Cw2BFP8/z5b5b3d99O/wC4tnFHsCGQO6MZwj7qfUzA8BXsVKIR32/hxKSEzp89O7Tm/CWabPUTEpR0b3HemUbzqQyrOT3gaGvAbZ7UiZM470R/MaW82EUWCBk6fvHTZcwC37VTvcNpChx3CoE5j27TumnxFRriPezfoYhdkKP1XueMPdfIduWsqptEr0L1D31I5bT5y44V31I8uxRnBM1E+rmbmROHf3Bt2tw3eUUctt4ypiXUelbj3ccWoot0WtJX03IUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qd2dRmJlU7+/S6K/CGIGjZH2AvDy/vo/U0N588ENhhU=; b=ndFkOUygTkzhPZq0LZ+Slx5m3RWzIL9N1dN/YiiTLRZvTw2Q8641XYXfLoBUEvskXTTK02Ob+EJAlneiiOjVwCV5qV68FQU/eBQxEOthOR9r2LuE7zf8z21vSG3O8EKMc2gBuueXWthDzJyOlcnz7xlfoqa5zvDfSZpEZufzdCg= Received: from CY4PR11MB1272.namprd11.prod.outlook.com (2603:10b6:903:29::9) by CY4PR1101MB2072.namprd11.prod.outlook.com (2603:10b6:910:1d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.25; Thu, 3 Dec 2020 07:08:47 +0000 Received: from CY4PR11MB1272.namprd11.prod.outlook.com ([fe80::a403:f387:2d1f:8fe8]) by CY4PR11MB1272.namprd11.prod.outlook.com ([fe80::a403:f387:2d1f:8fe8%4]) with mapi id 15.20.3632.021; Thu, 3 Dec 2020 07:08:47 +0000 From: "Dong, Eric" To: "Dong, Guo" , "devel@edk2.groups.io" CC: "Ni, Ray" , "lersek@redhat.com" , "Kumar, Rahul1" Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg/CpuDxe: Fix boot error Thread-Topic: [edk2-devel] [PATCH] UefiCpuPkg/CpuDxe: Fix boot error Thread-Index: AQHWyPOBCZq/L9zJ50a2I1BGg3eygqnk9Etg Date: Thu, 3 Dec 2020 07:08:47 +0000 Message-ID: References: <20201202213833.23316-1-guo.dong@intel.com> In-Reply-To: <20201202213833.23316-1-guo.dong@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.39] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 70f153ec-e668-42b5-f654-08d8975a47b2 x-ms-traffictypediagnostic: CY4PR1101MB2072: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2331; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: BnSU9fdDBXt0f+OVsWmLZpFyYWw99xFaWLpZ1QCESn205D6jb17WMcTv8AptWa/LOL/I7o26ZikbIzgAC9my5rPJnxhjeqR+2vpuOdISu1EBxkOzY6qraJKsgI1E33bVpnf+cHSbpxR9J9qhJDvZFyjWYCRoVu9g5NKVraKeJjm6RuduWISRHprD0rHVhOIBr1dw8b9MvA/wZ52bZteRZ8yIBfGSVnyVsqpfmE+XW9EwSzXa35ZbOsDCt5cvjhvH/6Np+Z7ZxKDf/6xBuWelxCiOZD+2LHX4AcFC4GxF2A++HNWKX3uvlH0WBzM+kjVnmJj4yLNjXdvmRAm6GuBiImYjV/OeIoHl91s1IfzWcqkIM4r8AYmJlAjcnDOolgBlIGTN/rbeQqi2yiHrN9ut4A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR11MB1272.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(396003)(39860400002)(366004)(376002)(346002)(76116006)(8936002)(52536014)(478600001)(4326008)(7696005)(9686003)(8676002)(110136005)(66556008)(66476007)(966005)(66946007)(86362001)(64756008)(66446008)(316002)(186003)(107886003)(71200400001)(54906003)(6506007)(53546011)(2906002)(33656002)(55016002)(26005)(19627235002)(83380400001)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?wQtsZJdca46pByUiYpAInbq+M63Yf29hHnnJRzhokbnUDZbvXP3aXFepG8pz?= =?us-ascii?Q?gzl3bgRgMe2FrGylpt4Oec2PkA8RqQNf58wufy2lbhAVynCNTRp6wa+wE8p7?= =?us-ascii?Q?ahdBmsOz/4NjZsEPadWJp+ueon4dQQaijxwBkO8RLxzDzjTDEkxBnAhjccIp?= =?us-ascii?Q?WRaEpOio2KwlkTRZJr5Lb5Wgjbd+GgvwTBqF9945PR9gCVZ3mMMte909sgOu?= =?us-ascii?Q?nDPZ8wFMZ763o16q+TUPo8qTu1n1O6xNCsyOzBUrkmVUvcPaDgDMoMPCCbS6?= =?us-ascii?Q?ZzREXmlt977h1rpff8RV7D6a4G2Q2UGd1MNJFgaAsMvRvvGQFSuWWjwgqp4P?= =?us-ascii?Q?pEUcQXo7NGZhqq4dOOYKSFwLI8jUt6djoFZ0JObYd213vXX1q11nI9VEdRGN?= =?us-ascii?Q?+iGYueHPVBumyuy0Wg3Jg9E3Bm/N8ZV8jo+2ZW1CMnYgKoh1kwjYtVqMz+A3?= =?us-ascii?Q?37+VUj4Der+a59YW7aGxYJJNlXC2g0WHMx3lDGbocJ71ECyFo93T19nr6E5s?= =?us-ascii?Q?fI3/b7ow0kRwMvC978Oc/+pfb5j8ta1WTsVAwTNSVyxc6PBFnRCN9p0XjrRn?= =?us-ascii?Q?9xS8D6cs4YLZRyvtesZZ2Y3T9hunY7RCeY9jIJiBMPOoaYwCnNdr1ESrTLNT?= =?us-ascii?Q?opz+2hlTEFal34yHhjxYyeRqQeq7pljzOQkvqie7Yp6s0mbMCl/zL5hIxGPi?= =?us-ascii?Q?keHqItkZqClvMaKciCWC9LOo5TkJazdopnjZ6eXV9ViEtFFfE21bcKApwk/9?= =?us-ascii?Q?bqN0dcdg2ei7Oy/JeKuJYjxtYB2Ufk/QbiW2U0XSj/97gP+Kkc8RIe3JV51+?= =?us-ascii?Q?Ao5Tr3a2AuBSg6H2dyVWfM5SDJak7bTZ5VjQ0AJEXhro26bF0WQnRMPHiNPH?= =?us-ascii?Q?jXdas7P1Y3K4fpuSMkC4JmXWathl/lW+ONABhudI7p0Dsbjx1h9wQmmLU6IR?= =?us-ascii?Q?ckftAAUAUHU7tqNLYYZF6CGvCsCX8KQWoDwoiJWk75A=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1272.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70f153ec-e668-42b5-f654-08d8975a47b2 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2020 07:08:47.7767 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: bvloBD0/U3UlDGXxE9h28t58LiGCPGb801olN+Uw8dV/BZK9imllC4JDYbB3iNtHn5Ge9hhKxQfTkYW/0pzRQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2072 Return-Path: eric.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Eric Dong -----Original Message----- From: Guo Dong =20 Sent: Thursday, December 3, 2020 5:39 AM To: devel@edk2.groups.io Cc: Dong, Eric ; Ni, Ray ; lersek@re= dhat.com; Kumar, Rahul1 Subject: [edk2-devel] [PATCH] UefiCpuPkg/CpuDxe: Fix boot error REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3084 When DXE drivers are dispatched above 4GB memory and the system is already = in 64bit mode, the address setCodeSelectorLongJump in stack will be overrid= e by parameter. so change to use 64bit address and jump to qword address. Signed-off-by: Guo Dong --- UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm b/UefiCpuPkg/CpuDxe/X64/CpuA= sm.nasm index c3489bcc3e..6ad32b49f4 100644 --- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm +++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm @@ -23,8 +23,8 @@ ASM_PFX(SetCodeSelector): sub rsp, 0x10 lea rax, [setCodeSelectorLongJump] mov [rsp], rax - mov [rsp+4], cx - jmp dword far [rsp] + mov [rsp+8], cx + jmp qword far [rsp] setCodeSelectorLongJump: add rsp, 0x10 ret -- 2.16.2.windows.1