From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: nathaniel.l.desimone@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Fri, 17 May 2019 17:55:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 17:55:53 -0700 X-ExtLoop1: 1 Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by fmsmga004.fm.intel.com with ESMTP; 17 May 2019 17:55:53 -0700 Received: from orsmsx160.amr.corp.intel.com (10.22.226.43) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 17 May 2019 17:55:52 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.116]) by ORSMSX160.amr.corp.intel.com ([169.254.13.155]) with mapi id 14.03.0415.000; Fri, 17 May 2019 17:55:52 -0700 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Agyeman, Prince" CC: "Kubacki, Michael A" , "Kinney, Michael D" , "Gao, Liming" , "Sinha, Ankit" Subject: Re: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg: Casting functions to EFIAPI Thread-Topic: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg: Casting functions to EFIAPI Thread-Index: AQHVC0Sp0okHiI+Vx0mocASsMd/Dp6ZwDwUQ Date: Sat, 18 May 2019 00:55:52 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AAEB3A7F4@ORSMSX114.amr.corp.intel.com> References: <08db7c1beb0a707429a9c4c9aed8f5489663c08a.1557779977.git.prince.agyeman@intel.com> In-Reply-To: <08db7c1beb0a707429a9c4c9aed8f5489663c08a.1557779977.git.prince.agyeman@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTNmNDg0YmYtZWExMy00OTFmLWI2ODctYWY3YjZiNTU3NzQ0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibE1NdngyMGU3a2Q1VHNsY3l2RlQ3OE82OEozd0hLYXdIRW5Ncjk2YkZodnEyZjU0RlR1RXNMRVhqaWdFaERZaSJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: devel@edk2.groups.io On Behalf Of Agyeman, Pr= ince Sent: Wednesday, May 15, 2019 10:36 AM To: devel@edk2.groups.io Cc: Agyeman, Prince ; Kubacki, Michael A ; Kinney, Michael D ; Des= imone, Nathaniel L ; Gao, Liming ; Sinha, Ankit Subject: [edk2-devel] [edk2-platforms] [PATCH 2/5] KabylakeSiliconPkg: Cas= ting functions to EFIAPI From: Prince Agyeman This fixes the calling convension issues in gcc Gcc build was tested on Ubuntu 16.04.5 LTS with gcc version 5.4.0, nasm ve= rsion 2.11.08 Cc: Michael Kubacki Cc: Michael D Kinney Cc: Nate DeSimone Cc: Liming Gao Cc: Ankit Sinha Signed-off-by: Prince Agyeman --- .../Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h | 11 +++----= ---- .../Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c | 11 +++----= ---- .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 12 ++++---= ----- .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 12 ++++---= ----- 4 files changed, 14 insertions(+), 32 deletions(-) diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h= b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h index 58ef567..666340e 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h @@ -1,14 +1,8 @@ /** @file Header file for PCH Init SMM Handler =20 -Copyright (c) 2017, Intel Corporation. All rights reserved.
-This pro= gram and the accompanying materials are licensed and made available under -= the terms and conditions of the BSD License that accompanies this distribut= ion. -The full text of the license may be found at -http://opensource.org/licen= ses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WI= THOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 @@ -211,6 +205,7 @@ PchPcieLinkEqHandlerFunction ( =20 **/ VOID +EFIAPI PchPcieIoTrapSmiCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_IO_TRAP_CONTEXT *CallbackContext, diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c= b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c index b4234f6..847fbfb 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c @@ -1,14 +1,8 @@ /** @file PCH Pcie SMM Driver Entry =20 -Copyright (c) 2017, Intel Corporation. All rights reserved.
-This pro= gram and the accompanying materials are licensed and made available under -= the terms and conditions of the BSD License that accompanies this distribut= ion. -The full text of the license may be found at -http://opensource.org/licen= ses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WI= THOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ #include "PchInitSmm.h" @@ -244,6 +238,7 @@ PchPciePmIoTrapSmiCallback ( =20 **/ VOID +EFIAPI PchPcieIoTrapSmiCallback ( IN EFI_HANDLE DispatchHandle, IN EFI_SMM_IO_TRAP_CONTEXT *CallbackContext, diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pch= Smm.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h index 3eebdc1..a9f0664 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h @@ -1,14 +1,8 @@ /** @file Prototypes and defines for the PCH SMM Dispatcher. =20 -Copyright (c) 2017, Intel Corporation. All rights reserved.
-This pro= gram and the accompanying materials are licensed and made available under -= the terms and conditions of the BSD License that accompanies this distribut= ion. -The full text of the license may be found at -http://opensource.org/licen= ses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WI= THOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ #ifndef PCH_SMM_H @@ -516,6 +510,7 @@ typedef struct { registered and the SMI source has been = enabled. **/ EFI_STATUS +EFIAPI PchSmmCoreRegister ( IN PCH_SMM_GENERIC_PROTOCOL *This, IN EFI_SMM_HANDLER_ENTRY_POINT2 DispatchFunction, @@ -536,6 +531,7 @@ PchSmmCoreRegister ( @retval EFI_INVALID_PARAMETER Handle is invalid. **/ EFI_STATUS +EFIAPI PchSmmCoreUnRegister ( IN PCH_SMM_GENERIC_PROTOCOL *This, IN EFI_HANDLE *DispatchHandle diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pch= SmmCore.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSm= mCore.c index 77f0561..cb3bfba 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore= .c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCo +++ re.c @@ -2,14 +2,8 @@ This driver is responsible for the registration of child drivers and the abstraction of the PCH SMI sources. =20 -Copyright (c) 2017, Intel Corporation. All rights reserved.
-This pro= gram and the accompanying materials are licensed and made available under -= the terms and conditions of the BSD License that accompanies this distribut= ion. -The full text of the license may be found at -http://opensource.org/licen= ses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WI= THOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ #include "PchSmm.h" @@ -331,6 +325,7 @@ SmiInputValueDuplicateCheck ( registered and the SMI source has been = enabled. **/ EFI_STATUS +EFIAPI PchSmmCoreRegister ( IN PCH_SMM_GENERIC_PROTOCOL *This, IN EFI_SMM_HANDLER_ENTRY_POINT2 DispatchFunction, @@ -602,6 +597,7 @@ Error: @retval EFI_INVALID_PARAMETER Handle is invalid. **/ EFI_STATUS +EFIAPI PchSmmCoreUnRegister ( IN PCH_SMM_GENERIC_PROTOCOL *This, IN EFI_HANDLE *DispatchHandle -- 2.7.4