* [edk2-devel] [PATCH 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg
2024-03-12 9:18 [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
@ 2024-03-12 9:18 ` PierreGondois
2024-03-12 9:18 ` [edk2-devel] [PATCH 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|Mmu].h " PierreGondois
2024-03-12 16:47 ` [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files " Leif Lindholm
2 siblings, 0 replies; 7+ messages in thread
From: PierreGondois @ 2024-03-12 9:18 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: 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 +-
{ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h | 2 +-
{ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h | 0
MdePkg/Include/Library/ArmLib.h | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h (94%)
rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h (100%)
diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
index ef6a132b8dfc..b0c2e39cd910 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 <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..f5cbc2e97c3b 100644
--- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
+++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-#include <Chipset/AArch64.h>
+#include <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..6739f5c37d38 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 <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..177d10e66d5d 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -9,7 +9,7 @@
#
#------------------------------------------------------------------------------
-#include <Chipset/AArch64.h>
+#include <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..6a1f3f947788 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 <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..d0d6bc44f78c 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
@@ -5,7 +5,7 @@
#
#
-#include <Chipset/AArch64.h>
+#include <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..9b81b96a4949 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 <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..27a85049fa78 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 <AArch64/AArch64.h>
VOID
ArchInitialize (
diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
index 9cab88ca086e..493628b8880d 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 <AArch64/AArch64.h>
VOID
ArchInitialize (
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/AArch64/AArch64.h
similarity index 94%
rename from ArmPkg/Include/Chipset/AArch64.h
rename to MdePkg/Include/AArch64/AArch64.h
index 5390bf0a2774..a77c3a95f1b5 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/MdePkg/Include/AArch64/AArch64.h
@@ -10,7 +10,7 @@
#ifndef AARCH64_H_
#define AARCH64_H_
-#include <Chipset/AArch64Mmu.h>
+#include <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/AArch64/AArch64Mmu.h
similarity index 100%
rename from ArmPkg/Include/Chipset/AArch64Mmu.h
rename to MdePkg/Include/AArch64/AArch64Mmu.h
diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index 6aa8a48f07f3..852264dba289 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 <AArch64/AArch64.h>
#else
#error "Unknown chipset."
#endif
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116674): https://edk2.groups.io/g/devel/message/116674
Mute This Topic: https://groups.io/mt/104881291/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] 7+ messages in thread* [edk2-devel] [PATCH 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|Mmu].h to MdePkg
2024-03-12 9:18 [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
2024-03-12 9:18 ` [edk2-devel] [PATCH 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h " PierreGondois
@ 2024-03-12 9:18 ` PierreGondois
2024-03-12 16:47 ` [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files " Leif Lindholm
2 siblings, 0 replies; 7+ messages in thread
From: PierreGondois @ 2024-03-12 9:18 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: 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 +-
ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h | 2 +-
.../Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h | 0
MdePkg/Include/Library/ArmLib.h | 2 +-
9 files changed, 8 insertions(+), 8 deletions(-)
rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h (95%)
rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h (100%)
diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c
index fc411b845d64..7652b97b43c7 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 <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..6acc4d3e7cc5 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 <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..bf3a874822ac 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 <Arm/AArch32.h>
UINT32
ConvertSectionAttributesToPageAttributes (
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
index 28e4cd9f1a77..60dc6c987cbd 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 <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..5e751cddd7d6 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 <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..60e530e4f1c5 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 <Arm/AArch32.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/MdePkg/Include/Arm/AArch32.h
similarity index 95%
rename from ArmPkg/Include/Chipset/ArmV7.h
rename to MdePkg/Include/Arm/AArch32.h
index 94620c087df2..e7e6e4dcd0a2 100644
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/MdePkg/Include/Arm/AArch32.h
@@ -10,7 +10,7 @@
#ifndef ARM_V7_H_
#define ARM_V7_H_
-#include <Chipset/ArmV7Mmu.h>
+#include <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/Arm/AArch32Mmu.h
similarity index 100%
rename from ArmPkg/Include/Chipset/ArmV7Mmu.h
rename to MdePkg/Include/Arm/AArch32Mmu.h
diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index 852264dba289..71c2076652fa 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 <Arm/AArch32.h>
#elif defined (MDE_CPU_AARCH64)
#include <AArch64/AArch64.h>
#else
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116675): https://edk2.groups.io/g/devel/message/116675
Mute This Topic: https://groups.io/mt/104881292/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] 7+ messages in thread
* Re: [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
2024-03-12 9:18 [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg PierreGondois
2024-03-12 9:18 ` [edk2-devel] [PATCH 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h " PierreGondois
2024-03-12 9:18 ` [edk2-devel] [PATCH 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|Mmu].h " PierreGondois
@ 2024-03-12 16:47 ` Leif Lindholm
2024-03-12 16:53 ` Michael D Kinney
2024-03-27 8:52 ` PierreGondois
2 siblings, 2 replies; 7+ messages in thread
From: Leif Lindholm @ 2024-03-12 16:47 UTC (permalink / raw)
To: Pierre Gondois, devel
Cc: Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao, Liming Gao,
Michael D Kinney, Sami Mujawar, Zhiguang Liu
On 2024-03-12 02:18, Pierre Gondois wrote:
> 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.
I like this!
Traveling this week, so unable to test until Wednesday next week at the
earliest, which I would like to do for something this core before giving
a Reviewed-by. So for now, for the series:
Acked-by: Leif Lindholm <quic_llindhol@quicinc.com>
> [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/ArmV7[|Mmu].h to MdePkg
> ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|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 +-
> {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h | 2 +-
> .../Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h | 0
> .../Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h | 2 +-
> .../Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h | 0
> MdePkg/Include/Library/ArmLib.h | 4 ++--
> 20 files changed, 19 insertions(+), 19 deletions(-)
> rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h (94%)
> rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h (100%)
> rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h (95%)
> rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h (100%)
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116692): https://edk2.groups.io/g/devel/message/116692
Mute This Topic: https://groups.io/mt/104881290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
2024-03-12 16:47 ` [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files " Leif Lindholm
@ 2024-03-12 16:53 ` Michael D Kinney
2024-03-13 10:26 ` PierreGondois
2024-03-27 8:52 ` PierreGondois
1 sibling, 1 reply; 7+ messages in thread
From: Michael D Kinney @ 2024-03-12 16:53 UTC (permalink / raw)
To: Leif Lindholm, Pierre Gondois, devel@edk2.groups.io
Cc: Ard Biesheuvel, Gerd Hoffmann, Yao, Jiewen, Liming Gao,
Sami Mujawar, Liu, Zhiguang, Kinney, Michael D
The MdePkg does have a standard location for CPU specific register
related includes.
Did you consider moving some of the content into
* MdePkg/Include/Register/Arm
* MdePkg/Include/Register/AArch64
Thanks,
Mike
> -----Original Message-----
> From: Leif Lindholm <quic_llindhol@quicinc.com>
> Sent: Tuesday, March 12, 2024 9:47 AM
> To: Pierre Gondois <pierre.gondois@arm.com>; devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Gerd Hoffmann
> <kraxel@redhat.com>; Yao, Jiewen <jiewen.yao@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Kinney, Michael D <michael.d.kinney@intel.com>;
> Sami Mujawar <sami.mujawar@arm.com>; Liu, Zhiguang <zhiguang.liu@intel.com>
> Subject: Re: [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
>
> On 2024-03-12 02:18, Pierre Gondois wrote:
> > 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.
>
> I like this!
> Traveling this week, so unable to test until Wednesday next week at the
> earliest, which I would like to do for something this core before giving
> a Reviewed-by. So for now, for the series:
> Acked-by: Leif Lindholm <quic_llindhol@quicinc.com>
>
> > [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/ArmV7[|Mmu].h to MdePkg
> > ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|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 +-
> > {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h | 2 +-
> > .../Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h | 0
> > .../Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h | 2 +-
> > .../Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h | 0
> > MdePkg/Include/Library/ArmLib.h | 4 ++--
> > 20 files changed, 19 insertions(+), 19 deletions(-)
> > rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h
> (94%)
> > rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h
> (100%)
> > rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h
> (95%)
> > rename ArmPkg/Include/Chipset/ArmV7Mmu.h =>
> MdePkg/Include/Arm/AArch32Mmu.h (100%)
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116694): https://edk2.groups.io/g/devel/message/116694
Mute This Topic: https://groups.io/mt/104881290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
2024-03-12 16:53 ` Michael D Kinney
@ 2024-03-13 10:26 ` PierreGondois
0 siblings, 0 replies; 7+ messages in thread
From: PierreGondois @ 2024-03-13 10:26 UTC (permalink / raw)
To: Kinney, Michael D, Leif Lindholm, devel@edk2.groups.io
Cc: Ard Biesheuvel, Gerd Hoffmann, Yao, Jiewen, Liming Gao,
Sami Mujawar, Liu, Zhiguang
Hello Michael,
On 3/12/24 17:53, Kinney, Michael D wrote:
> The MdePkg does have a standard location for CPU specific register
> related includes.
>
> Did you consider moving some of the content into
>
> * MdePkg/Include/Register/Arm
> * MdePkg/Include/Register/AArch64
Yes right, this should be a better location,
Regards,
Pierre
>
> Thanks,
>
> Mike
>
>> -----Original Message-----
>> From: Leif Lindholm <quic_llindhol@quicinc.com>
>> Sent: Tuesday, March 12, 2024 9:47 AM
>> To: Pierre Gondois <pierre.gondois@arm.com>; devel@edk2.groups.io
>> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Gerd Hoffmann
>> <kraxel@redhat.com>; Yao, Jiewen <jiewen.yao@intel.com>; Liming Gao
>> <gaoliming@byosoft.com.cn>; Kinney, Michael D <michael.d.kinney@intel.com>;
>> Sami Mujawar <sami.mujawar@arm.com>; Liu, Zhiguang <zhiguang.liu@intel.com>
>> Subject: Re: [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
>>
>> On 2024-03-12 02:18, Pierre Gondois wrote:
>>> 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.
>>
>> I like this!
>> Traveling this week, so unable to test until Wednesday next week at the
>> earliest, which I would like to do for something this core before giving
>> a Reviewed-by. So for now, for the series:
>> Acked-by: Leif Lindholm <quic_llindhol@quicinc.com>
>>
>>> [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/ArmV7[|Mmu].h to MdePkg
>>> ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|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 +-
>>> {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h | 2 +-
>>> .../Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h | 0
>>> .../Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h | 2 +-
>>> .../Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h | 0
>>> MdePkg/Include/Library/ArmLib.h | 4 ++--
>>> 20 files changed, 19 insertions(+), 19 deletions(-)
>>> rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h
>> (94%)
>>> rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h
>> (100%)
>>> rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h
>> (95%)
>>> rename ArmPkg/Include/Chipset/ArmV7Mmu.h =>
>> MdePkg/Include/Arm/AArch32Mmu.h (100%)
>>>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116714): https://edk2.groups.io/g/devel/message/116714
Mute This Topic: https://groups.io/mt/104881290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files to MdePkg
2024-03-12 16:47 ` [edk2-devel] [PATCH 0/2] ArmPkg/MdePkg: Move Chipset/* files " Leif Lindholm
2024-03-12 16:53 ` Michael D Kinney
@ 2024-03-27 8:52 ` PierreGondois
1 sibling, 0 replies; 7+ messages in thread
From: PierreGondois @ 2024-03-27 8:52 UTC (permalink / raw)
To: Leif Lindholm, devel
Cc: Ard Biesheuvel, Gerd Hoffmann, Jiewen Yao, Liming Gao,
Michael D Kinney, Sami Mujawar, Zhiguang Liu
Hello Leif,
On 3/12/24 17:47, Leif Lindholm wrote:
> On 2024-03-12 02:18, Pierre Gondois wrote:
>> 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.
>
> I like this!
> Traveling this week, so unable to test until Wednesday next week at the
> earliest, which I would like to do for something this core before giving
> a Reviewed-by. So for now, for the series:
> Acked-by: Leif Lindholm <quic_llindhol@quicinc.com>
I forgot to add your Acked-by tag.
Just a ping if the v2 was forgotten:
- https://edk2.groups.io/g/devel/message/116759
Regards,
Pierre
>
>> [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/ArmV7[|Mmu].h to MdePkg
>> ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|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 +-
>> {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h | 2 +-
>> .../Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h | 0
>> .../Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h | 2 +-
>> .../Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h | 0
>> MdePkg/Include/Library/ArmLib.h | 4 ++--
>> 20 files changed, 19 insertions(+), 19 deletions(-)
>> rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64.h (94%)
>> rename {ArmPkg/Include/Chipset => MdePkg/Include/AArch64}/AArch64Mmu.h (100%)
>> rename ArmPkg/Include/Chipset/ArmV7.h => MdePkg/Include/Arm/AArch32.h (95%)
>> rename ArmPkg/Include/Chipset/ArmV7Mmu.h => MdePkg/Include/Arm/AArch32Mmu.h (100%)
>>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117164): https://edk2.groups.io/g/devel/message/117164
Mute This Topic: https://groups.io/mt/104881290/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 7+ messages in thread