diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-17 03:20:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-19 02:26:19 -0400 |
commit | 6faaeb8ea30e55c9fd7cf65d05f3ce44973d1d12 (patch) | |
tree | b4d0b571ac45147a865aba23158c8691015d089c /arch/sparc/include | |
parent | ce4a925c29208cf48084d9fa174d965a65246a8d (diff) |
sparc64: Add PCR ops for SPARC-T4.
This is enough to get the NMIs working, more work is needed
for perf events.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/asi.h | 4 | ||||
-rw-r--r-- | arch/sparc/include/asm/pcr.h | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/asi.h b/arch/sparc/include/asm/asi.h index 61ebe7411ceb..cc0006dc5d4a 100644 --- a/arch/sparc/include/asm/asi.h +++ b/arch/sparc/include/asm/asi.h | |||
@@ -141,7 +141,8 @@ | |||
141 | /* SpitFire and later extended ASIs. The "(III)" marker designates | 141 | /* SpitFire and later extended ASIs. The "(III)" marker designates |
142 | * UltraSparc-III and later specific ASIs. The "(CMT)" marker designates | 142 | * UltraSparc-III and later specific ASIs. The "(CMT)" marker designates |
143 | * Chip Multi Threading specific ASIs. "(NG)" designates Niagara specific | 143 | * Chip Multi Threading specific ASIs. "(NG)" designates Niagara specific |
144 | * ASIs, "(4V)" designates SUN4V specific ASIs. | 144 | * ASIs, "(4V)" designates SUN4V specific ASIs. "(NG4)" designates SPARC-T4 |
145 | * and later ASIs. | ||
145 | */ | 146 | */ |
146 | #define ASI_PHYS_USE_EC 0x14 /* PADDR, E-cachable */ | 147 | #define ASI_PHYS_USE_EC 0x14 /* PADDR, E-cachable */ |
147 | #define ASI_PHYS_BYPASS_EC_E 0x15 /* PADDR, E-bit */ | 148 | #define ASI_PHYS_BYPASS_EC_E 0x15 /* PADDR, E-bit */ |
@@ -243,6 +244,7 @@ | |||
243 | #define ASI_UDBL_CONTROL_R 0x7f /* External UDB control regs rd low*/ | 244 | #define ASI_UDBL_CONTROL_R 0x7f /* External UDB control regs rd low*/ |
244 | #define ASI_INTR_R 0x7f /* IRQ vector dispatch read */ | 245 | #define ASI_INTR_R 0x7f /* IRQ vector dispatch read */ |
245 | #define ASI_INTR_DATAN_R 0x7f /* (III) In irq vector data reg N */ | 246 | #define ASI_INTR_DATAN_R 0x7f /* (III) In irq vector data reg N */ |
247 | #define ASI_PIC 0xb0 /* (NG4) PIC registers */ | ||
246 | #define ASI_PST8_P 0xc0 /* Primary, 8 8-bit, partial */ | 248 | #define ASI_PST8_P 0xc0 /* Primary, 8 8-bit, partial */ |
247 | #define ASI_PST8_S 0xc1 /* Secondary, 8 8-bit, partial */ | 249 | #define ASI_PST8_S 0xc1 /* Secondary, 8 8-bit, partial */ |
248 | #define ASI_PST16_P 0xc2 /* Primary, 4 16-bit, partial */ | 250 | #define ASI_PST16_P 0xc2 /* Primary, 4 16-bit, partial */ |
diff --git a/arch/sparc/include/asm/pcr.h b/arch/sparc/include/asm/pcr.h index 9ebc7f3840d1..942bb17f60cd 100644 --- a/arch/sparc/include/asm/pcr.h +++ b/arch/sparc/include/asm/pcr.h | |||
@@ -32,6 +32,19 @@ extern void schedule_deferred_pcr_work(void); | |||
32 | #define PCR_N2_SL1_SHIFT 27 | 32 | #define PCR_N2_SL1_SHIFT 27 |
33 | #define PCR_N2_OV1 0x80000000 | 33 | #define PCR_N2_OV1 0x80000000 |
34 | 34 | ||
35 | #define PCR_N4_OV 0x00000001 /* PIC overflow */ | ||
36 | #define PCR_N4_TOE 0x00000002 /* Trap On Event */ | ||
37 | #define PCR_N4_UTRACE 0x00000004 /* Trace user events */ | ||
38 | #define PCR_N4_STRACE 0x00000008 /* Trace supervisor events */ | ||
39 | #define PCR_N4_HTRACE 0x00000010 /* Trace hypervisor events */ | ||
40 | #define PCR_N4_MASK 0x000007e0 /* Event mask */ | ||
41 | #define PCR_N4_MASK_SHIFT 5 | ||
42 | #define PCR_N4_SL 0x0000f800 /* Event Select */ | ||
43 | #define PCR_N4_SL_SHIFT 11 | ||
44 | #define PCR_N4_PICNPT 0x00010000 /* PIC non-privileged trap */ | ||
45 | #define PCR_N4_PICNHT 0x00020000 /* PIC non-hypervisor trap */ | ||
46 | #define PCR_N4_NTC 0x00040000 /* Next-To-Commit wrap */ | ||
47 | |||
35 | extern int pcr_arch_init(void); | 48 | extern int pcr_arch_init(void); |
36 | 49 | ||
37 | #endif /* __PCR_H */ | 50 | #endif /* __PCR_H */ |