[edk2-devel] [PATCH edk2-platforms 0/4] Phase out ArmPsciResetSystemLib

[edk2-devel] [PATCH edk2-platforms 0/4] Phase out ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

Replace references to ArmPsciResetSystemLib, which implements the
deprecated EfiResetSystemLib library class which is consumed only by
the ResetRuntimeDxe in EmbeddedPkg, which should no longer be used.

Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Oliver Smith-Denny <osde@linux.microsoft.com>
Cc: Rebecca Cran <rebecca@os.amperecomputing.com>
Cc: Nhi Pham <nhi@os.amperecomputing.com>
Cc: Chuong Tran <chuong@os.amperecomputing.com>
Cc: Peng Xie <xiepeng@phytium.com.cn>
Cc: Ling Jia <jialing@phytium.com.cn>
Cc: Yiqi Shu <shuyiqi@phytium.com.cn>

Ard Biesheuvel (4):
  Platform/*: Fix line endings in DSCs
  Platform/LoongArchQemu: Drop bogus EfiResetSystemLib resolutions
  Platform/Ampere: Switch to generic ResetRuntime DXE driver
  Platform/Phytium: Switch to generic ResetRuntime DXE driver

 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc      | 3 +--
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc | 4 ++--
 Platform/Loongson/LoongArchQemuPkg/Loongson.dsc           | 4 +---
 Platform/Phytium/DurianPkg/DurianPkg.dsc                  | 2 +-
 Platform/Ampere/JadePkg/Jade.fdf                          | 2 +-
 Platform/Phytium/DurianPkg/DurianPkg.fdf                  | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

--
2.45.2.1089.g2a221341d9-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120018): https://edk2.groups.io/g/devel/message/120018
Mute This Topic: https://groups.io/mt/107509600/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 1/4] Platform/*: Fix line endings in DSCs

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

Fix incorrect LFs in DSCs that should be CR-LF only.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc | 2 +-
 Platform/Loongson/LoongArchQemuPkg/Loongson.dsc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
index c781ce60b1df..1ca2bc1b8d46 100644
--- a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
+++ b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
@@ -59,7 +59,7 @@ [LibraryClasses.common]
 
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
 
diff --git a/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc b/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc
index 1a70f8bd0511..2304eec1b8be 100644
--- a/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc
+++ b/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc
@@ -155,7 +155,7 @@ [LibraryClasses.common]
   PciHostBridgeUtilityLib          | OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
   MmuLib                           | Platform/Loongson/LoongArchQemuPkg/Library/MmuLib/MmuBaseLib.inf
   FileExplorerLib                  | MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
-  ImagePropertiesRecordLib         | MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib         | MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
 !if $(HTTP_BOOT_ENABLE) == TRUE
   HttpLib                          | MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
-- 
2.45.2.1089.g2a221341d9-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120019): https://edk2.groups.io/g/devel/message/120019
Mute This Topic: https://groups.io/mt/107509601/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 2/4] Platform/LoongArchQemu: Drop bogus EfiResetSystemLib resolutions

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The LoongArchQemuPkg platforms do not include any drivers that depend on
a resolution for EfiResetSystemLib, and the provided resolutions of that
library class do not refer to libraries of the correct type anyway.

So just drop the bogus resolutions entirely.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Platform/Loongson/LoongArchQemuPkg/Loongson.dsc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc b/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc
index 2304eec1b8be..4497260063a0 100644
--- a/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc
+++ b/Platform/Loongson/LoongArchQemuPkg/Loongson.dsc
@@ -128,7 +128,6 @@ [LibraryClasses.common]
   IoLib                            | MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   PlatformHookLib                  | Platform/Loongson/LoongArchQemuPkg/Library/Fdt16550SerialPortHookLib/Fdt16550SerialPortHookLib.inf
   SerialPortLib                    | MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  EfiResetSystemLib                | Platform/Loongson/LoongArchQemuPkg/Library/ResetSystemAcpiLib/BaseResetSystemAcpiGedLib.inf
   ResetSystemLib                   | Platform/Loongson/LoongArchQemuPkg/Library/ResetSystemAcpiLib/BaseResetSystemAcpiGedLib.inf
 
   UefiLib                          | MdePkg/Library/UefiLib/UefiLib.inf
@@ -242,7 +241,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   RealTimeClockLib                 | Platform/Loongson/LoongArchQemuPkg/Library/LsRealTimeClockLib/LsRealTimeClockLib.inf
   VariablePolicyLib                | MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
   QemuFwCfgLib                     | Platform/Loongson/LoongArchQemuPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
-  EfiResetSystemLib                | Platform/Loongson/LoongArchQemuPkg/Library/ResetSystemAcpiLib/DxeResetSystemAcpiGedLib.inf
   ResetSystemLib                   | Platform/Loongson/LoongArchQemuPkg/Library/ResetSystemAcpiLib/DxeResetSystemAcpiGedLib.inf
   PciExpressLib                    | MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
 !if $(TARGET) != RELEASE
-- 
2.45.2.1089.g2a221341d9-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120020): https://edk2.groups.io/g/devel/message/120020
Mute This Topic: https://groups.io/mt/107509602/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 3/4] Platform/Ampere: Switch to generic ResetRuntime DXE driver

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The reset runtime DXE driver is deprecated and will be removed soon. It
is superseded by a generic implementation in MdeModulePkg, which is
shared between all architectures, and implements the notification
protocols that the EFI spec describes. So move the Ampere Jade platform
to this implementation the of ResetSystem EFI runtime service.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 +--
 Platform/Ampere/JadePkg/Jade.fdf                     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
index 1f705c68579a..fb170d436d00 100644
--- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
+++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
@@ -259,7 +259,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !endif
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
-  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
   NVParamLib|Silicon/Ampere/AmpereAltraPkg/Library/NVParamLib/RuntimeNVParamLib.inf
   AmpereCpuLib|Silicon/Ampere/AmpereAltraPkg/Library/AmpereCpuLib/RuntimeAmpereCpuLib.inf
@@ -588,7 +587,7 @@ [Components.common]
 !endif
   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
+  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
   EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
   ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf
index 7795f0e11115..127e4401f69b 100644
--- a/Platform/Ampere/JadePkg/Jade.fdf
+++ b/Platform/Ampere/JadePkg/Jade.fdf
@@ -222,7 +222,7 @@ [FV.FvMain]
   INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
 !endif
   INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-- 
2.45.2.1089.g2a221341d9-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120021): https://edk2.groups.io/g/devel/message/120021
Mute This Topic: https://groups.io/mt/107509603/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 4/4] Platform/Phytium: Switch to generic ResetRuntime DXE driver

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The reset runtime DXE driver is deprecated and will be removed soon. It
is superseded by a generic implementation in MdeModulePkg, which is
shared between all architectures, and implements the notification
protocols that the EFI spec describes. So move the Phytium Durian
platform to this implementation the of ResetSystem EFI runtime service.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc | 2 +-
 Platform/Phytium/DurianPkg/DurianPkg.dsc                  | 2 +-
 Platform/Phytium/DurianPkg/DurianPkg.fdf                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
index 1ca2bc1b8d46..514d7772980a 100644
--- a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
+++ b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
@@ -185,7 +185,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.AARCH64.DXE_RUNTIME_DRIVER]
-  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
diff --git a/Platform/Phytium/DurianPkg/DurianPkg.dsc b/Platform/Phytium/DurianPkg/DurianPkg.dsc
index c1519070d616..be5719ec9ee8 100644
--- a/Platform/Phytium/DurianPkg/DurianPkg.dsc
+++ b/Platform/Phytium/DurianPkg/DurianPkg.dsc
@@ -172,7 +172,7 @@ [Components.common]
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
   }
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
+  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
 
   #
diff --git a/Platform/Phytium/DurianPkg/DurianPkg.fdf b/Platform/Phytium/DurianPkg/DurianPkg.fdf
index 2d4427e5eaa7..321356a069f6 100644
--- a/Platform/Phytium/DurianPkg/DurianPkg.fdf
+++ b/Platform/Phytium/DurianPkg/DurianPkg.fdf
@@ -94,7 +94,7 @@ [FV.FvMain]
   INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
 
   INF Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.inf
-- 
2.45.2.1089.g2a221341d9-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120022): https://edk2.groups.io/g/devel/message/120022
Mute This Topic: https://groups.io/mt/107509604/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 3/4] Platform/Ampere: Switch to generic ResetRuntime DXE driver

[Nhi Pham via groups.io]

Thanks a lot for the patch.

Reviewed-by: Nhi Pham <nhi@os.amperecomputing.com>
Tested-by: Nhi Pham <nhi@os.amperecomputing.com>

On 7/21/2024 9:51 PM, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> The reset runtime DXE driver is deprecated and will be removed soon. It
> is superseded by a generic implementation in MdeModulePkg, which is
> shared between all architectures, and implements the notification
> protocols that the EFI spec describes. So move the Ampere Jade platform
> to this implementation the of ResetSystem EFI runtime service.
> 
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 +--
>  Platform/Ampere/JadePkg/Jade.fdf                     | 2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> index 1f705c68579a..fb170d436d00 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> @@ -259,7 +259,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>  !endif
>    VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
>  
> -  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
>    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
>    NVParamLib|Silicon/Ampere/AmpereAltraPkg/Library/NVParamLib/RuntimeNVParamLib.inf
>    AmpereCpuLib|Silicon/Ampere/AmpereAltraPkg/Library/AmpereCpuLib/RuntimeAmpereCpuLib.inf
> @@ -588,7 +587,7 @@ [Components.common]
>  !endif
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -  EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
> +  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>    EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
>    ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
> diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf
> index 7795f0e11115..127e4401f69b 100644
> --- a/Platform/Ampere/JadePkg/Jade.fdf
> +++ b/Platform/Ampere/JadePkg/Jade.fdf
> @@ -222,7 +222,7 @@ [FV.FvMain]
>    INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
>  !endif
>    INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>    INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
>    INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
>    INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120001): https://edk2.groups.io/g/devel/message/120001
Mute This Topic: https://groups.io/mt/107476835/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 3/4] Platform/Ampere: Switch to generic ResetRuntime DXE driver

[Leif Lindholm]

On Sun, Jul 21, 2024 at 16:51:54 +0200, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> The reset runtime DXE driver is deprecated and will be removed soon. It
> is superseded by a generic implementation in MdeModulePkg, which is
> shared between all architectures, and implements the notification
> protocols that the EFI spec describes. So move the Ampere Jade platform
> to this implementation the of ResetSystem EFI runtime service.
> 
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 +--
>  Platform/Ampere/JadePkg/Jade.fdf                     | 2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> index 1f705c68579a..fb170d436d00 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> @@ -259,7 +259,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>  !endif
>    VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
>  
> -  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf

Would it make sense to move the existing ResetSystemLib mapping here?
Not for any particular reason other than it's not actually used
anywhere else.

Regardless, for the series:
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

Thanks!

>    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
>    NVParamLib|Silicon/Ampere/AmpereAltraPkg/Library/NVParamLib/RuntimeNVParamLib.inf
>    AmpereCpuLib|Silicon/Ampere/AmpereAltraPkg/Library/AmpereCpuLib/RuntimeAmpereCpuLib.inf
> @@ -588,7 +587,7 @@ [Components.common]
>  !endif
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -  EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
> +  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>    EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
>    ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
> diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jade.fdf
> index 7795f0e11115..127e4401f69b 100644
> --- a/Platform/Ampere/JadePkg/Jade.fdf
> +++ b/Platform/Ampere/JadePkg/Jade.fdf
> @@ -222,7 +222,7 @@ [FV.FvMain]
>    INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
>  !endif
>    INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
> -  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
> +  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>    INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
>    INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
>    INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
> -- 
> 2.45.2.1089.g2a221341d9-goog
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120014): https://edk2.groups.io/g/devel/message/120014
Mute This Topic: https://groups.io/mt/107476835/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 3/4] Platform/Ampere: Switch to generic ResetRuntime DXE driver

[Ard Biesheuvel]

On Tue, 23 Jul 2024 at 17:32, Leif Lindholm <quic_llindhol@quicinc.com> wrote:
>
> On Sun, Jul 21, 2024 at 16:51:54 +0200, Ard Biesheuvel wrote:
> > From: Ard Biesheuvel <ardb@kernel.org>
> >
> > The reset runtime DXE driver is deprecated and will be removed soon. It
> > is superseded by a generic implementation in MdeModulePkg, which is
> > shared between all architectures, and implements the notification
> > protocols that the EFI spec describes. So move the Ampere Jade platform
> > to this implementation the of ResetSystem EFI runtime service.
> >
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > ---
> >  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 +--
> >  Platform/Ampere/JadePkg/Jade.fdf                     | 2 +-
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> > index 1f705c68579a..fb170d436d00 100644
> > --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> > +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> > @@ -259,7 +259,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
> >  !endif
> >    VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
> >
> > -  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
>
> Would it make sense to move the existing ResetSystemLib mapping here?
> Not for any particular reason other than it's not actually used
> anywhere else.

There isn't an obvious reason imo why we would ever use another
ResetSystemLib instance for other phases - the existing one is
universal, i.e., it doesn't produce HOBs or consume PPIs or protocols
and so it is usable from any context. So moving it here is possible
but unnecessary.


> Regardless, for the series:
> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
>

Cheers.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120015): https://edk2.groups.io/g/devel/message/120015
Mute This Topic: https://groups.io/mt/107476835/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 3/4] Platform/Ampere: Switch to generic ResetRuntime DXE driver

[Ard Biesheuvel]

On Tue, 23 Jul 2024 at 17:46, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Tue, 23 Jul 2024 at 17:32, Leif Lindholm <quic_llindhol@quicinc.com> wrote:
> >
> > On Sun, Jul 21, 2024 at 16:51:54 +0200, Ard Biesheuvel wrote:
> > > From: Ard Biesheuvel <ardb@kernel.org>
> > >
> > > The reset runtime DXE driver is deprecated and will be removed soon. It
> > > is superseded by a generic implementation in MdeModulePkg, which is
> > > shared between all architectures, and implements the notification
> > > protocols that the EFI spec describes. So move the Ampere Jade platform
> > > to this implementation the of ResetSystem EFI runtime service.
> > >
> > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > > ---
> > >  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 +--
> > >  Platform/Ampere/JadePkg/Jade.fdf                     | 2 +-
> > >  2 files changed, 2 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> > > index 1f705c68579a..fb170d436d00 100644
> > > --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> > > +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> > > @@ -259,7 +259,6 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
> > >  !endif
> > >    VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
> > >
> > > -  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
> >
> > Would it make sense to move the existing ResetSystemLib mapping here?
> > Not for any particular reason other than it's not actually used
> > anywhere else.
>
> There isn't an obvious reason imo why we would ever use another
> ResetSystemLib instance for other phases - the existing one is
> universal, i.e., it doesn't produce HOBs or consume PPIs or protocols
> and so it is usable from any context. So moving it here is possible
> but unnecessary.
>
>
> > Regardless, for the series:
> > Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
> >
>
> Cheers.

Merged as  a9dd58388452..8b7e9363aab9


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120016): https://edk2.groups.io/g/devel/message/120016
Mute This Topic: https://groups.io/mt/107476835/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-