1 files changed, 19 insertions, 17 deletions

diff --git a/arch/sparc/include/asm/pcr.h b/arch/sparc/include/asm/pcr.h
index 288d7beba051..942bb17f60cd 100644
--- a/arch/sparc/include/asm/pcr.h
+++ b/arch/sparc/include/asm/pcr.h
@@ -2,8 +2,13 @@
 #define __PCR_H
 
 struct pcr_ops {
-        u64 (*read)(void);
-        void (*write)(u64);
+        u64 (*read_pcr)(unsigned long);
+        void (*write_pcr)(unsigned long, u64);
+        u64 (*read_pic)(unsigned long);
+        void (*write_pic)(unsigned long, u64);
+        u64 (*nmi_picl_value)(unsigned int nmi_hz);
+        u64 pcr_nmi_enable;
+        u64 pcr_nmi_disable;
 };
 extern const struct pcr_ops *pcr_ops;
 
@@ -27,21 +32,18 @@ extern void schedule_deferred_pcr_work(void);
 #define PCR_N2_SL1_SHIFT        27
 #define PCR_N2_OV1              0x80000000
 
-extern unsigned int picl_shift;
-
-/* In order to commonize as much of the implementation as
- * possible, we use PICH as our counter.  Mostly this is
- * to accommodate Niagara-1 which can only count insn cycles
- * in PICH.
- */
-static inline u64 picl_value(unsigned int nmi_hz)
-{
-        u32 delta = local_cpu_data().clock_tick / (nmi_hz << picl_shift);
-
-        return ((u64)((0 - delta) & 0xffffffff)) << 32;
-}
-
-extern u64 pcr_enable;
+#define PCR_N4_OV               0x00000001 /* PIC overflow             */
+#define PCR_N4_TOE              0x00000002 /* Trap On Event            */
+#define PCR_N4_UTRACE           0x00000004 /* Trace user events        */
+#define PCR_N4_STRACE           0x00000008 /* Trace supervisor events  */
+#define PCR_N4_HTRACE           0x00000010 /* Trace hypervisor events  */
+#define PCR_N4_MASK             0x000007e0 /* Event mask               */
+#define PCR_N4_MASK_SHIFT       5
+#define PCR_N4_SL               0x0000f800 /* Event Select             */
+#define PCR_N4_SL_SHIFT         11
+#define PCR_N4_PICNPT           0x00010000 /* PIC non-privileged trap  */
+#define PCR_N4_PICNHT           0x00020000 /* PIC non-hypervisor trap  */
+#define PCR_N4_NTC              0x00040000 /* Next-To-Commit wrap      */
 
 extern int pcr_arch_init(void);