From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web09.1133.1574825209023183398 for ; Tue, 26 Nov 2019 19:26:49 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: chasel.chiu@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 19:26:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,248,1571727600"; d="scan'208";a="217299185" Received: from kmsmsx156.gar.corp.intel.com ([172.21.138.133]) by fmsmga001.fm.intel.com with ESMTP; 26 Nov 2019 19:26:47 -0800 Received: from pgsmsx111.gar.corp.intel.com ([169.254.2.24]) by KMSMSX156.gar.corp.intel.com ([169.254.1.162]) with mapi id 14.03.0439.000; Wed, 27 Nov 2019 11:26:46 +0800 From: "Chiu, Chasel" To: "Kubacki, Michael A" , "devel@edk2.groups.io" CC: "Chaganty, Rangasai V" , "Desimone, Nathaniel L" , "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: AQHVpM5brIiTdoaZyUCmOGpEn6slrqeeW1iw Date: Wed, 27 Nov 2019 03:26:45 +0000 Message-ID: <3C3EFB470A303B4AB093197B6777CCEC505AF56D@PGSMSX111.gar.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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTA5MTBkMWYtNDU3ZC00YmNlLWFiYmMtMjE3MzFhYzk5ODY4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaFE3TXhjMFVhR1ErSWxGQ2NZbU1PdVFDdDRNUldWcHd6NXRrakxpXC9pU2FlSklYWGM1UzQxWTZCWlh0RnhCSEIifQ== x-ctpclassification: CTP_NT x-originating-ip: [172.30.20.206] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu > -----Original Message----- > From: Kubacki, Michael A > Sent: Wednesday, November 27, 2019 10:57 AM > 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 > redundant ResetSystem() implementation >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2375 >=20 > The following commits introduced a new implementation of ResetSystem () > in ResetLib instances in KabylakeSiliconPkg: > * 2393cff0d4 > * 07fd95c9ca > * 0ad2f057d8 > * a6e61d43c9 >=20 > The PchResetLib instance PeiPchResetLib links against ResetLib and alread= y > contained a definition of ResetSystem (). This resulted in a build failur= e in > VS2017 due to multiple definitions of a symbol being provided to the link= er. > The failure did not reproduce in > VS2015 so it persisted until now. >=20 > This change removes the pre-existing implementation of ResetSystem () in > PchReset.c as it is now linked by the implementation in the ResetLib > instance. >=20 > 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 -------------------- >=20 > Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSy= st > emLib.c | 5 ++ > 2 files changed, 5 insertions(+), 55 deletions(-) >=20 > diff --git > a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c > b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c > index 20e5d36892..c3963164c1 100644 > --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchRese= t.c > +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchRes > +++ et.c > @@ -18,61 +18,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include #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 platform specific reset. > - The exact type of the reset is > defined by 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/PeiReset= Sy > stemLib.c > b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiReset= Sy > stemLib.c > index 6f12abf111..a3db100619 100644 > --- > a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiReset= Sy > stemLib.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 > + (FALSE); > } >=20 > -- > 2.16.2.windows.1