From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=helo; client-ip=104.47.33.66; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=leo.duran@amd.com; receiver=edk2-devel@lists.01.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0066.outbound.protection.outlook.com [104.47.33.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B298821CF58DE for ; Wed, 4 Oct 2017 11:59:21 -0700 (PDT) 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=5tSB5KXfJ1cJnzs2cthP6mxgOVPeNKnS3oexkb32QnY=; b=ijGYl+N1+0aQn7P4N2wIPhMiAQ3YbG+5IVyXrwX15SwojVyx/4rUqewMWDpl0472a6FqhSOnauoyAcV26nsnrhS4xFYwncp6kWxzGtBsH7J02/eGjI4mHuL5fdWAxXKNWRO1Y6vm7x8kxOi1z9VSi4WG1wub5YCl1XCZyvZgoIc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; 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; Wed, 4 Oct 2017 19:02:39 +0000 From: Leo Duran To: edk2-devel@lists.01.org Cc: Leo Duran , Jiewen Yao , Ruiyu Ni , Michael D Kinney , Jordan Justen , Liming Gao Date: Wed, 4 Oct 2017 14:02:27 -0500 Message-Id: <1507143747-18377-6-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507143747-18377-1-git-send-email-leo.duran@amd.com> References: <1507143747-18377-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR1701CA0004.namprd17.prod.outlook.com (10.172.58.14) To MWHPR12MB1246.namprd12.prod.outlook.com (10.169.204.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c1c0d80-e37d-4d71-afe9-08d50b5a7c40 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:E6FFpacRa0MK0doY/QBPiluQAGYO6rw364z4tojne//CBDG9MoYYkgUd4iwTJVvUNzfk2n9N6mSgN6mIDge6optEpbRlFz72r9GKmLhKAIqmxGqy3c+z+P0t4WpQV/J8dTOL1ERNWeve+zUaJ2plsDImNIMBUHw2FH8Hp9EpFmsaDwGH1jxgDajJzckWOEIvcuPdk4SaK/n1qZAfhZy+ZIQkbxz2lHRRrEhaj6RqXkC2TI9z9ZoDBummh1Fd1nC2; 25:/PlBU+bBjINMMDTPcsxGCzYI4Sc7CSjUdRLkrBQ4sS4J3AC9GtSnko7UH3Y4iuDuc9GTrkcGLmdexVBBaj6ym9Mju4OwmVP8GngiVLLonMoIWqIJhg9e8NwXSOHj5fsBKBSeZCFOWNXZh5urmTC22ag+PB+FuAehgDsTfZxypDSQ80Y7DlvEz8ZF20lWQCxmo1PqqcEwfO6V/kRfkaGFXpZqp6sHGGdBPOEoomcQEXj8O+dkmCfe73zcbRqa1tC8B5zsqMJhIMGpB56SOy00dV0NeKdWAXKvHgEbJsvVh8qqceSIzl+r+ucYceIxUCWK8aTrLGU3azU25hf3XxYC/g==; 31:JsKFgsKR4AwgAsG7cIECBwhLTJzCpFv1WFl/iobxvg3thx6kTqnBqCMBGziFhPAT0TDQXCvurld4z51Te9Fdb196e2fd1qmWudl10eNyWto/AYg6G+wr0yFijD+wijCx7kOrCB3hYxMsTvCrT5YmNc8SZ+9+V2HqRaUKGd3/uLXobE81UNmJM28/a3CBxGStPs6cJjqziUzIObo/32+Kl5QEVPufIm4Tep+utXvbsNU= X-MS-TrafficTypeDiagnostic: MWHPR12MB1246: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 20:bwXHmx7jQ3J9iP55hl1OLr2JLKyDfiXzFHvtJSDC84jMJmkL0D5sfifWeUjUK/8Mjf6bstvm7BAMuRC8M1ogcgGvyXuxemv/ErC2BDUOv4JV+R23JXjUMrFul5IjCJlQvz7NenMBKL4qONSkSaicWRdLo9b4Ol0P960l44Jy1Ra/zsG/KHBpJSydmMKBxxB0U8VnGLHadwz6Xyb+UggYsmsPi8E2SwQ4CTGqMUORjKMr5o081jcYQAfL1JDE+f/CFHJbMXRURZMvxYhoTg+5mxvQCtylaOzYJcE8ND6ePwimEX+d1YtwGy+GuXm4rDDJJQ4j4r34pNLKsbVnI3QoAppieDcm9N0Tmo6STUvHn3JrtCwweOX/M6xyttDFNqLVsTUHT+U9Zaa1fh/tXR0FhX3mz+9x97m8W9m+v73ZFGuwyghN18WjWBcy/0zrp7fPZx7AhSLLT3RnZO+hEfTbeErzpTPYuV7S7BhMi2HNvVaaXHCXjTSAuI2sBdQcwd94; 4:ipbsS9EfsHgyK1sHHHgrOkGAxP0PSyOb6BqBphi6A2RgBjCxhV1eVj4G26uKeOlSvsLMZ0ctF8UEgkwP7MmeJf5C9dXVgVHiZiyuTRWSSuiYwJUax7LA8m4g/y3SdZLjEPF0IGIRcJwSNsNcUKdA0rBDde03xRGthwHSI5NTsgXsd/eYaSQQWE7MBG5roZL60WLO7WRy7nHSQeSZnQ5WUQbwQVFY6tRJXdUZ1D1j9qTKaNhXidIDxtkRdYe5wIMmzZ4A25yPxWt+Yal+fLvsvYXGlTVzhsTDeXSdWcca2BBGuVz3XNcWpT1U9oZaXE+E2xV0UupF71wdk8lNhHcGtmdkFaTRsDj762X6pHmzJGI= 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)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123558100)(20161123560025)(20161123564025)(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: 0450A714CB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(199003)(189002)(5003940100001)(48376002)(3846002)(76176999)(50986999)(47776003)(66066001)(68736007)(25786009)(86362001)(33646002)(478600001)(2950100002)(16526018)(50466002)(6916009)(2906002)(6486002)(7736002)(5660300001)(6116002)(101416001)(6666003)(2351001)(105586002)(36756003)(106356001)(53936002)(81166006)(16586007)(4326008)(54906003)(189998001)(81156014)(50226002)(8936002)(305945005)(2361001)(316002)(53416004)(8676002)(97736004); 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:Yc54HSDD/sM4KuwgqADEN24MGG227qRCiP8gFsnnV?= =?us-ascii?Q?XzRKkYgOKfXf1lWImdZ0hfoMlX1hX/bm+Qqd5kz7w8z906w6Fuf2ted/EV/k?= =?us-ascii?Q?6JUevOmbX3KIrmQv0EVOMEnU2BZo6+QD959yMoj5aLps7TszH+UfNecDSDpI?= =?us-ascii?Q?bQbNMMBulNroy4dZE0FP3Oxa3415bY0fPs/VAKoH8Q+qFPunmrMGSFF/BFyS?= =?us-ascii?Q?c2JJLP1kO4YQlMzZz5zc9X+0nyS2yafamwPWTJRkK8YgmSM2wZ9+vZIqTPgw?= =?us-ascii?Q?+zQesA2vfEVVBG0d9xtSjCD+rFm/ggurniIVLR6D68TmW4pfuqb1/pFb+OFw?= =?us-ascii?Q?ju45+esLjPwHGQUMO7psyKQsMIZNUVkYk059IUQrAV4ZGG1AZj18eKtrh0RT?= =?us-ascii?Q?QAGgV8OF8zp8gv9Rr8kEhAkrYVWwFk3W0SIHW1ZpiNh4RSWwwe86AZCLeJ9z?= =?us-ascii?Q?v73TbtHshM4aRsLrQ9uKjqRlZXGzGS4B5N4jtl1T+KRFjYHUF6MtzSK5NWbk?= =?us-ascii?Q?e1ZMKPzfnNxEaRnPTi5nwilZTrDMxAyfoq3Nas4eOtX9GKvs5pm5aSNqKGCi?= =?us-ascii?Q?LAQ9OIY+gHqaflhBDAIp2ivIEZeUcY4fvscRLYFwrPyYZMd2LIu1hgjzglHF?= =?us-ascii?Q?3XxldHGVS7xXnh0/tdwHw4rLzflX6QHHwhKbVl9TfRCVwgCzQFKNUdRyGXC5?= =?us-ascii?Q?sREYbWwVxoJJWyUWECBrUdQmiIAsxVybrqkC6n3JbESz18xW69+xPL2Z7DDj?= =?us-ascii?Q?MgicoS2sLu7gVWs0xG/l4MeGadhtLsizn2sq4siTwcnZrdLMYKrgd5k3X6Qg?= =?us-ascii?Q?MmLEy3xgwX2U0F0zOKog0NiDJkIGiZBEGfzei3At1sKoC/CrDcM9i9Ge18vn?= =?us-ascii?Q?lFXczGplmRcuACMUQrkaIvp6R574NVJtFXGjnaWbj/t6x3Nf52ZY2V35sYIW?= =?us-ascii?Q?zGh9QsmeZbYcOCPRaj4pELgcvk97TrC5dzBalaeS6F4W3vXmYVLhQJ+t28i2?= =?us-ascii?Q?vu7Py4YiAnNa8DchzGBV8su0vUqmBPOiQPZZmBaE2RyRtu1C2Du4RszyviUx?= =?us-ascii?Q?OgK2weMdUA5mh0TRgVMQpKfO89A1by/MdwVufNhj1KVNgsL52Di3SGjSB8S5?= =?us-ascii?Q?/fb4L+mR8znvrfoMtqBiCljb2wjiHuJ?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 6:ZzMcv7fpkEpFUbpVbbRtAdehOzL5OVdPkxxMZVNj3R17hKxcG0sP9HHsLvznipaRA2lZiwPmVJDYALpqUb/F8IEODQVqC7vBeQ6ukEvYlz5jk8/6qy0kVhaXwUM/DM35A8Ngt+Ilu7Z6tS2cqya2qPELx8cKKl93LTj7NP6TzbVXRIK4z+7jwZQifkcfZIb75QDXUh9mpT8pUA8QE36+JbGoqnUmlNxor5XBqA3T6iDxCKXA0mIEG+NLuW3l3iBasYgjDAWCNKw/lDYRFSflTbWSL9WuTABM0t9IARuHgPooTK6DixUyHg7ITM5txX6+AfvPjBPw6wWVQQFDHSqj9Q==; 5:TBtWVirjwVtWwZVArhWCrXITypFwyDpge3ajaEnuZMaCnAdYiQwI85sgxyuCh7ZABKl/KyxbOSVVE0PvL35s7MnMleJtHFsLjomiHPcdnjFcgKce0MCqWk1cOrWnFKQBskGwKHzgWGjbGVgY3VoYLQ==; 24:2UGuFLIHTvRXPlIxIRUY7C7xWgZa08koeyfCxLAP8RW9i8GdlyzJm1zAIpu3gaGSaFikdipbdHn4S6osk1gCAImwfzUylHlDB8XPDMeRAeA=; 7:anzZJuQfVoXj5QrObcjm/ZKBs1uhj94W2xGMflw1vIGmvvxnT2aK9TaFHtTYYCM0Nqwun1N8rVDWTs0LQcFf3g8yrZi+Ceu4rxh+0KGH3JtVhsoxo+FEVgYS1E8Lg0QCh3HYNwIcVPyIiG8CIVVDZZBcnST3RDoPxWYgpkfYEj9NrARNsgNrzRdQGhlMNdtLc/qYb+sRFCPmxEKI6RZdYq7Y/d+gk9VHuT0fKJr47mc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1246; 20:J7PIYxzTZYu8v4e3C5qi2XmyQv0c7GaTCJGNj75A2tPgOB4AyoOcv1vJgeIyeLo/71nh47yKS5f16udPHOx50sVPAXo1gsOqDOjlnuR4sYzAl5+adNMFUOq06Kb+MtZL3moqx2KjkMRIrirrgR0uitEy2HVp56pW/VWT26nXDE2xSdEWVpeXzx7v0ibG3VxDUcsZDk80gzJgbVpsNqKU/KZ1gTe0aImmaQ/X7KCUt+oP6V4UPgMXuLvmE5HZuzeI X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 19:02:39.7525 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1246 Subject: [PATCH v4 5/5] UefiCpuPkg/SmmCpuFeaturesLib: Use FixedPCD on non-STM 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: , X-List-Received-Date: Wed, 04 Oct 2017 18:59:22 -0000 Content-Type: text/plain Consume a FixedPCD to replace Intel-specific macro. The new PCD will allow SMM support on AMD-based x86 systems. PcdCpuSmmSmramSaveStateMapOffset - SMRAM Save State Map Offset. 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/SmmCpuFeaturesLib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index 2d2bc6d..88f43b4 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -2,6 +2,8 @@ The CPU specific programming for PiSmmCpuDxeSmm module. Copyright (c) 2010 - 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 BSD License which accompanies this distribution. The full text of the license may be found at @@ -224,7 +226,7 @@ SmmCpuFeaturesInitializeProcessor ( // // Configure SMBASE. // - CpuState = (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET); + CpuState = (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + FixedPcdGet16 (PcdCpuSmmSmramSaveStateMapOffset)); CpuState->x86.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex]; // -- 2.7.4