From nobody Sat Apr 27 00:08:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51320+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51320+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1574823414; cv=none; d=zohomail.com; s=zohoarc; b=Kx1NLhjB3aIjzcpOA642T62fWWvVyuPsYlz6wzfvQF3BZTmLm9jh/9IwcBLa+UUUrzz6BDuc7jHA0Qg4k8T6aGRg4U3GJZkxMuSZN3S3lbicEy49CGKUmYwyIocgFGT9aqU8ZFVyncyBBGAulpkzzi94nDASB57UZZryrOYRywA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574823414; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=nrpCvaceVoz0N3pmjGhxaCdt9nwotNbc1I7pHxAZNZw=; b=F9rbjcpOov6fQsuKHtMeUvcO+hB0cAjFqL+Dz4H8Dtu43HEoPw8YvizmA1n+4XHxGqtO5/AGwZ4uVuXXz+U3zvNP3Zet/COjdhAlBaACy38IgokE824sMHhxUqzcBt1hl33xxUN1yoUDazSqXl/IHZcQx0Ohka27NnE3OkZlhNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51320+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574823414877871.0588112299929; Tue, 26 Nov 2019 18:56:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id k6zQYY1788612xLYwgbSyTZY; Tue, 26 Nov 2019 18:56:54 -0800 X-Received: from mga09.intel.com (mga09.intel.com []) by mx.groups.io with SMTP id smtpd.web09.821.1574823410057638827 for ; Tue, 26 Nov 2019 18:56:54 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 18:56:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,247,1571727600"; d="scan'208";a="383357730" X-Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga005.jf.intel.com with ESMTP; 26 Nov 2019 18:56:53 -0800 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Sai Chaganty , Chasel Chiu , Nate DeSimone , Zhichao Gao Subject: [edk2-devel] [edk2-platforms][PATCH V1 1/2] KabylakeSiliconPkg: Remove ResetSystemLib.h override Date: Tue, 26 Nov 2019 18:56:42 -0800 Message-Id: <20191127025643.32056-2-michael.a.kubacki@intel.com> In-Reply-To: <20191127025643.32056-1-michael.a.kubacki@intel.com> References: <20191127025643.32056-1-michael.a.kubacki@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.a.kubacki@intel.com X-Gm-Message-State: Itn4SwTyonPlTLIMn9NMLlUdx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574823414; bh=0+LWANP/yOTru0tG7BzhlcDETM64Zvzuo3s1yLICp0M=; h=Cc:Date:From:Reply-To:Subject:To; b=NB6MNljdCTevNOqQ9JR31Wg/v/9C0QaXPdudIinbCeNbffuzpVNqgp2hLIGUjf5eawe y6+MHVkUga0yapdp53qLpv6XVV5ZK3njQzi0dlExWzbssEJlhML7DX5TRSwr3IYt/Smx2 o8yS+Rbtd/eCoPkA/5VPTK/ZXXBob3gYIPs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2375 Removes a stale ResetSystemLib.h override in KabylakeSiliconPkg that does not contain the prototype for ResetSystem () and ResetPlatformSpecific (). The ResetSystemLib.h file from MdeModulePkg will be used. Any INF files that did not include the MdeModulePkg.dec under [Packages] were updated to do so. Cc: Sai Chaganty Cc: Chasel Chiu Cc: Nate DeSimone Cc: Zhichao Gao Signed-off-by: Michael Kubacki Reviewed-by: Chasel Chiu Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSys= temLib.inf | 3 +- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeR= untimeResetSystemLib.inf | 3 +- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib= .inf | 3 +- Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSys= temLib.inf | 3 +- Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/R= esetSystemLib.h | 62 -------------------- 5 files changed, 8 insertions(+), 66 deletions(-) diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib= /DxeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRe= setSystemLib/DxeResetSystemLib.inf index aa8877140a..46313bf35f 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeRes= etSystemLib.inf +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeRes= etSystemLib.inf @@ -1,7 +1,7 @@ ## @file # Component description file for Intel Ich7 Reset System Library. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -35,6 +35,7 @@ PchCycleDecodingLib =20 [Packages] MdePkg/MdePkg.dec +MdeModulePkg/MdeModulePkg.dec KabylakeSiliconPkg/SiPkg.dec =20 =20 diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSy= stemLib/DxeRuntimeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch= /Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf index 6b27661603..c7fad31c71 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib= /DxeRuntimeResetSystemLib.inf +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib= /DxeRuntimeResetSystemLib.inf @@ -1,7 +1,7 @@ ## @file # Component description file for Intel Ich7 Reset System Library. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -36,6 +36,7 @@ PchCycleDecodingLib =20 [Packages] MdePkg/MdePkg.dec +MdeModulePkg/MdeModulePkg.dec KabylakeSiliconPkg/SiPkg.dec =20 =20 diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/Pe= iPchResetLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchReset= Lib/PeiPchResetLib.inf index b04f4006ef..29f69078a4 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchRes= etLib.inf +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchRes= etLib.inf @@ -1,7 +1,7 @@ ## @file # Component description file for PCH Reset Lib Pei Phase # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -28,6 +28,7 @@ ResetSystemLib =20 [Packages] MdePkg/MdePkg.dec +MdeModulePkg/MdeModulePkg.dec KabylakeSiliconPkg/SiPkg.dec =20 [Sources] diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib= /PeiResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiRe= setSystemLib/PeiResetSystemLib.inf index 18a92a6f18..3c6ff78863 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes= etSystemLib.inf +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes= etSystemLib.inf @@ -1,7 +1,7 @@ ## @file # Component description file for Intel Ich7 Reset System Library. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -32,6 +32,7 @@ PchCycleDecodingLib =20 [Packages] MdePkg/MdePkg.dec +MdeModulePkg/MdeModulePkg.dec KabylakeSiliconPkg/SiPkg.dec =20 =20 diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu= de/Library/ResetSystemLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/M= deModulePkg/Include/Library/ResetSystemLib.h deleted file mode 100644 index 75d3e15ed7..0000000000 --- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr= ary/ResetSystemLib.h +++ /dev/null @@ -1,62 +0,0 @@ -/** @file - System reset Library Services. This library class defines a set of - methods that reset the whole system. - -Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __RESET_SYSTEM_LIB_H__ -#define __RESET_SYSTEM_LIB_H__ - -/** - This function causes a system-wide reset (cold reset), in which - all circuitry within the system returns to its initial state. This type = of reset - is asynchronous to system operation and operates without regard to - cycle boundaries. - - If this function returns, it means that the system does not support cold= reset. -**/ -VOID -EFIAPI -ResetCold ( - VOID - ); - -/** - This function causes a system-wide initialization (warm reset), in which= all processors - are set to their initial state. Pending cycles are not corrupted. - - If this function returns, it means that the system does not support warm= reset. -**/ -VOID -EFIAPI -ResetWarm ( - VOID - ); - -/** - This function causes the system to enter a power state equivalent - to the ACPI G2/S5 or G3 states. - - If this function returns, it means that the system does not support shut= down reset. -**/ -VOID -EFIAPI -ResetShutdown ( - VOID - ); - -/** - This function causes the system to enter S3 and then wake up immediately. - - If this function returns, it means that the system does not support S3 f= eature. -**/ -VOID -EFIAPI -EnterS3WithImmediateWake ( - VOID - ); - -#endif --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51320): https://edk2.groups.io/g/devel/message/51320 Mute This Topic: https://groups.io/mt/62194086/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 00:08:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51321+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51321+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1574823419; cv=none; d=zohomail.com; s=zohoarc; b=jLy3MZWeUlrYnBjDIwjJHHQPuPtukle6EgSi6GservT+B7ZNODrHe+/DLxVOX9qBxK0aiONQIHTV9YCsOd7TFdCa8kb/k9Rsk72yTMrKTQtwnX1zHfKzKu9uDMVvlEgj/x5Y6ky7P8F2ljlI79A2Es21UfI9ULQvs01d2+9zUVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574823419; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=j5gZrU6GSu0N2YhW0iK5PqZQg1e54dmylhsE4v+FeTM=; b=G3rMHd6YzCi6+1UzInJ7cJf/ZKsBhqYRd+r1WBbYgdGL35yUQYUGUFcW3x6TRLMCHr0TkHvh6zS2v/jdJhUmKxFRE63vamRN11pwu3ZTAJ/sy0a+1FRZm0DQFbmQrB1GMxGasiWQeGxd4EvEL+0Mtia5YUemw2JCS22uhDgk7m0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51321+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574823419445295.2063332312779; Tue, 26 Nov 2019 18:56:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id zRs4YY1788612x6Vb8SPVSe7; Tue, 26 Nov 2019 18:56:59 -0800 X-Received: from mga09.intel.com (mga09.intel.com []) by mx.groups.io with SMTP id smtpd.web09.821.1574823410057638827 for ; Tue, 26 Nov 2019 18:56:58 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 18:56:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,247,1571727600"; d="scan'208";a="383357762" X-Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga005.jf.intel.com with ESMTP; 26 Nov 2019 18:56:58 -0800 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Sai Chaganty , Chasel Chiu , Nate DeSimone , Zhichao Gao Subject: [edk2-devel] [edk2-platforms][PATCH V1 2/2] KabylakeSiliconPkg: Remove redundant ResetSystem() implementation Date: Tue, 26 Nov 2019 18:56:43 -0800 Message-Id: <20191127025643.32056-3-michael.a.kubacki@intel.com> In-Reply-To: <20191127025643.32056-1-michael.a.kubacki@intel.com> References: <20191127025643.32056-1-michael.a.kubacki@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.a.kubacki@intel.com X-Gm-Message-State: VeHoHyzhrt4YEtyaITXySnNnx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574823419; bh=Abs0tdg1SUiCiRf8SVMEcEJ1f4OOFniHulImp95PG4k=; h=Cc:Date:From:Reply-To:Subject:To; b=U2gp2Jk+af5lty8ZvbQf2DsbmbDkR0FHesjc9phyDR4ZVFwkJQbo38Ms75ZDukEea// NMR6eRmAdWdZXcDtEiuc8o2tAFVhsSWxtRdJdXSFsi5NC/o5y1NA5PuoxY1Akg7Y2IaQV +KFVTqgbihzflsz5HXmA+XTAmta7ETKnYAM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 linker. The failure did not reproduce in VS2015 so it persisted until now. This change removes the pre-existing implementation of ResetSystem () in PchReset.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 Reviewed-by: Chasel Chiu Reviewed-by: Nate DeSimone --- 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/PchReset.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 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/PeiRes= etSystemLib.c @@ -317,5 +317,10 @@ ResetSystem ( default: return; } + + // + // Given we should have reset getting here would be bad + // + ASSERT (FALSE); } =20 --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51321): https://edk2.groups.io/g/devel/message/51321 Mute This Topic: https://groups.io/mt/62194129/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-