public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
@ 2024-03-14 14:51 PierreGondois
  2024-03-14 14:51 ` [edk2-devel] [PATCH v2 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h " PierreGondois
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: PierreGondois @ 2024-03-14 14:51 UTC (permalink / raw)
  To: devel
  Cc: Pierre Gondois, Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao,
	Leif Lindholm, Liming Gao, Michael D Kinney, Sami Mujawar,
	Zhiguang Liu

v2:
- Move files to MdePkg/Include/Register/ instead of  MdePkg/Include/

This patch relies on [1].

Following the RFC v1: ArmPkg,MdePkg: move ArmLib.h to MdePkg [1],
move the Chipset/* files to the MdePkg as the Armlib.h relies on
them.

These patches span over multiple packages as these Chipset/* files
are relocated to a new directory and include paths must be updated.

[1] https://edk2.groups.io/g/devel/message/111566

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Pierre Gondois <pierre.gondois@arm.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>

Pierre Gondois (2):
  ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg
  ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg

 ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c     | 2 +-
 ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S     | 2 +-
 ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c             | 2 +-
 ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c                    | 2 +-
 ArmPkg/Library/ArmLib/AArch64/AArch64Support.S                | 2 +-
 ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c                          | 2 +-
 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c              | 2 +-
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c               | 2 +-
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c                  | 2 +-
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c                | 2 +-
 ArmPlatformPkg/PrePeiCore/AArch64/Exception.S                 | 2 +-
 ArmPlatformPkg/PrePeiCore/AArch64/Helper.S                    | 2 +-
 ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c                      | 2 +-
 ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S                   | 2 +-
 ArmVirtPkg/PrePi/AArch64/ArchPrePi.c                          | 2 +-
 MdePkg/Include/Library/ArmLib.h                               | 4 ++--
 .../Chipset => MdePkg/Include/Register/AArch64}/AArch64.h     | 2 +-
 .../Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h  | 0
 .../Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h  | 2 +-
 .../ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h    | 0
 20 files changed, 19 insertions(+), 19 deletions(-)
 rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64.h (94%)
 rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h (100%)
 rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h (94%)
 rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h (100%)

-- 
2.25.1



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



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [edk2-devel] [PATCH v2 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg
  2024-03-14 14:51 [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
@ 2024-03-14 14:51 ` PierreGondois
  2024-03-14 14:51 ` [edk2-devel] [PATCH v2 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h " PierreGondois
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: PierreGondois @ 2024-03-14 14:51 UTC (permalink / raw)
  To: devel
  Cc: Pierre Gondois, Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao,
	Leif Lindholm, Liming Gao, Michael D Kinney, Sami Mujawar,
	Zhiguang Liu

Following the discussion at [1] and as the ArmLib relies on them,
move ArmPkg/Chipset/AArch64[|Mmu].h files to the MdePkg.

Update the path to correctly include the moved files.

[1] https://edk2.groups.io/g/devel/message/111566

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c       | 2 +-
 ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S       | 2 +-
 ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c                      | 2 +-
 ArmPkg/Library/ArmLib/AArch64/AArch64Support.S                  | 2 +-
 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c                | 2 +-
 ArmPlatformPkg/PrePeiCore/AArch64/Exception.S                   | 2 +-
 ArmPlatformPkg/PrePeiCore/AArch64/Helper.S                      | 2 +-
 ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c                        | 2 +-
 ArmVirtPkg/PrePi/AArch64/ArchPrePi.c                            | 2 +-
 MdePkg/Include/Library/ArmLib.h                                 | 2 +-
 .../Chipset => MdePkg/Include/Register/AArch64}/AArch64.h       | 2 +-
 .../Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h    | 0
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64.h (94%)
 rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h (100%)

diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
index ef6a132b8dfc..16eb51c6eb81 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
@@ -10,7 +10,7 @@
 
 #include <Uefi.h>
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Protocol/DebugSupport.h> // for MAX_AARCH64_EXCEPTION
 
diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
index cd9437b6aab8..6f67e2557654 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
@@ -7,7 +7,7 @@
 //
 //------------------------------------------------------------------------------
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <Library/PcdLib.h>
 #include <AsmMacroIoLibV8.h>
 #include <Protocol/DebugSupport.h> // for exception type definitions
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
index 87285465871d..8afae1464f70 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
@@ -13,7 +13,7 @@
 #include <Library/ArmLib.h>
 #include <Library/DebugLib.h>
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 #include "AArch64Lib.h"
 #include "ArmLibPrivate.h"
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
index a7111e51882c..4bdfa7ac2ccb 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -9,7 +9,7 @@
 #
 #------------------------------------------------------------------------------
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <AsmMacroIoLibV8.h>
 
 .set CTRL_M_BIT,      (1 << 0)
diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
index 9d9c623581fe..6833015ff93f 100644
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
@@ -11,7 +11,7 @@
 
 #include <Uefi.h>
 #include <Pi/PiMultiPhase.h>
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/MemoryAllocationLib.h>
diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
index ffb643a56df0..36105e31800f 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
@@ -5,7 +5,7 @@
 #
 #
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 #include <AsmMacroIoLibV8.h>
 #include <Base.h>
 #include <AutoGen.h>
diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
index 2a604b719b26..a956b4d99634 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
@@ -6,7 +6,7 @@
 #=======================================================================================
 
 #include <AsmMacroIoLibV8.h>
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 // Setup EL1 while in EL1
 ASM_FUNC(SetupExceptionLevel1)
diff --git a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
index 296b029e08bf..a315413a9944 100644
--- a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
+++ b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
@@ -8,7 +8,7 @@
 
 #include "PrePi.h"
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 VOID
 ArchInitialize (
diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
index 9cab88ca086e..f4487b6a5197 100644
--- a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
+++ b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
@@ -8,7 +8,7 @@
 
 #include "PrePi.h"
 
-#include <Chipset/AArch64.h>
+#include <Register/AArch64/AArch64.h>
 
 VOID
 ArchInitialize (
diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index 6aa8a48f07f3..552ae3684b93 100644
--- a/MdePkg/Include/Library/ArmLib.h
+++ b/MdePkg/Include/Library/ArmLib.h
@@ -16,7 +16,7 @@
 #ifdef MDE_CPU_ARM
   #include <Chipset/ArmV7.h>
 #elif defined (MDE_CPU_AARCH64)
-  #include <Chipset/AArch64.h>
+  #include <Register/AArch64/AArch64.h>
 #else
   #error "Unknown chipset."
 #endif
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/Register/AArch64/AArch64.h
similarity index 94%
rename from ArmPkg/Include/Chipset/AArch64.h
rename to MdePkg/Include/Register/AArch64/AArch64.h
index 5390bf0a2774..7d894fa8a0fc 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/MdePkg/Include/Register/AArch64/AArch64.h
@@ -10,7 +10,7 @@
 #ifndef AARCH64_H_
 #define AARCH64_H_
 
-#include <Chipset/AArch64Mmu.h>
+#include <Register/AArch64/AArch64Mmu.h>
 
 // ARM Interrupt ID in Exception Table
 #define ARM_ARCH_EXCEPTION_IRQ  EXCEPT_AARCH64_IRQ
diff --git a/ArmPkg/Include/Chipset/AArch64Mmu.h b/MdePkg/Include/Register/AArch64/AArch64Mmu.h
similarity index 100%
rename from ArmPkg/Include/Chipset/AArch64Mmu.h
rename to MdePkg/Include/Register/AArch64/AArch64Mmu.h
-- 
2.25.1



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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [edk2-devel] [PATCH v2 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg
  2024-03-14 14:51 [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
  2024-03-14 14:51 ` [edk2-devel] [PATCH v2 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h " PierreGondois
@ 2024-03-14 14:51 ` PierreGondois
  2024-06-03 12:50 ` [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files " PierreGondois
  2024-06-10 16:28 ` Leif Lindholm
  3 siblings, 0 replies; 6+ messages in thread
From: PierreGondois @ 2024-03-14 14:51 UTC (permalink / raw)
  To: devel
  Cc: Pierre Gondois, Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao,
	Leif Lindholm, Liming Gao, Michael D Kinney, Sami Mujawar,
	Zhiguang Liu

Following the discussion at [1] and as the ArmLib relies on them,
move ArmPkg/Chipset/ArmV7[|Mmu].h files to the MdePkg.

Update the path to correctly include the moved files.

[1] https://edk2.groups.io/g/devel/message/111566

Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c               | 2 +-
 ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c                            | 2 +-
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c                 | 2 +-
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c                    | 2 +-
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c                  | 2 +-
 ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S                     | 2 +-
 MdePkg/Include/Library/ArmLib.h                                 | 2 +-
 .../Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h    | 2 +-
 .../ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h      | 0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h (94%)
 rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h (100%)

diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
index fc411b845d64..a3e12b73b602 100644
--- a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
+++ b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
@@ -11,7 +11,7 @@
 
 #include <Uefi.h>
 
-#include <Chipset/ArmV7.h>
+#include <Register/Arm/AArch32.h>
 
 #include <Library/ArmLib.h>
 
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c
index 521d5be0de33..0ba823457c58 100644
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c
@@ -13,7 +13,7 @@
 #include <Library/ArmLib.h>
 #include <Library/DebugLib.h>
 
-#include <Chipset/ArmV7.h>
+#include <Register/Arm/AArch32.h>
 
 #include "ArmV7Lib.h"
 #include "ArmLibPrivate.h"
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c
index 52dbfd714029..c17e1203be91 100644
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c
@@ -11,7 +11,7 @@
 
 #include <Library/ArmLib.h>
 
-#include <Chipset/ArmV7.h>
+#include <Register/Arm/AArch32.h>
 
 UINT32
 ConvertSectionAttributesToPageAttributes (
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
index 28e4cd9f1a77..d4df07514066 100644
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
@@ -8,7 +8,7 @@
 **/
 
 #include <Uefi.h>
-#include <Chipset/ArmV7.h>
+#include <Register/Arm/AArch32.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/MemoryAllocationLib.h>
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c
index 548ee1303870..7655cb4152de 100644
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c
@@ -17,7 +17,7 @@
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/MemoryAllocationLib.h>
 
-#include <Chipset/ArmV7.h>
+#include <Register/Arm/AArch32.h>
 
 #define __EFI_MEMORY_RWX  0                 // no restrictions
 
diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
index 6709dad0b9d1..bfe314ae2e3d 100644
--- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S
@@ -7,7 +7,7 @@
 
 #include <AsmMacroIoLib.h>
 
-#include <Chipset/ArmV7.h>
+#include <Register/Arm/AArch32.h>
 
 ASM_FUNC(_ModuleEntryPoint)
   // Do early platform specific actions
diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index 552ae3684b93..70ca6ce63842 100644
--- a/MdePkg/Include/Library/ArmLib.h
+++ b/MdePkg/Include/Library/ArmLib.h
@@ -14,7 +14,7 @@
 #include <Uefi/UefiBaseType.h>
 
 #ifdef MDE_CPU_ARM
-  #include <Chipset/ArmV7.h>
+  #include <Register/Arm/AArch32.h>
 #elif defined (MDE_CPU_AARCH64)
   #include <Register/AArch64/AArch64.h>
 #else
diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/MdePkg/Include/Register/Arm/AArch32.h
similarity index 94%
rename from ArmPkg/Include/Chipset/ArmV7.h
rename to MdePkg/Include/Register/Arm/AArch32.h
index 94620c087df2..e74e1e2bf833 100644
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/MdePkg/Include/Register/Arm/AArch32.h
@@ -10,7 +10,7 @@
 #ifndef ARM_V7_H_
 #define ARM_V7_H_
 
-#include <Chipset/ArmV7Mmu.h>
+#include <Register/Arm/AArch32Mmu.h>
 
 // ARM Interrupt ID in Exception Table
 #define ARM_ARCH_EXCEPTION_IRQ  EXCEPT_ARM_IRQ
diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/MdePkg/Include/Register/Arm/AArch32Mmu.h
similarity index 100%
rename from ArmPkg/Include/Chipset/ArmV7Mmu.h
rename to MdePkg/Include/Register/Arm/AArch32Mmu.h
-- 
2.25.1



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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
  2024-03-14 14:51 [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
  2024-03-14 14:51 ` [edk2-devel] [PATCH v2 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h " PierreGondois
  2024-03-14 14:51 ` [edk2-devel] [PATCH v2 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h " PierreGondois
@ 2024-06-03 12:50 ` PierreGondois
  2024-06-10 16:28 ` Leif Lindholm
  3 siblings, 0 replies; 6+ messages in thread
From: PierreGondois @ 2024-06-03 12:50 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao, Leif Lindholm,
	Liming Gao, Michael D Kinney, Sami Mujawar, Zhiguang Liu

Hello,
Just a ping in case this was left aside and as the patch-set (+ Leif's initial
patch) are a prerequisite to enable arm64 native instruction support for the
openssllib, which would also allow to use openssl's DRBG,

Regards,
Pierre

On 3/14/24 15:51, Pierre Gondois wrote:
> v2:
> - Move files to MdePkg/Include/Register/ instead of  MdePkg/Include/
> 
> This patch relies on [1].
> 
> Following the RFC v1: ArmPkg,MdePkg: move ArmLib.h to MdePkg [1],
> move the Chipset/* files to the MdePkg as the Armlib.h relies on
> them.
> 
> These patches span over multiple packages as these Chipset/* files
> are relocated to a new directory and include paths must be updated.
> 
> [1] https://edk2.groups.io/g/devel/message/111566
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pierre Gondois <pierre.gondois@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> 
> Pierre Gondois (2):
>    ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg
>    ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg
> 
>   ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c     | 2 +-
>   ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S     | 2 +-
>   ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c             | 2 +-
>   ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c                    | 2 +-
>   ArmPkg/Library/ArmLib/AArch64/AArch64Support.S                | 2 +-
>   ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c                          | 2 +-
>   ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c              | 2 +-
>   ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c               | 2 +-
>   ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c                  | 2 +-
>   ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c                | 2 +-
>   ArmPlatformPkg/PrePeiCore/AArch64/Exception.S                 | 2 +-
>   ArmPlatformPkg/PrePeiCore/AArch64/Helper.S                    | 2 +-
>   ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c                      | 2 +-
>   ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S                   | 2 +-
>   ArmVirtPkg/PrePi/AArch64/ArchPrePi.c                          | 2 +-
>   MdePkg/Include/Library/ArmLib.h                               | 4 ++--
>   .../Chipset => MdePkg/Include/Register/AArch64}/AArch64.h     | 2 +-
>   .../Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h  | 0
>   .../Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h  | 2 +-
>   .../ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h    | 0
>   20 files changed, 19 insertions(+), 19 deletions(-)
>   rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64.h (94%)
>   rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h (100%)
>   rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h (94%)
>   rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h (100%)
> 


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



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
  2024-03-14 14:51 [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
                   ` (2 preceding siblings ...)
  2024-06-03 12:50 ` [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files " PierreGondois
@ 2024-06-10 16:28 ` Leif Lindholm
  2024-06-11 14:29   ` PierreGondois
  3 siblings, 1 reply; 6+ messages in thread
From: Leif Lindholm @ 2024-06-10 16:28 UTC (permalink / raw)
  To: devel, pierre.gondois
  Cc: Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao, Liming Gao,
	Michael D Kinney, Sami Mujawar, Zhiguang Liu

On 2024-03-14 20:21, PierreGondois wrote:
> v2:
> - Move files to MdePkg/Include/Register/ instead of  MdePkg/Include/
> 
> This patch relies on [1].
> 
> Following the RFC v1: ArmPkg,MdePkg: move ArmLib.h to MdePkg [1],
> move the Chipset/* files to the MdePkg as the Armlib.h relies on
> them.
> 
> These patches span over multiple packages as these Chipset/* files
> are relocated to a new directory and include paths must be updated.
> 
> [1] https://edk2.groups.io/g/devel/message/111566

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

> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Pierre Gondois <pierre.gondois@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> 
> Pierre Gondois (2):
>    ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg
>    ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg
> 
>   ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c     | 2 +-
>   ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S     | 2 +-
>   ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c             | 2 +-
>   ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c                    | 2 +-
>   ArmPkg/Library/ArmLib/AArch64/AArch64Support.S                | 2 +-
>   ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c                          | 2 +-
>   ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c              | 2 +-
>   ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c               | 2 +-
>   ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c                  | 2 +-
>   ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c                | 2 +-
>   ArmPlatformPkg/PrePeiCore/AArch64/Exception.S                 | 2 +-
>   ArmPlatformPkg/PrePeiCore/AArch64/Helper.S                    | 2 +-
>   ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c                      | 2 +-
>   ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S                   | 2 +-
>   ArmVirtPkg/PrePi/AArch64/ArchPrePi.c                          | 2 +-
>   MdePkg/Include/Library/ArmLib.h                               | 4 ++--
>   .../Chipset => MdePkg/Include/Register/AArch64}/AArch64.h     | 2 +-
>   .../Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h  | 0
>   .../Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h  | 2 +-
>   .../ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h    | 0
>   20 files changed, 19 insertions(+), 19 deletions(-)
>   rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64.h (94%)
>   rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h (100%)
>   rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h (94%)
>   rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h (100%)
> 



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



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
  2024-06-10 16:28 ` Leif Lindholm
@ 2024-06-11 14:29   ` PierreGondois
  0 siblings, 0 replies; 6+ messages in thread
From: PierreGondois @ 2024-06-11 14:29 UTC (permalink / raw)
  To: Leif Lindholm, devel
  Cc: Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao, Liming Gao,
	Michael D Kinney, Sami Mujawar, Zhiguang Liu


On 6/10/24 18:28, Leif Lindholm wrote:
> On 2024-03-14 20:21, PierreGondois wrote:
>> v2:
>> - Move files to MdePkg/Include/Register/ instead of  MdePkg/Include/
>>
>> This patch relies on [1].
>>
>> Following the RFC v1: ArmPkg,MdePkg: move ArmLib.h to MdePkg [1],
>> move the Chipset/* files to the MdePkg as the Armlib.h relies on
>> them.
>>
>> These patches span over multiple packages as these Chipset/* files
>> are relocated to a new directory and include paths must be updated.
>>
>> [1] https://edk2.groups.io/g/devel/message/111566
> 
> For my part, for the series:
> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

Thanks !
I created a PR including your patch at:
https://github.com/tianocore/edk2/pull/5766

Regards,
Pierre

> 
>> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Cc: Jiewen Yao <jiewen.yao@intel.com>
>> Cc: Leif Lindholm <quic_llindhol@quicinc.com>
>> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Cc: Pierre Gondois <pierre.gondois@arm.com>
>> Cc: Sami Mujawar <sami.mujawar@arm.com>
>> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
>>
>> Pierre Gondois (2):
>>     ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg
>>     ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg
>>
>>    ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c     | 2 +-
>>    ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S     | 2 +-
>>    ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c             | 2 +-
>>    ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c                    | 2 +-
>>    ArmPkg/Library/ArmLib/AArch64/AArch64Support.S                | 2 +-
>>    ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c                          | 2 +-
>>    ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c              | 2 +-
>>    ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c               | 2 +-
>>    ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c                  | 2 +-
>>    ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c                | 2 +-
>>    ArmPlatformPkg/PrePeiCore/AArch64/Exception.S                 | 2 +-
>>    ArmPlatformPkg/PrePeiCore/AArch64/Helper.S                    | 2 +-
>>    ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c                      | 2 +-
>>    ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S                   | 2 +-
>>    ArmVirtPkg/PrePi/AArch64/ArchPrePi.c                          | 2 +-
>>    MdePkg/Include/Library/ArmLib.h                               | 4 ++--
>>    .../Chipset => MdePkg/Include/Register/AArch64}/AArch64.h     | 2 +-
>>    .../Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h  | 0
>>    .../Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h  | 2 +-
>>    .../ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h    | 0
>>    20 files changed, 19 insertions(+), 19 deletions(-)
>>    rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64.h (94%)
>>    rename {ArmPkg/Include/Chipset => MdePkg/Include/Register/AArch64}/AArch64Mmu.h (100%)
>>    rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Register/Arm/AArch32.h (94%)
>>    rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Register/Arm/AArch32Mmu.h (100%)
>>
> 


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



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-06-11 14:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-14 14:51 [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
2024-03-14 14:51 ` [edk2-devel] [PATCH v2 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h " PierreGondois
2024-03-14 14:51 ` [edk2-devel] [PATCH v2 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h " PierreGondois
2024-06-03 12:50 ` [edk2-devel] [PATCH v2 0/2] ArmPkg/MdePkg: Move Chipset/* files " PierreGondois
2024-06-10 16:28 ` Leif Lindholm
2024-06-11 14:29   ` PierreGondois

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox