tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdePkg: Update CpuSleep to use ARMv7 instruction. 

The code was using ARMv6 co-processor reg, that is a no-op on ARMv7. WFI is the instruction on ARMv7.

signed-off-by: andrewfish
reviewed-by: mdkinney



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12035 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2011-07-20 17:47:44 +00:00
parent 2d08d17d65
commit f7c8bd9f9d
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MdePkg/Library/BaseCpuLib/Arm/CpuSleep.S
View File

@ -1,6 +1,12 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# CpuSleep() for ARM # CpuSleep() for ARMv7
#
# ARMv6 versions was:
# MOV r0,#0
# MCR p15,0,r0,c7,c0,4 ;Wait for Interrupt instruction
#
# But this is a no-op on ARMv7
# #
# Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
@ -33,6 +39,5 @@ GCC_ASM_EXPORT(CpuSleep)
# ); # );
# #
ASM_PFX(CpuSleep): ASM_PFX(CpuSleep):
mov r0,#0 wfi
mcr p15,0,r0,c7,c0,4 // Wait for Interrupt instruction
bx lr bx lr

13
MdePkg/Library/BaseCpuLib/Arm/CpuSleep.asm
View File

@ -1,9 +1,15 @@
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; ;
; CpuSleep() for ARM ; CpuSleep() for ARMv7
;
; ARMv6 versions was:
; MOV r0,#0
; MCR p15,0,r0,c7,c0,4 ;Wait for Interrupt instruction
;
; But this is a no-op on ARMv7
; ;
; Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> ; Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
; Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> ; Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
; This program and the accompanying materials ; This program and the accompanying materials
; are licensed and made available under the terms and conditions of the BSD License ; are licensed and made available under the terms and conditions of the BSD License
; which accompanies this distribution. The full text of the license may be found at ; which accompanies this distribution. The full text of the license may be found at
@ -32,8 +38,7 @@
; ); ; );
; ;
CpuSleep CpuSleep
MOV r0,#0 WFI
MCR p15,0,r0,c7,c0,4 ;Wait for Interrupt instruction
BX LR BX LR
END END