From nobody Thu Dec 26 01:39:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1507068554479673.6227616433209; Tue, 3 Oct 2017 15:09:14 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8DDCB21F322B4; Tue, 3 Oct 2017 15:05:36 -0700 (PDT) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0071.outbound.protection.outlook.com [104.47.37.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8620121F303F9 for ; Tue, 3 Oct 2017 15:05:35 -0700 (PDT) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by MWHPR12MB1246.namprd12.prod.outlook.com (10.169.204.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 3 Oct 2017 22:08:53 +0000 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=helo; client-ip=104.47.37.71; helo=nam02-cy1-obe.outbound.protection.outlook.com; envelope-from=leo.duran@amd.com; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wm5oWpnbtfV8mvYIsLnATo/TUtV6adqReQSrZziC/Xs=; b=zdTPKCBIcXl4NWDgD5kzzSvOTE+yhinLxQKkwXRV2PLFIU+t3bm/O5Zb8xKcmgua1B2J86WnAEAbm6KZE3wVZNuctnCzZ4G14YmTCNW/XEtuHQoM748wjjG207exIY9E+8WRb+RI4uIrq+8SCkwWrnE185S4cvpTM7Q+yWayvkw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: edk2-devel@lists.01.org Date: Tue, 3 Oct 2017 17:08:29 -0500 Message-Id: <1507068509-5148-10-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507068509-5148-1-git-send-email-leo.duran@amd.com> References: <1507068509-5148-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR17CA0020.namprd17.prod.outlook.com (10.173.147.30) To MWHPR12MB1246.namprd12.prod.outlook.com (10.169.204.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1486627d-f940-4dd7-210d-08d50aab563a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR12MB1246; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 3:oygxbjTWTZHXZ8L0E+CpUPf0eEA0mBiwFWG7JPxNK1+KhRQ2YIvBJOPbi+zBNQAhFn9Rp+dozgiqbR3a/Kyb+cQeZItdTxsv0NqMTVgSkqm+ehJL6JMssxRU5ChUr2KXkr/asOXnR3/wb+W5Pmn1upZuF5rfwWIzV/ab+1/mQM/Ljea0yVkt9iuJF8sWEXtwBLyfkHxz+PIlvsQdtAnK7dN3z8RVpRJDY7WRbbAZBXgGe0CwkUQaYLDpeBBdw0DG; 25:e9fjAIeMmJXUPbcmgOyCt/5Iz+0nX57CuK5v15q+laSnFTKWFuOUQOLGvSolmsuKAk37xMrErxfeYkVD09ARrBYu6tqJBwEKeRPoVOEmOnzGR84Scyx9Ve4/n3pQnCsoCGAlWnSYISwaQYCDU7XgbluQwS5EpNAJxzKHVb1A1/qitX/R86SdvqpL9/2FXPLM3dZ6xF2D9A70s/LhkLViYoWIIr09cIrCht5mP9oDSz3SNdTNMNvWQ02eIeM+810k5lfwLpl448SMxiV85Rrpzrdy84cJPMH4JNsITLOyyMLw+ZdZixGgQ2kNwHb4afzAZAeuau40EVoxnzfwdSKyKw==; 31:yqifjz/RqvJSoCC8CRrFWF79tWmMbb6tqVCrtc0jvSb1xjaGwktsgh1cH0hzS1I+eF8z+yTv7xRXxjHM1fv9P5RibS5Hc/8RVeZbranRXBu0l0Y6rFDZn27B9viTJDUCXzZqW+yfaogAaVxiEEWhA3dPpDVqOzh76iY7KfYNQNMG6AYmYzcMUtYgacrbFvuLh3DPn5Us+Ge9qEC8+8JKFpGuUDje6HisgOb5kSIwl7k= X-MS-TrafficTypeDiagnostic: MWHPR12MB1246: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 20:ssr2WLycF50DEm4jy554Bc9D9XiRoox5AXMqALgnhKyGDZvBYxfQsgxLumADIcRAqaB0a+qCspZf0gw19MTHw7wboPbhFFFmi+W0DFyt3tnHMP5ea0tdGu9Pyv6q51OAJlWbjL/cMejWnnwyH2xRzQzmvHlxVpmUA/OT3O0DJUwdywU1jJRifKzpzm5bh1Rpkx8YkCZ+BLEqHQZo30ghW8/EJOsS373JObgkpZTGdKbDXWnR9Lb6lM4u83U1J6W+Ki0+y7a/v0C/O09nKqLerA4OX7yNsINe1GIWMbBNYKFeLnkZeamZoFzwSjR+vg8SdUuMENxXePFferRQq9XP9bKdCdrxkuZ167pClH5H0EAMX1RFCg1ElPToLABSFiIA2pQWWEqkXon5L4dd9gyjIEgToLZZHFdps6vV2N6GhPBZY72iQmASOyYLBdq8KGbikbbhBB0JfhwXdoMOY+zMrSXYKtyLuxkAtN64YSCk+GiM2ivoooIoS+HTASjYDepp; 4:hRuWLCiqxChow/WDU2HSII0ygcEs6XXm5z3gXjjLES68I+uEw/RWrZEbNXQ0rvtxJJEALglA6asetamhpGp4rQzymQv4JQG2uLn8ZekJ5C8/MqAva/Pt6gWzc2UB/rJYUzlEm0DE0UMtRD2g/M5R/e1c5s79gBFBBh0LcgLKIFp/RKCTtpBWO5QhOXBykLAclHqcQaSX6hf/wMuH28JjtJEok7paBZqOn1DOSuhOhQt4RWNeWnlUIWM1g+Rhz+cHAqCMybzLSHCcysEkLkb/D16OZpON692yDpGqVxlEIZKlTMdj5VneIoBZJF57wCBBpCygPxeJ1+EGLlyPql0hQJq04h5uZv27fOJSFpuwGq0= X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(788757137089)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123555025)(20161123564025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR12MB1246; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR12MB1246; X-Forefront-PRVS: 044968D9E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(39860400002)(199003)(189002)(48376002)(5003940100001)(47776003)(76176999)(50986999)(68736007)(66066001)(25786009)(101416001)(575784001)(6486002)(86362001)(33646002)(478600001)(2950100002)(16526018)(5660300001)(3846002)(6916009)(50466002)(7736002)(6116002)(2906002)(6666003)(105586002)(2351001)(53936002)(81166006)(106356001)(97736004)(4326008)(16586007)(54906003)(36756003)(8936002)(305945005)(81156014)(189998001)(2361001)(53416004)(50226002)(316002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1246; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR12MB1246; 23:PYnT6UPpAU+Yml5uyD/Ky/JFrvIo/Slh06eaRYl4P?= =?us-ascii?Q?JRlKp8e3hv5RQwngXc7LoQH11x5pkHTtRMEaqEre1p1+CA/2+6crZNAW2jjs?= =?us-ascii?Q?DysJppHDprCFGOG0sKVQwcYw1JiAAjXYOu7Kqxm9TbBaoa8xBpj8p6trOZW1?= =?us-ascii?Q?sy8xsNd+9b30CB89g1A0E+B5syk33yLoZvpCTuDqVUCXeS2+IFx/KjRD9tUX?= =?us-ascii?Q?mt3z0PtvSrdKRtlexLmTIeor7PKtht+iv5TM37zjVzpbStdo5+1kG8bNJhz8?= =?us-ascii?Q?8O7aP5aS1/cvkRWHv6XVquR0eVfo48X5JtpHl0JG3Tpj4DbDDOrOvMYluy29?= =?us-ascii?Q?EJRPH6CumZ3EGjM5ek2sMEfqY/0WN2datn/7v/sCKs2oiO6UarDZtAcrNo8+?= =?us-ascii?Q?Mr/8C06fJ1OFG09gkRfP/L89lD4bePqOwFulXTUSo37RDfFkk3HA595y7Deb?= =?us-ascii?Q?dTH/cS1sI7Dz1/0fR7hHs1BVL10Sl4QQxT+fh8jEeJMSgmSRDiFDMM1AQNtg?= =?us-ascii?Q?LkWYaiaroIfD6uO12OwNB+9jOmA4W5pH1hR4ErKMJtXGzXmIRdVgx3WSwsIy?= =?us-ascii?Q?KJKbXC1mAB/0cARFLwTDzCjFL03TFSmSt/QPInZ25u5UabGkxQ1QWFOtY+TC?= =?us-ascii?Q?WYAl59dzDRRzBHhtOG8c7gsVmxTwkp/LiD/3xRm8/dupsV6S8ZWl3qmTdG0Q?= =?us-ascii?Q?UnCgQI5BsO1m4oNWrJOIQ/2GYJYrR74ut/YB+d7gWl6NRd5omHLFuh+DTLZt?= =?us-ascii?Q?1+qXc/nrYB+XjLLqA/Feae/QrybuburhzoG0b9+az5cdN/BN8ZRRsvSLdAvO?= =?us-ascii?Q?PEzm3qkhvyYmJ+Z/ZTIAig2qNVUNLnjeT7BjFXb3ZXmJ2Zr8HYqmX563UD5x?= =?us-ascii?Q?3Z+hxVYei9N0rYph7YI2bE+TB++hFGmxSvnW5dltrWWkB78ILomrZCY9YJGW?= =?us-ascii?Q?eGTuCBZekL5L5L1XBGAWuBHp9LDNdz/2MaK773jPf6WGhcNdAgUVhf0oBgC1?= =?us-ascii?Q?LZaEj3YBjQo2dElbpCS5ol0XsvplZz43Da1wnWHvFrbVC5iISTTw1CjYrYss?= =?us-ascii?Q?zFuKA6c8vTxFvxSUn1vAUGoUXxjeY5KlFvW73aqLkuA7qi7PRO6vcq59WshQ?= =?us-ascii?Q?y9Qp6U2rCivIS2NpFdaVj5qKKLw6F5IxGxuaQGDZ5+dYNGAzyOY0Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 6:5isVD6M3PnIe3hcO6jcRRJiacFeAqHYxXKwt0av1wsXfoOvHmXvFTMLrH7ZvfurSwmH31oxDp+1ChTv4x3RuNsI9xQBxYcE2dbYrqeBKnebV06LnACiDsCDqV1vQ6rZs28xu+Hl/kNwJT98/iQlgxmtuXnbTjOINxTM6hmD9rdOtQI9FT7YU6pcYdrRscIJ5jgxQRHILCvF68apck+HsEMbs0xy/LGEboCDPqwIwOUKbC1JHgeefrq4w87x+oT8bObdfI91NhSSybWk8W1eQcFTU2X7fI6MYEX7qJwzpIItrIaBv/ycBKT53AMuORffovm+lOIW/t+5LOxk2fXeyAg==; 5:YdPH3jHfZeAVk9YG4JtaXhUMjY63zCIjZXsk7vO/dsK3mUlXnhawZlGXQh+9tSf/LL4PgDFF4ad0MKtyLzGjb3umeI2wzgi6TAc6EVjVZl2KaN6FyF9Gb062DeeleTIyQMqETudLi+5hPap4dZ3Yvw==; 24:KMd9i7HR52cDrxe59O40HUBbT60daNHhAMRIf2Cjvh0rBexfP0beIsNvUP1HH9VoImNWhgiUJo8RiHDbp7If4mPYBLpyuhNgWeiLCL5b3Uo=; 7:60SDsRXDNpKBOryXSB4yH1uZWymj0tGNRP6lKnmpbAh7p2JQyfCiJrMSF5sIdKP0hCuiuC68rWRTdZqfMNrXj31V28B+Ga5yNW6fmxa7VCcp1JJc/htD10A5h0+Turf5Be6FAKMqWqR5LJputVQ6PP/jjN0azfoFQtvyz+npPMlW2t13S9EQ4FLmD9EBYTOuhnFwOLuXdl7TO8e4J3oEM9y+LDJnsSl/Qh8VPioBDjE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 20:ghoQXAd/Yi/t3nlXD8IxxyiVAJGZoireDOcqwPZHrH5ZmF3vKWiUXyJURWJ5Y/gmlzK6yfJRz1l/Z5SJL1CYCLkHk6mt4SJuP05UE5Q7XounXj3zrNpHbRkkg8sz/sSbx+AbXX+Deruec7fI7eclSLz8xlleo1OnGYT4biQZpjnx3/j2UNe0Y/rBCIzyEltOyAIgB9maPOmhy9CAbJw8GT/eRgQai2ZJhnT81Nz6ckX8RYvfhnlI7Ud79KPn3Svy X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 22:08:53.6066 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1246 Subject: [edk2] [PATCH 9/9] UefiCpuPkg: SmmCpuFeaturesLib library. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jordan Justen , Jeff Fan , Liming Gao Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add a FixedPCD to replace an Intel-specific hard-coded macro. The new PCD allows SMM support on AMD-based x86 systems. PcdCpuSmmPSDOffset - Processor SMM Descriptor Offset in SMRAM. Cc: Jordan Justen Cc: Jeff Fan Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leo Duran --- UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S | 4 +++- UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm | 4 +++- UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm | 4 +++- UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S | 4 +++- UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm | 4 +++- UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S b/UefiCpu= Pkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S index 4c0f8c8..d3c291e 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.S @@ -1,6 +1,8 @@ #-------------------------------------------------------------------------= ----- # # Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.
+# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BS= D License # which accompanies this distribution. The full text of the license may b= e found at @@ -36,7 +38,7 @@ ASM_GLOBAL ASM_PFX(gStmSmiHandlerIdtr) # # Constants relating to TXT_PROCESSOR_SMM_DESCRIPTOR # -.equ DSC_OFFSET, 0xfb00 +.equ DSC_OFFSET, (FixedPcdGet16 (PcdCpuSmmPSDOffset)) .equ DSC_GDTPTR, 0x48 .equ DSC_GDTSIZ, 0x50 .equ DSC_CS, 0x14 diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm b/UefiC= puPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm index 91dc1eb..096f353 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.asm @@ -1,5 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; ; Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
+; Copyright (c) 2017, AMD Incorporated. All rights reserved.
+; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BS= D License ; which accompanies this distribution. The full text of the license may b= e found at @@ -29,7 +31,7 @@ MSR_EFER_XD EQU 0800h ; ; Constants relating to TXT_PROCESSOR_SMM_DESCRIPTOR ; -DSC_OFFSET EQU 0fb00h +DSC_OFFSET EQU (FixedPcdGet16 (PcdCpuSmmPSDOffset)) DSC_GDTPTR EQU 48h DSC_GDTSIZ EQU 50h DSC_CS EQU 14h diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm b/Uefi= CpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm index 00c0f067..696af46 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm @@ -1,5 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; ; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
+; Copyright (c) 2017, AMD Incorporated. All rights reserved.
+; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BS= D License ; which accompanies this distribution. The full text of the license may b= e found at @@ -25,7 +27,7 @@ ; ; Constants relating to TXT_PROCESSOR_SMM_DESCRIPTOR ; -%define DSC_OFFSET 0xfb00 +%define DSC_OFFSET (FixedPcdGet16 (PcdCpuSmmPSDOffset)) %define DSC_GDTPTR 0x48 %define DSC_GDTSIZ 0x50 %define DSC_CS 0x14 diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S b/UefiCpuP= kg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S index 1f9f91c..de0f71b 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.S @@ -1,6 +1,8 @@ #-------------------------------------------------------------------------= ----- # # Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.
+# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BS= D License # which accompanies this distribution. The full text of the license may b= e found at @@ -35,7 +37,7 @@ ASM_GLOBAL ASM_PFX(gStmSmiHandlerIdtr) # # Constants relating to TXT_PROCESSOR_SMM_DESCRIPTOR # -.equ DSC_OFFSET, 0xfb00 +.equ DSC_OFFSET, (FixedPcdGet16 (PcdCpuSmmPSDOffset)) .equ DSC_GDTPTR, 0x48 .equ DSC_GDTSIZ, 0x50 .equ DSC_CS, 0x14 diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm b/UefiCp= uPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm index ad51e07..3e4e080 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.asm @@ -1,5 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; ; Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+; Copyright (c) 2017, AMD Incorporated. All rights reserved.
+; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BS= D License ; which accompanies this distribution. The full text of the license may b= e found at @@ -40,7 +42,7 @@ MSR_EFER_XD EQU 0800h ; ; Constants relating to TXT_PROCESSOR_SMM_DESCRIPTOR ; -DSC_OFFSET EQU 0fb00h +DSC_OFFSET EQU (FixedPcdGet16 (PcdCpuSmmPSDOffset)) DSC_GDTPTR EQU 48h DSC_GDTSIZ EQU 50h DSC_CS EQU 14h diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm b/UefiC= puPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm index bcac643..8425499 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm @@ -1,5 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; ; Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
+; Copyright (c) 2017, AMD Incorporated. All rights reserved.
+; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BS= D License ; which accompanies this distribution. The full text of the license may b= e found at @@ -29,7 +31,7 @@ ; ; Constants relating to TXT_PROCESSOR_SMM_DESCRIPTOR ; -%define DSC_OFFSET 0xfb00 +%define DSC_OFFSET (FixedPcdGet16 (PcdCpuSmmPSDOffset)) %define DSC_GDTPTR 0x48 %define DSC_GDTSIZ 0x50 %define DSC_CS 0x14 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel