[PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

[PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

[Abdul Lateef Attar]

Adds initial DEC and DSC file for MinBoardPkg.
This package provides supporting modules for AMD boards to
leverage MinPlatformPkg framework.

Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Abner Chang <abner.chang@amd.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/AMD/MinBoardPkg/MinBoardPkg.dec | 19 +++++++++++++++++++
 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc | 21 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dec
 create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc

diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dec b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
new file mode 100644
index 000000000000..23d737d196a2
--- /dev/null
+++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
@@ -0,0 +1,19 @@
+## @file MinBoardPkg.dec
+#  Declaration file for AMD's MinBoardPkg.
+#
+#  This package supports AMD processor family based board as per the MinPlatform
+#  Arch specification.
+#
+#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#  @par Specification Reference:
+#   -https://tianocore-docs.github.io/edk2-MinimumPlatformSpecification/draft/ 0.7
+##
+
+[Defines]
+  DEC_SPECIFICATION              = 1.27
+  PACKAGE_NAME                   = MinBoardPkg
+  PACKAGE_GUID                   = 44F9D761-9ECB-43DD-A5AC-177E5048701B
+  PACKAGE_VERSION                = 0.1
+
diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
new file mode 100644
index 000000000000..8c120c0649e7
--- /dev/null
+++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
@@ -0,0 +1,21 @@
+## @file
+#  MinBoardPkg.dsc
+#
+#  Description file for AMD MinBoardPkg
+#
+#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+
+[Defines]
+  DSC_SPECIFICATION           = 1.30
+  PLATFORM_GUID               = 88F8A9AE-2FA0-4D58-A6F9-05F635C05F4E
+  PLATFORM_NAME               = MinBoardPkg
+  PLATFORM_VERSION            = 0.1
+  OUTPUT_DIRECTORY            = Build/$(PLATFORM_NAME)
+  BUILD_TARGETS               = DEBUG | RELEASE | NOOPT
+  SUPPORTED_ARCHITECTURES     = IA32 | X64
+
+[Packages]
+  MinBoardPkg/MinBoardPkg.dec
+
-- 
2.25.1

[PATCH v3 2/3] Platform/AMD/MinBoardPkg: Adds SetCacheMtrrLib library

[Abdul Lateef Attar]

Adds SetCacheMtrrLib library for MinBoardPkg,
which sets MTRR values for PEI phase and also
modifies the MTRR value at the end of PEI phase.

Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Abner Chang <abner.chang@amd.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc      |   9 ++
 .../SetCacheMtrrLib/SetCacheMtrrLib.inf       |  37 +++++
 .../Library/SetCacheMtrrLib/SetCacheMtrrLib.c | 133 ++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
 create mode 100644 Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c

diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
index 8c120c0649e7..810fac7aa9de 100644
--- a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
+++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
@@ -17,5 +17,14 @@ [Defines]
   SUPPORTED_ARCHITECTURES     = IA32 | X64
 
 [Packages]
+  MdePkg/MdePkg.dec
   MinBoardPkg/MinBoardPkg.dec
+  MinPlatformPkg/MinPlatformPkg.dec
+  UefiCpuPkg/UefiCpuPkg.dec
+
+[LibraryClasses.common.PEIM]
+  SetCacheMtrrLib|MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
+
+[Components.IA32]
+  MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
 
diff --git a/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
new file mode 100644
index 000000000000..add2e71651f9
--- /dev/null
+++ b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
@@ -0,0 +1,37 @@
+## @file
+# Component information file for Platform SetCacheMtrr Library.
+# This library implementation is for AMD processor based platforms.
+#
+# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.<BR>
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[Defines]
+  INF_VERSION                    = 1.29
+  BASE_NAME                      = PeiSetCacheMtrrLib
+  FILE_GUID                      = 1E8468E0-5EB4-4088-9B52-BFDC6E4DAE87
+  MODULE_TYPE                    = PEIM
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = SetCacheMtrrLib
+
+[LibraryClasses]
+  BaseLib
+  DebugLib
+  MtrrLib
+
+[Packages]
+  MdePkg/MdePkg.dec
+  MinPlatformPkg/MinPlatformPkg.dec
+  UefiCpuPkg/UefiCpuPkg.dec
+
+[Sources]
+  SetCacheMtrrLib.c
+
+[Guids]
+
+[Pcd]
+  gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress
+  gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
+
diff --git a/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
new file mode 100644
index 000000000000..33b774fedbd3
--- /dev/null
+++ b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
@@ -0,0 +1,133 @@
+/** @file
+
+SetCacheMtrr library functions.
+This library implementation is for AMD processor based platforms.
+
+Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.<BR>
+
+SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Uefi.h>
+#include <PiPei.h>
+#include <Library/DebugLib.h>
+#include <Library/MtrrLib.h>
+
+/**
+  This function sets the cache MTRR values for PEI phase.
+**/
+VOID
+EFIAPI
+SetCacheMtrr (
+  VOID
+  )
+{
+  EFI_STATUS  Status;
+
+  Status = MtrrSetMemoryAttribute (
+             0,
+             0xA0000,
+             CacheWriteBack
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "Error(%r) in setting CacheWriteBack for 0-0x9FFFF\n",
+      Status
+      ));
+  }
+
+  Status = MtrrSetMemoryAttribute (
+             0xA0000,
+             0x20000,
+             CacheUncacheable
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "Error(%r) in setting CacheUncacheable for 0xA0000-0xBFFFF\n",
+      Status
+      ));
+  }
+
+  Status = MtrrSetMemoryAttribute (
+             0xC0000,
+             0x40000,
+             CacheWriteProtected
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "Error(%r) in setting CacheWriteProtected for 0xC0000-0xFFFFF\n",
+      Status
+      ));
+  }
+
+  Status = MtrrSetMemoryAttribute (
+             0x100000,
+             0xAFF00000,
+             CacheWriteBack
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "Error(%r) in setting CacheWriteBack for 0x100000-0xAFFFFFFF\n",
+      Status
+      ));
+  }
+
+  Status = MtrrSetMemoryAttribute (
+             PcdGet32 (PcdFlashAreaBaseAddress),
+             PcdGet32 (PcdFlashAreaSize),
+             CacheWriteProtected
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "Error(%r) in setting CacheWriteProtected for 0x%X-0x%X\n",
+      Status,
+      PcdGet32 (PcdFlashAreaBaseAddress),
+      PcdGet32 (PcdFlashAreaBaseAddress) + PcdGet32 (PcdFlashAreaSize)
+      ));
+  }
+
+  MtrrDebugPrintAllMtrrs ();
+  return;
+}
+
+/**
+  Update MTRR setting in EndOfPei phase.
+  This function will set the MTRR value as CacheUncacheable
+  for Flash address.
+
+  @retval  EFI_SUCCESS  The function completes successfully.
+  @retval  Others       Some error occurs.
+**/
+EFI_STATUS
+EFIAPI
+SetCacheMtrrAfterEndOfPei (
+  VOID
+  )
+{
+  EFI_STATUS  Status;
+
+  Status = MtrrSetMemoryAttribute (
+             PcdGet32 (PcdFlashAreaBaseAddress),
+             PcdGet32 (PcdFlashAreaSize),
+             CacheUncacheable
+             );
+  if (EFI_ERROR (Status)) {
+    DEBUG ((
+      DEBUG_ERROR,
+      "Error(%r) in setting CacheUncacheable for 0x%X-0x%X\n",
+      Status,
+      PcdGet32 (PcdFlashAreaBaseAddress),
+      PcdGet32 (PcdFlashAreaBaseAddress) + PcdGet32 (PcdFlashAreaSize)
+      ));
+  }
+
+  MtrrDebugPrintAllMtrrs ();
+  return EFI_SUCCESS;
+}
+
-- 
2.25.1

