From nobody Thu Dec 26 01:58:52 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 1507070350580702.4108499110096; Tue, 3 Oct 2017 15:39:10 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 73F7521E78215; Tue, 3 Oct 2017 15:35:31 -0700 (PDT) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0070.outbound.protection.outlook.com [104.47.32.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0450A21E7821D for ; Tue, 3 Oct 2017 15:35:30 -0700 (PDT) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1239.namprd12.prod.outlook.com (10.168.167.14) 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:38:48 +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.32.70; helo=nam01-sn1-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=DJNJSTBuLGd4dXMMeiaL5cawx4eKPxUoVVXPSbrI3AU=; b=47vv7aPeH9wpSef/Nr28SzRT93XGNQBzaQX50F6bUGPCwcfgMqz9YQn0eJBUGiQqLDcEkVhH37Ar9V09Gbn+gb/ixUcWnFvjDNuF0RjXi2jVk8Uz+Krsqdlf+TXWWZKBDrKfnDnl0WJoexKJJ6vy3YDPHWo1eRL2BeAPkB5xECc= 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:38:25 -0500 Message-Id: <1507070305-6727-10-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507070305-6727-1-git-send-email-leo.duran@amd.com> References: <1507070305-6727-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR22CA0061.namprd22.prod.outlook.com (10.171.142.23) To CY4PR12MB1239.namprd12.prod.outlook.com (10.168.167.14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4586b72e-1cba-40ce-9f9e-08d50aaf840c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY4PR12MB1239; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 3:RzVYHhksvL2AR9ciJjjnnDcFuLmlO42i+YkysCD0b5MGfuFaiiUqFZbBse1s6N34lrMnV/Y534+ynHqPQkKk9ROM6rf7cJsBXnEXDOwYjvqz/FIr9UEmNOD6fHiQiWBKoo2Js1sk26oITkJi/knvYcKrRKOk2jVG6MCXzNNRSVZiR3fxDu8SqO9hEidlT4ruJddD9gITOPkZi0covBk9uqunwkFf2gtPHv94UJ+e2Eq26i5ve7eFhfZNtkQ05SNM; 25:KAuSfj4shIObsjlDjZ7JWtpiLTV6CM+2Lijsrrd6xz85jAQbNLLHi99I2F7HYlXh91FrviyIAFcOZtqEjEDE1IwGm6CFdIGdG7TMXb7dvNBaV2bsxxQISv/AKVmI8hYmxC7GZGCe0a2ZOtOSiu1vBKYW3W0ReFqBJbG+hYmVSDn6yrXM+waVk+5Jy9OWz8+fvirGQ47Xk3BCkIJwfLc1yco1CHrripUejewZhdunW7Y3FGVn/SMOFzCYlO6legwbK8kG122LHZNTekdvxv1aZ+anPqIVln5uVIyyxmAVA612PGti9CE5CGWp4Jfwyx2odYOqrfe7bEYBs+4HPkQsiA==; 31:SAGW8EXbmAx+mqBhsckULuE4XnQJIypvliE5CdQvOumm4+sKSW+FBWamKMovKE16VoWI3OD27p1WtFkXdovi6HBBiHJlVEhAFgQzplBodkF8dYUFoqNJvG7m6pvpTllDmmLi3yw6Cm2G8Aqh2YXuuWJsyEAX6xFr9ybSx5YHA98ae83YUKSitMM28qZLcV2aH9RDVmZ1cltKlSc749VJ0apfcat4lKEb0Bk0/eZt59o= X-MS-TrafficTypeDiagnostic: CY4PR12MB1239: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 20:cpQr2WJ9h0HA5hD0lr+JxNj61r/OS7WwYR18WPXSQeP2ykHL0klaxavRGIIGxV7KXA6KqmWkahex8DC38tCJUKqtBZxrI5mvUncd87wiRJ26gH/91CsDyTQTzikl/O4tW2HfEpNx/U7hX8zmtAaAGe+INLwXoZYuJf5+4Prtt0CKZMy11xmqhxOqfomIUAu2hf0NfQeg/71261zzuVitzaMhWZwBeV2f0xy0Vbc9qAoZQMh+0A2wxLGgHAGjrk1pqDKixuVWL78jWbWRyFamxUNpWrtc5SNp297uAIKGtx9k5kgA5Kkx1QxOOJbm1gvo9nVXBBHEfIlyRIcHSffoAXMFufFkvITx7AVmMiaswJhdqW+rD5MZ2+z03XRep0HrjLCmdP1JJ6okrptxpAZGP/Yt/H5rUj0KTveICymrvgTBhO3BXA8/MVsHL57dJm6cdUvZ8DcN2Xecs0Cki89nBvBIqZid1qBNF07aCRZ4JqWpBjiWYQVo9imDn9wFpx4J; 4:8rbJY5Pj/vdsWye1VrBrWS6WfBJXkCpB/lSd1Whb34pbkT4PHUjniXoXMW/M8UuGFZ33XhrCJO+KuVDqICDnUywjsyex/YhJZKr0okdAlVaVWZKShfrCyXK2/DJQ8PGaKBP1ppbTAnhhKAKE3PgrzL77UUoqXBheTcYG9gdu52F7n+xW91jZwLZGWnw7J+f03tLCZZuIO7IiJr5NSHBNSLQ3c7/GzZFbrsK8w2pwYMnPX5OZCbDYBUFWagBfltbadmTC9ExKBEXQFPMUG0/YLpUzAJxHXkLd528LOW0rfkeG9A9r5yRWjHWVB/LWci3CMFKGKu9gBsxACotYgbmAzyonRUGWKH0/Z2FXW3Obqv8= 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)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123558100)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR12MB1239; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR12MB1239; X-Forefront-PRVS: 044968D9E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(39860400002)(376002)(199003)(189002)(305945005)(189998001)(6116002)(106356001)(53936002)(7736002)(2950100002)(76176999)(101416001)(4326008)(50986999)(105586002)(36756003)(33646002)(50226002)(5003940100001)(53416004)(68736007)(2906002)(2351001)(2361001)(3846002)(48376002)(6916009)(97736004)(8936002)(25786009)(50466002)(47776003)(5660300001)(16586007)(575784001)(86362001)(8676002)(6666003)(54906003)(81156014)(81166006)(478600001)(6486002)(316002)(16526018)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1239; 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; CY4PR12MB1239; 23:13qIQTRAgeHc3uI5juycYCxNe34z0+kUY04cINXHt?= =?us-ascii?Q?gFG85hC/pCPyZznX0YOa3b6qkGWaE/n2YppoDwiPnTSUQYpufHnnzs0YqdhK?= =?us-ascii?Q?NlmQTxweuNy35BTAy9u0xZx4eXWQW+JCAaU5MpvUhXNNQEc7nVTYPE58HuJH?= =?us-ascii?Q?uzZNzZJH0BS7IJP/5/CCJh9W50q239hOtZXoCnNYrEAZ/e4UgvvSacReMix4?= =?us-ascii?Q?sGDwjWzpCq+54D4nETyAsJpBWl9YPKL/JWcytxNenYmwVa4hVqk/se5CJzeb?= =?us-ascii?Q?rDtxyYxQLvVKLOBNslTtA8T8lmPJvJra2o6XuNbDwDlRYhyNT0hNb6Phyz5w?= =?us-ascii?Q?t+1v8B8pdrot5pLvCpZU6+xZkzdV0uOR7id9FyajVcqsJXhHu78Fg9LR/2XM?= =?us-ascii?Q?wKSAFsIYPPggzrTxJKFCKyrN2xqA+2PxLIOyjQjK92yg6GIVg9i19KJAgDsj?= =?us-ascii?Q?08R7ksoEYyHhq298gm1L4S0o3oZfWs3wgIw73ditpCAqv6jhObd8IDx7l3Bt?= =?us-ascii?Q?BBf9zLUkHQWz6CpUdfjs2S97zoHuV0fMfV1y5JXVC3Wg27OLRrLfQtHjqewZ?= =?us-ascii?Q?3OHge78mRzwcPGlr0l1h4KGiAAn8aKSuzucb3ULjThYpr+uVeHby2sQv4L9P?= =?us-ascii?Q?ZxlfFQo171lIVs8lhbfBpAD6KhuxNOdbK8nFvvQf8+lnp5aNOURcLf4NUf93?= =?us-ascii?Q?7W720I28q4jYDPhScac/XYQChOmdc0+fPRnUsy1oyXFIUKVaCGk69PCoHRKd?= =?us-ascii?Q?ErFoAu5w6Jz05C29nPO1CJUFy6Yx5rTOrZCYicn0ie3HTyffdhYFnXh6/MfO?= =?us-ascii?Q?messzMdvs37NAkunPPKGrPu3nqKnyvekSKrYki3dj1zBeMuiyYvrR+Dqo0t2?= =?us-ascii?Q?T+qWdWQpMFg9+nbH9GhawGnK5J/v4Oq+tTiL3yEoDAlWWoM+UCbABiDJVw7q?= =?us-ascii?Q?fF/oMH1L8QYOsU8RR2FF6nQ0pGHlIbY5tX4IKx0vj7IU3fnhXRpSnN6YGg3Y?= =?us-ascii?Q?5Jx34HBbM0PWDyI/bjAQEI//cKXtZERDwbcYS883knJfAIQTZh7UnYpZYvfk?= =?us-ascii?Q?IEFAmRUDuYKxrDWGZWP4Sdo6R2xtuPOVZ8D4+d2WYk7iSK4AiTEVNhkkZCiO?= =?us-ascii?Q?wGUw2utbNjo4LWvIQD9HqFjMb1ZH9FGRMCsp67chE3+rOicJXCX2Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 6:oQwB4tq1SJLBaq9bQIqB6Wazu0866KVwbKuL/YbXzKcEM52K/fLGtEwljr3IYeQNPDiUmBTxpYYEqTpVM8+hsmPfPNamAthkFPfAZE/xnXDLtncjfv1Wi3DsGTVTDFFyATNeWPcP0nrxbGlYCroBQ5rbm9g+T6OiopN7K2KYzZgYhBrVpnPAOhr+nyN0C4z4mUiETqOdsRca0GVFc6K4kP7Xtkp7cYXmUXcsCKilZ6+GKdWwttyoPJxmNFr4AjsXscxBOJnk3s9ZSmY2DhcvfhQTEC7uEVBlJHbXdaeC9jzvxxXMrJovgPEyl7GWJG4Ylftm6dUoGGmLV9FF8iDWsw==; 5:VD8svQyYDHfr5G0HrbQx29abcFIQlJuMZlk8HEvB5BKEZvufyN+eOEiHjL1f8OdxvvDXWBZ5RZLsOrufNaLX94+xHUOebjpZCP2LFCp9wPPcE33YWUfxpgpmFLcxHNPwBjL+ZwT3VfHaQBXcTfqQmg==; 24:5iJds3lOKRB3+vztojMsB1Gkvi5yCC3dee/ZUyIPuvhmdeUeHmz7SORq+RGmUmrOzxoxrn9RwFHcYR+543Vu+nRhappwCVcshWdDj3a/lSQ=; 7:0onZ+BSV69FHge5KBg2ZqPQ9ovZeHEQA78kRT+albEpqdsUf+71H46kds0aqY/BdMhx0pZNGHIU5BK5DzICKDlK6da12p2L2a5XaCB0Q+M5/It1QOVHq/BPDKklCRmMAD3bpl/+Ll/VKMwK7cyGYnGLWwCsXZJzvaPAC3uKkfPH0oMAyCe8804TpLgY2OvjnWcO0VGYSvpUmCzedJ60hbMPI2t//b6eJ0NIZLJ+evCU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1239; 20:yBqGIgQWk2I401ZHaFTu8axqdS2/jsucY2dELLr4C/CRXAOX4ygSjxnfO84IXfCXjZ6MHqVioxL5lDO9Gr+N1KNaqYzKh7OFs0RbWMA9I9i/Wkhjj6nTLx3avLOfb5KmHisUgzJ8I7ro7IKWMS+Y1XyKWQmJhxo/Hzy3OCEos3ktwc6KrlaVDpZAdOS5J2vuF5zcGlkH8kMOcKZA5TeoQTX1TGwq53Ug8sZg4BSjLBh1O5CQ87ORLqMZKp0/ml11 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 22:38:48.7205 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1239 Subject: [edk2] [PATCH v2 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: Ruiyu Ni , Jordan Justen , Liming Gao , Jiewen Yao , Michael D Kinney 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: Jiewen Yao Cc: Ruiyu Ni Cc: Michael D Kinney Cc: Jordan Justen 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