[edk2-devel] [PATCH edk2-platforms 00/11] Phase out ArmSmcPsciResetSystemLib

[edk2-devel] [PATCH edk2-platforms 00/11] Phase out ArmSmcPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

ArmSmcPsciResetSystemLib is being replaced with a generic implementation
that is shared between physical and virtual placement, executing at
either EL2 or EL1.

So update all library class resolutions for ResetSystemLib and provide
additional resolutions for its dependency on ArmMonitorLib. This series
depends on [0] which removes dependencies on ArmHvcLib and ArmSmcLib
from the generic version of ArmMonitorLib being used here, so no
resolutions are provided for those.

Patches #1 and #2 are unrelated fixes.

Cc: Leif Lindholm <quic_llindhol@quicinc.com>

Ard Biesheuvel (11):
  Platform,Silicon: Fix line endings
  Silicon/SynQuacer: Fix CLANGDWARF build
  Platform/AMD/Styx: Switch to generic ArmPsciResetSystemLib
  Platform/ARM: Switch to generic ArmPsciResetSystemLib
  Platform/SbsaQemu: Switch to generic ArmPsciResetSystemLib
  Platform/SynQuacer: Switch to generic ArmPsciResetSystemLib
  Silicon/Ampere: Switch to generic ArmPsciResetSystemLib
  Silicon/HiSilicon: Switch to generic ArmPsciResetSystemLib
  Silicon/Armada7k8k: Switch to generic ArmPsciResetSystemLib
  Silicon/NxpQoriqLs: Switch to generic ArmPsciResetSystemLib
  Silicon/Phytium: Switch to generic ArmPsciResetSystemLib

 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                      | 3 ++-
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc                 | 3 ++-
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc         | 3 ++-
 Silicon/Hisilicon/Hisilicon.dsc.inc                          | 5 +++--
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                | 3 ++-
 Silicon/NXP/NxpQoriqLs.dsc.inc                               | 3 ++-
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc    | 3 ++-
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc               | 5 +++--
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                   | 5 +++--
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc                          | 3 ++-
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc             | 5 +++--
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 5 +++--
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc  | 5 +++--
 Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf    | 3 +--
 Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S      | 4 ++--
 15 files changed, 35 insertions(+), 23 deletions(-)

--
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 01/11] Platform,Silicon: Fix line endings

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

Fix some instances of a lone LF in DSCs that should all be CR-LF
entirely.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Hisilicon/Hisilicon.dsc.inc                          | 2 +-
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc               | 2 +-
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                   | 2 +-
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 +-
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 4771b61f89df..609c006648a3 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -26,7 +26,7 @@ [LibraryClasses.common]
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index f96e13c0d3bc..5a1ecfa43857 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -52,7 +52,7 @@ [LibraryClasses.common]
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index 337d14b05370..bf1f2bab52bc 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -70,7 +70,7 @@ [LibraryClasses.common]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 6e62aea44e6d..81c1210ee690 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -104,7 +104,7 @@ [LibraryClasses.common]
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   # BDS Libraries
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index bbc142d806b3..1f63997df963 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -71,7 +71,7 @@ [LibraryClasses.common]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 02/11] Silicon/SynQuacer: Fix CLANGDWARF build

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

Drop the CLANG3x build options, and add ones for CLANGDWARF so that
SynQuacer based platforms can be built with it.

Instead of copying the -no-integrated-as option that CLANG3x used, let's
fix the assembler code so it can be built with Clang's integrated
assembler. Also switch to LLD for linking the code, which is what
CLANGDWARF uses natively (and build hosts may lack a cross linker for
AArch64 when using CLANGDWARF)

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf | 3 +--
 Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
index 7b396db826a5..8c331738c81a 100644
--- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
+++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
@@ -23,5 +23,4 @@ [BuildOptions]
   *_*_AARCH64_OBJCOPY_FLAGS = -I elf64-little
   *_*_ARM_OBJCOPY_FLAGS = -I elf32-little
   *_*_*_ASM_FLAGS == -nostdlib -Wl,-e,0x81f8000,--section-start=.rodata=0x81f8000
-  *_CLANG35_*_ASM_FLAGS = -no-integrated-as
-  *_CLANG38_*_ASM_FLAGS = -no-integrated-as
+  *_CLANGDWARF_*_ASM_FLAGS = -target aarch64-linux-gnu -fuse-ld=lld -Wl,-no-pie
diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S
index a7f0eb2b7742..4f7c2aae20a1 100644
--- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S
+++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S
@@ -54,13 +54,13 @@
             TT_S2_VALID | (\cont << TT_S2_CONT_SHIFT)
   .endm
 
-  .macro    s2_l3_entry, base, offset=0, cont=0
+  .macro    s2_l3_entry, base, offset=0, cont=0, ignore=0
   .quad     ((\base << 12) + \offset) | TT_S2_AF | TT_S2_AP_RW | \
             TT_S2_SH_NON_SHAREABLE | TT_S2_MEMATTR_MEMORY_WB | \
             TT_S2_L3_PAGE | TT_S2_VALID | (\cont << TT_S2_CONT_SHIFT)
   .endm
 
-  .macro    smmu_l3_entry, base, offset=0, ignore=0
+  .macro    smmu_l3_entry, base, offset=0, ignore=0, ignore2=0
   .quad     ((\base << 12) + \offset) | TT_S2_AF | TT_S2_AP_RO | \
             TT_S2_SH_NON_SHAREABLE | TT_S2_MEMATTR_DEVICE_nGnRE | \
             TT_S2_L3_PAGE | TT_S2_VALID
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 03/11] Platform/AMD/Styx: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc              | 3 ++-
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                  | 3 ++-
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 5a1ecfa43857..5a1fdb8bfa1f 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -110,7 +110,8 @@ [LibraryClasses.common]
   # Styx specific libraries
   #
   AmdSataInit|Silicon/AMD/Styx/AmdModulePkg/Library/AmdSataInitLib/AmdSataInitLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
   RealTimeClockLib|Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
 
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index bf1f2bab52bc..7b791d1635e9 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -116,7 +116,8 @@ [LibraryClasses.common]
   # Styx specific libraries
   #
   AmdSataInit|Silicon/AMD/Styx/AmdModulePkg/Library/AmdSataInitLib/AmdSataInitLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
   RealTimeClockLib|Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
 
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index 1f63997df963..843d18bc746b 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -118,7 +118,8 @@ [LibraryClasses.common]
   # Styx specific libraries
   #
   AmdSataInit|Silicon/AMD/Styx/AmdModulePkg/Library/AmdSataInitLib/AmdSataInitLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
   RealTimeClockLib|Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
 
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 04/11] Platform/ARM: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move the ARM platforms to the generic ArmPsciResetSystemLib, and drop
the dependency on ArmSmcPsciResetSystemLib, which is deprecated and will
be removed.

Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Thomas Abraham <thomas.abraham@arm.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc      | 3 ++-
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 1090fbe2a1fc..a793e96f8b0f 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -39,7 +39,8 @@ [LibraryClasses.common]
   # NOR flash identification support
   NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf
 
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index f7f7b39bbf58..8b9be9e0d372 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -97,7 +97,8 @@ [LibraryClasses.common]
   NorFlashPlatformLib|Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
   # NOR flash identification support
   NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
   # ARM PL031 RTC Driver
   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120086): https://edk2.groups.io/g/devel/message/120086
Mute This Topic: https://groups.io/mt/107628950/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 04/11] Platform/ARM: Switch to generic ArmPsciResetSystemLib

[Sami Mujawar]

Hi Ard,

Thank you for this patch.

These changes look good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 25/07/2024, 09:25, "Ard Biesheuvel" <ardb+git@google.com <mailto:ardb+git@google.com>> wrote:


From: Ard Biesheuvel <ardb@kernel.org <mailto:ardb@kernel.org>>


The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.


Move the ARM platforms to the generic ArmPsciResetSystemLib, and drop
the dependency on ArmSmcPsciResetSystemLib, which is deprecated and will
be removed.


