ArmPkg/ArmGicV3: switch to ASM_FUNC() asm macro

Annotate functions with ASM_FUNC() so that they are emitted into
separate sections.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S b/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S
index f1c227f2c4211879eea0e46e69da0f6298c1393c..a4e0a4170a0388a66174cfed6c2cbaba6bd854b6 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S
+++ b/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S
@@ -32,24 +32,12 @@
 \r
 #endif\r
 \r
-.text\r
-.align 2\r
-\r
-GCC_ASM_EXPORT(ArmGicV3GetControlSystemRegisterEnable)\r
-GCC_ASM_EXPORT(ArmGicV3SetControlSystemRegisterEnable)\r
-GCC_ASM_EXPORT(ArmGicV3EnableInterruptInterface)\r
-GCC_ASM_EXPORT(ArmGicV3DisableInterruptInterface)\r
-GCC_ASM_EXPORT(ArmGicV3EndOfInterrupt)\r
-GCC_ASM_EXPORT(ArmGicV3AcknowledgeInterrupt)\r
-GCC_ASM_EXPORT(ArmGicV3SetPriorityMask)\r
-GCC_ASM_EXPORT(ArmGicV3SetBinaryPointer)\r
-\r
 //UINT32\r
 //EFIAPI\r
 //ArmGicV3GetControlSystemRegisterEnable (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3GetControlSystemRegisterEnable):\r
+ASM_FUNC(ArmGicV3GetControlSystemRegisterEnable)\r
         EL1_OR_EL2_OR_EL3(x1)\r
 1:  mrs x0, ICC_SRE_EL1\r
         b       4f\r
@@ -63,7 +51,7 @@ ASM_PFX(ArmGicV3GetControlSystemRegisterEnable):
 //ArmGicV3SetControlSystemRegisterEnable (\r
 //  IN UINT32         ControlSystemRegisterEnable\r
 //  );\r
-ASM_PFX(ArmGicV3SetControlSystemRegisterEnable):\r
+ASM_FUNC(ArmGicV3SetControlSystemRegisterEnable)\r
         EL1_OR_EL2_OR_EL3(x1)\r
 1:  msr ICC_SRE_EL1, x0\r
         b       4f\r
@@ -77,7 +65,7 @@ ASM_PFX(ArmGicV3SetControlSystemRegisterEnable):
 //ArmGicV3EnableInterruptInterface (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3EnableInterruptInterface):\r
+ASM_FUNC(ArmGicV3EnableInterruptInterface)\r
         mov     x0, #1\r
         msr     ICC_IGRPEN1_EL1, x0\r
         ret\r
@@ -86,7 +74,7 @@ ASM_PFX(ArmGicV3EnableInterruptInterface):
 //ArmGicV3DisableInterruptInterface (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3DisableInterruptInterface):\r
+ASM_FUNC(ArmGicV3DisableInterruptInterface)\r
         mov     x0, #0\r
         msr     ICC_IGRPEN1_EL1, x0\r
         ret\r
@@ -95,7 +83,7 @@ ASM_PFX(ArmGicV3DisableInterruptInterface):
 //ArmGicV3EndOfInterrupt (\r
 //  IN UINTN          InterruptId\r
 //  );\r
-ASM_PFX(ArmGicV3EndOfInterrupt):\r
+ASM_FUNC(ArmGicV3EndOfInterrupt)\r
         msr     ICC_EOIR1_EL1, x0\r
         ret\r
 \r
@@ -103,7 +91,7 @@ ASM_PFX(ArmGicV3EndOfInterrupt):
 //ArmGicV3AcknowledgeInterrupt (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3AcknowledgeInterrupt):\r
+ASM_FUNC(ArmGicV3AcknowledgeInterrupt)\r
         mrs     x0, ICC_IAR1_EL1\r
         ret\r
 \r
@@ -111,7 +99,7 @@ ASM_PFX(ArmGicV3AcknowledgeInterrupt):
 //ArmGicV3SetPriorityMask (\r
 //  IN UINTN          Priority\r
 //  );\r
-ASM_PFX(ArmGicV3SetPriorityMask):\r
+ASM_FUNC(ArmGicV3SetPriorityMask)\r
         msr     ICC_PMR_EL1, x0\r
         ret\r
 \r
@@ -119,6 +107,6 @@ ASM_PFX(ArmGicV3SetPriorityMask):
 //ArmGicV3SetBinaryPointer (\r
 //  IN UINTN          BinaryPoint\r
 //  );\r
-ASM_PFX(ArmGicV3SetBinaryPointer):\r
+ASM_FUNC(ArmGicV3SetBinaryPointer)\r
         msr     ICC_BPR1_EL1, x0\r
         ret\r

diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
index af14b91b9cfbb0fcd7fd19a1860b26bdc6c49e21..a72f3c86516350c9da4f3505bc5fd2da6b992f35 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
+++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
@@ -16,24 +16,12 @@
 \r
 // For the moment we assume this will run in SVC mode on ARMv7\r
 \r
-.text\r
-.align 2\r
-\r
-GCC_ASM_EXPORT(ArmGicV3GetControlSystemRegisterEnable)\r
-GCC_ASM_EXPORT(ArmGicV3SetControlSystemRegisterEnable)\r
-GCC_ASM_EXPORT(ArmGicV3EnableInterruptInterface)\r
-GCC_ASM_EXPORT(ArmGicV3DisableInterruptInterface)\r
-GCC_ASM_EXPORT(ArmGicV3EndOfInterrupt)\r
-GCC_ASM_EXPORT(ArmGicV3AcknowledgeInterrupt)\r
-GCC_ASM_EXPORT(ArmGicV3SetPriorityMask)\r
-GCC_ASM_EXPORT(ArmGicV3SetBinaryPointer)\r
-\r
 //UINT32\r
 //EFIAPI\r
 //ArmGicGetControlSystemRegisterEnable (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3GetControlSystemRegisterEnable):\r
+ASM_FUNC(ArmGicV3GetControlSystemRegisterEnable)\r
         mrc     p15, 0, r0, c12, c12, 5 // ICC_SRE\r
         bx      lr\r
 \r
@@ -42,7 +30,7 @@ ASM_PFX(ArmGicV3GetControlSystemRegisterEnable):
 //ArmGicSetControlSystemRegisterEnable (\r
 //  IN UINT32         ControlSystemRegisterEnable\r
 //  );\r
-ASM_PFX(ArmGicV3SetControlSystemRegisterEnable):\r
+ASM_FUNC(ArmGicV3SetControlSystemRegisterEnable)\r
         mcr     p15, 0, r0, c12, c12, 5 // ICC_SRE\r
         isb\r
         bx      lr\r
@@ -51,7 +39,7 @@ ASM_PFX(ArmGicV3SetControlSystemRegisterEnable):
 //ArmGicV3EnableInterruptInterface (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3EnableInterruptInterface):\r
+ASM_FUNC(ArmGicV3EnableInterruptInterface)\r
         mov     r0, #1\r
         mcr     p15, 0, r0, c12, c12, 7 // ICC_IGRPEN1\r
         bx      lr\r
@@ -60,7 +48,7 @@ ASM_PFX(ArmGicV3EnableInterruptInterface):
 //ArmGicV3DisableInterruptInterface (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3DisableInterruptInterface):\r
+ASM_FUNC(ArmGicV3DisableInterruptInterface)\r
         mov     r0, #0\r
         mcr     p15, 0, r0, c12, c12, 7 // ICC_IGRPEN1\r
         bx      lr\r
@@ -69,7 +57,7 @@ ASM_PFX(ArmGicV3DisableInterruptInterface):
 //ArmGicV3EndOfInterrupt (\r
 //  IN UINTN InterruptId\r
 //  );\r
-ASM_PFX(ArmGicV3EndOfInterrupt):\r
+ASM_FUNC(ArmGicV3EndOfInterrupt)\r
         mcr     p15, 0, r0, c12, c12, 1 //ICC_EOIR1\r
         bx      lr\r
 \r
@@ -77,7 +65,7 @@ ASM_PFX(ArmGicV3EndOfInterrupt):
 //ArmGicV3AcknowledgeInterrupt (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmGicV3AcknowledgeInterrupt):\r
+ASM_FUNC(ArmGicV3AcknowledgeInterrupt)\r
         mrc     p15, 0, r0, c12, c8, 0 //ICC_IAR1\r
         bx      lr\r
 \r
@@ -85,7 +73,7 @@ ASM_PFX(ArmGicV3AcknowledgeInterrupt):
 //ArmGicV3SetPriorityMask (\r
 //  IN UINTN                  Priority\r
 //  );\r
-ASM_PFX(ArmGicV3SetPriorityMask):\r
+ASM_FUNC(ArmGicV3SetPriorityMask)\r
         mcr     p15, 0, r0, c4, c6, 0 //ICC_PMR\r
         bx      lr\r
 \r
@@ -93,6 +81,6 @@ ASM_PFX(ArmGicV3SetPriorityMask):
 //ArmGicV3SetBinaryPointer (\r
 //  IN UINTN                  BinaryPoint\r
 //  );\r
-ASM_PFX(ArmGicV3SetBinaryPointer):\r
+ASM_FUNC(ArmGicV3SetBinaryPointer)\r
         mcr     p15, 0, r0, c12, c12, 3 //ICC_BPR1\r
         bx      lr\r