From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.40]) by mx.groups.io with SMTP id smtpd.web11.43441.1683182392706954318 for ; Wed, 03 May 2023 23:39:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=y+1MbXJC; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.244.40, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f5nuj4ecpAcMnPA59j+RANyBGerOfUMB2fJ2ULQQ9VOQNYA1H2bfuXhTtaBedJHStHqQVFKHB4E3Rsso/vCKyFXMO1+KQuUxUIX/rpM/eHi+izouB+uIpgp/7bbUgyqZVfl2r9FwChLXNRIYDm8sHWML3Ue3W82QKaMKIpCal4PNcOaHhK8KdsYE4911yCWPT1UFfKvangir47SKzWwlVCOOldVRYoGxWCVxPqtQUUsIb87hCHIcEDkMBLjgzzVKfZYed6Q0ikcvY2c7N1QzqXbWPSqO8yRo8fpGp6OrPjDGXAXvuuK+ms3KwRW+PeyXNI5yiMFLH/zHPYODJzXaVQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yMDdSLknmYA9BUK36ZrFU/77C3UHfGGahXmkGhFWvBA=; b=h/aofIVEljWpLjoGXBsxt1bmTa10x4asuGudIBqGVcmUQUaUV0ydeUkxZD9N76KAY7sqeedsC59jgh6yV3f1qBmViY1OOcRjfeJSkE5SvynbP7pvcOSkPtqXL2g5rGHqldsWYqjsy/NWdO2RC/r4JdKeHRpA3snvKUmAkOFJZBG9LGtiTKBO0USkLgyTJRdVHQx0/DMdijQHco+FCaaVoEUwD/yTuytbTr6Oz1dkxPmdMChV45fJXBO1Am2UKRPIX9hIoHEbFJH7I27DGrx1OOCN1VZ88ZDa356LtHdMOnbQyU5vVs2K9gzHXbuYLcDSnoHj68g8C0BOTBLHFnoJZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yMDdSLknmYA9BUK36ZrFU/77C3UHfGGahXmkGhFWvBA=; b=y+1MbXJC95tDay8Indljahu46E44jZ10CHHwFpUYqQWIPidvc4fSTrzv0AggR/uRmW/zLHl7hjOicqlcDokkl87n8Cd9HXgxcHMobqNW+YT5ASL9MRR1PB6Near4QxvA8PMl6pyFV4Qqrw8e1wuKbhNvzQDGo4vDkx3bFU4Xs00= Received: from BN0PR03CA0003.namprd03.prod.outlook.com (2603:10b6:408:e6::8) by SJ0PR12MB8166.namprd12.prod.outlook.com (2603:10b6:a03:4e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.26; Thu, 4 May 2023 06:39:48 +0000 Received: from BN8NAM11FT114.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::32) by BN0PR03CA0003.outlook.office365.com (2603:10b6:408:e6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.26 via Frontend Transport; Thu, 4 May 2023 06:39:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BN8NAM11FT114.mail.protection.outlook.com (10.13.177.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6363.26 via Frontend Transport; Thu, 4 May 2023 06:39:47 +0000 Received: from SATLEXMB07.amd.com (10.181.41.45) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 4 May 2023 01:39:47 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB07.amd.com (10.181.41.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 3 May 2023 23:39:47 -0700 Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Thu, 4 May 2023 01:39:44 -0500 From: "Abdul Lateef Attar" To: CC: Abdul Lateef Attar , Paul Grimes , Abner Chang , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann , Ard Biesheuvel , Jiewen Yao , Jordan Justen , Abdul Lateef Attar Subject: [PATCH v10 7/9] UefiCpuPkg: Implements MmSaveStateLib for Ovmf Date: Thu, 4 May 2023 12:09:19 +0530 Message-ID: <05ef8eede366e774885d6f2c9d6b89d8582fd253.1683182178.git.abdattar@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Return-Path: AbdulLateef.Attar@amd.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT114:EE_|SJ0PR12MB8166:EE_ X-MS-Office365-Filtering-Correlation-Id: c2a03738-d96e-471c-cb02-08db4c6a5ae7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 17GEW5JcwqTOz63ftZ8rDDQHERpG3RiZMn+36zCIZcmj7iCc5qdGzptN6q14XehhNSKssLQ1L06U6k15HtxIZhKQ2Xp+hPpaTSCtK/C1zfk07XuvaanlY/9uwGqKd46j6GYO53MMsHqESUliQOAX17nmnACYyXhAWu7a9tENMTtdFnk3AefqYl8zOt2NO7KMzvQG88IOs0nIdnbjJtmxpTC1S0svF+CW/fdp3Age8hEnWOBdC4r0hlooaQp6XSB2a9aNvRAnUCV9lq3t9Us6ocYHMBTVpaoA71h0pYyPTHM34CieNqTLtRd3Jvm9Bi5JkIUlSNH2Q8BkjP18jnj7o1pUACvLD/v07ajeAe29g6737pWtaZm0E9G8qyQXOcrWaM6+MgTU6Sh7d2mZRYTf5ZqpXhMTbu9rP+9+UhpDYyxFADZW6x4op+sm4W01m1jMLdjQGnHk4fISp+qi6xClUdfE5hvoV5e8zn+QsZLhNfW9wL36XBmMUvE+SdzHIrb1DSl97b6jDKvvyDCiE806yl3AsrrwbmKXS61FQH3rJTEPVv62jV0chxHcaFg7Wd6dYHdGUfn6UKEhTmgA+WT/+u4DPgij6Osd+5fVJoaBtAsJNiK8260WKyeFfO9Hlqs7LmwycHcfTkfSC/yYOl6FPPUZH1wrWe86hGboCT9i/04aGllgymLgBoMGEGGqB6RN5o6PFBauHgUi1wsIQ2jIadyJeiTjquJ1nI4WKXeFh/8= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(6029001)(4636009)(39860400002)(396003)(376002)(136003)(346002)(451199021)(40470700004)(46966006)(36840700001)(5660300002)(8676002)(8936002)(47076005)(82310400005)(2616005)(426003)(336012)(36860700001)(26005)(186003)(81166007)(356005)(82740400003)(83380400001)(40480700001)(41300700001)(54906003)(40460700003)(478600001)(966005)(19627235002)(7696005)(70206006)(70586007)(36756003)(6666004)(6916009)(30864003)(2906002)(316002)(4326008)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2023 06:39:47.7973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2a03738-d96e-471c-cb02-08db4c6a5ae7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT114.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8166 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abdul Lateef Attar BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4182 Implements MmSaveStateLib library interfaces to read and write save state registers for Ovmf/Qemu. Cc: Paul Grimes Cc: Abner Chang Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Signed-off-by: Abdul Lateef Attar --- UefiCpuPkg/UefiCpuPkg.dsc | 10 + .../MmSaveStateLib/OvmfMmSaveStateLib.inf | 29 + .../Library/MmSaveStateLib/OvmfMmSaveState.c | 612 ++++++++++++++++++ UefiCpuPkg/UefiCpuPkg.ci.yaml | 1 + 4 files changed, 652 insertions(+) create mode 100644 UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveStateLib.in= f create mode 100644 UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveState.c diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index 401550209af9..dea08aa8a012 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -178,6 +178,15 @@ [Components.IA32, Components.X64] SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/AmdSmmCpuFeat= uresLib.inf MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.i= nf } + + UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf { + + FILE_GUID =3D 8734325E-DEAD-4742-A582-EC6E0E1CDE2B + + SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/S= mmCpuPlatformHookLibNull.inf + MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveStateLib.= inf + } + UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezvousLib.inf @@ -195,6 +204,7 @@ [Components.IA32, Components.X64] } UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf + UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveStateLib.inf UefiCpuPkg/Library/SmmCpuFeaturesLib/AmdSmmCpuFeaturesLib.inf =20 [Components.X64] diff --git a/UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveStateLib.inf b/Uef= iCpuPkg/Library/MmSaveStateLib/OvmfMmSaveStateLib.inf new file mode 100644 index 000000000000..68f5813db21e --- /dev/null +++ b/UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveStateLib.inf @@ -0,0 +1,29 @@ +## @file +# MM Smram save state service lib. +# +# This is MM Smram save state service lib that provide service to read and +# save savestate area registers. +# +# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 1.29 + BASE_NAME =3D OvmfMmSaveStateLib + FILE_GUID =3D 689676f1-6da9-4169-b8bd-be4437e68c36 + MODULE_TYPE =3D DXE_SMM_DRIVER + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D MmSaveStateLib + +[Sources] + MmSaveState.h + MmSaveStateCommon.c + OvmfMmSaveState.c + +[Packages] + MdePkg/MdePkg.dec + OvmfPkg/OvmfPkg.dec + UefiCpuPkg/UefiCpuPkg.dec diff --git a/UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveState.c b/UefiCpuP= kg/Library/MmSaveStateLib/OvmfMmSaveState.c new file mode 100644 index 000000000000..19b5f0399fff --- /dev/null +++ b/UefiCpuPkg/Library/MmSaveStateLib/OvmfMmSaveState.c @@ -0,0 +1,612 @@ +/** @file +Provides services to access SMRAM Save State Map + +Copyright (c) 2010 - 2023, Intel Corporation. All rights reserved.
+Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "MmSaveState.h" +#include +#include + +/// +/// Macro used to simplify the lookup table entries of type +/// CPU_MM_SAVE_STATE_LOOKUP_ENTRY +/// +#define MM_CPU_OFFSET(Field) OFFSET_OF (QEMU_SMRAM_SAVE_STATE_MAP, Field) + +/// +/// Lookup table used to retrieve the widths and offsets associated with e= ach +/// supported EFI_MM_SAVE_STATE_REGISTER value +/// +CONST CPU_MM_SAVE_STATE_LOOKUP_ENTRY mCpuWidthOffset[] =3D { + { + 0, // Width32 + 0, // Width64 + 0, // Offset32 + 0, // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // Reserved + + // + // CPU Save State registers defined in PI SMM CPU Protocol. + // + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._GDTRBase), // Offset64Lo + MM_CPU_OFFSET (x64._GDTRBase) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_GDTBASE =3D 4 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._IDTRBase), // Offset64Lo + MM_CPU_OFFSET (x64._IDTRBase) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_IDTBASE =3D 5 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._LDTRBase), // Offset64Lo + MM_CPU_OFFSET (x64._LDTRBase) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_LDTBASE =3D 6 + + { + 0, // Width32 + 0, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._GDTRLimit), // Offset64Lo + MM_CPU_OFFSET (x64._GDTRLimit) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_GDTLIMIT =3D 7 + + { + 0, // Width32 + 0, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._IDTRLimit), // Offset64Lo + MM_CPU_OFFSET (x64._IDTRLimit) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_IDTLIMIT =3D 8 + + { + 0, // Width32 + 0, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._LDTRLimit), // Offset64Lo + MM_CPU_OFFSET (x64._LDTRLimit) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_LDTLIMIT =3D 9 + + { + 0, // Width32 + 0, // Width64 + 0, // Offset32 + 0, // Offset64Lo + 0 + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_LDTINFO =3D 10 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._ES), // Offset32 + MM_CPU_OFFSET (x64._ES), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_ES =3D 20 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._CS), // Offset32 + MM_CPU_OFFSET (x64._CS), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_CS =3D 21 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._SS), // Offset32 + MM_CPU_OFFSET (x64._SS), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_SS =3D 22 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._DS), // Offset32 + MM_CPU_OFFSET (x64._DS), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_DS =3D 23 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._FS), // Offset32 + MM_CPU_OFFSET (x64._FS), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_FS =3D 24 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._GS), // Offset32 + MM_CPU_OFFSET (x64._GS), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_GS =3D 25 + + { + 0, // Width32 + 4, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._LDTR), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_LDTR_SEL =3D 26 + + { + 4, // Width32 + 4, // Width64 + MM_CPU_OFFSET (x86._TR), // Offset32 + MM_CPU_OFFSET (x64._TR), // Offset64Lo + 0, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_TR_SEL =3D 27 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._DR7), // Offset32 + MM_CPU_OFFSET (x64._DR7), // Offset64Lo + MM_CPU_OFFSET (x64._DR7) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_DR7 =3D 28 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._DR6), // Offset32 + MM_CPU_OFFSET (x64._DR6), // Offset64Lo + MM_CPU_OFFSET (x64._DR6) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_DR6 =3D 29 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R8), // Offset64Lo + MM_CPU_OFFSET (x64._R8) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R8 =3D 30 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R9), // Offset64Lo + MM_CPU_OFFSET (x64._R9) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R9 =3D 31 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R10), // Offset64Lo + MM_CPU_OFFSET (x64._R10) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R10 =3D 32 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R11), // Offset64Lo + MM_CPU_OFFSET (x64._R11) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R11 =3D 33 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R12), // Offset64Lo + MM_CPU_OFFSET (x64._R12) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R12 =3D 34 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R13), // Offset64Lo + MM_CPU_OFFSET (x64._R13) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R13 =3D 35 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R14), // Offset64Lo + MM_CPU_OFFSET (x64._R14) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R14 =3D 36 + + { + 0, // Width32 + 8, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._R15), // Offset64Lo + MM_CPU_OFFSET (x64._R15) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_R15 =3D 37 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EAX), // Offset32 + MM_CPU_OFFSET (x64._RAX), // Offset64Lo + MM_CPU_OFFSET (x64._RAX) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RAX =3D 38 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EBX), // Offset32 + MM_CPU_OFFSET (x64._RBX), // Offset64Lo + MM_CPU_OFFSET (x64._RBX) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RBX =3D 39 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._ECX), // Offset32 + MM_CPU_OFFSET (x64._RCX), // Offset64Lo + MM_CPU_OFFSET (x64._RCX) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RCX =3D 40 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EDX), // Offset32 + MM_CPU_OFFSET (x64._RDX), // Offset64Lo + MM_CPU_OFFSET (x64._RDX) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RDX =3D 41 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._ESP), // Offset32 + MM_CPU_OFFSET (x64._RSP), // Offset64Lo + MM_CPU_OFFSET (x64._RSP) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RSP =3D 42 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EBP), // Offset32 + MM_CPU_OFFSET (x64._RBP), // Offset64Lo + MM_CPU_OFFSET (x64._RBP) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RBP =3D 43 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._ESI), // Offset32 + MM_CPU_OFFSET (x64._RSI), // Offset64Lo + MM_CPU_OFFSET (x64._RSI) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RSI =3D 44 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EDI), // Offset32 + MM_CPU_OFFSET (x64._RDI), // Offset64Lo + MM_CPU_OFFSET (x64._RDI) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RDI =3D 45 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EIP), // Offset32 + MM_CPU_OFFSET (x64._RIP), // Offset64Lo + MM_CPU_OFFSET (x64._RIP) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RIP =3D 46 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._EFLAGS), // Offset32 + MM_CPU_OFFSET (x64._RFLAGS), // Offset64Lo + MM_CPU_OFFSET (x64._RFLAGS) + 4, // Offset64Hi + TRUE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_RFLAGS =3D 51 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._CR0), // Offset32 + MM_CPU_OFFSET (x64._CR0), // Offset64Lo + MM_CPU_OFFSET (x64._CR0) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_CR0 =3D 52 + + { + 4, // Width32 + 8, // Width64 + MM_CPU_OFFSET (x86._CR3), // Offset32 + MM_CPU_OFFSET (x64._CR3), // Offset64Lo + MM_CPU_OFFSET (x64._CR3) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_CR3 =3D 53 + + { + 0, // Width32 + 4, // Width64 + 0, // Offset32 + MM_CPU_OFFSET (x64._CR4), // Offset64Lo + MM_CPU_OFFSET (x64._CR4) + 4, // Offset64Hi + FALSE // Writeable + }, // EFI_MM_SAVE_STATE_REGISTER_CR4 =3D 54 +}; + +/** + Read a save state register on the target processor. If this function + returns EFI_UNSUPPORTED, then the caller is responsible for reading the + MM Save State register. + + @param[in] CpuIndex The index of the CPU to read the Save State regist= er. + The value must be between 0 and the NumberOfCpus f= ield in + the System Management System Table (SMST). + @param[in] Register The MM Save State register to read. + @param[in] Width The number of bytes to read from the CPU save stat= e. + @param[out] Buffer Upon return, this holds the CPU register value rea= d + from the save state. + + @retval EFI_SUCCESS The register was read from Save State. + @retval EFI_INVALID_PARAMTER Buffer is NULL. + @retval EFI_UNSUPPORTED This function does not support reading Reg= ister. + @retval EFI_NOT_FOUND If desired Register not found. +**/ +EFI_STATUS +EFIAPI +MmSaveStateReadRegister ( + IN UINTN CpuIndex, + IN EFI_MM_SAVE_STATE_REGISTER Register, + IN UINTN Width, + OUT VOID *Buffer + ) +{ + UINTN RegisterIndex; + QEMU_SMRAM_SAVE_STATE_MAP *CpuSaveState; + + // + // Check for special EFI_MM_SAVE_STATE_REGISTER_LMA + // + if (Register =3D=3D EFI_MM_SAVE_STATE_REGISTER_LMA) { + // + // Only byte access is supported for this register + // + if (Width !=3D 1) { + return EFI_INVALID_PARAMETER; + } + + CpuSaveState =3D (QEMU_SMRAM_SAVE_STATE_MAP *)gSmst->CpuSaveState[CpuI= ndex]; + + // + // Check CPU mode + // + if ((CpuSaveState->x86.SMMRevId & 0xFFFF) =3D=3D 0) { + *(UINT8 *)Buffer =3D 32; + } else { + *(UINT8 *)Buffer =3D 64; + } + + return EFI_SUCCESS; + } + + // + // Check for special EFI_MM_SAVE_STATE_REGISTER_IO + // + if (Register =3D=3D EFI_MM_SAVE_STATE_REGISTER_IO) { + return EFI_NOT_FOUND; + } + + // + // Convert Register to a register lookup table index. Let + // PiSmmCpuDxeSmm implement other special registers (currently + // there is only EFI_MM_SAVE_STATE_REGISTER_PROCESSOR_ID). + // + RegisterIndex =3D MmSaveStateGetRegisterIndex (Register); + if (RegisterIndex =3D=3D 0) { + return (Register < EFI_MM_SAVE_STATE_REGISTER_IO ? + EFI_NOT_FOUND : + EFI_UNSUPPORTED); + } + + return MmSaveStateReadRegisterByIndex (CpuIndex, RegisterIndex, Width, B= uffer); +} + +/** + Writes a save state register on the target processor. If this function + returns EFI_UNSUPPORTED, then the caller is responsible for writing the + MM save state register. + + @param[in] CpuIndex The index of the CPU to write the MM Save State. T= he + value must be between 0 and the NumberOfCpus field = in + the System Management System Table (SMST). + @param[in] Register The MM Save State register to write. + @param[in] Width The number of bytes to write to the CPU save state. + @param[in] Buffer Upon entry, this holds the new CPU register value. + + @retval EFI_SUCCESS The register was written to Save State. + @retval EFI_INVALID_PARAMTER Buffer is NULL. + @retval EFI_UNSUPPORTED This function does not support writing Reg= ister. + @retval EFI_NOT_FOUND If desired Register not found. +**/ +EFI_STATUS +EFIAPI +MmSaveStateWriteRegister ( + IN UINTN CpuIndex, + IN EFI_MM_SAVE_STATE_REGISTER Register, + IN UINTN Width, + IN CONST VOID *Buffer + ) +{ + UINTN RegisterIndex; + QEMU_SMRAM_SAVE_STATE_MAP *CpuSaveState; + + // + // Writes to EFI_MM_SAVE_STATE_REGISTER_LMA are ignored + // + if (Register =3D=3D EFI_MM_SAVE_STATE_REGISTER_LMA) { + return EFI_SUCCESS; + } + + // + // Writes to EFI_MM_SAVE_STATE_REGISTER_IO are not supported + // + if (Register =3D=3D EFI_MM_SAVE_STATE_REGISTER_IO) { + return EFI_NOT_FOUND; + } + + // + // Convert Register to a register lookup table index. Let + // PiSmmCpuDxeSmm implement other special registers (currently + // there is only EFI_MM_SAVE_STATE_REGISTER_PROCESSOR_ID). + // + RegisterIndex =3D MmSaveStateGetRegisterIndex (Register); + if (RegisterIndex =3D=3D 0) { + return (Register < EFI_MM_SAVE_STATE_REGISTER_IO ? + EFI_NOT_FOUND : + EFI_UNSUPPORTED); + } + + CpuSaveState =3D (QEMU_SMRAM_SAVE_STATE_MAP *)gSmst->CpuSaveState[CpuInd= ex]; + + // + // Do not write non-writable SaveState, because it will cause exception. + // + if (!mCpuWidthOffset[RegisterIndex].Writeable) { + return EFI_UNSUPPORTED; + } + + // + // Check CPU mode + // + if ((CpuSaveState->x86.SMMRevId & 0xFFFF) =3D=3D 0) { + // + // If 32-bit mode width is zero, then the specified register can not b= e + // accessed + // + if (mCpuWidthOffset[RegisterIndex].Width32 =3D=3D 0) { + return EFI_NOT_FOUND; + } + + // + // If Width is bigger than the 32-bit mode width, then the specified + // register can not be accessed + // + if (Width > mCpuWidthOffset[RegisterIndex].Width32) { + return EFI_INVALID_PARAMETER; + } + + // + // Write SMM State register + // + ASSERT (CpuSaveState !=3D NULL); + CopyMem ( + (UINT8 *)CpuSaveState + mCpuWidthOffset[RegisterIndex].Offset32, + Buffer, + Width + ); + } else { + // + // If 64-bit mode width is zero, then the specified register can not b= e + // accessed + // + if (mCpuWidthOffset[RegisterIndex].Width64 =3D=3D 0) { + return EFI_NOT_FOUND; + } + + // + // If Width is bigger than the 64-bit mode width, then the specified + // register can not be accessed + // + if (Width > mCpuWidthOffset[RegisterIndex].Width64) { + return EFI_INVALID_PARAMETER; + } + + // + // Write lower 32-bits of SMM State register + // + CopyMem ( + (UINT8 *)CpuSaveState + mCpuWidthOffset[RegisterIndex].Offset64Lo, + Buffer, + MIN (4, Width) + ); + if (Width >=3D 4) { + // + // Write upper 32-bits of SMM State register + // + CopyMem ( + (UINT8 *)CpuSaveState + mCpuWidthOffset[RegisterIndex].Offset64Hi, + (UINT8 *)Buffer + 4, + Width - 4 + ); + } + } + + return EFI_SUCCESS; +} + +/** + Returns LMA value of the Processor. + + @param[in] CpuIndex Specifies the zero-based index of the CPU save sta= te. + + @retval UINT8 returns LMA bit value. +**/ +UINT8 +EFIAPI +MmSaveStateGetRegisterLma ( + IN UINTN CpuIndex + ) +{ + QEMU_SMRAM_SAVE_STATE_MAP *CpuSaveState; + + CpuSaveState =3D (QEMU_SMRAM_SAVE_STATE_MAP *)gSmst->CpuSaveState[CpuInd= ex]; + + if ((CpuSaveState->x86.SMMRevId & 0xFFFF) =3D=3D 0) { + return EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT; + } + + return EFI_MM_SAVE_STATE_REGISTER_LMA_64BIT; +} diff --git a/UefiCpuPkg/UefiCpuPkg.ci.yaml b/UefiCpuPkg/UefiCpuPkg.ci.yaml index c2280aedf5ce..b7b7a65ac352 100644 --- a/UefiCpuPkg/UefiCpuPkg.ci.yaml +++ b/UefiCpuPkg/UefiCpuPkg.ci.yaml @@ -44,6 +44,7 @@ "AcceptableDependencies": [ "MdePkg/MdePkg.dec", "MdeModulePkg/MdeModulePkg.dec", + "OvmfPkg/OvmfPkg.dec", "UefiCpuPkg/UefiCpuPkg.dec" ], # For host based unit tests --=20 2.25.1