Cc: Sami Mujawar <sami.mujawar@arm.com <mailto:sami.mujawar@arm.com>>
Cc: Thomas Abraham <thomas.abraham@arm.com <mailto:thomas.abraham@arm.com>>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org <mailto:ardb@kernel.org>>
---
Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 1090fbe2a1fc..a793e96f8b0f 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -39,7 +39,8 @@ [LibraryClasses.common]
# NOR flash identification support
NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
- ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+ ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+ ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf


diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index f7f7b39bbf58..8b9be9e0d372 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -97,7 +97,8 @@ [LibraryClasses.common]
NorFlashPlatformLib|Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
# NOR flash identification support
NorFlashInfoLib|EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
- ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+ ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+ ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf


# ARM PL031 RTC Driver
RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog







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

[edk2-devel] [PATCH edk2-platforms 05/11] Platform/SbsaQemu: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Cc: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Cc: Graeme Gregory <graeme@xora.org.uk>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index e78f1d71998a..089a639184e3 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -117,7 +117,8 @@ [LibraryClasses.common]
 
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
   MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
   # ARM PL031 RTC Driver
   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 06/11] Platform/SynQuacer: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc             | 5 +++--
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 917c1532fb3c..98f9e603755c 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -31,6 +31,7 @@ [Defines]
 !include MdePkg/MdeLibs.dsc.inc
 
 [LibraryClasses]
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 !if $(DEBUG_ON_UART1) == FALSE
   SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
 !else
@@ -148,7 +149,7 @@ [LibraryClasses.common.UEFI_APPLICATION]
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
 !if $(TARGET) != RELEASE
@@ -281,7 +282,7 @@ [Components.common]
 !if $(TPM2_ENABLE) == TRUE
   MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {
     <LibraryClasses>
-      ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+      ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
   }
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 81c1210ee690..15c9bc1e912d 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -206,7 +206,8 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
 
 !if $(TARGET) != RELEASE
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 07/11] Silicon/Ampere: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Cc: Nhi Pham <nhi@os.amperecomputing.com>
Cc: Chuong Tran <chuong@os.amperecomputing.com>
Cc: Rebecca Cran <rebecca@os.amperecomputing.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
index fb170d436d00..977e4c4c238d 100644
--- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
+++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
@@ -73,7 +73,8 @@ [LibraryClasses.common]
   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
   #
   # Ampere Altra specific Libraries
-- 
2.46.0.rc1.232.g9752f9e123-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120089): https://edk2.groups.io/g/devel/message/120089
Mute This Topic: https://groups.io/mt/107628953/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 07/11] Silicon/Ampere: Switch to generic ArmPsciResetSystemLib

[Nhi Pham via groups.io]

Thanks Ard for the patch.

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

Regards,
Nhi

On 7/25/2024 3:24 PM, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> The PSCI reset libraries in ArmPkg are being consolidated into a single
> one to reduce the maintenance burden of having multiple libraries doing
> the same thing in a slightly different way.
> 
> Move this platform to the generic ArmPsciResetSystemLib, and drop the
> dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
> removed.
> 
> Cc: Nhi Pham <nhi@os.amperecomputing.com>
> Cc: Chuong Tran <chuong@os.amperecomputing.com>
> Cc: Rebecca Cran <rebecca@os.amperecomputing.com>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>   Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> index fb170d436d00..977e4c4c238d 100644
> --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
> @@ -73,7 +73,8 @@ [LibraryClasses.common]
>     ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
>     ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
>     ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
> -  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
> +  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
> +  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
>   
>     #
>     # Ampere Altra specific Libraries


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

[edk2-devel] [PATCH edk2-platforms 08/11] Silicon/HiSilicon: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Cc: Wenyi Xie <xiewenyi2@huawei.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Hisilicon/Hisilicon.dsc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 609c006648a3..652bc4d375e1 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -59,7 +59,8 @@ [LibraryClasses.common]
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
 
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
   # ARM PL011 UART Driver
   PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 09/11] Silicon/Armada7k8k: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Cc: Marcin Wojtas <marcin.s.wojtas@gmail.com>
