From nobody Sun Feb 8 22:58:09 2026 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-