summaryrefslogtreecommitdiffstats
path: root/asm
diff options
context:
space:
mode:
authorReza Arbab <arbab@linux.ibm.com>2019-02-10 14:42:18 -0600
committerStewart Smith <stewart@linux.ibm.com>2019-02-10 21:42:32 -0600
commitd3803711f8a9ac90e675bf9978d983f38d14b856 (patch)
tree9abfbee5b56928258beda511d45f1ca5b2046df1 /asm
parent23470f10d0b1e120dc2d2f1606444fb6fc07b506 (diff)
downloadtalos-skiboot-d3803711f8a9ac90e675bf9978d983f38d14b856.tar.gz
talos-skiboot-d3803711f8a9ac90e675bf9978d983f38d14b856.zip
Add PVR_TYPE_P9P
Enable a new PVR to get us running on another p9 variant. Signed-off-by: Reza Arbab <arbab@linux.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'asm')
-rw-r--r--asm/head.S6
-rw-r--r--asm/misc.S7
2 files changed, 11 insertions, 2 deletions
diff --git a/asm/head.S b/asm/head.S
index 803fbf1a..1189fc49 100644
--- a/asm/head.S
+++ b/asm/head.S
@@ -278,6 +278,8 @@ boot_entry:
beq 2f
cmpwi cr0,%r3,PVR_TYPE_P9
beq 1f
+ cmpwi cr0,%r3,PVR_TYPE_P9P
+ beq 1f
attn /* Unsupported CPU type... what do we do ? */
b . /* loop here, just in case attn is disabled */
@@ -733,6 +735,8 @@ init_shared_sprs:
beq 3f
cmpwi cr0,%r3,PVR_TYPE_P9
beq 4f
+ cmpwi cr0,%r3,PVR_TYPE_P9P
+ beq 4f
/* Unsupported CPU type... what do we do ? */
b 9f
@@ -830,6 +834,8 @@ init_replicated_sprs:
beq 3f
cmpwi cr0,%r3,PVR_TYPE_P9
beq 4f
+ cmpwi cr0,%r3,PVR_TYPE_P9P
+ beq 4f
/* Unsupported CPU type... what do we do ? */
b 9f
diff --git a/asm/misc.S b/asm/misc.S
index 381590b9..6ef11a35 100644
--- a/asm/misc.S
+++ b/asm/misc.S
@@ -73,10 +73,13 @@ cleanup_global_tlb:
mfspr %r3,SPR_PVR
srdi %r3,%r3,16
cmpwi cr0,%r3,PVR_TYPE_P9
- bnelr
+ beq cr0,1f
+ cmpwi cr0,%r3,PVR_TYPE_P9P
+ beq cr0,1f
+ blr
/* Sync out previous updates */
- ptesync
+1: ptesync
#ifndef OLD_BINUTILS
.machine "power9"
OpenPOWER on IntegriCloud