Cc: Narinder Dhillon <ndhillon@marvell.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index ab719f360eda..362b25373490 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -97,7 +97,8 @@ [LibraryClasses.common]
   # Reset and Time libraries
   TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf
   RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
   # These libraries are used by the dynamic EFI Shell commands
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 10/11] Silicon/NxpQoriqLs: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/NXP/NxpQoriqLs.dsc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/NXP/NxpQoriqLs.dsc.inc b/Silicon/NXP/NxpQoriqLs.dsc.inc
index 21549dc20aa7..eef0ffa9a9a6 100644
--- a/Silicon/NXP/NxpQoriqLs.dsc.inc
+++ b/Silicon/NXP/NxpQoriqLs.dsc.inc
@@ -101,7 +101,8 @@ [LibraryClasses.common]
   ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
   I2cLib|Silicon/NXP/Library/I2cLib/I2cLib.inf
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
   IoAccessLib|Silicon/NXP/Library/IoAccessLib/IoAccessLib.inf
 
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog



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

[edk2-devel] [PATCH edk2-platforms 11/11] Silicon/Phytium: Switch to generic ArmPsciResetSystemLib

[Ard Biesheuvel via groups.io]

From: Ard Biesheuvel <ardb@kernel.org>

The PSCI reset libraries in ArmPkg are being consolidated into a single
one to reduce the maintenance burden of having multiple libraries doing
the same thing in a slightly different way.

Move this platform to the generic ArmPsciResetSystemLib, and drop the
dependency on ArmSmcPsciResetSystemLib, which is deprecated and will be
removed.

Cc: Peng Xie <xiepeng@phytium.com.cn>
Cc: Ling Jia <jialing@phytium.com.cn>
Cc: Yiqi Shu <shuyiqi@phytium.com.cn>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
index 514d7772980a..78612d933ba7 100644
--- a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
+++ b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
@@ -185,7 +185,8 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.AARCH64.DXE_RUNTIME_DRIVER]
-  ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-- 
2.46.0.rc1.232.g9752f9e123-goog



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120093): https://edk2.groups.io/g/devel/message/120093
Mute This Topic: https://groups.io/mt/107628957/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 00/11] Phase out ArmSmcPsciResetSystemLib

[Leif Lindholm]

On Thu, Jul 25, 2024 at 10:24:51 +0200, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> ArmSmcPsciResetSystemLib is being replaced with a generic implementation
> that is shared between physical and virtual placement, executing at
> either EL2 or EL1.
> 
> So update all library class resolutions for ResetSystemLib and provide
> additional resolutions for its dependency on ArmMonitorLib. This series
> depends on [0] which removes dependencies on ArmHvcLib and ArmSmcLib
> from the generic version of ArmMonitorLib being used here, so no
> resolutions are provided for those.
> 
> Patches #1 and #2 are unrelated fixes.
> 
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>

For the series:
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

Thanks for this cleanup!

> Ard Biesheuvel (11):
>   Platform,Silicon: Fix line endings
>   Silicon/SynQuacer: Fix CLANGDWARF build
>   Platform/AMD/Styx: Switch to generic ArmPsciResetSystemLib
>   Platform/ARM: Switch to generic ArmPsciResetSystemLib
>   Platform/SbsaQemu: Switch to generic ArmPsciResetSystemLib
>   Platform/SynQuacer: Switch to generic ArmPsciResetSystemLib
>   Silicon/Ampere: Switch to generic ArmPsciResetSystemLib
>   Silicon/HiSilicon: Switch to generic ArmPsciResetSystemLib
>   Silicon/Armada7k8k: Switch to generic ArmPsciResetSystemLib
>   Silicon/NxpQoriqLs: Switch to generic ArmPsciResetSystemLib
>   Silicon/Phytium: Switch to generic ArmPsciResetSystemLib
> 
>  Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                      | 3 ++-
>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc                 | 3 ++-
>  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc         | 3 ++-
>  Silicon/Hisilicon/Hisilicon.dsc.inc                          | 5 +++--
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                | 3 ++-
>  Silicon/NXP/NxpQoriqLs.dsc.inc                               | 3 ++-
>  Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc    | 3 ++-
>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc               | 5 +++--
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc                   | 5 +++--
>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc                          | 3 ++-
>  Platform/Socionext/DeveloperBox/DeveloperBox.dsc             | 5 +++--
>  Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 5 +++--
>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc  | 5 +++--
>  Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf    | 3 +--
>  Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S      | 4 ++--
>  15 files changed, 35 insertions(+), 23 deletions(-)
> 
> --
> 2.46.0.rc1.232.g9752f9e123-goog
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120033): https://edk2.groups.io/g/devel/message/120033
Mute This Topic: https://groups.io/mt/107539807/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 00/11] Phase out ArmSmcPsciResetSystemLib

