From d3803711f8a9ac90e675bf9978d983f38d14b856 Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Sun, 10 Feb 2019 14:42:18 -0600 Subject: Add PVR_TYPE_P9P Enable a new PVR to get us running on another p9 variant. Signed-off-by: Reza Arbab Signed-off-by: Stewart Smith --- asm/head.S | 6 ++++++ asm/misc.S | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'asm') diff --git a/asm/head.S b/asm/head.S index 803fbf1..1189fc4 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 381590b..6ef11a3 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" -- cgit v1.1