Revision: 18915
http://sourceforge.net/p/edk2/code/18915
Author: leiflindholm
Date: 2015-11-20 13:14:59 +0000 (Fri, 20 Nov 2015)
Log Message:
-----------
ArmPkg: ArmLib: purge incorrect ArmDrainWriteBuffer () alias
In ArmLib, there exists an alias for ArmDataSynchronizationBarrier,
named after one of several names for the pre-ARMv6 cp15 operation that
was formalised into the Data Synchronization Barrier in ARMv6.
This alias is also the one called from within ArmLib, in preference of
the correct name. Through the power of code reuse, this name slipped
into the AArch64 variant as well.
Expunge it from the codebase.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindh...@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Include/Library/ArmLib.h
trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
Modified: trunk/edk2/ArmPkg/Include/Library/ArmLib.h
===================================================================
--- trunk/edk2/ArmPkg/Include/Library/ArmLib.h 2015-11-20 08:22:46 UTC (rev
18914)
+++ trunk/edk2/ArmPkg/Include/Library/ArmLib.h 2015-11-20 13:14:59 UTC (rev
18915)
@@ -393,12 +393,6 @@
VOID
EFIAPI
-ArmDrainWriteBuffer (
- VOID
- );
-
-VOID
-EFIAPI
ArmDataMemoryBarrier (
VOID
);
Modified: trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c 2015-11-20
08:22:46 UTC (rev 18914)
+++ trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c 2015-11-20
13:14:59 UTC (rev 18915)
@@ -33,7 +33,7 @@
AArch64AllDataCachesOperation (DataCacheOperation);
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
if (SavedInterruptState) {
ArmEnableInterrupts ();
@@ -46,7 +46,7 @@
VOID
)
{
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
AArch64DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);
}
@@ -56,7 +56,7 @@
VOID
)
{
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
AArch64DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);
}
@@ -66,6 +66,6 @@
VOID
)
{
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
AArch64DataCacheOperation (ArmCleanDataCacheEntryBySetWay);
}
Modified: trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S 2015-11-20
08:22:46 UTC (rev 18914)
+++ trunk/edk2/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S 2015-11-20
13:14:59 UTC (rev 18915)
@@ -26,7 +26,6 @@
GCC_ASM_EXPORT (ArmInvalidateDataCacheEntryBySetWay)
GCC_ASM_EXPORT (ArmCleanDataCacheEntryBySetWay)
GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryBySetWay)
-GCC_ASM_EXPORT (ArmDrainWriteBuffer)
GCC_ASM_EXPORT (ArmEnableMmu)
GCC_ASM_EXPORT (ArmDisableMmu)
GCC_ASM_EXPORT (ArmDisableCachesAndMmu)
@@ -364,7 +363,6 @@
ASM_PFX(ArmDataSynchronizationBarrier):
-ASM_PFX(ArmDrainWriteBuffer):
dsb sy
ret
Modified: trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c 2015-11-20 08:22:46 UTC
(rev 18914)
+++ trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c 2015-11-20 13:14:59 UTC
(rev 18915)
@@ -32,7 +32,7 @@
ArmV7AllDataCachesOperation (DataCacheOperation);
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
if (SavedInterruptState) {
ArmEnableInterrupts ();
@@ -45,7 +45,7 @@
VOID
)
{
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
ArmV7DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);
}
@@ -55,7 +55,7 @@
VOID
)
{
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
ArmV7DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);
}
@@ -65,6 +65,6 @@
VOID
)
{
- ArmDrainWriteBuffer ();
+ ArmDataSynchronizationBarrier ();
ArmV7DataCacheOperation (ArmCleanDataCacheEntryBySetWay);
}
Modified: trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S 2015-11-20
08:22:46 UTC (rev 18914)
+++ trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S 2015-11-20
13:14:59 UTC (rev 18915)
@@ -23,7 +23,6 @@
GCC_ASM_EXPORT (ArmInvalidateDataCacheEntryBySetWay)
GCC_ASM_EXPORT (ArmCleanDataCacheEntryBySetWay)
GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryBySetWay)
-GCC_ASM_EXPORT (ArmDrainWriteBuffer)
GCC_ASM_EXPORT (ArmEnableMmu)
GCC_ASM_EXPORT (ArmDisableMmu)
GCC_ASM_EXPORT (ArmDisableCachesAndMmu)
@@ -261,7 +260,6 @@
bx LR
ASM_PFX(ArmDataSynchronizationBarrier):
-ASM_PFX(ArmDrainWriteBuffer):
dsb
bx LR
Modified: trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm 2015-11-20
08:22:46 UTC (rev 18914)
+++ trunk/edk2/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm 2015-11-20
13:14:59 UTC (rev 18915)
@@ -20,7 +20,6 @@
EXPORT ArmInvalidateDataCacheEntryBySetWay
EXPORT ArmCleanDataCacheEntryBySetWay
EXPORT ArmCleanInvalidateDataCacheEntryBySetWay
- EXPORT ArmDrainWriteBuffer
EXPORT ArmEnableMmu
EXPORT ArmDisableMmu
EXPORT ArmDisableCachesAndMmu
@@ -255,7 +254,6 @@
bx LR
ArmDataSynchronizationBarrier
-ArmDrainWriteBuffer
dsb
bx LR
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits
