From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.92.67.101; helo=eur02-am5-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067101.outbound.protection.outlook.com [40.92.67.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 74B29210C0F4C for ; Mon, 23 Jul 2018 18:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1lifMAH9ykLTssQCO6byAVQGXNOVAF8l5AAy/CapRfM=; b=bTCgcJ09iUeunMcsNnJ/jMkOTXuM7mIQGyoKHHOmQEwo7ZqXXNcfdhSFjcAKBsJIQET2gMmHBWxf06pLoIOZZnWfn7zzNa9bYf3mpO0QHyWy6g5F9UbMsjh+1krQS+ObqbS3GM5pomD3odi6c3WBV+GarmOezptKJt4C98VBQcRmEiRIXvSZqOQNEpjD3Zhm07+UFVRiu0EdEOHdNHzEvuO0W84RY1ggGXTwLnvNrBdvZFQRJ6wHjxXOA0EBb1eRdP2UKdamrPTYvpmilfYRuJPDM1V8eCqszQs2x/PQ55PN7AhVXnTKW+eMYP7gu7o/r7ucb/YlAZ00PdnBHm24aQ== Received: from HE1EUR02FT023.eop-EUR02.prod.protection.outlook.com (10.152.10.52) by HE1EUR02HT197.eop-EUR02.prod.protection.outlook.com (10.152.10.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.995.12; Tue, 24 Jul 2018 01:40:38 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com (10.152.10.55) by HE1EUR02FT023.mail.protection.outlook.com (10.152.10.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.995.12 via Frontend Transport; Tue, 24 Jul 2018 01:40:38 +0000 Received: from VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7532:4dc6:e9f7:4765]) by VI1PR0801MB1790.eurprd08.prod.outlook.com ([fe80::7532:4dc6:e9f7:4765%2]) with mapi id 15.20.0973.022; Tue, 24 Jul 2018 01:40:38 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "michael.d.kinney@intel.com" , "liming.gao@intel.com" , "star.zeng@intel.com" , "eric.dong@intel.com" , "ruiyu.ni@intel.com" , "lersek@redhat.com" , "kelly.steele@intel.com" , "jordan.l.justen@intel.com" , "ard.biesheuvel@linaro.org" Thread-Topic: [PATCH 5/8] QuarkSocPkg/SmmAccessPei: Update MM PPI usages. Thread-Index: AQHUIu9StkhOJidhDE6Vewq0YHDHOg== Date: Tue, 24 Jul 2018 01:40:38 +0000 Message-ID: References: In-Reply-To: Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:802:2a::35) To VI1PR0801MB1790.eurprd08.prod.outlook.com (2603:10a6:800:5b::15) x-incomingtopheadermarker: OriginalChecksum:4E45192501960CF9E759A4C74EA96544F7301B0E24BE53AA6A981AE80C0F2C08; UpperCasedChecksum:C1117D3DDBD405B0A0360E5BE237BBFBD48726640EE070A0DB7945357798E488; SizeAsReceived:8030; Count:50 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [LQS9pYjJm71BI11OJxia1sU991PfpIpM] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT197; 6:7qvZDuWuHLUA5jAR06yjOuHCcS62QgHOuV/6m7Ldy7dnIYb2KvSdj5Zv6yfw9r7rHe4VmJ24Gr1PvP183+zRNkzg1T7q4B+qgelWB58SmswD5I7s7YYK4xrAr/G0/QPNaAyDn8rpE1Nmy6tvj9U8deUhs+UfwX7r7xlCGCraq2fSDCfjsZwABvTQOqb5mNnr4gga3f/nFpublJDFb9a3x9LFmZ39A7NlHpYkoQ8swbLZT3SUBX3a/gNq0u531/kVW4ksE+vwrTSaMt/IZd0BJS3QdV60vXLSpRX5Do4VR76XlJIX5Vtc8DEiMiXsmpLKxrvzQgBUljvCR7hAnncKBEpKGZ7AROdc9DiD5xtniSogFzrN/6c8QQgTrxZmx3fyw7lzTnPyXDXBpVQKAIhQ7ICt/8xkG8j+olZ96ZwZpZYJ89SuQBCq0FPxRTet/KJXnc0T0b8bo7gBV8clMCbDQA==; 5:+dxhVn4Cv1b+XNdVbXnhenm9aCTckfYOUQZPSpFnQkigvAr0e9FhjSLyA8D1+viyeA4BfmOga2vEHtdMzL3BXjIc7cHI/aTHBrKXZ48+J1TOTsmVOTC3WAS0xS/xVlPAel6JVJyUQ3LhebB/eLK8igrqVhc4nNQWGFLS7livCrs=; 7:i5zIowZO3cEct0Sl4UChOTL46nkWb+doKBz9I5Rs0CflxOPwgUsdd99UJMNDh4/8mSG7UDHKEvfn0x1uX9Xxk/dPqDP8IMPjHwRIjwHfBgMek97Qgkgy/1n7KYJvhRjd3+fDJuULqMitDvot7l2JmvxEb3Y+ckgVm77LJL5W0lTUmvFb4GzsCF8ma5ZYtRXf3VT9C4XDBNbfDcRUG92bPyfVv21hbqw/4RO3mkKBeoIIAjvW+zw6TT6mQcq7n96S x-incomingheadercount: 50 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125500)(1701031045); SRVR:HE1EUR02HT197; x-ms-traffictypediagnostic: HE1EUR02HT197: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(82015058); SRVR:HE1EUR02HT197; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT197; x-forefront-prvs: 0743E8D0A6 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(50944005)(199004)(189003)(55016002)(105586002)(15650500001)(99286004)(33656002)(14454004)(386003)(2900100001)(72206003)(6916009)(106356001)(8936002)(102836004)(76176011)(305945005)(74316002)(54906003)(7696005)(81156014)(97736004)(26005)(6346003)(8676002)(68736007)(446003)(11346002)(476003)(2351001)(20460500001)(486006)(426003)(2501003)(86362001)(4326008)(82202002)(5250100002)(256004)(25786009)(5660300001)(14444005)(56003)(87572001)(5640700003)(7416002)(104016004)(6436002); DIR:OUT; SFP:1901; SCL:1; SRVR:HE1EUR02HT197; H:VI1PR0801MB1790.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: outlook.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Marvin.Haeuser@outlook.com; x-microsoft-antispam-message-info: 1w014r6Lt1NT3+O0VHpPSyIpKXqtd7onlCkrD9/BJdTFGm6yIzSLQ1/tmBD557bCyc2FP4QyYI/UnMFyNTOjeYVrcF6ruKPsYlKWwzZvyv5EkAD6y8ATXFbKBBqLMPLmWS8MW2adRhGP46rMTXRblMGA0SPkV/Ut1xXGgsP+mlfSs6wA08Dq18m4RPaFGGWXWv0LHywoY3hNoPErPXttTzwkaC1lKj2CvKqGmn2e1z8= MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: 72389df1-616a-4f02-ed22-08d5f1067518 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jul 2018 01:40:38.5403 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT197 Subject: [PATCH 5/8] QuarkSocPkg/SmmAccessPei: Update MM PPI usages. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 01:40:42 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Update all references to the SMM PPIs from MdeModulePkg to rather use MdePkg's MM PPI declarations. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marvin Haeuser --- QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c | 48 += +++++++++---------- QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf | 2 += - 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPe= i.c b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c index 70fdf096117f..6686d87a3fda 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c @@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 **/ #include -#include +#include #include #include #include @@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. CR ( \ a, \ SMM_ACCESS_PRIVATE_DATA, \ - SmmAccess, \ + MmAccess, \ SMM_ACCESS_PRIVATE_DATA_SIGNATURE \ ) =20 @@ -39,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. typedef struct { UINTN Signature; EFI_HANDLE Handle; - PEI_SMM_ACCESS_PPI SmmAccess; + EFI_PEI_MM_ACCESS_PPI MmAccess; UINTN NumberRegions; EFI_SMRAM_DESCRIPTOR SmramDesc[MAX_SMRAM_RANGES]; UINT8 TsegSize; @@ -55,7 +55,7 @@ EFI_STATUS EFIAPI Open ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_ACCESS_PPI *This, + IN EFI_PEI_MM_ACCESS_PPI *This, IN UINTN DescriptorIndex ) /*++ @@ -70,7 +70,7 @@ Routine Description: Arguments: =20 PeiServices - General purpose services available to every PEIM. - This - Pointer to the SMM Access Interface. + This - Pointer to the MM Access Interface. DescriptorIndex - Region of SMRAM to Open. =20 Returns: @@ -102,7 +102,7 @@ Returns: =20 SmmAccess->SmramDesc[DescriptorIndex].RegionState &=3D ~(EFI_SMRAM_CLOSE= D | EFI_ALLOCATED); SmmAccess->SmramDesc[DescriptorIndex].RegionState |=3D EFI_SMRAM_OPEN; - SmmAccess->SmmAccess.OpenState =3D TRUE; + SmmAccess->MmAccess.OpenState =3D TRUE; =20 return EFI_SUCCESS; } @@ -111,7 +111,7 @@ EFI_STATUS EFIAPI Close ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_ACCESS_PPI *This, + IN EFI_PEI_MM_ACCESS_PPI *This, IN UINTN DescriptorIndex ) /*++ @@ -124,7 +124,7 @@ Routine Description: Arguments: =20 PeiServices - General purpose services available to every PEIM. - This - Pointer to the SMM Access Interface. + This - Pointer to the MM Access Interface. DescriptorIndex - Region of SMRAM to Close. =20 Returns: @@ -174,7 +174,7 @@ Returns: } } =20 - SmmAccess->SmmAccess.OpenState =3D OpenState; + SmmAccess->MmAccess.OpenState =3D OpenState; =20 return EFI_SUCCESS; } @@ -183,7 +183,7 @@ EFI_STATUS EFIAPI Lock ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_ACCESS_PPI *This, + IN EFI_PEI_MM_ACCESS_PPI *This, IN UINTN DescriptorIndex ) /*++ @@ -198,7 +198,7 @@ Routine Description: Arguments: =20 PeiServices - General purpose services available to every PEIM. - This - Pointer to the SMM Access Interface. + This - Pointer to the MM Access Interface. DescriptorIndex - Region of SMRAM to Lock. =20 Returns: @@ -216,12 +216,12 @@ Returns: =20 if (DescriptorIndex >=3D SmmAccess->NumberRegions) { return EFI_INVALID_PARAMETER; - } else if (SmmAccess->SmmAccess.OpenState) { + } else if (SmmAccess->MmAccess.OpenState) { return EFI_DEVICE_ERROR; } =20 SmmAccess->SmramDesc[DescriptorIndex].RegionState |=3D EFI_SMRAM_LOCKED; - SmmAccess->SmmAccess.LockState =3D TRUE; + SmmAccess->MmAccess.LockState =3D TRUE; =20 // // Lock TSEG @@ -235,7 +235,7 @@ EFI_STATUS EFIAPI GetCapabilities ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_ACCESS_PPI *This, + IN EFI_PEI_MM_ACCESS_PPI *This, IN OUT UINTN *SmramMapSize, IN OUT EFI_SMRAM_DESCRIPTOR *SmramMap ) @@ -293,7 +293,7 @@ SmmAccessPeiEntryPoint ( =20 Routine Description: =20 - This is the constructor for the SMM Access Ppi + This is the constructor for the MM Access Ppi =20 Arguments: =20 @@ -354,17 +354,17 @@ Returns: SmmAccessPrivate->SmramDesc[Index].RegionState =3D DescriptorBlock->= Descriptor[Index].RegionState; } =20 - SmmAccessPrivate->NumberRegions =3D Index; - SmmAccessPrivate->SmmAccess.Open =3D Open; - SmmAccessPrivate->SmmAccess.Close =3D Close; - SmmAccessPrivate->SmmAccess.Lock =3D Lock; - SmmAccessPrivate->SmmAccess.GetCapabilities =3D GetCapabilities; - SmmAccessPrivate->SmmAccess.LockState =3D FALSE; - SmmAccessPrivate->SmmAccess.OpenState =3D FALSE; + SmmAccessPrivate->NumberRegions =3D Index; + SmmAccessPrivate->MmAccess.Open =3D Open; + SmmAccessPrivate->MmAccess.Close =3D Close; + SmmAccessPrivate->MmAccess.Lock =3D Lock; + SmmAccessPrivate->MmAccess.GetCapabilities =3D GetCapabilities; + SmmAccessPrivate->MmAccess.LockState =3D FALSE; + SmmAccessPrivate->MmAccess.OpenState =3D FALSE; =20 PpiList->Flags =3D (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_= TERMINATE_LIST); - PpiList->Guid =3D &gPeiSmmAccessPpiGuid; - PpiList->Ppi =3D &SmmAccessPrivate->SmmAccess; + PpiList->Guid =3D &gEfiPeiMmAccessPpiGuid; + PpiList->Ppi =3D &SmmAccessPrivate->MmAccess; =20 Status =3D (**PeiServices).InstallPpi (PeiServices, PpiList); ASSERT_EFI_ERROR(Status); diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPe= i.inf b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf index a1e4af7725ac..41566d5ecc2b 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf @@ -44,7 +44,7 @@ [Guids] gEfiSmmPeiSmramMemoryReserveGuid # ALWAYS_CONSUMED =20 [Ppis] - gPeiSmmAccessPpiGuid # ALWAYS_PRODUCED + gEfiPeiMmAccessPpiGuid # ALWAYS_PRODUCED gEfiPeiMemoryDiscoveredPpiGuid # ALWAYS_CONSUMED =20 [Depex] --=20 2.18.0.windows.1