PmLib: update powman hcode register headers to spec1.3

Change-Id: I7ccf60233d8aa9c79afe33155a86125f68adb50c
Original-Change-Id: I9830aff8e0f33d5643d765ed2ef091d2ca8a610e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29359
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45171
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>

1 files changed, 13 insertions, 183 deletions

diff --git a/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h b/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h
index 0e48cb6ff..d01a6b8a4 100644
--- a/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h
+++ b/src/import/chips/p9/common/pmlib/include/registers/ocb_register_addresses.h
@@ -25,14 +25,6 @@
 #ifndef __OCB_REGISTER_ADDRESSES_H__
 #define __OCB_REGISTER_ADDRESSES_H__
 
-// $Id$
-// $Source$
-//-----------------------------------------------------------------------------
-// *! (C) Copyright International Business Machines Corp. 2015
-// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
-//-----------------------------------------------------------------------------
-
 /// \file ocb_register_addresses.h
 /// \brief Symbolic addresses for the OCB unit
 
@@ -52,6 +44,7 @@
 #define OCB_OIEPR0 0xc0060060
 #define OCB_OIEPR0_CLR 0xc0060068
 #define OCB_OIEPR0_OR 0xc0060070
+#define OCB_OINKR0 0xc0060080
 #define OCB_OISR1 0xc0060100
 #define OCB_OISR1_CLR 0xc0060108
 #define OCB_OISR1_OR 0xc0060110
@@ -64,6 +57,7 @@
 #define OCB_OIEPR1 0xc0060160
 #define OCB_OIEPR1_CLR 0xc0060168
 #define OCB_OIEPR1_OR 0xc0060170
+#define OCB_OINKR1 0xc0060180
 #define OCB_OIRR0A 0xc0060200
 #define OCB_OIRR0A_CLR 0xc0060208
 #define OCB_OIRR0A_OR 0xc0060210
@@ -338,170 +332,6 @@
 #define OCB_OPIT7Q3 0xc0062718
 #define OCB_OPIT7Q4 0xc0062720
 #define OCB_OPIT7Q5 0xc0062728
