From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.2113.1626168428500440481 for ; Tue, 13 Jul 2021 02:27:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="197404476" X-IronPort-AV: E=Sophos;i="5.84,236,1620716400"; d="scan'208";a="197404476" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2021 02:27:01 -0700 X-IronPort-AV: E=Sophos;i="5.84,236,1620716400"; d="scan'208";a="502994045" Received: from nldesimo-desk1.amr.corp.intel.com ([10.209.47.40]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2021 02:27:01 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Chasel Chiu , Jeremy Soller , Michael Kubacki , Benjamin Doron Subject: [edk2-platforms][PATCH V1] KabylakeOpenBoardPkg: Implement the PEI Reset Services Date: Tue, 13 Jul 2021 02:26:48 -0700 Message-Id: <20210713092648.2222-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This change implements the ResetSystem and ResetSystem2 PEI services for KabylakeRvp3 and GalagoPro3. The invocation of PchInitializeReset() was missing from BoardInitLib. Signed-off-by: Nate DeSimone Cc: Chasel Chiu Cc: Jeremy Soller Cc: Michael Kubacki Cc: Benjamin Doron --- .../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 3 ++- .../BoardInitLib/PeiGalagoPro3InitPreMemLib.c | 8 +++++++- .../BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 3 ++- .../Library/BoardInitLib/PeiBoardInitPreMemLib.inf | 3 ++- .../BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c | 13 +++++++++++-- .../BoardInitLib/PeiMultiBoardInitPreMemLib.inf | 3 ++- 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf index e4b783684f..d6c91cd2b9 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf @@ -1,7 +1,7 @@ ## @file # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library # -# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2021 Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -22,6 +22,7 @@ MemoryAllocationLib PcdLib SiliconInitLib + PchResetLib [Packages] MinPlatformPkg/MinPlatformPkg.dec diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiGalagoPro3InitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiGalagoPro3InitPreMemLib.c index ca32ab2514..6bf77a2af0 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiGalagoPro3InitPreMemLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiGalagoPro3InitPreMemLib.c @@ -1,7 +1,7 @@ /** @file System 76 GalagoPro3 board pre-memory initialization. -Copyright (c) 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -209,6 +209,12 @@ GalagoPro3BoardInitBeforeMemoryInit ( /// SiliconInit (); + // + // Install PCH RESET PPI and EFI RESET2 PeiService + // + Status = PchInitializeReset (); + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; } diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf index d866f59338..fe31f42135 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf @@ -1,7 +1,7 @@ ## @file # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library # -# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2021 Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -24,6 +24,7 @@ PcdLib SiliconInitLib MultiBoardInitSupportLib + PchResetLib [Packages] MinPlatformPkg/MinPlatformPkg.dec diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf index d0cdba666f..850fc51418 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf @@ -1,7 +1,7 @@ ## @file # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem Library # -# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2021 Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -23,6 +23,7 @@ PcdLib SiliconInitLib EcLib + PchResetLib [Packages] MinPlatformPkg/MinPlatformPkg.dec diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c index 8f2e036356..d34b0be3c7 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitPreMemLib.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -28,6 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include +#include #include "PeiKabylakeRvp3InitLib.h" @@ -282,6 +283,8 @@ KabylakeRvp3BoardInitBeforeMemoryInit ( VOID ) { + EFI_STATUS Status; + if (LibPcdGetSku () == BoardIdKabyLakeYLpddr3Rvp3) { KabylakeRvp3InitPreMem (); } else if (LibPcdGetSku () == BoardIdSkylakeRvp3) { @@ -297,12 +300,18 @@ KabylakeRvp3BoardInitBeforeMemoryInit ( GpioInitPreMem (); SioInit (); - + /// /// Do basic PCH init /// SiliconInit (); + // + // Install PCH RESET PPI and EFI RESET2 PeiService + // + Status = PchInitializeReset (); + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; } diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf index a51712ac34..23fe6b6f03 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf @@ -1,7 +1,7 @@ ## @file # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem Library # -# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2021 Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -25,6 +25,7 @@ SiliconInitLib MultiBoardInitSupportLib EcLib + PchResetLib [Packages] MinPlatformPkg/MinPlatformPkg.dec -- 2.27.0.windows.1