From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.1979.1574830186783296418 for ; Tue, 26 Nov 2019 20:49:46 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 20:49:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,248,1571727600"; d="scan'208";a="240193958" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by fmsmga002.fm.intel.com with ESMTP; 26 Nov 2019 20:49:45 -0800 Received: from orsmsx123.amr.corp.intel.com (10.22.240.116) by ORSMSX107.amr.corp.intel.com (10.22.240.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 26 Nov 2019 20:49:45 -0800 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.67]) by ORSMSX123.amr.corp.intel.com ([169.254.1.236]) with mapi id 14.03.0439.000; Tue, 26 Nov 2019 20:49:44 -0800 From: "Nate DeSimone" To: "Kubacki, Michael A" , "devel@edk2.groups.io" CC: "Chaganty, Rangasai V" , "Chiu, Chasel" , "Gao, Zhichao" Subject: Re: [edk2-platforms][PATCH V1 2/2] KabylakeSiliconPkg: Remove redundant ResetSystem() implementation Thread-Topic: [edk2-platforms][PATCH V1 2/2] KabylakeSiliconPkg: Remove redundant ResetSystem() implementation Thread-Index: AQHVpM5ZUf1JYcUBSEu/hus3OP0QFqeecnHw Date: Wed, 27 Nov 2019 04:49:44 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5C03201@ORSMSX114.amr.corp.intel.com> References: <20191127025643.32056-1-michael.a.kubacki@intel.com> <20191127025643.32056-3-michael.a.kubacki@intel.com> In-Reply-To: <20191127025643.32056-3-michael.a.kubacki@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmNiMGIyY2UtMjMzZS00YTg2LWJjNDMtZWFhNjliZjFhMTkzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidjBRZ1BZQjFHUHJcLzk0NGVEeUlxaW40UG9TaDZXZFV1cHJUeHhBV3NsZ0luZG5WaXJNMU9yK3VremRcL1BIYjNjIn0= x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] 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: Kubacki, Michael A =20 Sent: Tuesday, November 26, 2019 6:57 PM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Chiu, Chasel ; Desimone, Nathaniel L = ; Gao, Zhichao Subject: [edk2-platforms][PATCH V1 2/2] KabylakeSiliconPkg: Remove redundan= t ResetSystem() implementation REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2375 The following commits introduced a new implementation of ResetSystem () in = ResetLib instances in KabylakeSiliconPkg: * 2393cff0d4 * 07fd95c9ca * 0ad2f057d8 * a6e61d43c9 The PchResetLib instance PeiPchResetLib links against ResetLib and already = contained a definition of ResetSystem (). This resulted in a build failure = in VS2017 due to multiple definitions of a symbol being provided to the lin= ker. The failure did not reproduce in VS2015 so it persisted until now. This change removes the pre-existing implementation of ResetSystem () in Pc= hReset.c as it is now linked by the implementation in the ResetLib instance= . Cc: Sai Chaganty Cc: Chasel Chiu Cc: Nate DeSimone Cc: Zhichao Gao Signed-off-by: Michael Kubacki --- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c = | 55 -------------------- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys= temLib.c | 5 ++ 2 files changed, 5 insertions(+), 55 deletions(-) diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/Pc= hReset.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchR= eset.c index 20e5d36892..c3963164c1 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.= c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchRes +++ et.c @@ -18,61 +18,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <= Library/ResetSystemLib.h> #include =20 -VOID -EFIAPI -ResetPlatformSpecific ( - IN UINTN DataSize, - IN VOID *ResetData OPTIONAL - ); - - -/** - Resets the entire platform. - - @param[in] ResetType UEFI defined reset type. - @param[in] ResetStatus The status code for the reset. - @param[in] DataSize The size of ResetData in bytes. - @param[in] ResetData Optional element used to introduce a pla= tform specific reset. - The exact type of the reset is defined b= y the EFI_GUID that follows - the Null-terminated Unicode string. - -**/ -VOID -EFIAPI -ResetSystem ( - IN EFI_RESET_TYPE ResetType, - IN EFI_STATUS ResetStatus, - IN UINTN DataSize, - IN VOID *ResetData OPTIONAL - ) -{ - switch (ResetType) { - case EfiResetWarm: - ResetWarm (); - break; - - case EfiResetCold: - ResetCold (); - break; - - case EfiResetShutdown: - ResetShutdown (); - return; - - case EfiResetPlatformSpecific: - ResetPlatformSpecific (DataSize, ResetData); - return; - - default: - return; - } - - // - // Given we should have reset getting here would be bad - // - ASSERT (FALSE); -} - /** Execute Pch Reset from the host controller. =20 diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib= /PeiResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiRese= tSystemLib/PeiResetSystemLib.c index 6f12abf111..a3db100619 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes= etSystemLib.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/Pei +++ ResetSystemLib.c @@ -317,5 +317,10 @@ ResetSystem ( default: return; } + + // + // Given we should have reset getting here would be bad // ASSERT=20 + (FALSE); } =20 -- 2.16.2.windows.1