From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.60]) by mx.groups.io with SMTP id smtpd.web10.27955.1683346070346129934 for ; Fri, 05 May 2023 21:07:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=MylhaZgP; 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.93.60, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DiSURb9aeAKqykXk+51bSOzdlTJda4VXlQGR+4sSdz/plLoaipB+SjOqcvSULmr9Z8ZRLV8/mRKCrjeBvruUriwHLKvvRZrr6xlr9noVKr/LXNlCKQDKPpTVIWEq44+b9JbyDRAe+CSfqkYD+q3WZX9bK20Gq8vah+7arhV+WNODnG1l76jDCNM6rMyTDy/Ka1ZXaRJvW63YlwBpyn+x6tghxT7zmo98Syip+PmKLTWZsrewKULNcGuOKxJMKA8Us+QOLHmy4E/twu1HViajBxkHFpw+RdYNXSrHF4Az9vMIZVI9H7TuNRVyvPAPb2VVkYyysYguJSuOleUEStl2GA== 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=d2bI/C0iFHiNP+DYkABu0SYhyFFPz+cWQXCpvTpOepE=; b=SHIG51/3xSAjUa7MkQxY2wILwrHwMKc21m7ODYKY84PyJ5hOV4A0hPcgW22Aqodu75R6Z9STjBYEaAA5LN2ogRiCOYikZUg5bzMQZrJAqR+9exaYxJSL8XyLyiv6g9empSN6DiB+5MzpyTJfz8rD+5J8nyP1W7vkBvC2n5+Z1PaYKIKUZ6GnMmOcuzrAmuHeY3Rw6euHP4owOHDeuvGgHlL6e3/xNsas/iXKPJO/DvMroTYbILK3uCpnzzCXwemYb27fNQ+1VaowT1UhonExg/lAL8KIc5guj93AeiFM30fw64XLTKRh8G0XrI9p9npSjq47wDBVmjjdTcgNgZzWnw== 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=d2bI/C0iFHiNP+DYkABu0SYhyFFPz+cWQXCpvTpOepE=; b=MylhaZgPTVjcfMW64rQWa/ZLc/riWYLdi5eC3+nldosT2spaETRbtRX5oJzG+V8Q0LJiB8tjE8D/ubzfEG4MOuS4d7aG8TIsQMM+yakEM9hBXRCUJtfK6AeiFap3zYzhO3dBFIFJ47mHF03Lvdw+128+syu2maoMgNOOot8wk2A= Received: from DS7PR03CA0235.namprd03.prod.outlook.com (2603:10b6:5:3ba::30) by SA3PR12MB9157.namprd12.prod.outlook.com (2603:10b6:806:39a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.27; Sat, 6 May 2023 04:07:47 +0000 Received: from DM6NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::5) by DS7PR03CA0235.outlook.office365.com (2603:10b6:5:3ba::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.29 via Frontend Transport; Sat, 6 May 2023 04:07: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT049.mail.protection.outlook.com (10.13.172.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6363.27 via Frontend Transport; Sat, 6 May 2023 04:07:47 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 5 May 2023 23:07:46 -0500 Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Fri, 5 May 2023 23:07:43 -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 v11 8/8] OvmfPkg: Uses MmSaveStateLib library Date: Sat, 6 May 2023 09:37:04 +0530 Message-ID: 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: DM6NAM11FT049:EE_|SA3PR12MB9157:EE_ X-MS-Office365-Filtering-Correlation-Id: dce91a5a-2426-4330-2fea-08db4de7738b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WX7FNN/75F25hM3MdK9FS+st47JuMHxRk7SvdiEv1a0vXmVM80+qYALUpSKkNTflEdQ1UtqUVJhI6iaUwmUNpU1JhsyvMso8ojeBzwWyiBKF3nL1GpotF4wkSuOVpAfctPytew6hz0ZlADq5CIF/elO6rn49GxnKblOEQ08OnxClUWhd3e5hk3UEuV6zmT8R35au1iCeDlGF24OIVpVFo3hRFVbgPbD/ztOQJrbfRccNjtNQJ9ikA5bxBRPJug+O6lrKRxnqlBSzFSU9mYmLnsIt/J+gSOVR6cw+FrHMTLapVzumX8E7K91VTk7uADBIDgz6VKSc6P09CHDb15irMegL2NThNiy/wCMFM3HzOP51rdnOck0Fn8M8Mz0NMkbGuQ6YzAcjkppEBTd/ns8ulDgZ/AAfCVH25zAtRHCf2pvO7TO65YPkFA1KY3fg0kdvAM8dHyq0jft/rrnLWHgeLXXWLMeZSTuftwlxzy7+tKijJ4suYQE/41P+ONe7zmiMKz/6F610xvdppc1RuJZ8H6HQrwizIjxZtE/LzzVnMJfswYo93HG/G4x8aZzNnOpxQRqrVKiCz+Rq/HEc0yjgfWBwMFAfx85HEZwtWtyhzlXbmmaY7NZuOhXh7HkO4ml5YZU4Qiw1w9b3fDw+912c615tYdhw6LJ/peISff/oSmiGav6xQKExzGFdNrpKnVCzVwXAg5pRJq0I/2iQJWHi6/P0ELOERk0tcGV4mrWfJtY= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(6029001)(4636009)(39860400002)(396003)(376002)(136003)(346002)(451199021)(40470700004)(36840700001)(46966006)(36756003)(47076005)(966005)(19627235002)(316002)(7696005)(54906003)(70586007)(6916009)(4326008)(478600001)(70206006)(6666004)(40480700001)(45080400002)(82310400005)(8676002)(30864003)(8936002)(41300700001)(5660300002)(2906002)(82740400003)(81166007)(356005)(186003)(2616005)(26005)(36860700001)(336012)(426003)(83380400001)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 04:07:47.3405 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dce91a5a-2426-4330-2fea-08db4de7738b 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9157 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abdul Lateef Attar BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4182 Uses new MmSaveStateLib library instance. 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 --- OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 3 + OvmfPkg/OvmfPkgX64.dsc | 1 + .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 767 ------------------ 4 files changed, 5 insertions(+), 767 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index e333b8b41803..86fc9f6174b2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -972,6 +972,7 @@ [Components] SmmCpuPlatformHookLib|OvmfPkg/Library/SmmCpuPlatformHookLibQemu/SmmC= puPlatformHookLibQemu.inf SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLi= b.inf + MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.i= nf } =20 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 25974230a27e..da5fd7042f4f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -4,6 +4,7 @@ # Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# Copyright (c) Microsoft Corporation. +# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -444,6 +445,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezv= ousLib.inf + MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf =20 [LibraryClasses.common.SMM_CORE] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf @@ -990,6 +992,7 @@ [Components.X64] SmmCpuPlatformHookLib|OvmfPkg/Library/SmmCpuPlatformHookLibQemu/SmmC= puPlatformHookLibQemu.inf SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLi= b.inf + MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.i= nf } =20 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index c1762ffca445..ae706a5099c5 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -1066,6 +1066,7 @@ [Components] SmmCpuPlatformHookLib|OvmfPkg/Library/SmmCpuPlatformHookLibQemu/SmmC= puPlatformHookLibQemu.inf SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLi= b.inf + MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.i= nf } =20 # diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPk= g/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index a009123dae88..4c354bafe42f 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -578,773 +578,6 @@ SmmCpuFeaturesSetSmmRegister ( ASSERT (FALSE); } =20 -/// -/// Macro used to simplify the lookup table entries of type -/// CPU_SMM_SAVE_STATE_LOOKUP_ENTRY -/// -#define SMM_CPU_OFFSET(Field) OFFSET_OF (QEMU_SMRAM_SAVE_STATE_MAP, Field= ) - -/// -/// Macro used to simplify the lookup table entries of type -/// CPU_SMM_SAVE_STATE_REGISTER_RANGE -/// -#define SMM_REGISTER_RANGE(Start, End) { Start, End, End - Start + 1 } - -/// -/// Structure used to describe a range of registers -/// -typedef struct { - EFI_SMM_SAVE_STATE_REGISTER Start; - EFI_SMM_SAVE_STATE_REGISTER End; - UINTN Length; -} CPU_SMM_SAVE_STATE_REGISTER_RANGE; - -/// -/// Structure used to build a lookup table to retrieve the widths and offs= ets -/// associated with each supported EFI_SMM_SAVE_STATE_REGISTER value -/// - -#define SMM_SAVE_STATE_REGISTER_FIRST_INDEX 1 - -typedef struct { - UINT8 Width32; - UINT8 Width64; - UINT16 Offset32; - UINT16 Offset64Lo; - UINT16 Offset64Hi; - BOOLEAN Writeable; -} CPU_SMM_SAVE_STATE_LOOKUP_ENTRY; - -/// -/// Table used by GetRegisterIndex() to convert an EFI_SMM_SAVE_STATE_REGI= STER -/// value to an index into a table of type CPU_SMM_SAVE_STATE_LOOKUP_ENTRY -/// -STATIC CONST CPU_SMM_SAVE_STATE_REGISTER_RANGE mSmmCpuRegisterRanges[] = =3D { - SMM_REGISTER_RANGE ( - EFI_SMM_SAVE_STATE_REGISTER_GDTBASE, - EFI_SMM_SAVE_STATE_REGISTER_LDTINFO - ), - SMM_REGISTER_RANGE ( - EFI_SMM_SAVE_STATE_REGISTER_ES, - EFI_SMM_SAVE_STATE_REGISTER_RIP - ), - SMM_REGISTER_RANGE ( - EFI_SMM_SAVE_STATE_REGISTER_RFLAGS, - EFI_SMM_SAVE_STATE_REGISTER_CR4 - ), - { (EFI_SMM_SAVE_STATE_REGISTER)0, (EFI_SMM_SAVE_STATE_REGISTER)0,0 } -}; - -/// -/// Lookup table used to retrieve the widths and offsets associated with e= ach -/// supported EFI_SMM_SAVE_STATE_REGISTER value -/// -STATIC CONST CPU_SMM_SAVE_STATE_LOOKUP_ENTRY mSmmCpuWidthOffset[] =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 - SMM_CPU_OFFSET (x64._GDTRBase), // Offset64Lo - SMM_CPU_OFFSET (x64._GDTRBase) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_GDTBASE =3D 4 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._IDTRBase), // Offset64Lo - SMM_CPU_OFFSET (x64._IDTRBase) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_IDTBASE =3D 5 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._LDTRBase), // Offset64Lo - SMM_CPU_OFFSET (x64._LDTRBase) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_LDTBASE =3D 6 - - { - 0, // Width32 - 0, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._GDTRLimit), // Offset64Lo - SMM_CPU_OFFSET (x64._GDTRLimit) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_GDTLIMIT =3D 7 - - { - 0, // Width32 - 0, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._IDTRLimit), // Offset64Lo - SMM_CPU_OFFSET (x64._IDTRLimit) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_IDTLIMIT =3D 8 - - { - 0, // Width32 - 0, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._LDTRLimit), // Offset64Lo - SMM_CPU_OFFSET (x64._LDTRLimit) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_LDTLIMIT =3D 9 - - { - 0, // Width32 - 0, // Width64 - 0, // Offset32 - 0, // Offset64Lo - 0 + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_LDTINFO =3D 10 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._ES), // Offset32 - SMM_CPU_OFFSET (x64._ES), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_ES =3D 20 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._CS), // Offset32 - SMM_CPU_OFFSET (x64._CS), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_CS =3D 21 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._SS), // Offset32 - SMM_CPU_OFFSET (x64._SS), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_SS =3D 22 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._DS), // Offset32 - SMM_CPU_OFFSET (x64._DS), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_DS =3D 23 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._FS), // Offset32 - SMM_CPU_OFFSET (x64._FS), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_FS =3D 24 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._GS), // Offset32 - SMM_CPU_OFFSET (x64._GS), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_GS =3D 25 - - { - 0, // Width32 - 4, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._LDTR), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_LDTR_SEL =3D 26 - - { - 4, // Width32 - 4, // Width64 - SMM_CPU_OFFSET (x86._TR), // Offset32 - SMM_CPU_OFFSET (x64._TR), // Offset64Lo - 0, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_TR_SEL =3D 27 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._DR7), // Offset32 - SMM_CPU_OFFSET (x64._DR7), // Offset64Lo - SMM_CPU_OFFSET (x64._DR7) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_DR7 =3D 28 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._DR6), // Offset32 - SMM_CPU_OFFSET (x64._DR6), // Offset64Lo - SMM_CPU_OFFSET (x64._DR6) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_DR6 =3D 29 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R8), // Offset64Lo - SMM_CPU_OFFSET (x64._R8) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R8 =3D 30 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R9), // Offset64Lo - SMM_CPU_OFFSET (x64._R9) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R9 =3D 31 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R10), // Offset64Lo - SMM_CPU_OFFSET (x64._R10) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R10 =3D 32 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R11), // Offset64Lo - SMM_CPU_OFFSET (x64._R11) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R11 =3D 33 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R12), // Offset64Lo - SMM_CPU_OFFSET (x64._R12) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R12 =3D 34 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R13), // Offset64Lo - SMM_CPU_OFFSET (x64._R13) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R13 =3D 35 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R14), // Offset64Lo - SMM_CPU_OFFSET (x64._R14) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R14 =3D 36 - - { - 0, // Width32 - 8, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._R15), // Offset64Lo - SMM_CPU_OFFSET (x64._R15) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_R15 =3D 37 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EAX), // Offset32 - SMM_CPU_OFFSET (x64._RAX), // Offset64Lo - SMM_CPU_OFFSET (x64._RAX) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RAX =3D 38 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EBX), // Offset32 - SMM_CPU_OFFSET (x64._RBX), // Offset64Lo - SMM_CPU_OFFSET (x64._RBX) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RBX =3D 39 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._ECX), // Offset32 - SMM_CPU_OFFSET (x64._RCX), // Offset64Lo - SMM_CPU_OFFSET (x64._RCX) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RCX =3D 40 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EDX), // Offset32 - SMM_CPU_OFFSET (x64._RDX), // Offset64Lo - SMM_CPU_OFFSET (x64._RDX) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RDX =3D 41 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._ESP), // Offset32 - SMM_CPU_OFFSET (x64._RSP), // Offset64Lo - SMM_CPU_OFFSET (x64._RSP) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RSP =3D 42 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EBP), // Offset32 - SMM_CPU_OFFSET (x64._RBP), // Offset64Lo - SMM_CPU_OFFSET (x64._RBP) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RBP =3D 43 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._ESI), // Offset32 - SMM_CPU_OFFSET (x64._RSI), // Offset64Lo - SMM_CPU_OFFSET (x64._RSI) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RSI =3D 44 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EDI), // Offset32 - SMM_CPU_OFFSET (x64._RDI), // Offset64Lo - SMM_CPU_OFFSET (x64._RDI) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RDI =3D 45 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EIP), // Offset32 - SMM_CPU_OFFSET (x64._RIP), // Offset64Lo - SMM_CPU_OFFSET (x64._RIP) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RIP =3D 46 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._EFLAGS), // Offset32 - SMM_CPU_OFFSET (x64._RFLAGS), // Offset64Lo - SMM_CPU_OFFSET (x64._RFLAGS) + 4, // Offset64Hi - TRUE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_RFLAGS =3D 51 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._CR0), // Offset32 - SMM_CPU_OFFSET (x64._CR0), // Offset64Lo - SMM_CPU_OFFSET (x64._CR0) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_CR0 =3D 52 - - { - 4, // Width32 - 8, // Width64 - SMM_CPU_OFFSET (x86._CR3), // Offset32 - SMM_CPU_OFFSET (x64._CR3), // Offset64Lo - SMM_CPU_OFFSET (x64._CR3) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_CR3 =3D 53 - - { - 0, // Width32 - 4, // Width64 - 0, // Offset32 - SMM_CPU_OFFSET (x64._CR4), // Offset64Lo - SMM_CPU_OFFSET (x64._CR4) + 4, // Offset64Hi - FALSE // Writeable - }, // EFI_SMM_SAVE_STATE_REGISTER_CR4 =3D 54 -}; - -// -// No support for I/O restart -// - -/** - Read information from the CPU save state. - - @param Register Specifies the CPU register to read form the save state= . - - @retval 0 Register is not valid - @retval >0 Index into mSmmCpuWidthOffset[] associated with Register - -**/ -STATIC -UINTN -GetRegisterIndex ( - IN EFI_SMM_SAVE_STATE_REGISTER Register - ) -{ - UINTN Index; - UINTN Offset; - - for (Index =3D 0, Offset =3D SMM_SAVE_STATE_REGISTER_FIRST_INDEX; - mSmmCpuRegisterRanges[Index].Length !=3D 0; - Index++) - { - if ((Register >=3D mSmmCpuRegisterRanges[Index].Start) && - (Register <=3D mSmmCpuRegisterRanges[Index].End)) - { - return Register - mSmmCpuRegisterRanges[Index].Start + Offset; - } - - Offset +=3D mSmmCpuRegisterRanges[Index].Length; - } - - return 0; -} - -/** - Read a CPU Save State register on the target processor. - - This function abstracts the differences that whether the CPU Save State - register is in the IA32 CPU Save State Map or X64 CPU Save State Map. - - This function supports reading a CPU Save State register in SMBase reloc= ation - handler. - - @param[in] CpuIndex Specifies the zero-based index of the CPU sav= e - state. - @param[in] RegisterIndex Index into mSmmCpuWidthOffset[] look up table= . - @param[in] Width The number of bytes to read from the CPU save - state. - @param[out] Buffer Upon return, this holds the CPU register valu= e - read from the save state. - - @retval EFI_SUCCESS The register was read from Save State. - @retval EFI_NOT_FOUND The register is not defined for the Save S= tate - of Processor. - @retval EFI_INVALID_PARAMTER This or Buffer is NULL. - -**/ -STATIC -EFI_STATUS -ReadSaveStateRegisterByIndex ( - IN UINTN CpuIndex, - IN UINTN RegisterIndex, - IN UINTN Width, - OUT VOID *Buffer - ) -{ - 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) { - // - // If 32-bit mode width is zero, then the specified register can not b= e - // accessed - // - if (mSmmCpuWidthOffset[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 > mSmmCpuWidthOffset[RegisterIndex].Width32) { - return EFI_INVALID_PARAMETER; - } - - // - // Write return buffer - // - ASSERT (CpuSaveState !=3D NULL); - CopyMem ( - Buffer, - (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset32, - Width - ); - } else { - // - // If 64-bit mode width is zero, then the specified register can not b= e - // accessed - // - if (mSmmCpuWidthOffset[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 > mSmmCpuWidthOffset[RegisterIndex].Width64) { - return EFI_INVALID_PARAMETER; - } - - // - // Write lower 32-bits of return buffer - // - CopyMem ( - Buffer, - (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset64Lo= , - MIN (4, Width) - ); - if (Width >=3D 4) { - // - // Write upper 32-bits of return buffer - // - CopyMem ( - (UINT8 *)Buffer + 4, - (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset64= Hi, - Width - 4 - ); - } - } - - return EFI_SUCCESS; -} - -/** - Read an SMM Save State register on the target processor. If this functi= on - returns EFI_UNSUPPORTED, then the caller is responsible for reading the - SMM Save Sate register. - - @param[in] CpuIndex The index of the CPU to read the SMM Save State. = The - value must be between 0 and the NumberOfCpus field= in - the System Management System Table (SMST). - @param[in] Register The SMM 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 - Register. -**/ -EFI_STATUS -EFIAPI -SmmCpuFeaturesReadSaveStateRegister ( - IN UINTN CpuIndex, - IN EFI_SMM_SAVE_STATE_REGISTER Register, - IN UINTN Width, - OUT VOID *Buffer - ) -{ - UINTN RegisterIndex; - QEMU_SMRAM_SAVE_STATE_MAP *CpuSaveState; - - // - // Check for special EFI_SMM_SAVE_STATE_REGISTER_LMA - // - if (Register =3D=3D EFI_SMM_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_SMM_SAVE_STATE_REGISTER_IO - // - if (Register =3D=3D EFI_SMM_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_SMM_SAVE_STATE_REGISTER_PROCESSOR_ID). - // - RegisterIndex =3D GetRegisterIndex (Register); - if (RegisterIndex =3D=3D 0) { - return (Register < EFI_SMM_SAVE_STATE_REGISTER_IO ? - EFI_NOT_FOUND : - EFI_UNSUPPORTED); - } - - return ReadSaveStateRegisterByIndex (CpuIndex, RegisterIndex, Width, Buf= fer); -} - -/** - Writes an SMM Save State register on the target processor. If this func= tion - returns EFI_UNSUPPORTED, then the caller is responsible for writing the - SMM Save Sate register. - - @param[in] CpuIndex The index of the CPU to write the SMM Save State. = The - value must be between 0 and the NumberOfCpus field = in - the System Management System Table (SMST). - @param[in] Register The SMM 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 - Register. -**/ -EFI_STATUS -EFIAPI -SmmCpuFeaturesWriteSaveStateRegister ( - IN UINTN CpuIndex, - IN EFI_SMM_SAVE_STATE_REGISTER Register, - IN UINTN Width, - IN CONST VOID *Buffer - ) -{ - UINTN RegisterIndex; - QEMU_SMRAM_SAVE_STATE_MAP *CpuSaveState; - - // - // Writes to EFI_SMM_SAVE_STATE_REGISTER_LMA are ignored - // - if (Register =3D=3D EFI_SMM_SAVE_STATE_REGISTER_LMA) { - return EFI_SUCCESS; - } - - // - // Writes to EFI_SMM_SAVE_STATE_REGISTER_IO are not supported - // - if (Register =3D=3D EFI_SMM_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_SMM_SAVE_STATE_REGISTER_PROCESSOR_ID). - // - RegisterIndex =3D GetRegisterIndex (Register); - if (RegisterIndex =3D=3D 0) { - return (Register < EFI_SMM_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 (!mSmmCpuWidthOffset[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 (mSmmCpuWidthOffset[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 > mSmmCpuWidthOffset[RegisterIndex].Width32) { - return EFI_INVALID_PARAMETER; - } - - // - // Write SMM State register - // - ASSERT (CpuSaveState !=3D NULL); - CopyMem ( - (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset32, - Buffer, - Width - ); - } else { - // - // If 64-bit mode width is zero, then the specified register can not b= e - // accessed - // - if (mSmmCpuWidthOffset[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 > mSmmCpuWidthOffset[RegisterIndex].Width64) { - return EFI_INVALID_PARAMETER; - } - - // - // Write lower 32-bits of SMM State register - // - CopyMem ( - (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset64Lo= , - Buffer, - MIN (4, Width) - ); - if (Width >=3D 4) { - // - // Write upper 32-bits of SMM State register - // - CopyMem ( - (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offset64= Hi, - (UINT8 *)Buffer + 4, - Width - 4 - ); - } - } - - return EFI_SUCCESS; -} - /** This function is hook point called after the gEfiSmmReadyToLockProtocolG= uid notification is completely processed. --=20 2.25.1