[PATCH v3 3/3] Maintainers.txt: Adds AMD/MinBoardPkg maintainers

[Abdul Lateef Attar]

From: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>

Adds maintainers for AMD/MinBoardPkg

Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Abner Chang <abner.chang@amd.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
---
 Maintainers.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Maintainers.txt b/Maintainers.txt
index 747191366070..3ce578abcf7e 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -91,6 +91,11 @@ F: Silicon/AMD/Styx/
 M: Ard Biesheuvel <ardb+tianocore@kernel.org>
 M: Leif Lindholm <quic_llindhol@quicinc.com>
 
+AMD MinBoard package for MinPlatformPkg
+F: Platform/AMD/MinBoardPkg
+M: Abner Chang <abner.chang@amd.com>
+M: Abdul Lateef Attar <abdattar@amd.com>
+
 Ampere Computing
 F: Platform/Ampere
 F: Silicon/Ampere
-- 
2.25.1

Re: [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

[Chang, Abner]

[AMD Official Use Only - General]

Reviewed-by: Abner Chang <abner.chang@amd.com>

> -----Original Message-----
> From: Abdul Lateef Attar <abdattar@amd.com>
> Sent: Thursday, March 23, 2023 2:14 PM
> To: devel@edk2.groups.io
> Cc: Attar, AbdulLateef (Abdul Lateef) <AbdulLateef.Attar@amd.com>; Ard
> Biesheuvel <ardb+tianocore@kernel.org>; Leif Lindholm
> <quic_llindhol@quicinc.com>; Chang, Abner <Abner.Chang@amd.com>;
> Michael D Kinney <michael.d.kinney@intel.com>
> Subject: [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support
> MinPlatformPkg
> 
> Adds initial DEC and DSC file for MinBoardPkg.
> This package provides supporting modules for AMD boards to
> leverage MinPlatformPkg framework.
> 
> Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Abner Chang <abner.chang@amd.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Platform/AMD/MinBoardPkg/MinBoardPkg.dec | 19
> +++++++++++++++++++
>  Platform/AMD/MinBoardPkg/MinBoardPkg.dsc | 21
> +++++++++++++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dec
>  create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> 
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> new file mode 100644
> index 000000000000..23d737d196a2
> --- /dev/null
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> @@ -0,0 +1,19 @@
> +## @file MinBoardPkg.dec
> +#  Declaration file for AMD's MinBoardPkg.
> +#
> +#  This package supports AMD processor family based board as per the
> MinPlatform
> +#  Arch specification.
> +#
> +#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +#  @par Specification Reference:
> +#   -https://tianocore-docs.github.io/edk2-
> MinimumPlatformSpecification/draft/ 0.7
> +##
> +
> +[Defines]
> +  DEC_SPECIFICATION              = 1.27
> +  PACKAGE_NAME                   = MinBoardPkg
> +  PACKAGE_GUID                   = 44F9D761-9ECB-43DD-A5AC-177E5048701B
> +  PACKAGE_VERSION                = 0.1
> +
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> new file mode 100644
> index 000000000000..8c120c0649e7
> --- /dev/null
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> @@ -0,0 +1,21 @@
> +## @file
> +#  MinBoardPkg.dsc
> +#
> +#  Description file for AMD MinBoardPkg
> +#
> +#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
> +##
> +
> +[Defines]
> +  DSC_SPECIFICATION           = 1.30
> +  PLATFORM_GUID               = 88F8A9AE-2FA0-4D58-A6F9-05F635C05F4E
> +  PLATFORM_NAME               = MinBoardPkg
> +  PLATFORM_VERSION            = 0.1
> +  OUTPUT_DIRECTORY            = Build/$(PLATFORM_NAME)
> +  BUILD_TARGETS               = DEBUG | RELEASE | NOOPT
> +  SUPPORTED_ARCHITECTURES     = IA32 | X64
> +
> +[Packages]
> +  MinBoardPkg/MinBoardPkg.dec
> +
> --
> 2.25.1

Re: [PATCH v3 3/3] Maintainers.txt: Adds AMD/MinBoardPkg maintainers

[Chang, Abner]

[AMD Official Use Only - General]

Reviewed-by: Abner Chang <abner.chang@amd.com>

> -----Original Message-----
> From: Abdul Lateef Attar <abdattar@amd.com>
> Sent: Thursday, March 23, 2023 2:14 PM
> To: devel@edk2.groups.io
> Cc: Attar, AbdulLateef (Abdul Lateef) <AbdulLateef.Attar@amd.com>; Attar,
> AbdulLateef (Abdul Lateef) <AbdulLateef.Attar@amd.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Leif Lindholm <quic_llindhol@quicinc.com>;
> Chang, Abner <Abner.Chang@amd.com>; Michael D Kinney
> <michael.d.kinney@intel.com>
> Subject: [PATCH v3 3/3] Maintainers.txt: Adds AMD/MinBoardPkg
> maintainers
> 
> From: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>
> 
> Adds maintainers for AMD/MinBoardPkg
> 
> Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Abner Chang <abner.chang@amd.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Maintainers.txt | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt index
> 747191366070..3ce578abcf7e 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -91,6 +91,11 @@ F: Silicon/AMD/Styx/
>  M: Ard Biesheuvel <ardb+tianocore@kernel.org>
>  M: Leif Lindholm <quic_llindhol@quicinc.com>
> 
> +AMD MinBoard package for MinPlatformPkg
> +F: Platform/AMD/MinBoardPkg
> +M: Abner Chang <abner.chang@amd.com>
> +M: Abdul Lateef Attar <abdattar@amd.com>
> +
>  Ampere Computing
>  F: Platform/Ampere
>  F: Silicon/Ampere
> --
> 2.25.1

Re: [PATCH v3 2/3] Platform/AMD/MinBoardPkg: Adds SetCacheMtrrLib library

[Chang, Abner]

[AMD Official Use Only - General]

Hi Abdul, one comment below,

> -----Original Message-----
> From: Abdul Lateef Attar <abdattar@amd.com>
> Sent: Thursday, March 23, 2023 2:14 PM
> To: devel@edk2.groups.io
> Cc: Attar, AbdulLateef (Abdul Lateef) <AbdulLateef.Attar@amd.com>; Ard
> Biesheuvel <ardb+tianocore@kernel.org>; Leif Lindholm
> <quic_llindhol@quicinc.com>; Chang, Abner <Abner.Chang@amd.com>;
> Michael D Kinney <michael.d.kinney@intel.com>
> Subject: [PATCH v3 2/3] Platform/AMD/MinBoardPkg: Adds SetCacheMtrrLib
> library
> 
> Adds SetCacheMtrrLib library for MinBoardPkg, which sets MTRR values for
> PEI phase and also modifies the MTRR value at the end of PEI phase.
> 
> Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Abner Chang <abner.chang@amd.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Platform/AMD/MinBoardPkg/MinBoardPkg.dsc      |   9 ++
>  .../SetCacheMtrrLib/SetCacheMtrrLib.inf       |  37 +++++
>  .../Library/SetCacheMtrrLib/SetCacheMtrrLib.c | 133 ++++++++++++++++++
>  3 files changed, 179 insertions(+)
>  create mode 100644
> Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
>  create mode 100644
> Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
> 
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> index 8c120c0649e7..810fac7aa9de 100644
> --- a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> @@ -17,5 +17,14 @@ [Defines]
>    SUPPORTED_ARCHITECTURES     = IA32 | X64
> 
>  [Packages]
> +  MdePkg/MdePkg.dec
>    MinBoardPkg/MinBoardPkg.dec
> +  MinPlatformPkg/MinPlatformPkg.dec
> +  UefiCpuPkg/UefiCpuPkg.dec
> +
> +[LibraryClasses.common.PEIM]
> +
> +SetCacheMtrrLib|MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.i
> nf
> +
> +[Components.IA32]
> +  MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.inf
> 
> diff --git
> a/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.in
> f
> b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.in
> f
> new file mode 100644
> index 000000000000..add2e71651f9
> --- /dev/null
> +++
> b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.i
> +++ nf
> @@ -0,0 +1,37 @@
> +## @file
> +# Component information file for Platform SetCacheMtrr Library.
> +# This library implementation is for AMD processor based platforms.
> +#
> +# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights
> +reserved.<BR> # # SPDX-License-Identifier: BSD-2-Clause-Patent # ##
> +
> +[Defines]
> +  INF_VERSION                    = 1.29
> +  BASE_NAME                      = PeiSetCacheMtrrLib
> +  FILE_GUID                      = 1E8468E0-5EB4-4088-9B52-BFDC6E4DAE87
> +  MODULE_TYPE                    = PEIM
> +  VERSION_STRING                 = 1.0
> +  LIBRARY_CLASS                  = SetCacheMtrrLib
> +
> +[LibraryClasses]
> +  BaseLib
> +  DebugLib
> +  MtrrLib
> +
> +[Packages]
> +  MdePkg/MdePkg.dec
> +  MinPlatformPkg/MinPlatformPkg.dec
> +  UefiCpuPkg/UefiCpuPkg.dec
> +
> +[Sources]
> +  SetCacheMtrrLib.c
> +
> +[Guids]
We can remove this section if no reference to any GUIDs.
You don't have to send another version of patch to address this comment, just update this file before you pushing it to edk2-platforms.

Reviewed-by: Abner Chang <abner.chang@amd.com>
Thanks
Abner
> +
> +[Pcd]
> +  gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress
> +  gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
> +
> diff --git
> a/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
> b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
> new file mode 100644
> index 000000000000..33b774fedbd3
> --- /dev/null
> +++
> b/Platform/AMD/MinBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
> @@ -0,0 +1,133 @@
> +/** @file
> +
> +SetCacheMtrr library functions.
> +This library implementation is for AMD processor based platforms.
> +
> +Copyright (C) 2023 Advanced Micro Devices, Inc. All rights
> +reserved.<BR>
> +
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +**/
> +
> +#include <Uefi.h>
> +#include <PiPei.h>
> +#include <Library/DebugLib.h>
> +#include <Library/MtrrLib.h>
> +
> +/**
> +  This function sets the cache MTRR values for PEI phase.
> +**/
> +VOID
> +EFIAPI
> +SetCacheMtrr (
> +  VOID
> +  )
> +{
> +  EFI_STATUS  Status;
> +
> +  Status = MtrrSetMemoryAttribute (
> +             0,
> +             0xA0000,
> +             CacheWriteBack
> +             );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((
> +      DEBUG_ERROR,
> +      "Error(%r) in setting CacheWriteBack for 0-0x9FFFF\n",
> +      Status
> +      ));
> +  }
> +
> +  Status = MtrrSetMemoryAttribute (
> +             0xA0000,
> +             0x20000,
> +             CacheUncacheable
> +             );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((
> +      DEBUG_ERROR,
> +      "Error(%r) in setting CacheUncacheable for 0xA0000-0xBFFFF\n",
> +      Status
> +      ));
> +  }
> +
> +  Status = MtrrSetMemoryAttribute (
> +             0xC0000,
> +             0x40000,
> +             CacheWriteProtected
> +             );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((
> +      DEBUG_ERROR,
> +      "Error(%r) in setting CacheWriteProtected for 0xC0000-0xFFFFF\n",
> +      Status
> +      ));
> +  }
> +
> +  Status = MtrrSetMemoryAttribute (
> +             0x100000,
> +             0xAFF00000,
> +             CacheWriteBack
> +             );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((
> +      DEBUG_ERROR,
> +      "Error(%r) in setting CacheWriteBack for 0x100000-0xAFFFFFFF\n",
> +      Status
> +      ));
> +  }
> +
> +  Status = MtrrSetMemoryAttribute (
> +             PcdGet32 (PcdFlashAreaBaseAddress),
> +             PcdGet32 (PcdFlashAreaSize),
> +             CacheWriteProtected
> +             );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((
> +      DEBUG_ERROR,
> +      "Error(%r) in setting CacheWriteProtected for 0x%X-0x%X\n",
> +      Status,
> +      PcdGet32 (PcdFlashAreaBaseAddress),
> +      PcdGet32 (PcdFlashAreaBaseAddress) + PcdGet32 (PcdFlashAreaSize)
> +      ));
> +  }
> +
> +  MtrrDebugPrintAllMtrrs ();
> +  return;
> +}
> +
> +/**
> +  Update MTRR setting in EndOfPei phase.
> +  This function will set the MTRR value as CacheUncacheable
> +  for Flash address.
> +
> +  @retval  EFI_SUCCESS  The function completes successfully.
> +  @retval  Others       Some error occurs.
> +**/
> +EFI_STATUS
> +EFIAPI
> +SetCacheMtrrAfterEndOfPei (
> +  VOID
> +  )
> +{
> +  EFI_STATUS  Status;
> +
> +  Status = MtrrSetMemoryAttribute (
> +             PcdGet32 (PcdFlashAreaBaseAddress),
> +             PcdGet32 (PcdFlashAreaSize),
> +             CacheUncacheable
> +             );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((
> +      DEBUG_ERROR,
> +      "Error(%r) in setting CacheUncacheable for 0x%X-0x%X\n",
> +      Status,
> +      PcdGet32 (PcdFlashAreaBaseAddress),
> +      PcdGet32 (PcdFlashAreaBaseAddress) + PcdGet32 (PcdFlashAreaSize)
> +      ));
> +  }
> +
> +  MtrrDebugPrintAllMtrrs ();
> +  return EFI_SUCCESS;
> +}
> +
> --
> 2.25.1

