On 3 November 2015 at 12:28, Mark Rutland <[email protected]> wrote: > On Tue, Nov 03, 2015 at 11:16:27AM +0100, Ard Biesheuvel wrote: >> Replace all instances of ArmDataSyncronizationBarrier with >> ArmDataSynchronizationBarrier. > > There are a few instances left in the ARM9 support: > > ArmPkg/Library/ArmLib/Arm9/Arm9Support.S:GCC_ASM_EXPORT(ArmDataSyncronizationBarrier) > ArmPkg/Library/ArmLib/Arm9/Arm9Support.S:ASM_PFX(ArmDataSyncronizationBarrier): > ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm: EXPORT > ArmDataSyncronizationBarrier > ArmPkg/Library/ArmLib/Arm9/Arm9Support.asm:ASM_PFX(ArmDataSyncronizationBarrier): > > Any reason to not fix those up? >
There wasn't until I reshuffled the patches :-) > Otherwise this looks sensible to me. Thanks. >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <[email protected]> >> --- >> ArmPkg/Include/Library/ArmLib.h | 2 +- >> ArmPkg/Library/ArmLib/AArch64/AArch64Support.S | 4 ++-- >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S | 4 ++-- >> ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm | 4 ++-- >> BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c | 4 ++-- >> Omap35xxPkg/InterruptDxe/HardwareInterrupt.c | 6 +++--- >> Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c | 2 +- >> 7 files changed, 13 insertions(+), 13 deletions(-) >> >> diff --git a/ArmPkg/Include/Library/ArmLib.h >> b/ArmPkg/Include/Library/ArmLib.h >> index b4768841bd9d..58116663b28d 100644 >> --- a/ArmPkg/Include/Library/ArmLib.h >> +++ b/ArmPkg/Include/Library/ArmLib.h >> @@ -483,7 +483,7 @@ ArmDataMemoryBarrier ( >> >> VOID >> EFIAPI >> -ArmDataSyncronizationBarrier ( >> +ArmDataSynchronizationBarrier ( >> VOID >> ); >> >> diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S >> b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S >> index 28cf27fbd1b6..8b5e0fb6e7fe 100644 >> --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S >> +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S >> @@ -42,7 +42,7 @@ GCC_ASM_EXPORT (ArmDisableBranchPrediction) >> GCC_ASM_EXPORT (AArch64AllDataCachesOperation) >> GCC_ASM_EXPORT (AArch64PerformPoUDataCacheOperation) >> GCC_ASM_EXPORT (ArmDataMemoryBarrier) >> -GCC_ASM_EXPORT (ArmDataSyncronizationBarrier) >> +GCC_ASM_EXPORT (ArmDataSynchronizationBarrier) >> GCC_ASM_EXPORT (ArmInstructionSynchronizationBarrier) >> GCC_ASM_EXPORT (ArmWriteVBar) >> GCC_ASM_EXPORT (ArmReadVBar) >> @@ -389,7 +389,7 @@ ASM_PFX(ArmDataMemoryBarrier): >> ret >> >> >> -ASM_PFX(ArmDataSyncronizationBarrier): >> +ASM_PFX(ArmDataSynchronizationBarrier): >> ASM_PFX(ArmDrainWriteBuffer): >> dsb sy >> ret >> diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S >> b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S >> index af5ec23a1a4f..f59cd5f32e6b 100644 >> --- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S >> +++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S >> @@ -40,7 +40,7 @@ GCC_ASM_EXPORT (ArmSetHighVectors) >> GCC_ASM_EXPORT (ArmV7AllDataCachesOperation) >> GCC_ASM_EXPORT (ArmV7PerformPoUDataCacheOperation) >> GCC_ASM_EXPORT (ArmDataMemoryBarrier) >> -GCC_ASM_EXPORT (ArmDataSyncronizationBarrier) >> +GCC_ASM_EXPORT (ArmDataSynchronizationBarrier) >> GCC_ASM_EXPORT (ArmInstructionSynchronizationBarrier) >> GCC_ASM_EXPORT (ArmReadVBar) >> GCC_ASM_EXPORT (ArmWriteVBar) >> @@ -321,7 +321,7 @@ ASM_PFX(ArmDataMemoryBarrier): >> dmb >> bx LR >> >> -ASM_PFX(ArmDataSyncronizationBarrier): >> +ASM_PFX(ArmDataSynchronizationBarrier): >> ASM_PFX(ArmDrainWriteBuffer): >> dsb >> bx LR >> diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm >> b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm >> index 2b13811dc6cf..07ff1ae15a6a 100644 >> --- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm >> +++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm >> @@ -37,7 +37,7 @@ >> EXPORT ArmV7AllDataCachesOperation >> EXPORT ArmV7PerformPoUDataCacheOperation >> EXPORT ArmDataMemoryBarrier >> - EXPORT ArmDataSyncronizationBarrier >> + EXPORT ArmDataSynchronizationBarrier >> EXPORT ArmInstructionSynchronizationBarrier >> EXPORT ArmReadVBar >> EXPORT ArmWriteVBar >> @@ -315,7 +315,7 @@ ArmDataMemoryBarrier >> dmb >> bx LR >> >> -ArmDataSyncronizationBarrier >> +ArmDataSynchronizationBarrier >> ArmDrainWriteBuffer >> dsb >> bx LR >> diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c >> b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c >> index dbbe68a7a08e..3b0244004853 100755 >> --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c >> +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c >> @@ -92,11 +92,11 @@ ArmPlatformInitialize ( >> >> // Turn off the functional clock for Timer 3 >> MmioAnd32 (CM_FCLKEN_PER, 0xFFFFFFFF ^ CM_ICLKEN_PER_EN_GPT3_ENABLE ); >> - ArmDataSyncronizationBarrier (); >> + ArmDataSynchronizationBarrier (); >> >> // Clear IRQs >> MmioWrite32 (INTCPS_CONTROL, INTCPS_CONTROL_NEWIRQAGR); >> - ArmDataSyncronizationBarrier (); >> + ArmDataSynchronizationBarrier (); >> >> return RETURN_SUCCESS; >> } >> diff --git a/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c >> b/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c >> index e9d84aeabb69..09e22b5921b0 100644 >> --- a/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c >> +++ b/Omap35xxPkg/InterruptDxe/HardwareInterrupt.c >> @@ -237,7 +237,7 @@ EndOfInterrupt ( >> ) >> { >> MmioWrite32 (INTCPS_CONTROL, INTCPS_CONTROL_NEWIRQAGR); >> - ArmDataSyncronizationBarrier (); >> + ArmDataSynchronizationBarrier (); >> return EFI_SUCCESS; >> } >> >> @@ -267,7 +267,7 @@ IrqInterruptHandler ( >> >> // Needed to prevent infinite nesting when Time Driver lowers TPL >> MmioWrite32 (INTCPS_CONTROL, INTCPS_CONTROL_NEWIRQAGR); >> - ArmDataSyncronizationBarrier (); >> + ArmDataSynchronizationBarrier (); >> >> InterruptHandler = gRegisteredInterruptHandlers[Vector]; >> if (InterruptHandler != NULL) { >> @@ -277,7 +277,7 @@ IrqInterruptHandler ( >> >> // Needed to clear after running the handler >> MmioWrite32 (INTCPS_CONTROL, INTCPS_CONTROL_NEWIRQAGR); >> - ArmDataSyncronizationBarrier (); >> + ArmDataSynchronizationBarrier (); >> } >> >> // >> diff --git a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c >> b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c >> index de849d4fd691..11f0bdd117af 100755 >> --- a/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c >> +++ b/Omap35xxPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.c >> @@ -159,7 +159,7 @@ DebugAgentTimerEndOfInterrupt ( >> while ((MmioRead32 (gTISR) & TISR_ALL_INTERRUPT_MASK) != >> TISR_NO_INTERRUPTS_PENDING); >> >> MmioWrite32 (INTCPS_CONTROL, INTCPS_CONTROL_NEWFIQAGR); >> - ArmDataSyncronizationBarrier (); >> + ArmDataSynchronizationBarrier (); >> >> } >> >> -- >> 1.9.1 >> _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
