From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.92.68.10; helo=eur02-he1-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068010.outbound.protection.outlook.com [40.92.68.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6FBAB210C0F71 for ; Mon, 23 Jul 2018 18:40:46 -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=XMLQ8Nr+vKamDfJ/nfhJUFM3uDyv7zT2q7XUHHef0r4=; b=tsUjOeMCfFRtpj0Pf6+6b7ede2nHLHahxL2X7buZPW2dVzq4Q/uOOgImvT98BdOZsQiWV39KN7JmLcgGAWuDbaU6OU+gY0j9q45b27uiY6zYfPRJLjJ9G7mBIuYYj7nKWrWiNuPFkOikshfmbLNKX2xM2fUZn0WRPzNteDWPqrkCwf5EgWSCQgqeE10rfjmTLYRrhq+R4DzMiy7SwxapkGKxbKkOs4sD66Pwt0k8w/ADpvsneNaQwKe8833aS+klrbUASpvMd4fdN/fPoJ3e7RPHFynGJA8qyCuNVex63MziCLLEg0rRj8tguNHEbrw+skYLYGd90PC9iP+TBDtApA== Received: from HE1EUR02FT023.eop-EUR02.prod.protection.outlook.com (10.152.10.59) by HE1EUR02HT152.eop-EUR02.prod.protection.outlook.com (10.152.11.139) 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:39 +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:39 +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:39 +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 6/8] QuarkSocPkg/SmmControlPei: Update MM PPI usages. Thread-Index: AQHUIu9TWjRMy+AeCUubpOOCloM76w== Date: Tue, 24 Jul 2018 01:40:39 +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:E60F1796E16CA9705586F6060C50292EC601B8C493F399FC351C064EED5CB3AE; UpperCasedChecksum:B924ECE40A64B14502F95E1E287A13CC2069D264F9D5E824FC0D26946688D4CC; SizeAsReceived:8031; Count:50 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [LWZMGlaIQIC9rUAczqIwsDmGK7mAIE4s] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR02HT152; 6:KsrGCsjJYjndO3cTmbPB3Mt4toOBIKILhZZp5y0MqMebYik7E69v32zkHCJNtDPklfGjcBvBhF0kqQZY7a8Ewvs21RkpjFLQbx3zuAhu/uIAuWliflOSeO48Do8ednO0U1TyiKEgG7FlbLXnzcCIZR9BtUPbCVMBNPPAGJFQDyBRletEou0ZFkQU6P1uR+ClD+231JsMV1v1AmfMHj/385UnGMYsgwmaOeYQ5nH/vxCeZDeCK4Rl0fzvQgjzRJUvScB4srXgK/FuwEP4f9L/dEPoxmI64hspkxmf8AJmgRqbtqcupSSGAx4NrOrx+DNcZ4h0PgkPlg8ANj/RAkI6HLQn9oF9ttrw4OtHfu6jRf1ulFH5NfHniUGf/AKyhrwM0ex09NmlU15gDQkshNv35qA+XPNVTCc6oHtdL1+e9DaijRjGTpoJrhfQNlIP7tCrz6xWigeyQDc55sk9V4tYEw==; 5:15yLbYKZbeaIRq/6FbMVf0IAper70y8MSqH7p2bhanULsp0wfjJvWUdKe8DwXvd3bhXT1RARk/h9CtAZzZaNF/amyg/ZsorkNTr+aFYNgMzWiApSomYpCBz2STBp12WGZ0a3fc+J+lKwm4DBfBoBXF9xj3Q68Z4iL5VfbKcsI78=; 7:DdIbX1Nn9o8QTSmvz2LKcLPWfkdgp5mIRh+lTuqFTQr7XT+MEVzNjq+xP1EiQqADGK+cxYA/6RD7cKhm3TjoBMNdxhLZt2cgzRwLHGgwsP2Zz5/5Yt1UxkMyGO6mDM5doYDrNL/c7hti/+0/6YFre5hMZTWsxH21UJB71MB0O3plmvHCEXa04pfvWGJjnXjAjmjVIGq2RswTPjWtduJ7MVsgl0+oIXsnTs6+gBj3km/M8Udzg/3Q16g3wznKq6wK 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:HE1EUR02HT152; x-ms-traffictypediagnostic: HE1EUR02HT152: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(82015058); SRVR:HE1EUR02HT152; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR02HT152; x-forefront-prvs: 0743E8D0A6 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(189003)(199004)(575784001)(104016004)(5640700003)(486006)(6436002)(86362001)(99286004)(476003)(82202002)(7416002)(6916009)(14444005)(446003)(256004)(87572001)(426003)(97736004)(11346002)(56003)(54906003)(5660300001)(20460500001)(5250100002)(55016002)(2900100001)(2501003)(68736007)(106356001)(102836004)(7696005)(8676002)(81156014)(386003)(6346003)(26005)(105586002)(33656002)(76176011)(72206003)(74316002)(14454004)(25786009)(2351001)(4326008)(15650500001)(305945005)(8936002); DIR:OUT; SFP:1901; SCL:1; SRVR:HE1EUR02HT152; H:VI1PR0801MB1790.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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: ll9/Ps2D6iint9n0Huc6+k9ttlISfwSq4s+pbnAUvULme2uatiK7iT4GCdBm+IEFKKnv2Oi2oaXizEGgbuIT4Mj1XayMKMg+pBlicAuvC5ML3mprtphTnSrqswyzUtjFBJh/y1ml062BCQ60NA6+LBBX2N7zL4Wnkt/NoNOTddCcWQBIrY+m+/BpcdnWxxNMy2U6/3Shewz5SdZ6DszhcL6OaXTC630p5AO+TjyqdNg= 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: bff13091-2c9f-44b7-a594-08d5f10675a6 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jul 2018 01:40:39.4111 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT152 Subject: [PATCH 6/8] QuarkSocPkg/SmmControlPei: 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:47 -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/SmmControlPei/SmmControlPei.c | 24= ++++++++++---------- QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf | 2= +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControl= Pei.c b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c index 4d19c8f89b0b..98f83d2ce82b 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c @@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 #include =20 -#include +#include =20 #include #include @@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 @param PeiServices Describes the list of possible PEI Services. @param This A pointer to an instance of - EFI_SMM_CONTROL_PPI + EFI_PEI_MM_CONTROL_PPI @param ArgumentBuffer The argument buffer @param ArgumentBufferSize The size of the argument buffer @param Periodic TRUE to indicate a periodical SMI @@ -48,7 +48,7 @@ EFI_STATUS EFIAPI PeiActivate ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_CONTROL_PPI *This, + IN EFI_PEI_MM_CONTROL_PPI *This, IN OUT INT8 *ArgumentBuffer OPTIONAL, IN OUT UINTN *ArgumentBufferSize OPTIONAL, IN BOOLEAN Periodic OPTIONAL, @@ -59,7 +59,7 @@ PeiActivate ( Clears an SMI. =20 @param PeiServices Describes the list of possible PEI Services. - @param This Pointer to an instance of EFI_SMM_CONTROL_PP= I + @param This Pointer to an instance of EFI_PEI_MM_CONTROL= _PPI @param Periodic TRUE to indicate a periodical SMI =20 @return Return value from SmmClear() @@ -69,18 +69,18 @@ EFI_STATUS EFIAPI PeiDeactivate ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_CONTROL_PPI *This, + IN EFI_PEI_MM_CONTROL_PPI *This, IN BOOLEAN Periodic OPTIONAL ); =20 -PEI_SMM_CONTROL_PPI mSmmControlPpi =3D { +EFI_PEI_MM_CONTROL_PPI mSmmControlPpi =3D { PeiActivate, PeiDeactivate }; =20 EFI_PEI_PPI_DESCRIPTOR mPpiList =3D { (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), - &gPeiSmmControlPpiGuid, + &gEfiPeiMmControlPpiGuid, &mSmmControlPpi }; =20 @@ -177,7 +177,7 @@ Returns: =20 @param PeiServices Describes the list of possible PEI Services. @param This A pointer to an instance of - EFI_SMM_CONTROL_PPI + EFI_PEI_MM_CONTROL_PPI @param ArgumentBuffer The argument buffer @param ArgumentBufferSize The size of the argument buffer @param Periodic TRUE to indicate a periodical SMI @@ -191,7 +191,7 @@ EFI_STATUS EFIAPI PeiActivate ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_CONTROL_PPI *This, + IN EFI_PEI_MM_CONTROL_PPI *This, IN OUT INT8 *ArgumentBuffer OPTIONAL, IN OUT UINTN *ArgumentBufferSize OPTIONAL, IN BOOLEAN Periodic OPTIONAL, @@ -232,7 +232,7 @@ PeiActivate ( Clears an SMI. =20 @param PeiServices Describes the list of possible PEI Services. - @param This Pointer to an instance of EFI_SMM_CONTROL_PP= I + @param This Pointer to an instance of EFI_PEI_MM_CONTROL= _PPI @param Periodic TRUE to indicate a periodical SMI =20 @return Return value from SmmClear() @@ -242,7 +242,7 @@ EFI_STATUS EFIAPI PeiDeactivate ( IN EFI_PEI_SERVICES **PeiServices, - IN PEI_SMM_CONTROL_PPI *This, + IN EFI_PEI_MM_CONTROL_PPI *This, IN BOOLEAN Periodic OPTIONAL ) { @@ -255,7 +255,7 @@ PeiDeactivate ( /** This is the constructor for the SMM Control Ppi. =20 - This function installs EFI_SMM_CONTROL_PPI. + This function installs EFI_PEI_MM_CONTROL_PPI. =20 @param FileHandle Handle of the file being invoked. @param PeiServices Describes the list of possible PEI Services. diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControl= Pei.inf b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei= .inf index 6b1dd1bcfd1c..0a98e5739416 100644 --- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf +++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf @@ -46,7 +46,7 @@ [LibraryClasses] QNCAccessLib =20 [Ppis] - gPeiSmmControlPpiGuid # ALWAYS_PRODUCED + gEfiPeiMmControlPpiGuid # ALWAYS_PRODUCED =20 [Pcd] gEfiQuarkNcSocIdTokenSpaceGuid.PcdPm1blkIoBaseAddress --=20 2.18.0.windows.1