[Ard Biesheuvel]

On Thu, 25 Jul 2024 at 11:49, Leif Lindholm <quic_llindhol@quicinc.com> wrote:
>
> On Thu, Jul 25, 2024 at 10:24:51 +0200, Ard Biesheuvel wrote:
> > From: Ard Biesheuvel <ardb@kernel.org>
> >
> > ArmSmcPsciResetSystemLib is being replaced with a generic implementation
> > that is shared between physical and virtual placement, executing at
> > either EL2 or EL1.
> >
> > So update all library class resolutions for ResetSystemLib and provide
> > additional resolutions for its dependency on ArmMonitorLib. This series
> > depends on [0] which removes dependencies on ArmHvcLib and ArmSmcLib
> > from the generic version of ArmMonitorLib being used here, so no
> > resolutions are provided for those.
> >
> > Patches #1 and #2 are unrelated fixes.
> >
> > Cc: Leif Lindholm <quic_llindhol@quicinc.com>
>
> For the series:
> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
>
> Thanks for this cleanup!
>
> > Ard Biesheuvel (11):
> >   Platform,Silicon: Fix line endings
> >   Silicon/SynQuacer: Fix CLANGDWARF build
> >   Platform/AMD/Styx: Switch to generic ArmPsciResetSystemLib
> >   Platform/ARM: Switch to generic ArmPsciResetSystemLib
> >   Platform/SbsaQemu: Switch to generic ArmPsciResetSystemLib
> >   Platform/SynQuacer: Switch to generic ArmPsciResetSystemLib

Thanks. I've merged these ^^^ already, with acks. I'll give the
reviewers/maintainers of the remaining ones some time to respond, and
likely merge them tomorrow.


> >   Silicon/Ampere: Switch to generic ArmPsciResetSystemLib
> >   Silicon/HiSilicon: Switch to generic ArmPsciResetSystemLib
> >   Silicon/Armada7k8k: Switch to generic ArmPsciResetSystemLib
> >   Silicon/NxpQoriqLs: Switch to generic ArmPsciResetSystemLib
> >   Silicon/Phytium: Switch to generic ArmPsciResetSystemLib
> >
> >  Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                      | 3 ++-
> >  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc                 | 3 ++-
> >  Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc         | 3 ++-
> >  Silicon/Hisilicon/Hisilicon.dsc.inc                          | 5 +++--
> >  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                | 3 ++-
> >  Silicon/NXP/NxpQoriqLs.dsc.inc                               | 3 ++-
> >  Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc    | 3 ++-
> >  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc               | 5 +++--
> >  Platform/LeMaker/CelloBoard/CelloBoard.dsc                   | 5 +++--
> >  Platform/Qemu/SbsaQemu/SbsaQemu.dsc                          | 3 ++-
> >  Platform/Socionext/DeveloperBox/DeveloperBox.dsc             | 5 +++--
> >  Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 5 +++--
> >  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc  | 5 +++--
> >  Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf    | 3 +--
> >  Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S      | 4 ++--
> >  15 files changed, 35 insertions(+), 23 deletions(-)
> >
> > --
> > 2.46.0.rc1.232.g9752f9e123-goog
> >
>
>
> 
>
>


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