[edk2-devel] [edk2-platforms][PATCH V2 12/15] KabylakeOpenBoardPkg: Add board ID to Global NVS

Kubacki, Michael A posted 15 patches 6 years, 4 months ago
Only 14 patches received!
[edk2-devel] [edk2-platforms][PATCH V2 12/15] KabylakeOpenBoardPkg: Add board ID to Global NVS
Posted by Kubacki, Michael A 6 years, 4 months ago
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 <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Jeremy Soller <jeremy@system76.com>
Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
---
 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.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
 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.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
 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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#47986): https://edk2.groups.io/g/devel/message/47986
Mute This Topic: https://groups.io/mt/34279351/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms][PATCH V2 12/15] KabylakeOpenBoardPkg: Add board ID to Global NVS
Posted by Chiu, Chasel 6 years, 4 months ago
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

> -----Original Message-----
> From: Kubacki, Michael A <michael.a.kubacki@intel.com>
> Sent: Wednesday, September 25, 2019 2:13 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>;
> Jeremy Soller <jeremy@system76.com>
> Subject: [edk2-platforms][PATCH V2 12/15] KabylakeOpenBoardPkg: Add
> board ID to Global NVS
> 
> 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 <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Ankit Sinha <ankit.sinha@intel.com>
> Cc: Jeremy Soller <jeremy@system76.com>
> Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
> ---
>  Platform/Intel/KabylakeOpenBoardPkg/Include/Acpi/GlobalNvsAreaDef.h
> | 3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/Dx
> eGalagoPro3AcpiTableLib.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.<BR>
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  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/BoardAcpiLi
> +++ b/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/BoardAcpiLi
> b/DxeKabylakeRvp3AcpiTableLib.c
> index 154d859090..eceac3d037 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeKabylakeRvp3AcpiTableLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpi
> +++ Lib/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.<BR>
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#48027): https://edk2.groups.io/g/devel/message/48027
Mute This Topic: https://groups.io/mt/34279351/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-