diff options
| author | Joel Stanley <joel.stanley@au1.ibm.com> | 2017-06-27 18:00:09 +0930 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-27 23:48:17 -0400 |
| commit | f2250d8720223ea8fde4a7c0b6819eaebf070915 (patch) | |
| tree | 2c550613bd3cd44f652cb80d7fac0c7dbededaa3 /src/kernel | |
| parent | 0ffbb55230683d680c3a4dbc6ba40b4af5c61572 (diff) | |
| download | talos-hostboot-f2250d8720223ea8fde4a7c0b6819eaebf070915.tar.gz talos-hostboot-f2250d8720223ea8fde4a7c0b6819eaebf070915.zip | |
kernel: Fix cmp in shutdown.S for modern binutils
This is a further fix that was missed in 10983d35f568 ("Convert cmpi to
cmpwi to fix build for modern binutils").
In the past binutils would assume 'cmp' meant 'cmpw'. Modern binutils
require the explict use of cmpw or cmpd.
The first two instances are dealing with SPRs, which are 32-bit, so cmpw
is correct.
It is not clear what to do in the third use of cmp, but given old toolchains
have generated cmpw lets assume that we should maintain the behaviour.
Change-Id: Iee5dd5903dcd7ac4028bab0176e08ce3db23b2d5
Signed-off-by: Joel Stanley <joel.stanley@au1.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42476
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/shutdown.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/shutdown.S b/src/kernel/shutdown.S index b3c47725a..0c42a19cf 100644 --- a/src/kernel/shutdown.S +++ b/src/kernel/shutdown.S @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2016 +# Contributors Listed Below - COPYRIGHT 2012,2017 # [+] International Business Machines Corp. # # @@ -94,7 +94,7 @@ kernel_shutdown_ea0_1_mode: ;// as it was the one that updated the cpu_count & lowest_pir ;// barrier - 1 wait for all nodes to report mfspr r10, PIR - cmp cr0, r10, r7 + cmpw cr0, r10, r7 bne+ 2f ;// inside KERNEL_BARRIER below ;// Perform barrier - 1 @@ -132,7 +132,7 @@ kernel_shutdown_ea0_1_mode: addi r8, r8, 8 ;// Check for PIR == r7. mfspr r10, PIR - cmp cr0, r10, r7 + cmpw cr0, r10, r7 beq 3f ;// Increment thread count. 1: @@ -165,7 +165,7 @@ kernel_shutdown_ea0_1_mode: 1: or 1,1,1 ld r11, 0(r8) - cmp cr0, r3, r11 + cmpw cr0, r3, r11 bne+ 1b isync ;// All other threads have left, so wait a little bit... |
