From 63e65d32fd40865b4283047f2afc821387d2686b Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 18 Mar 2020 14:27:41 +0000
Subject: [PATCH] re-add priv/hypv suffix

---
 openpower/isatables/sprs.csv | 52 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/openpower/isatables/sprs.csv b/openpower/isatables/sprs.csv
index 5080169b3..1251e8e16 100644
--- a/openpower/isatables/sprs.csv
+++ b/openpower/isatables/sprs.csv
@@ -4,14 +4,14 @@ Idx,SPR,priv_mtspr,priv_mfspr,len
 8,LR,no,no,64
 9,CTR,no,no,64
 13,AMR,no,no,64
-17,DSCR,yes,yes,64
+17,DSCR_priv,yes,yes,64
 18,DSISR,yes,yes,32
 19,DAR,yes,yes,64
 22,DEC,yes,yes,64
 26,SRR0,yes,yes,64
 27,SRR1,yes,yes,64
 28,CFAR,yes,yes,64
-29,AMR,yes,yes,64
+29,AMR_priv,yes,yes,64
 48,PIDR,yes,yes,32
 61,IAMR,yes,yes,64
 128,TFHAR,no,no,64
@@ -20,7 +20,7 @@ Idx,SPR,priv_mtspr,priv_mfspr,len
 131,TEXASRU,no,no,32
 136,CTRL,-,no,32
 144,TIDR,yes,yes,64
-152,CTRL,yes,-,32
+152,CTRL_priv,yes,-,32
 153,FSCR,yes,yes,64
 157,UAMOR,yes,yes,64
 158,GSR,yes,-,0
@@ -35,13 +35,13 @@ Idx,SPR,priv_mtspr,priv_mfspr,len
 259,SPRG3,-,no,64
 268,TB,-,no,64
 269,TBU,-,no,32
-272,SPRG0,yes,yes,64
-273,SPRG1,yes,yes,64
-274,SPRG2,yes,yes,64
-275,SPRG3,yes,yes,64
+272,SPRG0_priv,yes,yes,64
+273,SPRG1_priv,yes,yes,64
+274,SPRG2_priv,yes,yes,64
+275,SPRG3_priv,yes,yes,64
 283,CIR,-,yes,32
 284,TBL,hypv,-,32
-285,TBU,hypv,-,32
+285,TBU_hypv,hypv,-,32
 286,TBU40,hypv,-,64
 287,PVR,-,yes,32
 304,HSPRG0,hypv,hypv,64
@@ -76,19 +76,19 @@ Idx,SPR,priv_mtspr,priv_mfspr,len
 780,SIAR,-,no,64
 781,SDAR,-,no,64
 782,MMCR1,-,no,64
-784,SIER,yes,yes,64
-785,MMCR2,yes,yes,64
-786,MMCRA,yes,yes,64
-787,PMC1,yes,yes,32
-788,PMC2,yes,yes,32
-789,PMC3,yes,yes,32
-790,PMC4,yes,yes,32
-791,PMC5,yes,yes,32
-792,PMC6,yes,yes,32
-795,MMCR0,yes,yes,64
-796,SIAR,yes,yes,64
-797,SDAR,yes,yes,64
-798,MMCR1,yes,yes,64
+784,SIER_priv,yes,yes,64
+785,MMCR2_priv,yes,yes,64
+786,MMCRA_priv,yes,yes,64
+787,PMC1_priv,yes,yes,32
+788,PMC2_priv,yes,yes,32
+789,PMC3_priv,yes,yes,32
+790,PMC4_priv,yes,yes,32
+791,PMC5_priv,yes,yes,32
+792,PMC6_priv,yes,yes,32
+795,MMCR0_priv,yes,yes,64
+796,SIAR_priv,yes,yes,64
+797,SDAR_priv,yes,yes,64
+798,MMCR1_priv,yes,yes,64
 800,BESCRS,no,no,64
 801,BESCRSU,no,no,32
 802,BESCRR,no,no,64
@@ -96,16 +96,16 @@ Idx,SPR,priv_mtspr,priv_mfspr,len
 804,EBBHR,no,no,64
 805,EBBRR,no,no,64
 806,BESCR,no,no,64
-808,reserved,no,no,0
-809,reserved8,no,no,0
-810,reserved,no,no,0
-811,reserved,no,no,0
+808,reserved808,no,no,0
+809,reserved809,no,no,0
+810,reserved810,no,no,0
+811,reserved811,no,no,0
 815,TAR,no,no,64
 816,ASDR,hypv,hypv,64
 823,PSSCR,yes,yes,64
 848,IC,hypv,yes,64
 849,VTB,hypv,yes,64
-855,PSSCR,hypv,hypv,64
+855,PSSCR_hypv,hypv,hypv,64
 896,PPR,no,no,64
 898,PPR32,no,no,32
 1023,PIR,-,yes,32
-- 
2.30.2