From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.53]) by mx.groups.io with SMTP id smtpd.web11.1549.1689143073680056722 for ; Tue, 11 Jul 2023 23:24:33 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=XBXwNjOo; 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.237.53, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eZoMQ2wSn68+seWkLDM7uF86cOrAHO44VXyUzK2uq2xH2dcBUEbZk0OgSlNdrpYERqfmraF1A3jivnH+Z5u9wqjaXTIqzIdPjk7MwmF2WRDMFS9Qb7HOyzA1aXlMWs9YBiBXp4J2h6wvl2t7UBY0ADJtFcchiwUj28u2Syyz43ozst42vj5YDFxBxoJ9BBG0jLxHG4IR6GtI4yu9rbgLVCLLKyIAdv3DF3ckGaPvxa1WSo67Jj5N04NDiclTka2pDAmwU6sfb3hcV1f+S1YILV91+x/kDQKlUQyzCuPgtFJa1Ae4cksQJXi06XKCeQI+toF7mL4SOPv/J0vCoyK/VA== 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=LUk7S/Ue/B/A38BNsKGxw4DLl/aogKseevs+yPLDY3Q=; b=XS84b8OGk48U2II7V1MjrXGWPyVqChY3uSYKIX3fbRoO9NlzZ2M7ga7feggNEAbxfu2fYOTrD3E0PATggoQgFLeV3pq1VeUOMcyWqANEjC1WgPl3AWs7f1cZAlYNRyVoxx6iKlPcWUQXsEI3vmCPvoq7Hl0Rw+93wzOLAaE7G4waHX7kO+lq+2Ex0qSataDp/07sKz2y1q5r2YwWSlCwwwphxRlud6uENyXqZvY8rJs3nmrctf3PQcaz9L/EeiMXbEEir2OFJ/hHH6wnmleDuQsx/xlxhfXVMqSDGLjGotLNe4uP4iXv8v7Y9/3QDP9hUzAGlc47tz8LZRS27kISWA== 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=LUk7S/Ue/B/A38BNsKGxw4DLl/aogKseevs+yPLDY3Q=; b=XBXwNjOoz6NKm2PMa4aQseLAbH3gXWarZbj3VL8ACZTiDnl6KSo6487E7oeGDREx67rZzyNW57cEB9yjUf/BsB7YBd/IDb4CtYAT74gh6u4N0DqNeu4oXCpz1PiS9BvDXUqbBMITUQAkJPWzWgb4rzTsFtE3TG8WRuxdHWcrklA= Received: from DS7PR03CA0028.namprd03.prod.outlook.com (2603:10b6:5:3b8::33) by MN2PR12MB4096.namprd12.prod.outlook.com (2603:10b6:208:1dc::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.20; Wed, 12 Jul 2023 06:24:30 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b8:cafe::e5) by DS7PR03CA0028.outlook.office365.com (2603:10b6:5:3b8::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.20 via Frontend Transport; Wed, 12 Jul 2023 06:24:30 +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 DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6588.20 via Frontend Transport; Wed, 12 Jul 2023 06:24:30 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.2507.23; Wed, 12 Jul 2023 01:24:29 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 11 Jul 2023 23:24:29 -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.2507.23 via Frontend Transport; Wed, 12 Jul 2023 01:24:27 -0500 From: "Abdul Lateef Attar" To: CC: Abdul Lateef Attar , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann , Abner Chang Subject: [PATCH v1 1/1] UefiCpuPkg: Uses gMmst in MmSaveStateLib Date: Wed, 12 Jul 2023 11:54:21 +0530 Message-ID: <9f4ee69f63e53cf8e001d8e0ea516da131494b23.1689142923.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: DM6NAM11FT022:EE_|MN2PR12MB4096:EE_ X-MS-Office365-Filtering-Correlation-Id: 576874f1-084f-45df-8f41-08db82a0a671 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CLPD4K5ajX+eldErHTNglKt3qyg0yx6HVkh6s6QB1rNXRFTq3V+bY70+hcuktA4L3OJ+4Po+JitlQfPNrdVmYQFytqqxyU4qgTYSJm5n0gIejcShgEhrLXAf1vLijRa0Xq2qFrl9HnFh3OydGs6d6Swh3Tg6VODYDb3ypdTkWf3h7O3Bj9TJUE9xEQiGtY4Wiin73Q1eKedH1JbfdSKDUuctS+pbDRyZVSm63f8MOHOmaFA8rYJ+b5N1CDIUAhIk51Qa32Kd6Xzi9O12Kno3DwCi0E3Fw21xAFz1LCe0GUsrRoGHWYsMMClgKGZHcg4NPMlnzaPCwGpIwWThWnqlRo+uKtqtuYewNuRyxLb/31vfO4GSGx5KDinomkCuat1sxY9aBV0bZXkjTDIESJxOyvFSMv9paE03Z6phCLK7bWZSUp2thDc+D4mZ4WokZcOKIoJdiMKQtJdGzBhKhiRdaKYAGgzWJ7Kdiep+pvUw1F5LzqSK0ZapZv3aJpiOO74vukaNGSGLhtGGUkXkb/M2+V1fK5/uQPKQoYWKOnETX5m/fbahjNBz2YmJzrYP2PKWB2Y8VLQGJY1GI1XHEBmIIhvjJkpsA7pZPkrDBwAdKB7uQAwiMBOXHPMM+lYrVHrNJ0U6SdrARrbpdc1kg5/XnzolkAwzkwxZt0XRGQJsZhmty8bMlJhhdK1Mwlw6jSX3GFmnTHQVzST10csJtq48ed6F6ZSHBEo9ULe17q0UIuE4rRB9exdwbJgCcXeniwLi 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)(376002)(346002)(39860400002)(396003)(136003)(451199021)(36840700001)(46966006)(40470700004)(7696005)(40460700003)(966005)(6666004)(36860700001)(47076005)(186003)(26005)(426003)(336012)(83380400001)(36756003)(2616005)(82310400005)(81166007)(356005)(82740400003)(40480700001)(70586007)(6916009)(4326008)(70206006)(41300700001)(2906002)(316002)(5660300002)(8676002)(8936002)(54906003)(478600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 06:24:30.0958 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 576874f1-084f-45df-8f41-08db82a0a671 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: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4096 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abdul Lateef Attar BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4182 Use gMmst instead of gSmst. Replace SmmServicesTableLib with MmServicesTableLib. Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Cc: Abner Chang Signed-off-by: Abdul Lateef Attar --- UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf | 2 +- UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf | 2 +- UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h | 2 +- UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c | 4 ++-- UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c | 2 +- UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf b/Uefi= CpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf index 5c0685f283d3..dcee6c401d30 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf +++ b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf @@ -31,4 +31,4 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib - SmmServicesTableLib + MmServicesTableLib diff --git a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf b/Ue= fiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf index b92dfa643203..b7fd4078f58a 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf +++ b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf @@ -31,4 +31,4 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib - SmmServicesTableLib + MmServicesTableLib diff --git a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h b/UefiCpuPkg/L= ibrary/MmSaveStateLib/MmSaveState.h index c3499cbb3b17..6c7e8abd5f62 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h +++ b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include =20 // Macro used to simplify the lookup table entries of type CPU_MM_SAVE_STA= TE_REGISTER_RANGE diff --git a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c b/UefiCpuPk= g/Library/MmSaveStateLib/AmdMmSaveState.c index 9fed52896f5c..3315a6cc44ff 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c +++ b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c @@ -108,7 +108,7 @@ MmSaveStateReadRegister ( UINT8 DataWidth; =20 // Read CPU State - CpuSaveState =3D (AMD_SMRAM_SAVE_STATE_MAP *)gSmst->CpuSaveState[CpuInde= x]; + CpuSaveState =3D (AMD_SMRAM_SAVE_STATE_MAP *)gMmst->CpuSaveState[CpuInde= x]; =20 // Check for special EFI_MM_SAVE_STATE_REGISTER_LMA if (Register =3D=3D EFI_MM_SAVE_STATE_REGISTER_LMA) { @@ -226,7 +226,7 @@ MmSaveStateWriteRegister ( return EFI_NOT_FOUND; } =20 - CpuSaveState =3D gSmst->CpuSaveState[CpuIndex]; + CpuSaveState =3D gMmst->CpuSaveState[CpuIndex]; =20 // // Do not write non-writable SaveState, because it will cause exception. diff --git a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c b/UefiCpu= Pkg/Library/MmSaveStateLib/IntelMmSaveState.c index fd321bb571d5..c2ccd65b1dc4 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c +++ b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c @@ -296,7 +296,7 @@ MmSaveStateWriteRegister ( return EFI_NOT_FOUND; } =20 - CpuSaveState =3D gSmst->CpuSaveState[CpuIndex]; + CpuSaveState =3D gMmst->CpuSaveState[CpuIndex]; =20 // // Do not write non-writable SaveState, because it will cause exception. diff --git a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c b/UefiCp= uPkg/Library/MmSaveStateLib/MmSaveStateCommon.c index 09c6c3f96fed..f66245b82c40 100644 --- a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c +++ b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c @@ -99,8 +99,8 @@ MmSaveStateReadRegisterByIndex ( // // Write return buffer // - ASSERT (gSmst->CpuSaveState[CpuIndex] !=3D NULL); - CopyMem (Buffer, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + mCpuWidthOff= set[RegisterIndex].Offset32, Width); + ASSERT (gMmst->CpuSaveState[CpuIndex] !=3D NULL); + CopyMem (Buffer, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + mCpuWidthOff= set[RegisterIndex].Offset32, Width); } else { // // If 64-bit mode width is zero, then the specified register can not b= e accessed @@ -119,12 +119,12 @@ MmSaveStateReadRegisterByIndex ( // // Write lower 32-bits of return buffer // - CopyMem (Buffer, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + mCpuWidthOff= set[RegisterIndex].Offset64Lo, MIN (4, Width)); + CopyMem (Buffer, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + mCpuWidthOff= set[RegisterIndex].Offset64Lo, MIN (4, Width)); if (Width > 4) { // // Write upper 32-bits of return buffer // - CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)gSmst->CpuSaveState[CpuIndex]= + mCpuWidthOffset[RegisterIndex].Offset64Hi, Width - 4); + CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)gMmst->CpuSaveState[CpuIndex]= + mCpuWidthOffset[RegisterIndex].Offset64Hi, Width - 4); } } =20 --=20 2.25.1