From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.a.kubacki@intel.com) Received: from mga03.intel.com (mga03.intel.com []) by groups.io with SMTP; Tue, 24 Sep 2019 11:13:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Sep 2019 11:13:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,545,1559545200"; d="scan'208";a="340160782" Received: from makuback-desk1.amr.corp.intel.com ([10.7.159.162]) by orsmga004.jf.intel.com with ESMTP; 24 Sep 2019 11:13:29 -0700 From: "Kubacki, Michael A" To: devel@edk2.groups.io Cc: Chasel Chiu , Nate DeSimone , Ankit Sinha , Jeremy Soller Subject: [edk2-platforms][PATCH V2 12/15] KabylakeOpenBoardPkg: Add board ID to Global NVS Date: Tue, 24 Sep 2019 11:12:45 -0700 Message-Id: <20190924181248.12816-13-michael.a.kubacki@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20190924181248.12816-1-michael.a.kubacki@intel.com> References: <20190924181248.12816-1-michael.a.kubacki@intel.com> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2207 Adds the board ID as a field in global NVS (BDID) to allow ACPI code to take conditional actions based on the active board. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Ankit Sinha Cc: Jeremy Soller Signed-off-by: Michael Kubacki --- Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h | 3 ++- Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c | 2 ++ Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c | 2 ++ Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h index 93c5a0b55a..3d0a3f4ed8 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h @@ -1,7 +1,7 @@ /** @file ACPI DSDT table -Copyright (c) 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -111,6 +111,7 @@ typedef struct { UINT8 TbtNativeOsHotPlug; ///< Offset 81 TbtNativeOsHotPlug UINT8 TbtSelector; ///< Offset 82 Thunderbolt(TM) Root port selector UINT8 TbtSelector1; ///< Offset 83 Thunderbolt(TM) Root port selector + UINT8 BoardId; ///< Offset 84 Board ID } EFI_GLOBAL_NVS_AREA; #pragma pack(pop) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c index b9386d59b8..5b36f6dfb3 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c @@ -56,6 +56,8 @@ GalagoPro3UpdateGlobalNvs ( mGlobalNvsArea.Area->Ps2MouseEnable = PcdGet8 (PcdPs2KbMsEnable); mGlobalNvsArea.Area->Ps2KbMsEnable = PcdGet8 (PcdPs2KbMsEnable); + + mGlobalNvsArea.Area->BoardId = (UINT8) LibPcdGetSku (); } EFI_STATUS diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c index 154d859090..eceac3d037 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c @@ -56,6 +56,8 @@ KabylakeRvp3UpdateGlobalNvs ( mGlobalNvsArea.Area->Ps2MouseEnable = FALSE; mGlobalNvsArea.Area->Ps2KbMsEnable = PcdGet8 (PcdPs2KbMsEnable); + + mGlobalNvsArea.Area->BoardId = (UINT8) LibPcdGetSku (); } EFI_STATUS diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl index e0ff9d9bf5..92b4bc1e53 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl +++ b/Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvs.asl @@ -1,7 +1,7 @@ /** @file ACPI DSDT table -Copyright (c) 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -111,4 +111,5 @@ SPDX-License-Identifier: BSD-2-Clause-Patent Offset(81), TNAT, 8, // Offset(81), TbtNativeOsHotPlug Offset(82), TBSE, 8, // Offset(82), Thunderbolt(TM) Root port selector Offset(83), TBS1, 8, // Offset(83), Thunderbolt(TM) Root port selector + Offset(84), BDID, 8, // Offset(84), Board ID } -- 2.16.2.windows.1