-#define OCB_OPIT0CNRP(n) (OCB_OPIT0C0RP + ((OCB_OPIT0C1RP - OCB_OPIT0C0RP) * (n)))
-#define OCB_OPIT0C0RP 0xc0062800
-#define OCB_OPIT0C1RP 0xc0062808
-#define OCB_OPIT0C2RP 0xc0062810
-#define OCB_OPIT0C3RP 0xc0062818
-#define OCB_OPIT0C4RP 0xc0062820
-#define OCB_OPIT0C5RP 0xc0062828
-#define OCB_OPIT0C6RP 0xc0062830
-#define OCB_OPIT0C7RP 0xc0062838
-#define OCB_OPIT0C8RP 0xc0062840
-#define OCB_OPIT0C9RP 0xc0062848
-#define OCB_OPIT0C10RP 0xc0062850
-#define OCB_OPIT0C11RP 0xc0062858
-#define OCB_OPIT0C12RP 0xc0062860
-#define OCB_OPIT0C13RP 0xc0062868
-#define OCB_OPIT0C14RP 0xc0062870
-#define OCB_OPIT0C15RP 0xc0062878
-#define OCB_OPIT0C16RP 0xc0062880
-#define OCB_OPIT0C17RP 0xc0062888
-#define OCB_OPIT0C18RP 0xc0062890
-#define OCB_OPIT0C19RP 0xc0062898
-#define OCB_OPIT0C20RP 0xc00628a0
-#define OCB_OPIT0C21RP 0xc00628a8
-#define OCB_OPIT0C22RP 0xc00628b0
-#define OCB_OPIT0C23RP 0xc00628b8
-#define OCB_OPIT1CNRP(n) (OCB_OPIT1C0RP + ((OCB_OPIT1C1RP - OCB_OPIT1C0RP) * (n)))
-#define OCB_OPIT1C0RP 0xc0062900
-#define OCB_OPIT1C1RP 0xc0062908
-#define OCB_OPIT1C2RP 0xc0062910
-#define OCB_OPIT1C3RP 0xc0062918
-#define OCB_OPIT1C4RP 0xc0062920
-#define OCB_OPIT1C5RP 0xc0062928
-#define OCB_OPIT1C6RP 0xc0062930
-#define OCB_OPIT1C7RP 0xc0062938
-#define OCB_OPIT1C8RP 0xc0062940
-#define OCB_OPIT1C9RP 0xc0062948
-#define OCB_OPIT1C10RP 0xc0062950
-#define OCB_OPIT1C11RP 0xc0062958
-#define OCB_OPIT1C12RP 0xc0062960
-#define OCB_OPIT1C13RP 0xc0062968
-#define OCB_OPIT1C14RP 0xc0062970
-#define OCB_OPIT1C15RP 0xc0062978
-#define OCB_OPIT1C16RP 0xc0062980
-#define OCB_OPIT1C17RP 0xc0062988
-#define OCB_OPIT1C18RP 0xc0062990
-#define OCB_OPIT1C19RP 0xc0062998
-#define OCB_OPIT1C20RP 0xc00629a0
-#define OCB_OPIT1C21RP 0xc00629a8
-#define OCB_OPIT1C22RP 0xc00629b0
-#define OCB_OPIT1C23RP 0xc00629b8
-#define OCB_OPIT2CNRP(n) (OCB_OPIT2C0RP + ((OCB_OPIT2C1RP - OCB_OPIT2C0RP) * (n)))
-#define OCB_OPIT2C0RP 0xc0062a00
-#define OCB_OPIT2C1RP 0xc0062a08
-#define OCB_OPIT2C2RP 0xc0062a10
-#define OCB_OPIT2C3RP 0xc0062a18
-#define OCB_OPIT2C4RP 0xc0062a20
-#define OCB_OPIT2C5RP 0xc0062a28
-#define OCB_OPIT2C6RP 0xc0062a30
-#define OCB_OPIT2C7RP 0xc0062a38
-#define OCB_OPIT2C8RP 0xc0062a40
-#define OCB_OPIT2C9RP 0xc0062a48
-#define OCB_OPIT2C10RP 0xc0062a50
-#define OCB_OPIT2C11RP 0xc0062a58
-#define OCB_OPIT2C12RP 0xc0062a60
-#define OCB_OPIT2C13RP 0xc0062a68
-#define OCB_OPIT2C14RP 0xc0062a70
-#define OCB_OPIT2C15RP 0xc0062a78
-#define OCB_OPIT2C16RP 0xc0062a80
-#define OCB_OPIT2C17RP 0xc0062a88
-#define OCB_OPIT2C18RP 0xc0062a90
-#define OCB_OPIT2C19RP 0xc0062a98
-#define OCB_OPIT2C20RP 0xc0062aa0
-#define OCB_OPIT2C21RP 0xc0062aa8
-#define OCB_OPIT2C22RP 0xc0062ab0
-#define OCB_OPIT2C23RP 0xc0062ab8
-#define OCB_OPIT3CNRP(n) (OCB_OPIT3C0RP + ((OCB_OPIT3C1RP - OCB_OPIT3C0RP) * (n)))
-#define OCB_OPIT3C0RP 0xc0062b00
-#define OCB_OPIT3C1RP 0xc0062b08
-#define OCB_OPIT3C2RP 0xc0062b10
-#define OCB_OPIT3C3RP 0xc0062b18
-#define OCB_OPIT3C4RP 0xc0062b20
-#define OCB_OPIT3C5RP 0xc0062b28
-#define OCB_OPIT3C6RP 0xc0062b30
-#define OCB_OPIT3C7RP 0xc0062b38
-#define OCB_OPIT3C8RP 0xc0062b40
-#define OCB_OPIT3C9RP 0xc0062b48
-#define OCB_OPIT3C10RP 0xc0062b50
-#define OCB_OPIT3C11RP 0xc0062b58
-#define OCB_OPIT3C12RP 0xc0062b60
-#define OCB_OPIT3C13RP 0xc0062b68
-#define OCB_OPIT3C14RP 0xc0062b70
-#define OCB_OPIT3C15RP 0xc0062b78
-#define OCB_OPIT3C16RP 0xc0062b80
-#define OCB_OPIT3C17RP 0xc0062b88
-#define OCB_OPIT3C18RP 0xc0062b90
-#define OCB_OPIT3C19RP 0xc0062b98
-#define OCB_OPIT3C20RP 0xc0062ba0
-#define OCB_OPIT3C21RP 0xc0062ba8
-#define OCB_OPIT3C22RP 0xc0062bb0
-#define OCB_OPIT3C23RP 0xc0062bb8
-#define OCB_OPIT4CNRP(n) (OCB_OPIT4C0RP + ((OCB_OPIT4C1RP - OCB_OPIT4C0RP) * (n)))
-#define OCB_OPIT4C0RP 0xc0062c00
-#define OCB_OPIT4C1RP 0xc0062c08
-#define OCB_OPIT4C2RP 0xc0062c10
-#define OCB_OPIT4C3RP 0xc0062c18
-#define OCB_OPIT4C4RP 0xc0062c20
-#define OCB_OPIT4C5RP 0xc0062c28
-#define OCB_OPIT4C6RP 0xc0062c30
-#define OCB_OPIT4C7RP 0xc0062c38
-#define OCB_OPIT4C8RP 0xc0062c40
-#define OCB_OPIT4C9RP 0xc0062c48
-#define OCB_OPIT4C10RP 0xc0062c50
-#define OCB_OPIT4C11RP 0xc0062c58
-#define OCB_OPIT4C12RP 0xc0062c60
-#define OCB_OPIT4C13RP 0xc0062c68
-#define OCB_OPIT4C14RP 0xc0062c70
-#define OCB_OPIT4C15RP 0xc0062c78
-#define OCB_OPIT4C16RP 0xc0062c80
-#define OCB_OPIT4C17RP 0xc0062c88
-#define OCB_OPIT4C18RP 0xc0062c90
-#define OCB_OPIT4C19RP 0xc0062c98
-#define OCB_OPIT4C20RP 0xc0062ca0
-#define OCB_OPIT4C21RP 0xc0062ca8
-#define OCB_OPIT4C22RP 0xc0062cb0
-#define OCB_OPIT4C23RP 0xc0062cb8
-#define OCB_OPIT5CNRP(n) (OCB_OPIT5C0RP + ((OCB_OPIT5C1RP - OCB_OPIT5C0RP) * (n)))
-#define OCB_OPIT5C0RP 0xc0062d00
-#define OCB_OPIT5C1RP 0xc0062d08
-#define OCB_OPIT5C2RP 0xc0062d10
-#define OCB_OPIT5C3RP 0xc0062d18
-#define OCB_OPIT5C4RP 0xc0062d20
-#define OCB_OPIT5C5RP 0xc0062d28
-#define OCB_OPIT5C6RP 0xc0062d30
-#define OCB_OPIT5C7RP 0xc0062d38
-#define OCB_OPIT5C8RP 0xc0062d40
-#define OCB_OPIT5C9RP 0xc0062d48
-#define OCB_OPIT5C10RP 0xc0062d50
-#define OCB_OPIT5C11RP 0xc0062d58
-#define OCB_OPIT5C12RP 0xc0062d60
-#define OCB_OPIT5C13RP 0xc0062d68
-#define OCB_OPIT5C14RP 0xc0062d70
-#define OCB_OPIT5C15RP 0xc0062d78
-#define OCB_OPIT5C16RP 0xc0062d80
-#define OCB_OPIT5C17RP 0xc0062d88
-#define OCB_OPIT5C18RP 0xc0062d90
-#define OCB_OPIT5C19RP 0xc0062d98
-#define OCB_OPIT5C20RP 0xc0062da0
-#define OCB_OPIT5C21RP 0xc0062da8
-#define OCB_OPIT5C22RP 0xc0062db0
-#define OCB_OPIT5C23RP 0xc0062db8
-#define OCB_OPIT6QNRP(n) (OCB_OPIT6Q0RP + ((OCB_OPIT6Q1RP - OCB_OPIT6Q0RP) * (n)))
-#define OCB_OPIT6Q0RP 0xc0062e00
-#define OCB_OPIT6Q1RP 0xc0062e08
-#define OCB_OPIT6Q2RP 0xc0062e10
-#define OCB_OPIT6Q3RP 0xc0062e18
-#define OCB_OPIT6Q4RP 0xc0062e20
-#define OCB_OPIT6Q5RP 0xc0062e28
-#define OCB_OPIT7QNRP(n) (OCB_OPIT7Q0RP + ((OCB_OPIT7Q1RP - OCB_OPIT7Q0RP) * (n)))
-#define OCB_OPIT7Q0RP 0xc0062f00
-#define OCB_OPIT7Q1RP 0xc0062f08
-#define OCB_OPIT7Q2RP 0xc0062f10
-#define OCB_OPIT7Q3RP 0xc0062f18
-#define OCB_OPIT7Q4RP 0xc0062f20
-#define OCB_OPIT7Q5RP 0xc0062f28
 #define OCB_OPITNPRA(n) (OCB_OPIT0PRA + ((OCB_OPIT1PRA - OCB_OPIT0PRA) * (n)))
 #define OCB_OPIT0PRA 0xc0063000
 #define OCB_OPIT1PRA 0xc0063100