Re: [edk2-devel] [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

[Sean]

Regardless of directory path I would suggest that all "Packages" have a 
unique and descriptive name.  MinBoardPkg doesn't meet that 
suggestion.   If/when the edk2 CI tools run I would expect problems/odd 
behavior if two packages collide in naming.

Thanks

Sean



On 3/22/2023 11:13 PM, Abdul Lateef Attar via groups.io wrote:
> Adds initial DEC and DSC file for MinBoardPkg.
> This package provides supporting modules for AMD boards to
> leverage MinPlatformPkg framework.
>
> Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Abner Chang <abner.chang@amd.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>   Platform/AMD/MinBoardPkg/MinBoardPkg.dec | 19 +++++++++++++++++++
>   Platform/AMD/MinBoardPkg/MinBoardPkg.dsc | 21 +++++++++++++++++++++
>   2 files changed, 40 insertions(+)
>   create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dec
>   create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
>
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dec b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> new file mode 100644
> index 000000000000..23d737d196a2
> --- /dev/null
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> @@ -0,0 +1,19 @@
> +## @file MinBoardPkg.dec
> +#  Declaration file for AMD's MinBoardPkg.
> +#
> +#  This package supports AMD processor family based board as per the MinPlatform
> +#  Arch specification.
> +#
> +#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +#  @par Specification Reference:
> +#   -https://tianocore-docs.github.io/edk2-MinimumPlatformSpecification/draft/ 0.7
> +##
> +
> +[Defines]
> +  DEC_SPECIFICATION              = 1.27
> +  PACKAGE_NAME                   = MinBoardPkg
> +  PACKAGE_GUID                   = 44F9D761-9ECB-43DD-A5AC-177E5048701B
> +  PACKAGE_VERSION                = 0.1
> +
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> new file mode 100644
> index 000000000000..8c120c0649e7
> --- /dev/null
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> @@ -0,0 +1,21 @@
> +## @file
> +#  MinBoardPkg.dsc
> +#
> +#  Description file for AMD MinBoardPkg
> +#
> +#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
> +##
> +
> +[Defines]
> +  DSC_SPECIFICATION           = 1.30
> +  PLATFORM_GUID               = 88F8A9AE-2FA0-4D58-A6F9-05F635C05F4E
> +  PLATFORM_NAME               = MinBoardPkg
> +  PLATFORM_VERSION            = 0.1
> +  OUTPUT_DIRECTORY            = Build/$(PLATFORM_NAME)
> +  BUILD_TARGETS               = DEBUG | RELEASE | NOOPT
> +  SUPPORTED_ARCHITECTURES     = IA32 | X64
> +
> +[Packages]
> +  MinBoardPkg/MinBoardPkg.dec
> +

Re: [edk2-devel] [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

[Chang, Abner]

[AMD Official Use Only - General]

Hi Sean,
Could you please elaborate more about the issue of package name collision? CI tool may have problem if same package name under two different folders (such as Intel/MinBoardPkg and AMD/MinBoardPkg)?
MinBoardPkg is under AMD folder which seems to me that package is for AMD specifically.
Thanks
Abner


> -----Original Message-----
> From: Sean Brogan <spbrogan@outlook.com>
> Sent: Saturday, April 1, 2023 4:20 AM
> To: devel@edk2.groups.io; Attar, AbdulLateef (Abdul Lateef)
> <AbdulLateef.Attar@amd.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Leif Lindholm
> <quic_llindhol@quicinc.com>; Chang, Abner <Abner.Chang@amd.com>;
> Michael D Kinney <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg
> to support MinPlatformPkg
> 
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
> 
> 
> Regardless of directory path I would suggest that all "Packages" have a
> unique and descriptive name.  MinBoardPkg doesn't meet that
> suggestion.   If/when the edk2 CI tools run I would expect problems/odd
> behavior if two packages collide in naming.
> 
> Thanks
> 
> Sean
> 
> 
> 
> On 3/22/2023 11:13 PM, Abdul Lateef Attar via groups.io wrote:
> > Adds initial DEC and DSC file for MinBoardPkg.
> > This package provides supporting modules for AMD boards to leverage
> > MinPlatformPkg framework.
> >
> > Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
> > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> > Cc: Abner Chang <abner.chang@amd.com>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >   Platform/AMD/MinBoardPkg/MinBoardPkg.dec | 19
> +++++++++++++++++++
> >   Platform/AMD/MinBoardPkg/MinBoardPkg.dsc | 21
> +++++++++++++++++++++
> >   2 files changed, 40 insertions(+)
> >   create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> >   create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> >
> > diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> > b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> > new file mode 100644
> > index 000000000000..23d737d196a2
> > --- /dev/null
> > +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> > @@ -0,0 +1,19 @@
> > +## @file MinBoardPkg.dec
> > +#  Declaration file for AMD's MinBoardPkg.
> > +#
> > +#  This package supports AMD processor family based board as per the
> > +MinPlatform #  Arch specification.
> > +#
> > +#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
> > +#  SPDX-License-Identifier: BSD-2-Clause-Patent # #  @par
> > +Specification Reference:
> > +#   -https://tianocore-docs.github.io/edk2-
> MinimumPlatformSpecification/draft/ 0.7
> > +##
> > +
> > +[Defines]
> > +  DEC_SPECIFICATION              = 1.27
> > +  PACKAGE_NAME                   = MinBoardPkg
> > +  PACKAGE_GUID                   = 44F9D761-9ECB-43DD-A5AC-177E5048701B
> > +  PACKAGE_VERSION                = 0.1
> > +
> > diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> > b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> > new file mode 100644
> > index 000000000000..8c120c0649e7
> > --- /dev/null
> > +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> > @@ -0,0 +1,21 @@
> > +## @file
> > +#  MinBoardPkg.dsc
> > +#
> > +#  Description file for AMD MinBoardPkg # #  Copyright (c) 2023,
> > +Advanced Micro Devices, Inc. All rights reserved.
> > +#  SPDX-License-Identifier: BSD-2-Clause-Patent ##
> > +
> > +[Defines]
> > +  DSC_SPECIFICATION           = 1.30
> > +  PLATFORM_GUID               = 88F8A9AE-2FA0-4D58-A6F9-05F635C05F4E
> > +  PLATFORM_NAME               = MinBoardPkg
> > +  PLATFORM_VERSION            = 0.1
> > +  OUTPUT_DIRECTORY            = Build/$(PLATFORM_NAME)
> > +  BUILD_TARGETS               = DEBUG | RELEASE | NOOPT
> > +  SUPPORTED_ARCHITECTURES     = IA32 | X64
> > +
> > +[Packages]
> > +  MinBoardPkg/MinBoardPkg.dec
> > +

Re: [edk2-devel] [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

[Attar, AbdulLateef (Abdul Lateef)]

[AMD Official Use Only - General]

Hi Sean,
        Renamed the AMD/MinBoardPkg to AMD/AmdMinBoardPkg and submitted the V4 version for review.
PR: https://github.com/tianocore/edk2-platforms/pull/75
Thanks
AbduL

-----Original Message-----
From: Sean Brogan <spbrogan@outlook.com>
Sent: 01 April 2023 01:50
To: devel@edk2.groups.io; Attar, AbdulLateef (Abdul Lateef) <AbdulLateef.Attar@amd.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Leif Lindholm <quic_llindhol@quicinc.com>; Chang, Abner <Abner.Chang@amd.com>; Michael D Kinney <michael.d.kinney@intel.com>
Subject: Re: [edk2-devel] [PATCH v3 1/3] Platform/AMD: Adds MinBoardPkg to support MinPlatformPkg

Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.


Regardless of directory path I would suggest that all "Packages" have a unique and descriptive name.  MinBoardPkg doesn't meet that
suggestion.   If/when the edk2 CI tools run I would expect problems/odd
behavior if two packages collide in naming.

Thanks

Sean



On 3/22/2023 11:13 PM, Abdul Lateef Attar via groups.io wrote:
> Adds initial DEC and DSC file for MinBoardPkg.
> This package provides supporting modules for AMD boards to leverage
> MinPlatformPkg framework.
>
> Signed-off-by: Abdul Lateef Attar <abdattar@amd.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Abner Chang <abner.chang@amd.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>   Platform/AMD/MinBoardPkg/MinBoardPkg.dec | 19 +++++++++++++++++++
>   Platform/AMD/MinBoardPkg/MinBoardPkg.dsc | 21 +++++++++++++++++++++
>   2 files changed, 40 insertions(+)
>   create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dec
>   create mode 100644 Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
>
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> new file mode 100644
> index 000000000000..23d737d196a2
> --- /dev/null
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dec
> @@ -0,0 +1,19 @@
> +## @file MinBoardPkg.dec
> +#  Declaration file for AMD's MinBoardPkg.
> +#
> +#  This package supports AMD processor family based board as per the
> +MinPlatform #  Arch specification.
> +#
> +#  Copyright (c) 2023, Advanced Micro Devices, Inc. All rights reserved.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent # #  @par
> +Specification Reference:
> +#   -https://tianocore-docs.github.io/edk2-MinimumPlatformSpecification/draft/ 0.7
> +##
> +
> +[Defines]
> +  DEC_SPECIFICATION              = 1.27
> +  PACKAGE_NAME                   = MinBoardPkg
> +  PACKAGE_GUID                   = 44F9D761-9ECB-43DD-A5AC-177E5048701B
> +  PACKAGE_VERSION                = 0.1
> +
> diff --git a/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> new file mode 100644
> index 000000000000..8c120c0649e7
> --- /dev/null
> +++ b/Platform/AMD/MinBoardPkg/MinBoardPkg.dsc
> @@ -0,0 +1,21 @@
> +## @file
> +#  MinBoardPkg.dsc
> +#
> +#  Description file for AMD MinBoardPkg # #  Copyright (c) 2023,
> +Advanced Micro Devices, Inc. All rights reserved.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent ##
> +
> +[Defines]
> +  DSC_SPECIFICATION           = 1.30
> +  PLATFORM_GUID               = 88F8A9AE-2FA0-4D58-A6F9-05F635C05F4E
> +  PLATFORM_NAME               = MinBoardPkg
> +  PLATFORM_VERSION            = 0.1
> +  OUTPUT_DIRECTORY            = Build/$(PLATFORM_NAME)
> +  BUILD_TARGETS               = DEBUG | RELEASE | NOOPT
> +  SUPPORTED_ARCHITECTURES     = IA32 | X64
> +
> +[Packages]
> +  MinBoardPkg/MinBoardPkg.dec
> +