@@ -615,17 +445,17 @@
 #define OCB_OEAR 0x0006d206
 #define OCB_OACR 0x0006d207
 #define OCB_OCBEAR 0x0006d210
-#define OCB_FIRPIB_BASE 0x01010800
-#define OCB_OCCLFIR 0x01020800
-#define OCB_OCCLFIR_AND 0x01020801
-#define OCB_OCCLFIR_OR 0x01020802
-#define OCB_OCCLFIRMASK 0x01020803
-#define OCB_OCCLFIRMASK_AND 0x01020804
-#define OCB_OCCLFIRMASK_OR 0x01020805
-#define OCB_OCCLFIRACT0 0x01020806
-#define OCB_OCCLFIRACT1 0x01020807
-#define OCB_OCCLFIRWOF 0x01020808
-#define OCB_OCCERRRPT 0x0102080a
+#define OCB_FIRPIB_BASE 0x01000800
+#define OCB_OCCLFIR 0x01010800
+#define OCB_OCCLFIR_AND 0x01010801
+#define OCB_OCCLFIR_OR 0x01010802
+#define OCB_OCCLFIRMASK 0x01010803
+#define OCB_OCCLFIRMASK_AND 0x01010804
+#define OCB_OCCLFIRMASK_OR 0x01010805
+#define OCB_OCCLFIRACT0 0x01010806
+#define OCB_OCCLFIRACT1 0x01010807
+#define OCB_OCCLFIRWOF 0x01010808
+#define OCB_OCCERRRPT 0x0101080a
 
 #endif // __OCB_REGISTER_ADDRESSES_H__