Module Name:    src
Committed By:   matt
Date:           Thu Feb 25 23:30:05 UTC 2010

Modified Files:
        src/sys/arch/powerpc/include: spr.h
        src/sys/arch/powerpc/include/ibm4xx: Makefile
        src/sys/arch/powerpc/include/oea: Makefile
Added Files:
        src/sys/arch/powerpc/include/ibm4xx: spr.h
        src/sys/arch/powerpc/include/oea: spr.h

Log Message:
Split <powerpc/spr.h> into a common <powerpc/spr.h> and <powerpc/XXX/spr.h>
where XXX is ibm4xx or oea.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/include/spr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/ibm4xx/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/ibm4xx/spr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/oea/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/oea/spr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/include/spr.h
diff -u src/sys/arch/powerpc/include/spr.h:1.44 src/sys/arch/powerpc/include/spr.h:1.45
--- src/sys/arch/powerpc/include/spr.h:1.44	Sat Feb 23 19:54:54 2008
+++ src/sys/arch/powerpc/include/spr.h	Thu Feb 25 23:30:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: spr.h,v 1.44 2008/02/23 19:54:54 matt Exp $	*/
+/*	$NetBSD: spr.h,v 1.45 2010/02/25 23:30:04 matt Exp $	*/
 
 #ifndef _POWERPC_SPR_H_
 #define	_POWERPC_SPR_H_
@@ -17,524 +17,31 @@
 /*
  * Special Purpose Register declarations.
  *
- * The first column in the comments indicates which PowerPC
- * architectures the SPR is valid on - 4 for 4xx series,
- * 6 for 6xx/7xx series and 8 for 8xx and 8xxx series.
+ * The first column in the comments indicates which PowerPC architectures the
+ * SPR is valid on - E for BookE series, 4 for 4xx series,
+ * 6 for 6xx/7xx series and 8 for 8xx and 8xxx (but not 85xx) series.
  */
 
-#define	SPR_MQ			0x000	/* .6. 601 MQ register */
-#define	SPR_XER			0x001	/* 468 Fixed Point Exception Register */
-#define	SPR_RTCU_R		0x004	/* .6. 601 RTC Upper - Read */
-#define	SPR_RTCL_R		0x005	/* .6. 601 RTC Lower - Read */
-#define	SPR_LR			0x008	/* 468 Link Register */
-#define	SPR_CTR			0x009	/* 468 Count Register */
-#define	SPR_DSISR		0x012	/* .68 DSI exception source */
-#define	  DSISR_DIRECT		  0x80000000 /* Direct-store error exception */
-#define	  DSISR_NOTFOUND	  0x40000000 /* Translation not found */
-#define	  DSISR_PROTECT		  0x08000000 /* Memory access not permitted */
-#define	  DSISR_INVRX		  0x04000000 /* Reserve-indexed insn direct-store access */
-#define	  DSISR_STORE		  0x02000000 /* Store operation */
-#define	  DSISR_DABR		  0x00400000 /* DABR match */
-#define	  DSISR_SEGMENT		  0x00200000 /* XXX; not in 6xx PEM */
-#define	  DSISR_EAR		  0x00100000 /* eciwx/ecowx && EAR[E] == 0 */
-#define	SPR_DAR			0x013	/* .68 Data Address Register */
-#define	SPR_RTCU_W		0x014	/* .6. 601 RTC Upper - Write */
-#define	SPR_RTCL_W		0x015	/* .6. 601 RTC Lower - Write */
-#define	SPR_DEC			0x016	/* .68 DECrementer register */
-#define	SPR_SDR1		0x019	/* .68 Page table base address register */
-#define	SPR_SRR0		0x01a	/* 468 Save/Restore Register 0 */
-#define	SPR_SRR1		0x01b	/* 468 Save/Restore Register 1 */
-#define	SPR_44XPID		0x030	/* 4.. 440 Process ID */
-#define SPR_EIE			0x050	/* ..8 Exception Interrupt ??? */
-#define SPR_EID			0x051	/* ..8 Exception Interrupt ??? */
-#define SPR_NRI			0x052	/* ..8 Exception Interrupt ??? */
-#define	SPR_USPRG0		0x100	/* 4.. User SPR General 0 */
-#define	SPR_VRSAVE		0x100	/* .6. AltiVec VRSAVE */
-#define	SPR_SPRG0		0x110	/* 468 SPR General 0 */
-#define	SPR_SPRG1		0x111	/* 468 SPR General 1 */
-#define	SPR_SPRG2		0x112	/* 468 SPR General 2 */
-#define	SPR_SPRG3		0x113	/* 468 SPR General 3 */
-#define	SPR_SPRG4		0x114	/* 4.. SPR General 4 */
-#define	SPR_SPRG5		0x115	/* 4.. SPR General 5 */
-#define	SPR_SPRG6		0x116	/* 4.. SPR General 6 */
-#define	SPR_SPRG7		0x117	/* 4.. SPR General 7 */
-#define	SPR_ASR			0x118	/* ... Address Space Register (PPC64) */
-#define	SPR_EAR			0x11a	/* .68 External Access Register */
-#define	SPR_TBL			0x11c	/* 468 Time Base Lower */
-#define	SPR_TBU			0x11d	/* 468 Time Base Upper */
-#define	SPR_PVR			0x11f	/* 468 Processor Version Register */
-#define	  MPC601		  0x0001
-#define	  MPC603		  0x0003
-#define	  MPC604		  0x0004
-#define	  MPC602		  0x0005
-#define	  MPC603e		  0x0006
-#define	  MPC603ev		  0x0007
-#define	  MPC750		  0x0008
-#define	  MPC604e		  0x0009
-#define	  MPC604ev		  0x000a
-#define	  MPC7400		  0x000c
-#define	  MPC620		  0x0014
-#define	  IBM403		  0x0020
-#define	  IBM401A1		  0x0021
-#define	  IBM401B2		  0x0022
-#define	  IBM401C2		  0x0023
-#define	  IBM401D2		  0x0024
-#define	  IBM401E2		  0x0025
-#define	  IBM401F2		  0x0026
-#define	  IBM401G2		  0x0027
-#define   IBMRS64II		  0x0033
-#define   IBMRS64IIIp		  0x0034
-#define   IBMPOWER4		  0x0035
-#define   IBMRS64IIIi		  0x0036
-#define   IBMRS64IV		  0x0037
-#define   IBMPOWER4II		  0x0038
-#define   IBM970		  0x0039
-#define   IBMPOWER5GR		  0x003a
-#define   IBMPOWER5GS		  0x003b
-#define   IBM970FX		  0x003c
-#define   IBMPOWER6		  0x003e
-#define   IBMPOWER3		  0x0040
-#define	  IBMPOWER3II		  0x0041
-#define   IBM970MP		  0x0044
-#define   IBM970GX		  0x0045
-#define	  MPC860		  0x0050
-#define   IBMCELL		  0x0070
-#define	  MPC8240		  0x0081
-#define   PA6T			  0x0090
-#define   IBMPOWER6P5		  0x0f00
-#define   XILVIRTEX		  0x2001
-#define	  IBM405GP		  0x4011
-#define   IBMSTB03		  0x4013
-#define   IBMSTB04		  0x4081
-#define   IBM405GS3		  0x40b1
-#define   IBM405H		  0x4141
-#define	  IBM405L		  0x4161
-#define   IBM405LP		  0x41f1
-#define	  IBM405GPR		  0x5091
-#define   IBM405EP		  0x5121
-#define   IBMSTB25		  0x5151
-#define	  IBM750FX		  0x7000
-#define   IBM750GX		  0x7002
-#define	  MPC7450		  0x8000
-#define	  MPC7455		  0x8001
-#define   MPC7457		  0x8002
-#define   MPC7447A		  0x8003
-#define   MPC7448		  0x8004
-#define MPC745X_P(v)		  ((v & 0xFFF8) == 0x8000)
-#define	  MPC7410		  0x800c
-#define	  MPC5200		  0x8011
-#define   MPCe500		  0x8020
-#define   MPCe500v2		  0x8021
-#define	  MPC8245		  0x8081
-#define   MPCG2			  0x8082
-#define   MPCe300c1		  0x8083
-#define   MPCe300c2		  0x8084
-#define   MPCe300c3		  0x8085
-
-#define	SPR_IBAT0U		0x210	/* .68 Instruction BAT Reg 0 Upper */
-#define	SPR_IBAT0L		0x211	/* .6. Instruction BAT Reg 0 Lower */
-#define	SPR_IBAT1U		0x212	/* .6. Instruction BAT Reg 1 Upper */
-#define	SPR_IBAT1L		0x213	/* .6. Instruction BAT Reg 1 Lower */
-#define	SPR_IBAT2U		0x214	/* .6. Instruction BAT Reg 2 Upper */
-#define	SPR_IBAT2L		0x215	/* .6. Instruction BAT Reg 2 Lower */
-#define	SPR_IBAT3U		0x216	/* .6. Instruction BAT Reg 3 Upper */
-#define	SPR_IBAT3L		0x217	/* .6. Instruction BAT Reg 3 Lower */
-#define	SPR_DBAT0U		0x218	/* .6. Data BAT Reg 0 Upper */
-#define	SPR_DBAT0L		0x219	/* .6. Data BAT Reg 0 Lower */
-#define	SPR_DBAT1U		0x21a	/* .6. Data BAT Reg 1 Upper */
-#define	SPR_DBAT1L		0x21b	/* .6. Data BAT Reg 1 Lower */
-#define	SPR_DBAT2U		0x21c	/* .6. Data BAT Reg 2 Upper */
-#define	SPR_DBAT2L		0x21d	/* .6. Data BAT Reg 2 Lower */
-#define	SPR_DBAT3U		0x21e	/* .6. Data BAT Reg 3 Upper */
-#define	SPR_DBAT3L		0x21f	/* .6. Data BAT Reg 3 Lower */
-#define SPR_IC_CST		0x230	/* ..8 Instruction Cache CSR */
-#define  IC_CST_IEN		0x80000000 /* I cache is ENabled   (RO) */
-#define  IC_CST_CMD_INVALL	0x0c000000 /* I cache invalidate all */
-#define  IC_CST_CMD_UNLOCKALL	0x0a000000 /* I cache unlock all */
-#define  IC_CST_CMD_UNLOCK	0x08000000 /* I cache unlock block */
-#define  IC_CST_CMD_LOADLOCK	0x06000000 /* I cache load & lock block */
-#define  IC_CST_CMD_DISABLE	0x04000000 /* I cache disable */
-#define  IC_CST_CMD_ENABLE	0x02000000 /* I cache enable */
-#define  IC_CST_CCER1		0x00200000 /* I cache error type 1 (RO) */
-#define  IC_CST_CCER2		0x00100000 /* I cache error type 2 (RO) */
-#define  IC_CST_CCER3		0x00080000 /* I cache error type 3 (RO) */
-#define	SPR_IBAT4U		0x230	/* .6. Instruction BAT Reg 4 Upper */
-#define SPR_IC_ADR		0x231	/* ..8 Instruction Cache Address */
-#define	SPR_IBAT4L		0x231	/* .6. Instruction BAT Reg 4 Lower */
-#define SPR_IC_DAT		0x232	/* ..8 Instruction Cache Data */
-#define	SPR_IBAT5U		0x232	/* .6. Instruction BAT Reg 5 Upper */
-#define	SPR_IBAT5L		0x233	/* .6. Instruction BAT Reg 5 Lower */
-#define	SPR_IBAT6U		0x234	/* .6. Instruction BAT Reg 6 Upper */
-#define	SPR_IBAT6L		0x235	/* .6. Instruction BAT Reg 6 Lower */
-#define	SPR_IBAT7U		0x236	/* .6. Instruction BAT Reg 7 Upper */
-#define	SPR_IBAT7L		0x237	/* .6. Instruction BAT Reg 7 Lower */
-#define SPR_DC_CST		0x238	/* ..8 Data Cache CSR */
-#define  DC_CST_DEN		0x80000000 /* D cache ENabled (RO) */
-#define  DC_CST_DFWT		0x40000000 /* D cache Force Write-Thru (RO) */
-#define  DC_CST_LES		0x20000000 /* D cache Little Endian Swap (RO) */
-#define  DC_CST_CMD_FLUSH	0x0e000000 /* D cache invalidate all */
-#define  DC_CST_CMD_INVALL	0x0c000000 /* D cache invalidate all */
-#define  DC_CST_CMD_UNLOCKALL	0x0a000000 /* D cache unlock all */
-#define  DC_CST_CMD_UNLOCK	0x08000000 /* D cache unlock block */
-#define  DC_CST_CMD_CLRLESWAP	0x07000000 /* D cache clr little-endian swap */
-#define  DC_CST_CMD_LOADLOCK	0x06000000 /* D cache load & lock block */
-#define  DC_CST_CMD_SETLESWAP	0x05000000 /* D cache set little-endian swap */
-#define  DC_CST_CMD_DISABLE	0x04000000 /* D cache disable */
-#define  DC_CST_CMD_CLRFWT	0x03000000 /* D cache clear forced write-thru */
-#define  DC_CST_CMD_ENABLE	0x02000000 /* D cache enable */
-#define  DC_CST_CMD_SETFWT	0x01000000 /* D cache set forced write-thru */
-#define  DC_CST_CCER1		0x00200000 /* D cache error type 1 (RO) */
-#define  DC_CST_CCER2		0x00100000 /* D cache error type 2 (RO) */
-#define  DC_CST_CCER3		0x00080000 /* D cache error type 3 (RO) */
-#define	SPR_DBAT4U		0x238	/* .6. Data BAT Reg 4 Upper */
-#define SPR_DC_ADR		0x239	/* ..8 Data Cache Address */
-#define	SPR_DBAT4L		0x239	/* .6. Data BAT Reg 4 Lower */
-#define SPR_DC_DAT		0x23a	/* ..8 Data Cache Data */
-#define	SPR_DBAT5U		0x23a	/* .6. Data BAT Reg 5 Upper */
-#define	SPR_DBAT5L		0x23b	/* .6. Data BAT Reg 5 Lower */
-#define	SPR_DBAT6U		0x23c	/* .6. Data BAT Reg 6 Upper */
-#define	SPR_DBAT6L		0x23d	/* .6. Data BAT Reg 6 Lower */
-#define	SPR_DBAT7U		0x23e	/* .6. Data BAT Reg 7 Upper */
-#define	SPR_DBAT7L		0x23f	/* .6. Data BAT Reg 7 Lower */
-#define	SPR_MI_CTR		0x310	/* ..8 IMMU control */
-#define  Mx_CTR_GPM		0x80000000 /* Group Protection Mode */
-#define  Mx_CTR_PPM		0x40000000 /* Page Protection Mode */
-#define  Mx_CTR_CIDEF		0x20000000 /* Cache-Inhibit DEFault */
-#define  MD_CTR_WTDEF		0x20000000 /* Write-Through DEFault */
-#define  Mx_CTR_RSV4		0x08000000 /* Reserve 4 TLB entries */
-#define  MD_CTR_TWAM		0x04000000 /* TableWalk Assist Mode */
-#define  Mx_CTR_PPCS		0x02000000 /* Priv/user state compare mode */
-#define  Mx_CTR_TLB_INDX	0x000001f0 /* TLB index mask */
-#define  Mx_CTR_TLB_INDX_BITPOS	8	  /* TLB index shift */
-#define	SPR_MI_AP		0x312	/* ..8 IMMU access protection */
-#define  Mx_GP_SUPER(n)		(0 << (2*(15-(n)))) /* access is supervisor */
-#define  Mx_GP_PAGE		(1 << (2*(15-(n)))) /* access is page protect */
-#define  Mx_GP_SWAPPED		(2 << (2*(15-(n)))) /* access is swapped */
-#define  Mx_GP_USER		(3 << (2*(15-(n)))) /* access is user */
-#define	SPR_MI_EPN		0x313	/* ..8 IMMU effective number */
-#define  Mx_EPN_EPN		0xfffff000 /* Effective Page Number mask */
-#define  Mx_EPN_EV		0x00000020 /* Entry Valid */
-#define  Mx_EPN_ASID		0x0000000f /* Address Space ID */
-#define	SPR_MI_TWC		0x315	/* ..8 IMMU tablewalk control */
-#define  MD_TWC_L2TB		0xfffff000 /* Level-2 Tablewalk Base */
-#define  Mx_TWC_APG		0x000001e0 /* Access Protection Group */
-#define  Mx_TWC_G		0x00000010 /* Guarded memory */
-#define  Mx_TWC_PS		0x0000000c /* Page Size (L1) */
-#define  MD_TWC_WT		0x00000002 /* Write-Through */
-#define  Mx_TWC_V		0x00000001 /* Entry Valid */
-#define	SPR_MI_RPN		0x316	/* ..8 IMMU real (phys) page number */
-#define  Mx_RPN_RPN		0xfffff000 /* Real Page Number */
-#define  Mx_RPN_PP		0x00000ff0 /* Page Protection */
-#define  Mx_RPN_SPS		0x00000008 /* Small Page Size */
-#define  Mx_RPN_SH		0x00000004 /* SHared page */
-#define  Mx_RPN_CI		0x00000002 /* Cache Inhibit */
-#define  Mx_RPN_V		0x00000001 /* Valid */
-#define	SPR_MD_CTR		0x318	/* ..8 DMMU control */
-#define	SPR_M_CASID		0x319	/* ..8 CASID */
-#define  M_CASID		0x0000000f /* Current AS Id */
-#define	SPR_MD_AP		0x31a	/* ..8 DMMU access protection */
-#define	SPR_MD_EPN		0x31b	/* ..8 DMMU effective number */
-#define	SPR_M_TWB		0x31c	/* ..8 MMU tablewalk base */
-#define  M_TWB_L1TB		0xfffff000 /* level-1 translation base */
-#define  M_TWB_L1INDX		0x00000ffc /* level-1 index */
-#define	SPR_MD_TWC		0x31d	/* ..8 DMMU tablewalk control */
-#define	SPR_MD_RPN		0x31e	/* ..8 DMMU real (phys) page number */
-#define	SPR_MD_TW		0x31f	/* ..8 MMU tablewalk scratch */
-#define	SPR_MI_CAM		0x330	/* ..8 IMMU CAM entry read */
-#define	SPR_MI_RAM0		0x331	/* ..8 IMMU RAM entry read reg 0 */
-#define	SPR_MI_RAM1		0x332	/* ..8 IMMU RAM entry read reg 1 */
-#define	SPR_MD_CAM		0x338	/* ..8 IMMU CAM entry read */
-#define	SPR_MD_RAM0		0x339	/* ..8 IMMU RAM entry read reg 0 */
-#define	SPR_MD_RAM1		0x33a	/* ..8 IMMU RAM entry read reg 1 */
-#define	SPR_UMMCR2		0x3a0	/* .6. User Monitor Mode Control Register 2 */
-#define	SPR_UMMCR0		0x3a8	/* .6. User Monitor Mode Control Register 0 */
-#define	SPR_USIA		0x3ab	/* .6. User Sampled Instruction Address */
-#define	SPR_UMMCR1		0x3ac	/* .6. User Monitor Mode Control Register 1 */
-#define	SPR_ZPR			0x3b0	/* 4.. Zone Protection Register */
-#define	SPR_MMCR2		0x3b0	/* .6. Monitor Mode Control Register 2 */
-#define	 SPR_MMCR2_THRESHMULT_32  0x80000000 /* Multiply MMCR0 threshold by 32 */
-#define	 SPR_MMCR2_THRESHMULT_2	  0x00000000 /* Multiply MMCR0 threshold by 2 */
-#define	SPR_PID			0x3b1	/* 4.. Process ID */
-#define	SPR_PMC5		0x3b1	/* .6. Performance Counter Register 5 */
-#define	SPR_PMC6		0x3b2	/* .6. Performance Counter Register 6 */
-#define	SPR_MMUCR		0x3b2	/* 4.. MMU Control Register */
-#define	  MMUCR_SW0A		  0x01000000 /* Store WithOut Allocate */
-#define	  MMUCR_U1TE		  0x00400000 /* U1 Transient Enable */
-#define	  MMUCR_U2SWOAE		  0x00200000 /* U2 SWOA Enab */
-#define	  MMUCR_DULXE		  0x00080000 /* Data Cache Unlock Exc. Ena. */
-#define	  MMUCR_IULXE		  0x00040000 /* Inst. Cache Unlock Exc. Ena. */
-#define	  MMUCR_STS		  0x00010000 /* Search Translation Space [TS] */
-#define	  MMUCR_STID		  0x000000ff /* Search Translation ID */
-#define	SPR_CCR0		0x3b3	/* 4.. Core Configuration Register 0 */
-#define	SPR_IAC3		0x3b4	/* 4.. Instruction Address Compare 3 */
-#define	SPR_IAC4		0x3b5	/* 4.. Instruction Address Compare 4 */
-#define	SPR_DVC1		0x3b6	/* 4.. Data Value Compare 1 */
-#define	SPR_DVC2		0x3b7	/* 4.. Data Value Compare 2 */
-#define	SPR_MMCR0		0x3b8	/* .6. Monitor Mode Control Register 0 */
-#define	  MMCR0_FC		  0x80000000 /* Freeze counters */
-#define	  MMCR0_FCS		  0x40000000 /* Freeze counters in supervisor mode */
-#define	  MMCR0_FCP		  0x20000000 /* Freeze counters in user mode */
-#define	  MMCR0_FCM1		  0x10000000 /* Freeze counters when mark=1 */
-#define	  MMCR0_FCM0		  0x08000000 /* Freeze counters when mark=0 */
-#define	  MMCR0_PMXE		  0x04000000 /* Enable PM interrupt */
-#define	  MMCR0_FCECE		  0x02000000 /* Freeze counters after event */
-#define	  MMCR0_TBSEL_15	  0x01800000 /* Count bit 15 of TBL */
-#define	  MMCR0_TBSEL_19	  0x01000000 /* Count bit 19 of TBL */
-#define	  MMCR0_TBSEL_23	  0x00800000 /* Count bit 23 of TBL */
-#define	  MMCR0_TBSEL_31	  0x00000000 /* Count bit 31 of TBL */
-#define	  MMCR0_TBEE		  0x00400000 /* Time-base event enable */
-#define	  MMCRO_THRESHOLD(x)	  ((x) << 16) /* Threshold value */
-#define	  MMCR0_PMC1CE		  0x00008000 /* PMC1 condition enable */
-#define	  MMCR0_PMCNCE		  0x00004000 /* PMCn condition enable */
-#define	  MMCR0_TRIGGER		  0x00002000 /* Trigger */
-#define	  MMCR0_PMC1SEL(x)	  ((x) << 6) /* PMC1 selector */
-#define	  MMCR0_PMC2SEL(x)	  ((x) << 0) /* PMC2 selector */
-#define	SPR_SGR			0x3b9	/* 4.. Storage Guarded Register */
-#define	SPR_PMC1		0x3b9	/* .6. Performance Counter Register 1 */
-#define	SPR_DCWR		0x3ba	/* 4.. Data Cache Write-through Register */
-#define	SPR_PMC2		0x3ba	/* .6. Performance Counter Register 2 */
-#define	SPR_SLER		0x3bb	/* 4.. Storage Little Endian Register */
-#define	SPR_SIA			0x3bb	/* .6. Sampled Instruction Address */
-#define	SPR_MMCR1		0x3bc	/* .6. Monitor Mode Control Register 2 */
-#define	  MMCR1_PMC3SEL(x)	  ((x) << 27) /* PMC 3 selector */
-#define	  MMCR1_PMC4SEL(x)	  ((x) << 22) /* PMC 4 selector */
-#define	  MMCR1_PMC5SEL(x)	  ((x) << 17) /* PMC 5 selector */
-#define	  MMCR1_PMC6SEL(x)	  ((x) << 11) /* PMC 6 selector */
-
-#define	SPR_SU0R		0x3bc	/* 4.. Storage User-defined 0 Register */
-#define	SPR_DBCR1		0x3bd	/* 4.. Debug Control Register 1 */
-#define	SPR_PMC3		0x3bd	/* .6. Performance Counter Register 3 */
-#define	SPR_PMC4		0x3be	/* .6. Performance Counter Register 4 */
-#define	SPR_DMISS		0x3d0	/* .68 Data TLB Miss Address Register */
-#define	SPR_DCMP		0x3d1	/* .68 Data TLB Compare Register */
-#define	SPR_HASH1		0x3d2	/* .68 Primary Hash Address Register */
-#define	SPR_ICDBDR		0x3d3	/* 4.. Instruction Cache Debug Data Register */
-#define	SPR_HASH2		0x3d3	/* .68 Secondary Hash Address Register */
-#define	SPR_ESR			0x3d4	/* 4.. Exception Syndrome Register */
-#define	  ESR_MCI		  0x80000000 /* Machine check - instruction */
-#define	  ESR_PIL		  0x08000000 /* Program interrupt - illegal */
-#define	  ESR_PPR		  0x04000000 /* Program interrupt - privileged */
-#define	  ESR_PTR		  0x02000000 /* Program interrupt - trap */
-#define	  ESR_DST		  0x00800000 /* Data storage interrupt - store fault */
-#define	  ESR_DIZ		  0x00800000 /* Data/instruction storage interrupt - zone fault */
-#define	  ESR_U0F		  0x00008000 /* Data storage interrupt - U0 fault */
-#define	SPR_IMISS		0x3d4	/* .68 Instruction TLB Miss Address Register */
-#define	SPR_TLBMISS		0x3d4	/* .6. TLB Miss Address Register */
-#define	SPR_DEAR		0x3d5	/* 4.. Data Error Address Register */
-#define	SPR_ICMP		0x3d5	/* .68 Instruction TLB Compare Register */
-#define	SPR_PTEHI		0x3d5	/* .6. Instruction TLB Compare Register */
-#define	SPR_EVPR		0x3d6	/* 4.. Exception Vector Prefix Register */
-#define	SPR_RPA			0x3d6	/* .68 Required Physical Address Register */
-#define	SPR_PTELO		0x3d6	/* .6. Required Physical Address Register */
-#define	SPR_TSR			0x3d8	/* 4.. Timer Status Register */
-#define	  TSR_ENW		  0x80000000 /* Enable Next Watchdog */
-#define	  TSR_WIS		  0x40000000 /* Watchdog Interrupt Status */
-#define	  TSR_WRS_MASK		  0x30000000 /* Watchdog Reset Status */
-#define	  TSR_WRS_NONE		  0x00000000 /* No watchdog reset has occurred */
-#define	  TSR_WRS_CORE		  0x10000000 /* Core reset was forced by the watchdog */
-#define	  TSR_WRS_CHIP		  0x20000000 /* Chip reset was forced by the watchdog */
-#define	  TSR_WRS_SYSTEM	  0x30000000 /* System reset was forced by the watchdog */
-#define	  TSR_PIS		  0x08000000 /* PIT Interrupt Status */
-#define	  TSR_FIS		  0x04000000 /* FIT Interrupt Status */
-#define	SPR_TCR			0x3da	/* 4.. Timer Control Register */
-#define	  TCR_WP_MASK		  0xc0000000 /* Watchdog Period mask */
-#define	  TCR_WP_2_17		  0x00000000 /* 2**17 clocks */
-#define	  TCR_WP_2_21		  0x40000000 /* 2**21 clocks */
-#define	  TCR_WP_2_25		  0x80000000 /* 2**25 clocks */
-#define	  TCR_WP_2_29		  0xc0000000 /* 2**29 clocks */
-#define	  TCR_WRC_MASK		  0x30000000 /* Watchdog Reset Control mask */
-#define	  TCR_WRC_NONE		  0x00000000 /* No watchdog reset */
-#define	  TCR_WRC_CORE		  0x10000000 /* Core reset */
-#define	  TCR_WRC_CHIP		  0x20000000 /* Chip reset */
-#define	  TCR_WRC_SYSTEM	  0x30000000 /* System reset */
-#define	  TCR_WIE		  0x08000000 /* Watchdog Interrupt Enable */
-#define	  TCR_PIE		  0x04000000 /* PIT Interrupt Enable */
-#define	  TCR_FP_MASK		  0x03000000 /* FIT Period */
-#define	  TCR_FP_2_9		  0x00000000 /* 2**9 clocks */
-#define	  TCR_FP_2_13		  0x01000000 /* 2**13 clocks */
-#define	  TCR_FP_2_17		  0x02000000 /* 2**17 clocks */
-#define	  TCR_FP_2_21		  0x03000000 /* 2**21 clocks */
-#define	  TCR_FIE		  0x00800000 /* FIT Interrupt Enable */
-#define	  TCR_ARE		  0x00400000 /* Auto Reload Enable */
-#define	SPR_PIT			0x3db	/* 4.. Programmable Interval Timer */
-#define	SPR_SRR2		0x3de	/* 4.. Save/Restore Register 2 */
-#define	SPR_SRR3		0x3df	/* 4.. Save/Restore Register 3 */
-#define	SPR_DBSR		0x3f0	/* 4.. Debug Status Register */
-#define	  DBSR_IC		  0x80000000 /* Instruction completion debug event */
-#define	  DBSR_BT		  0x40000000 /* Branch Taken debug event */
-#define	  DBSR_EDE		  0x20000000 /* Exception debug event */
-#define	  DBSR_TIE		  0x10000000 /* Trap Instruction debug event */
-#define	  DBSR_UDE		  0x08000000 /* Unconditional debug event */
-#define	  DBSR_IA1		  0x04000000 /* IAC1 debug event */
-#define	  DBSR_IA2		  0x02000000 /* IAC2 debug event */
-#define	  DBSR_DR1		  0x01000000 /* DAC1 Read debug event */
-#define	  DBSR_DW1		  0x00800000 /* DAC1 Write debug event */
-#define	  DBSR_DR2		  0x00400000 /* DAC2 Read debug event */
-#define	  DBSR_DW2		  0x00200000 /* DAC2 Write debug event */
-#define	  DBSR_IDE		  0x00100000 /* Imprecise debug event */
-#define	  DBSR_IA3		  0x00080000 /* IAC3 debug event */
-#define	  DBSR_IA4		  0x00040000 /* IAC4 debug event */
-#define	  DBSR_MRR		  0x00000300 /* Most recent reset */
-#define	SPR_HID0		0x3f0	/* ..8 Hardware Implementation Register 0 */
-#define	SPR_HID1		0x3f1	/* ..8 Hardware Implementation Register 1 */
-#define	SPR_DBCR0		0x3f2	/* 4.. Debug Control Register 0 */
-#define	  DBCR0_EDM		  0x80000000 /* External Debug Mode */
-#define	  DBCR0_IDM		  0x40000000 /* Internal Debug Mode */
-#define	  DBCR0_RST_MASK	  0x30000000 /* ReSeT */
-#define	  DBCR0_RST_NONE	  0x00000000 /*   No action */
-#define	  DBCR0_RST_CORE	  0x10000000 /*   Core reset */
-#define	  DBCR0_RST_CHIP	  0x20000000 /*   Chip reset */
-#define	  DBCR0_RST_SYSTEM	  0x30000000 /*   System reset */
-#define	  DBCR0_IC		  0x08000000 /* Instruction Completion debug event */
-#define	  DBCR0_BT		  0x04000000 /* Branch Taken debug event */
-#define	  DBCR0_EDE		  0x02000000 /* Exception Debug Event */
-#define	  DBCR0_TDE		  0x01000000 /* Trap Debug Event */
-#define	  DBCR0_IA1		  0x00800000 /* IAC (Instruction Address Compare) 1 debug event */
-#define	  DBCR0_IA2		  0x00400000 /* IAC 2 debug event */
-#define	  DBCR0_IA12		  0x00200000 /* Instruction Address Range Compare 1-2 */
-#define	  DBCR0_IA12X		  0x00100000 /* IA12 eXclusive */
-#define	  DBCR0_IA3		  0x00080000 /* IAC 3 debug event */
-#define	  DBCR0_IA4		  0x00040000 /* IAC 4 debug event */
-#define	  DBCR0_IA34		  0x00020000 /* Instruction Address Range Compare 3-4 */
-#define	  DBCR0_IA34X		  0x00010000 /* IA34 eXclusive */
-#define	  DBCR0_IA12T		  0x00008000 /* Instruction Address Range Compare 1-2 range Toggle */
-#define	  DBCR0_IA34T		  0x00004000 /* Instruction Address Range Compare 3-4 range Toggle */
-#define	  DBCR0_FT		  0x00000001 /* Freeze Timers on debug event */
-#define	SPR_IABR		0x3f2	/* ..8 Instruction Address Breakpoint Register 0 */
-#define	SPR_HID2		0x3f3	/* ..8 Hardware Implementation Register 2 */
-#define	SPR_IAC1		0x3f4	/* 4.. Instruction Address Compare 1 */
-#define	SPR_IAC2		0x3f5	/* 4.. Instruction Address Compare 2 */
-#define	SPR_DABR		0x3f5	/* .6. Data Address Breakpoint Register */
-#define	SPR_DAC1		0x3f6	/* 4.. Data Address Compare 1 */
-#define	SPR_MSSCR0		0x3f6	/* .6. Memory SubSystem Control Register */
-#define	  MSSCR0_SHDEN		  0x80000000 /* 0: Shared-state enable */
-#define	  MSSCR0_SHDPEN3	  0x40000000 /* 1: ~SHD[01] signal enable in MEI mode */
-#define	  MSSCR0_L1INTVEN	  0x38000000 /* 2-4: L1 data cache ~HIT intervention enable */
-#define	  MSSCR0_L2INTVEN	  0x07000000 /* 5-7: L2 data cache ~HIT intervention enable */
-#define	  MSSCR0_DL1HWF		  0x00800000 /* 8: L1 data cache hardware flush */
-#define	  MSSCR0_MBO		  0x00400000 /* 9: must be one */
-#define	  MSSCR0_EMODE		  0x00200000 /* 10: MPX bus mode (read-only) */
-#define	  MSSCR0_ABD		  0x00100000 /* 11: address bus driven (read-only) */
-#define	  MSSCR0_BMODE		  0x0000c000 /* 16-17: Bus Mode (read-only) (7450) */
-#define	  MSSCR0_ID		  0x00000040 /* 26: Processor ID */
-#define	  MSSCR0_L2PFE		  0x00000003 /* 30-31: L2 prefetching enabled (7450) */
-#define	SPR_DAC2		0x3f7	/* 4.. Data Address Compare 2 */
-#define	SPR_L2PM		0x3f8	/* .6. L2 Private Memory Control Register */
-#define	SPR_L2CR		0x3f9	/* .6. L2 Control Register */
-#define	  L2CR_L2E		  0x80000000 /* 0: L2 enable */
-#define	  L2CR_L2PE		  0x40000000 /* 1: L2 data parity enable */
-#define	  L2CR_L2SIZ		  0x30000000 /* 2-3: L2 size */
-#define	   L2SIZ_2M		  0x00000000
-#define	   L2SIZ_256K		  0x10000000
-#define	   L2SIZ_512K		  0x20000000
-#define	   L2SIZ_1M		  0x30000000
-#define	  L2CR_L2CLK		  0x0e000000 /* 4-6: L2 clock ratio */
-#define	   L2CLK_DIS		  0x00000000 /* disable L2 clock */
-#define	   L2CLK_10		  0x02000000 /* core clock / 1   */
-#define	   L2CLK_15		  0x04000000 /*            / 1.5 */
-#define	   L2CLK_35		  0x06000000 /*            / 3.5 */
-#define	   L2CLK_20		  0x08000000 /*            / 2   */
-#define	   L2CLK_25		  0x0a000000 /*            / 2.5 */
-#define	   L2CLK_30		  0x0c000000 /*            / 3   */
-#define	   L2CLK_40		  0x0e000000 /*            / 4   */
-#define	  L2CR_L2RAM		  0x01800000 /* 7-8: L2 RAM type */
-#define	   L2RAM_FLOWTHRU_BURST	  0x00000000
-#define	   L2RAM_PIPELINE_BURST	  0x01000000
-#define	   L2RAM_PIPELINE_LATE	  0x01800000
-#define	  L2CR_L2DO		  0x00400000 /* 9: L2 data-only.
-				      Setting this bit disables instruction
-				      caching. */
-#define	  L2CR_L2I		  0x00200000 /* 10: L2 global invalidate. */
-#define	  L2CR_L2CTL		  0x00100000 /* 11: L2 RAM control (ZZ enable).
-				      Enables automatic operation of the
-				      L2ZZ (low-power mode) signal. */
-#define	  L2CR_L2WT		  0x00080000 /* 12: L2 write-through. */
-#define	  L2CR_L2TS		  0x00040000 /* 13: L2 test support. */
-#define	  L2CR_L2OH		  0x00030000 /* 14-15: L2 output hold. */
-#define	  L2CR_L2SL		  0x00008000 /* 16: L2 DLL slow. */
-#define	  L2CR_L2DF		  0x00004000 /* 17: L2 differential clock. */
-#define	  L2CR_L2BYP		  0x00002000 /* 18: L2 DLL bypass. */
-#define	  L2CR_L2FA		  0x00001000 /* 19: L2 flush assist (for software flush). */
-#define	  L2CR_L2HWF		  0x00000800 /* 20: L2 hardware flush. */
-#define	  L2CR_L2IO		  0x00000400 /* 21: L2 instruction-only. */
-#define	  L2CR_L2CLKSTP		  0x00000200 /* 22: L2 clock stop. */
-#define	  L2CR_L2DRO		  0x00000100 /* 23: L2DLL rollover checkstop enable. */
-#define	  L2CR_L2IP		  0x00000001 /* 31: L2 global invalidate in */
-					     /*     progress (read only). */
-#define	SPR_L3CR		0x3fa	/* .6. L3 Control Register */
-#define	  L3CR_RESERVED		  0x0438003a /* Reserved bits in L3CR */
-#define	  L3CR_L3E		  0x80000000 /* 0: L3 enable */
-#define	  L3CR_L3PE		  0x40000000 /* 1: L3 data parity checking enable */
-#define	  L3CR_L3APE		  0x20000000 /* 2: L3 address parity checking enable */
-#define	  L3CR_L3SIZ		  0x10000000 /* 3: L3 size (0=1MB, 1=2MB) */
-#define	   L3SIZ_1M		  0x00000000
-#define	   L3SIZ_2M		  0x10000000
-#define	  L3CR_L3CLKEN		  0x08000000 /* 4: Enables the L3_CLK[0:1] signals */
-#define	  L3CR_L3CLK		  0x03800000 /* 6-8: L3 clock ratio */
-#define	   L3CLK_60		  0x00000000 /* core clock / 6   */
-#define	   L3CLK_20		  0x01000000 /*            / 2   */
-#define	   L3CLK_25		  0x01800000 /*            / 2.5 */
-#define	   L3CLK_30		  0x02000000 /*            / 3   */
-#define	   L3CLK_35		  0x02800000 /*            / 3.5 */
-#define	   L3CLK_40		  0x03000000 /*            / 4   */
-#define	   L3CLK_50		  0x03800000 /*            / 5   */
-#define	  L3CR_L3IO		  0x00400000 /* 9: L3 instruction-only mode */
-#define	  L3CR_L3SPO		  0x00040000 /* 13: L3 sample point override */
-#define	  L3CR_L3CKSP		  0x00030000 /* 14-15: L3 clock sample point */
-#define	   L3CKSP_2		  0x00000000 /* 2 clocks */
-#define	   L3CKSP_3		  0x00010000 /* 3 clocks */
-#define	   L3CKSP_4		  0x00020000 /* 4 clocks */
-#define	   L3CKSP_5		  0x00030000 /* 5 clocks */
-#define	  L3CR_L3PSP		  0x0000e000 /* 16-18: L3 P-clock sample point */
-#define	   L3PSP_0		  0x00000000 /* 0 clocks */
-#define	   L3PSP_1		  0x00002000 /* 1 clocks */
-#define	   L3PSP_2		  0x00004000 /* 2 clocks */
-#define	   L3PSP_3		  0x00006000 /* 3 clocks */
-#define	   L3PSP_4		  0x00008000 /* 4 clocks */
-#define	   L3PSP_5		  0x0000a000 /* 5 clocks */
-#define	  L3CR_L3REP		  0x00001000 /* 19: L3 replacement algorithm (0=default, 1=alternate) */
-#define	  L3CR_L3HWF		  0x00000800 /* 20: L3 hardware flush */
-#define	  L3CR_L3I		  0x00000400 /* 21: L3 global invalidate */
-#define	  L3CR_L3RT		  0x00000300 /* 22-23: L3 SRAM type */
-#define	   L3RT_MSUG2_DDR	  0x00000000 /* MSUG2 DDR SRAM */
-#define	   L3RT_PIPELINE_LATE	  0x00000100 /* Pipelined (register-register) synchronous late-write SRAM */
-#define	   L3RT_PB2_SRAM	  0x00000300 /* PB2 SRAM */
-#define	  L3CR_L3NIRCA		  0x00000080 /* 24: L3 non-integer ratios clock adjustment for the SRAM */
-#define	  L3CR_L3DO		  0x00000040 /* 25: L3 data-only mode */
-#define	  L3CR_PMEN		  0x00000004 /* 29: Private memory enable */
-#define	  L3CR_PMSIZ		  0x00000004 /* 31: Private memory size (0=1MB, 1=2MB) */
-#define	SPR_DCCR		0x3fa	/* 4.. Data Cache Cachability Register */
-#define	SPR_ICCR		0x3fb	/* 4.. Instruction Cache Cachability Register */
-#define	SPR_THRM1		0x3fc	/* .6. Thermal Management Register */
-#define	SPR_THRM2		0x3fd	/* .6. Thermal Management Register */
-#define	 SPR_THRM_TIN		  0x80000000 /* Thermal interrupt bit (RO) */
-#define	 SPR_THRM_TIV		  0x40000000 /* Thermal interrupt valid (RO) */
-#define	 SPR_THRM_THRESHOLD(x)	  ((x) << 23) /* Thermal sensor threshold */
-#define	 SPR_THRM_TID		  0x00000004 /* Thermal interrupt direction */
-#define	 SPR_THRM_TIE		  0x00000002 /* Thermal interrupt enable */
-#define	 SPR_THRM_VALID		  0x00000001 /* Valid bit */
-#define	SPR_THRM3		0x3fe	/* .6. Thermal Management Register */
-#define	 SPR_THRM_TIMER(x)	  ((x) << 1) /* Sampling interval timer */
-#define	 SPR_THRM_ENABLE       	  0x00000001 /* TAU Enable */
-#define	SPR_FPECR		0x3fe	/* .6. Floating-Point Exception Cause Register */
-#define	SPR_PIR			0x3ff	/* .6. Processor Identification Register */
+#define	SPR_XER			0x001	/* E468 Fixed Point Exception Register */
+#define	SPR_LR			0x008	/* E468 Link Register */
+#define	SPR_CTR			0x009	/* E468 Count Register */
+#define	SPR_DEC			0x016	/* E468 DECrementer register */
+#define	SPR_SRR0		0x01a	/* E468 Save/Restore Register 0 */
+#define	SPR_SRR1		0x01b	/* E468 Save/Restore Register 1 */
+#define	SPR_SPRG0		0x110	/* E468 SPR General 0 */
+#define	SPR_SPRG1		0x111	/* E468 SPR General 1 */
+#define	SPR_SPRG2		0x112	/* E468 SPR General 2 */
+#define	SPR_SPRG3		0x113	/* E468 SPR General 3 */
+#define	SPR_SPRG4		0x114	/* E4.. SPR General 4 */
+#define	SPR_SPRG5		0x115	/* E4.. SPR General 5 */
+#define	SPR_SPRG6		0x116	/* E4.. SPR General 6 */
+#define	SPR_SPRG7		0x117	/* E4.. SPR General 7 */
+#define	SPR_TBL			0x11c	/* E468 Time Base Lower */
+#define	SPR_TBU			0x11d	/* E468 Time Base Upper */
+#define	SPR_PVR			0x11f	/* E468 Processor Version Register */
 
 /* Time Base Register declarations */
-#define	TBR_TBL			0x10c	/* 468 Time Base Lower */
-#define	TBR_TBU			0x10d	/* 468 Time Base Upper */
-
-/* Performance counter declarations */
-#define	PMC_OVERFLOW	  	0x80000000 /* Counter has overflowed */
-
-/* The first five countable [non-]events are common to all the PMC's */
-#define	PMCN_NONE		 0 /* Count nothing */
-#define	PMCN_CYCLES		 1 /* Processor cycles */
-#define	PMCN_ICOMP		 2 /* Instructions completed */
-#define	PMCN_TBLTRANS		 3 /* TBL bit transitions */
-#define	PCMN_IDISPATCH		 4 /* Instructions dispatched */
-
-/* SPRs specific to the IBM 970 series processors */
-#define SPR_HID4       0x3F4   /* 970 HID4 */
-#define SPR_HID5       0x3F6   /* 970 HID5 */
+#define	TBR_TBL			0x10c	/* E468 Time Base Lower */
+#define	TBR_TBU			0x10d	/* E468 Time Base Upper */
 
 #endif /* !_POWERPC_SPR_H_ */

Index: src/sys/arch/powerpc/include/ibm4xx/Makefile
diff -u src/sys/arch/powerpc/include/ibm4xx/Makefile:1.5 src/sys/arch/powerpc/include/ibm4xx/Makefile:1.6
--- src/sys/arch/powerpc/include/ibm4xx/Makefile:1.5	Sun Dec 11 12:18:43 2005
+++ src/sys/arch/powerpc/include/ibm4xx/Makefile	Thu Feb 25 23:30:05 2010
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2005/12/11 12:18:43 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2010/02/25 23:30:05 matt Exp $
 
 INCSDIR= /usr/include/powerpc/ibm4xx
 
-INCS=	cpu.h pmap.h tlb.h
+INCS=	cpu.h pmap.h spr.h tlb.h
 
 .include <bsd.kinc.mk>

Index: src/sys/arch/powerpc/include/oea/Makefile
diff -u src/sys/arch/powerpc/include/oea/Makefile:1.1 src/sys/arch/powerpc/include/oea/Makefile:1.2
--- src/sys/arch/powerpc/include/oea/Makefile:1.1	Mon Feb  3 17:10:05 2003
+++ src/sys/arch/powerpc/include/oea/Makefile	Thu Feb 25 23:30:05 2010
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2003/02/03 17:10:05 matt Exp $
+#	$NetBSD: Makefile,v 1.2 2010/02/25 23:30:05 matt Exp $
 
 INCSDIR= /usr/include/powerpc/oea
 
 INCS=	bat.h \
 	hid.h hid_601.h \
 	pmap.h pte.h \
-	sr_601.h \
+	spr.h sr_601.h \
 	vmparam.h
 
 .include <bsd.kinc.mk>

Added files:

Index: src/sys/arch/powerpc/include/ibm4xx/spr.h
diff -u /dev/null src/sys/arch/powerpc/include/ibm4xx/spr.h:1.1
--- /dev/null	Thu Feb 25 23:30:05 2010
+++ src/sys/arch/powerpc/include/ibm4xx/spr.h	Thu Feb 25 23:30:05 2010
@@ -0,0 +1,151 @@
+/*	$NetBSD: spr.h,v 1.1 2010/02/25 23:30:05 matt Exp $	*/
+
+#ifndef _POWERPC_IBM4XX_SPR_H_
+#define	_POWERPC_IBM4XX_SPR_H_
+
+/*
+ * IBM4xx Special Purpose Register declarations.
+ *
+ * The first column in the comments indicates which PowerPC architectures the
+ * SPR is valid on - E for BookE series, 4 for 4xx series,
+ * 6 for 6xx/7xx series and 8 for 8xx and 8xxx (but not 85xx) series.
+ */
+
+#define	SPR_44XPID		0x030	/* E4.. 440 Process ID */
+#define	SPR_USPRG0		0x100	/* E4.. User SPR General 0 */
+#define	  IBM403		  0x0020
+#define	  IBM401A1		  0x0021
+#define	  IBM401B2		  0x0022
+#define	  IBM401C2		  0x0023
+#define	  IBM401D2		  0x0024
+#define	  IBM401E2		  0x0025
+#define	  IBM401F2		  0x0026
+#define	  IBM401G2		  0x0027
+#define   XILVIRTEX		  0x2001
+#define	  IBM405GP		  0x4011
+#define   IBMSTB03		  0x4013
+#define   IBMSTB04		  0x4081
+#define   IBM405GS3		  0x40b1
+#define   IBM405H		  0x4141
+#define	  IBM405L		  0x4161
+#define   IBM405LP		  0x41f1
+#define	  IBM405GPR		  0x5091
+#define   IBM405EP		  0x5121
+#define   IBMSTB25		  0x5151
+
+#define	SPR_ZPR			0x3b0	/* .4.. Zone Protection Register */
+#define	SPR_PID			0x3b1	/* .4.. Process ID */
+#define	SPR_MMUCR		0x3b2	/* .4.. MMU Control Register */
+#define	  MMUCR_SW0A		  0x01000000 /* Store WithOut Allocate */
+#define	  MMUCR_U1TE		  0x00400000 /* U1 Transient Enable */
+#define	  MMUCR_U2SWOAE		  0x00200000 /* U2 SWOA Enab */
+#define	  MMUCR_DULXE		  0x00080000 /* Data Cache Unlock Exc. Ena. */
+#define	  MMUCR_IULXE		  0x00040000 /* Inst. Cache Unlock Exc. Ena. */
+#define	  MMUCR_STS		  0x00010000 /* Search Translation Space [TS] */
+#define	  MMUCR_STID		  0x000000ff /* Search Translation ID */
+#define	SPR_CCR0		0x3b3	/* .4.. Core Configuration Register 0 */
+#define	SPR_IAC3		0x3b4	/* .4.. Instruction Address Compare 3 */
+#define	SPR_IAC4		0x3b5	/* .4.. Instruction Address Compare 4 */
+#define	SPR_DVC1		0x3b6	/* .4.. Data Value Compare 1 */
+#define	SPR_DVC2		0x3b7	/* .4.. Data Value Compare 2 */
+#define	SPR_SGR			0x3b9	/* .4.. Storage Guarded Register */
+#define	SPR_DCWR		0x3ba	/* .4.. Data Cache Write-through Register */
+#define	SPR_SLER		0x3bb	/* .4.. Storage Little Endian Register */
+#define	SPR_SU0R		0x3bc	/* .4.. Storage User-defined 0 Register */
+#define	SPR_DBCR1		0x3bd	/* .4.. Debug Control Register 1 */
+#define	SPR_ICDBDR		0x3d3	/* .4.. Instruction Cache Debug Data Register */
+#define	SPR_ESR			0x3d4	/* .4.. Exception Syndrome Register */
+#define	  ESR_MCI		  0x80000000 /* 0: Machine check - instruction */
+#define	  ESR_PIL		  0x08000000 /* 4: Program interrupt - illegal */
+#define	  ESR_PPR		  0x04000000 /* 5: Program interrupt - privileged */
+#define	  ESR_PTR		  0x02000000 /* 6: Program interrupt - trap */
+#define	  ESR_DST		  0x00800000 /* 8: Data storage interrupt - store fault */
+#define	  ESR_DIZ		  0x00800000 /* 8: Data/instruction storage interrupt - zone fault */
+#define	  ESR_ST		  0x00800000 /* 8: Store operation */
+#define	  ESR_DLK		  0x00200000 /* 10: dcache exception */
+#define	  ESR_ILK		  0x00100000 /* 11: icache exception */
+#define	  ESR_BO		  0x00020000 /* 14: Byte ordering exception */
+#define	  ESR_U0F		  0x00008000 /* 16: Data storage interrupt - U0 fault */
+#define	  ESR_SPE		  0x00000080 /* 24: SPE exception */
+#define	SPR_DEAR		0x3d5	/* .4.. Data Error Address Register */
+#define	SPR_EVPR		0x3d6	/* .4.. Exception Vector Prefix Register */
+#define	SPR_TSR			0x3d8	/* .4.. Timer Status Register */
+#define	  TSR_ENW		  0x80000000 /* Enable Next Watchdog */
+#define	  TSR_WIS		  0x40000000 /* Watchdog Interrupt Status */
+#define	  TSR_WRS_MASK		  0x30000000 /* Watchdog Reset Status */
+#define	  TSR_WRS_NONE		  0x00000000 /* No watchdog reset has occurred */
+#define	  TSR_WRS_CORE		  0x10000000 /* Core reset was forced by the watchdog */
+#define	  TSR_WRS_CHIP		  0x20000000 /* Chip reset was forced by the watchdog */
+#define	  TSR_WRS_SYSTEM	  0x30000000 /* System reset was forced by the watchdog */
+#define	  TSR_PIS		  0x08000000 /* PIT Interrupt Status */
+#define	  TSR_FIS		  0x04000000 /* FIT Interrupt Status */
+#define	SPR_TCR			0x3da	/* .4.. Timer Control Register */
+#define	  TCR_WP_MASK		  0xc0000000 /* Watchdog Period mask */
+#define	  TCR_WP_2_17		  0x00000000 /* 2**17 clocks */
+#define	  TCR_WP_2_21		  0x40000000 /* 2**21 clocks */
+#define	  TCR_WP_2_25		  0x80000000 /* 2**25 clocks */
+#define	  TCR_WP_2_29		  0xc0000000 /* 2**29 clocks */
+#define	  TCR_WRC_MASK		  0x30000000 /* Watchdog Reset Control mask */
+#define	  TCR_WRC_NONE		  0x00000000 /* No watchdog reset */
+#define	  TCR_WRC_CORE		  0x10000000 /* Core reset */
+#define	  TCR_WRC_CHIP		  0x20000000 /* Chip reset */
+#define	  TCR_WRC_SYSTEM	  0x30000000 /* System reset */
+#define	  TCR_WIE		  0x08000000 /* Watchdog Interrupt Enable */
+#define	  TCR_PIE		  0x04000000 /* PIT Interrupt Enable */
+#define	  TCR_FP_MASK		  0x03000000 /* FIT Period */
+#define	  TCR_FP_2_9		  0x00000000 /* 2**9 clocks */
+#define	  TCR_FP_2_13		  0x01000000 /* 2**13 clocks */
+#define	  TCR_FP_2_17		  0x02000000 /* 2**17 clocks */
+#define	  TCR_FP_2_21		  0x03000000 /* 2**21 clocks */
+#define	  TCR_FIE		  0x00800000 /* FIT Interrupt Enable */
+#define	  TCR_ARE		  0x00400000 /* Auto Reload Enable */
+#define	SPR_PIT			0x3db	/* .4.. Programmable Interval Timer */
+#define	SPR_SRR2		0x3de	/* .4.. Save/Restore Register 2 */
+#define	SPR_SRR3		0x3df	/* .4.. Save/Restore Register 3 */
+#define	SPR_DBSR		0x3f0	/* .4.. Debug Status Register */
+#define	  DBSR_IC		  0x80000000 /* Instruction completion debug event */
+#define   DBSR_IDE		  0x80000000 /* Imprecise debug event */
+#define	  DBSR_BT		  0x40000000 /* Branch Taken debug event */
+#define	  DBSR_EDE		  0x20000000 /* Exception debug event */
+#define	  DBSR_TIE		  0x10000000 /* Trap Instruction debug event */
+#define	  DBSR_UDE		  0x08000000 /* Unconditional debug event */
+#define	  DBSR_IA1		  0x04000000 /* IAC1 debug event */
+#define	  DBSR_IA2		  0x02000000 /* IAC2 debug event */
+#define	  DBSR_DR1		  0x01000000 /* DAC1 Read debug event */
+#define	  DBSR_DW1		  0x00800000 /* DAC1 Write debug event */
+#define	  DBSR_DR2		  0x00400000 /* DAC2 Read debug event */
+#define	  DBSR_DW2		  0x00200000 /* DAC2 Write debug event */
+#define	  DBSR_IA3		  0x00080000 /* IAC3 debug event */
+#define	  DBSR_IA4		  0x00040000 /* IAC4 debug event */
+#define	  DBSR_MRR		  0x00000300 /* Most recent reset */
+#define	SPR_DBCR0		0x3f2	/* .4.. Debug Control Register 0 */
+#define	  DBCR0_EDM		  0x80000000 /* 0: External Debug Mode */
+#define	  DBCR0_IDM		  0x40000000 /* 1: Internal Debug Mode */
+#define	  DBCR0_RST_MASK	  0x30000000 /* 2..3: ReSeT */
+#define	  DBCR0_RST_NONE	  0x00000000 /*   No action */
+#define	  DBCR0_RST_CORE	  0x10000000 /*   Core reset */
+#define	  DBCR0_RST_CHIP	  0x20000000 /*   Chip reset */
+#define	  DBCR0_RST_SYSTEM	  0x30000000 /*   System reset */
+#define	  DBCR0_IC		  0x08000000 /* 4: Instruction Completion debug event */
+#define	  DBCR0_BT		  0x04000000 /* 5: Branch Taken debug event */
+#define	  DBCR0_EDE		  0x02000000 /* 6: Exception Debug Event */
+#define	  DBCR0_TDE		  0x01000000 /* 7: Trap Debug Event */
+#define	  DBCR0_IA1		  0x00800000 /* 8: IAC (Instruction Address Compare) 1 debug event */
+#define	  DBCR0_IA2		  0x00400000 /* 9: IAC 2 debug event */
+#define	  DBCR0_IA12		  0x00200000 /* 10: Instruction Address Range Compare 1-2 */
+#define	  DBCR0_IA12X		  0x00100000 /* 11: IA12 eXclusive */
+#define	  DBCR0_IA3		  0x00080000 /* 12: IAC 3 debug event */
+#define	  DBCR0_IA4		  0x00040000 /* 13: IAC 4 debug event */
+#define	  DBCR0_IA34		  0x00020000 /* 14: Instruction Address Range Compare 3-4 */
+#define	  DBCR0_IA34X		  0x00010000 /* 15: IA34 eXclusive */
+#define	  DBCR0_IA12T		  0x00008000 /* 16: Instruction Address Range Compare 1-2 range Toggle */
+#define	  DBCR0_IA34T		  0x00004000 /* 17: Instruction Address Range Compare 3-4 range Toggle */
+#define	  DBCR0_FT		  0x00000001 /* 31: Freeze Timers on debug event */
+#define	SPR_IAC1		0x3f4	/* .4.. Instruction Address Compare 1 */
+#define	SPR_IAC2		0x3f5	/* .4.. Instruction Address Compare 2 */
+#define	SPR_DAC1		0x3f6	/* .4.. Data Address Compare 1 */
+#define	SPR_DAC2		0x3f7	/* .4.. Data Address Compare 2 */
+#define	SPR_DCCR		0x3fa	/* .4.. Data Cache Cachability Register */
+#define	SPR_ICCR		0x3fb	/* .4.. Instruction Cache Cachability Register */
+
+#endif /* !_POWERPC_IBM4XX_SPR_H_ */

Index: src/sys/arch/powerpc/include/oea/spr.h
diff -u /dev/null src/sys/arch/powerpc/include/oea/spr.h:1.1
--- /dev/null	Thu Feb 25 23:30:05 2010
+++ src/sys/arch/powerpc/include/oea/spr.h	Thu Feb 25 23:30:05 2010
@@ -0,0 +1,288 @@
+/*	$NetBSD: spr.h,v 1.1 2010/02/25 23:30:05 matt Exp $	*/
+
+#ifndef _POWERPC_OEA_SPR_H_
+#define	_POWERPC_OEA_SPR_H_
+
+/*
+ * Special Purpose Register declarations.
+ *
+ * The first column in the comments indicates which PowerPC architectures the
+ * SPR is valid on - E for BookE series, 4 for 4xx series,
+ * 6 for 6xx/7xx series and 8 for 8xx (but not most 8xxx) series.
+ */
+
+#define	SPR_MQ			0x000	/* ..6. 601 MQ register */
+#define	SPR_RTCU_R		0x004	/* ..6. 601 RTC Upper - Read */
+#define	SPR_RTCL_R		0x005	/* ..6. 601 RTC Lower - Read */
+#define	SPR_DSISR		0x012	/* ..68 DSI exception source */
+#define	  DSISR_DIRECT		  0x80000000 /* Direct-store error exception */
+#define	  DSISR_NOTFOUND	  0x40000000 /* Translation not found */
+#define	  DSISR_PROTECT		  0x08000000 /* Memory access not permitted */
+#define	  DSISR_INVRX		  0x04000000 /* Reserve-indexed insn direct-store access */
+#define	  DSISR_STORE		  0x02000000 /* Store operation */
+#define	  DSISR_DABR		  0x00400000 /* DABR match */
+#define	  DSISR_SEGMENT		  0x00200000 /* XXX; not in 6xx PEM */
+#define	  DSISR_EAR		  0x00100000 /* eciwx/ecowx && EAR[E] == 0 */
+#define	SPR_DAR			0x013	/* ..68 Data Address Register */
+#define	SPR_RTCU_W		0x014	/* ..6. 601 RTC Upper - Write */
+#define	SPR_RTCL_W		0x015	/* ..6. 601 RTC Lower - Write */
+#define	SPR_SDR1		0x019	/* ..68 Page table base address register */
+#define	SPR_VRSAVE		0x100	/* ..6. AltiVec VRSAVE */
+#define	SPR_ASR			0x118	/* ..6. Address Space Register (PPC64) */
+#define	SPR_EAR			0x11a	/* ..68 External Access Register */
+#define	  MPC601		  0x0001
+#define	  MPC603		  0x0003
+#define	  MPC604		  0x0004
+#define	  MPC602		  0x0005
+#define	  MPC603e		  0x0006
+#define	  MPC603ev		  0x0007
+#define	  MPC750		  0x0008
+#define	  MPC604e		  0x0009
+#define	  MPC604ev		  0x000a
+#define	  MPC7400		  0x000c
+#define	  MPC620		  0x0014
+#define   IBMRS64II		  0x0033
+#define   IBMRS64IIIp		  0x0034
+#define   IBMPOWER4		  0x0035
+#define   IBMRS64IIIi		  0x0036
+#define   IBMRS64IV		  0x0037
+#define   IBMPOWER4II		  0x0038
+#define   IBM970		  0x0039
+#define   IBMPOWER5GR		  0x003a
+#define   IBMPOWER5GS		  0x003b
+#define   IBM970FX		  0x003c
+#define   IBMPOWER6		  0x003e
+#define   IBMPOWER3		  0x0040
+#define	  IBMPOWER3II		  0x0041
+#define   IBM970MP		  0x0044
+#define   IBM970GX		  0x0045
+#define   IBMCELL		  0x0070
+#define	  MPC8240		  0x0081
+#define   PA6T			  0x0090
+#define   IBMPOWER6P5		  0x0f00
+#define   IBMSTB25		  0x5151
+#define	  IBM750FX		  0x7000
+#define   IBM750GX		  0x7002
+#define	  MPC7450		  0x8000
+#define	  MPC7455		  0x8001
+#define   MPC7457		  0x8002
+#define   MPC7447A		  0x8003
+#define   MPC7448		  0x8004
+#define MPC745X_P(v)		  ((v & 0xFFF8) == 0x8000)
+#define	  MPC7410		  0x800c
+#define	  MPC5200		  0x8011
+#define   MPC8245		  0x8081
+#define   MPCG2			  0x8082
+#define   MPCe300c1		  0x8083
+#define   MPCe300c2		  0x8084
+#define   MPCe300c3		  0x8085
+
+#define	SPR_IBAT0U		0x210	/* ..68 Instruction BAT Reg 0 Upper */
+#define	SPR_IBAT0L		0x211	/* ..6. Instruction BAT Reg 0 Lower */
+#define	SPR_IBAT1U		0x212	/* ..6. Instruction BAT Reg 1 Upper */
+#define	SPR_IBAT1L		0x213	/* ..6. Instruction BAT Reg 1 Lower */
+#define	SPR_IBAT2U		0x214	/* ..6. Instruction BAT Reg 2 Upper */
+#define	SPR_IBAT2L		0x215	/* ..6. Instruction BAT Reg 2 Lower */
+#define	SPR_IBAT3U		0x216	/* ..6. Instruction BAT Reg 3 Upper */
+#define	SPR_IBAT3L		0x217	/* ..6. Instruction BAT Reg 3 Lower */
+#define	SPR_DBAT0U		0x218	/* ..6. Data BAT Reg 0 Upper */
+#define	SPR_DBAT0L		0x219	/* ..6. Data BAT Reg 0 Lower */
+#define	SPR_DBAT1U		0x21a	/* ..6. Data BAT Reg 1 Upper */
+#define	SPR_DBAT1L		0x21b	/* ..6. Data BAT Reg 1 Lower */
+#define	SPR_DBAT2U		0x21c	/* ..6. Data BAT Reg 2 Upper */
+#define	SPR_DBAT2L		0x21d	/* ..6. Data BAT Reg 2 Lower */
+#define	SPR_DBAT3U		0x21e	/* ..6. Data BAT Reg 3 Upper */
+#define	SPR_DBAT3L		0x21f	/* ..6. Data BAT Reg 3 Lower */
+#define	SPR_IBAT4U		0x230	/* ..6. Instruction BAT Reg 4 Upper */
+#define	SPR_IBAT4L		0x231	/* ..6. Instruction BAT Reg 4 Lower */
+#define	SPR_IBAT5U		0x232	/* ..6. Instruction BAT Reg 5 Upper */
+#define	SPR_IBAT5L		0x233	/* ..6. Instruction BAT Reg 5 Lower */
+#define	SPR_IBAT6U		0x234	/* ..6. Instruction BAT Reg 6 Upper */
+#define	SPR_IBAT6L		0x235	/* ..6. Instruction BAT Reg 6 Lower */
+#define	SPR_IBAT7U		0x236	/* ..6. Instruction BAT Reg 7 Upper */
+#define	SPR_IBAT7L		0x237	/* ..6. Instruction BAT Reg 7 Lower */
+#define	SPR_DBAT4U		0x238	/* ..6. Data BAT Reg 4 Upper */
+#define	SPR_DBAT4L		0x239	/* ..6. Data BAT Reg 4 Lower */
+#define	SPR_DBAT5U		0x23a	/* ..6. Data BAT Reg 5 Upper */
+#define	SPR_DBAT5L		0x23b	/* ..6. Data BAT Reg 5 Lower */
+#define	SPR_DBAT6U		0x23c	/* ..6. Data BAT Reg 6 Upper */
+#define	SPR_DBAT6L		0x23d	/* ..6. Data BAT Reg 6 Lower */
+#define	SPR_DBAT7U		0x23e	/* ..6. Data BAT Reg 7 Upper */
+#define	SPR_UMMCR2		0x3a0	/* ..6. User Monitor Mode Control Register 2 */
+#define	SPR_UMMCR0		0x3a8	/* ..6. User Monitor Mode Control Register 0 */
+#define	SPR_USIA		0x3ab	/* ..6. User Sampled Instruction Address */
+#define	SPR_UMMCR1		0x3ac	/* ..6. User Monitor Mode Control Register 1 */
+#define	SPR_MMCR2		0x3b0	/* ..6. Monitor Mode Control Register 2 */
+#define	 SPR_MMCR2_THRESHMULT_32  0x80000000 /* Multiply MMCR0 threshold by 32 */
+#define	 SPR_MMCR2_THRESHMULT_2	  0x00000000 /* Multiply MMCR0 threshold by 2 */
+#define	SPR_PMC5		0x3b1	/* ..6. Performance Counter Register 5 */
+#define	SPR_PMC6		0x3b2	/* ..6. Performance Counter Register 6 */
+
+#define	SPR_MMCR0		0x3b8	/* ..6. Monitor Mode Control Register 0 */
+#define	  MMCR0_FC		  0x80000000 /* Freeze counters */
+#define	  MMCR0_FCS		  0x40000000 /* Freeze counters in supervisor mode */
+#define	  MMCR0_FCP		  0x20000000 /* Freeze counters in user mode */
+#define	  MMCR0_FCM1		  0x10000000 /* Freeze counters when mark=1 */
+#define	  MMCR0_FCM0		  0x08000000 /* Freeze counters when mark=0 */
+#define	  MMCR0_PMXE		  0x04000000 /* Enable PM interrupt */
+#define	  MMCR0_FCECE		  0x02000000 /* Freeze counters after event */
+#define	  MMCR0_TBSEL_15	  0x01800000 /* Count bit 15 of TBL */
+#define	  MMCR0_TBSEL_19	  0x01000000 /* Count bit 19 of TBL */
+#define	  MMCR0_TBSEL_23	  0x00800000 /* Count bit 23 of TBL */
+#define	  MMCR0_TBSEL_31	  0x00000000 /* Count bit 31 of TBL */
+#define	  MMCR0_TBEE		  0x00400000 /* Time-base event enable */
+#define	  MMCRO_THRESHOLD(x)	  ((x) << 16) /* Threshold value */
+#define	  MMCR0_PMC1CE		  0x00008000 /* PMC1 condition enable */
+#define	  MMCR0_PMCNCE		  0x00004000 /* PMCn condition enable */
+#define	  MMCR0_TRIGGER		  0x00002000 /* Trigger */
+#define	  MMCR0_PMC1SEL(x)	  ((x) << 6) /* PMC1 selector */
+#define	  MMCR0_PMC2SEL(x)	  ((x) << 0) /* PMC2 selector */
+#define	SPR_PMC1		0x3b9	/* ..6. Performance Counter Register 1 */
+#define	SPR_PMC2		0x3ba	/* ..6. Performance Counter Register 2 */
+#define	SPR_SIA			0x3bb	/* ..6. Sampled Instruction Address */
+#define	SPR_MMCR1		0x3bc	/* ..6. Monitor Mode Control Register 2 */
+#define	  MMCR1_PMC3SEL(x)	  ((x) << 27) /* PMC 3 selector */
+#define	  MMCR1_PMC4SEL(x)	  ((x) << 22) /* PMC 4 selector */
+#define	  MMCR1_PMC5SEL(x)	  ((x) << 17) /* PMC 5 selector */
+#define	  MMCR1_PMC6SEL(x)	  ((x) << 11) /* PMC 6 selector */
+
+#define	SPR_PMC3		0x3bd	/* ..6. Performance Counter Register 3 */
+#define	SPR_PMC4		0x3be	/* ..6. Performance Counter Register 4 */
+#define	SPR_DMISS		0x3d0	/* ..68 Data TLB Miss Address Register */
+#define	SPR_DCMP		0x3d1	/* ..68 Data TLB Compare Register */
+#define	SPR_HASH1		0x3d2	/* ..68 Primary Hash Address Register */
+#define	SPR_HASH2		0x3d3	/* ..68 Secondary Hash Address Register */
+#define	SPR_IMISS		0x3d4	/* ..68 Instruction TLB Miss Address Register */
+#define	SPR_TLBMISS		0x3d4	/* ..6. TLB Miss Address Register */
+#define	SPR_ICMP		0x3d5	/* ..68 Instruction TLB Compare Register */
+#define	SPR_PTEHI		0x3d5	/* ..6. Instruction TLB Compare Register */
+#define	SPR_RPA			0x3d6	/* ..68 Required Physical Address Register */
+#define	SPR_PTELO		0x3d6	/* ..6. Required Physical Address Register */
+#define SPR_HID0		0x3f0	/* E.68 Hardware Implementation Register
+ 0 */
+#define SPR_HID1		0x3f1	/* E.68 Hardware Implementation Register
+ 1 */
+#define SPR_HID4		0x3f4   /* ..6. 970 HID4 */
+#define SPR_HID5		0x3f6   /* ..6. 970 HID5 */
+#define	SPR_DABR		0x3f5	/* ..6. Data Address Breakpoint Register */
+#define	SPR_MSSCR0		0x3f6	/* ..6. Memory SubSystem Control Register */
+#define	  MSSCR0_SHDEN		  0x80000000 /* 0: Shared-state enable */
+#define	  MSSCR0_SHDPEN3	  0x40000000 /* 1: ~SHD[01] signal enable in MEI mode */
+#define	  MSSCR0_L1INTVEN	  0x38000000 /* 2-4: L1 data cache ~HIT intervention enable */
+#define	  MSSCR0_L2INTVEN	  0x07000000 /* 5-7: L2 data cache ~HIT intervention enable */
+#define	  MSSCR0_DL1HWF		  0x00800000 /* 8: L1 data cache hardware flush */
+#define	  MSSCR0_MBO		  0x00400000 /* 9: must be one */
+#define	  MSSCR0_EMODE		  0x00200000 /* 10: MPX bus mode (read-only) */
+#define	  MSSCR0_ABD		  0x00100000 /* 11: address bus driven (read-only) */
+#define	  MSSCR0_BMODE		  0x0000c000 /* 16-17: Bus Mode (read-only) (7450) */
+#define	  MSSCR0_ID		  0x00000040 /* 26: Processor ID */
+#define	  MSSCR0_L2PFE		  0x00000003 /* 30-31: L2 prefetching enabled (7450) */
+#define	SPR_L2PM		0x3f8	/* ..6. L2 Private Memory Control Register */
+#define	SPR_L2CR		0x3f9	/* ..6. L2 Control Register */
+#define	  L2CR_L2E		  0x80000000 /* 0: L2 enable */
+#define	  L2CR_L2PE		  0x40000000 /* 1: L2 data parity enable */
+#define	  L2CR_L2SIZ		  0x30000000 /* 2-3: L2 size */
+#define	   L2SIZ_2M		  0x00000000
+#define	   L2SIZ_256K		  0x10000000
+#define	   L2SIZ_512K		  0x20000000
+#define	   L2SIZ_1M		  0x30000000
+#define	  L2CR_L2CLK		  0x0e000000 /* 4-6: L2 clock ratio */
+#define	   L2CLK_DIS		  0x00000000 /* disable L2 clock */
+#define	   L2CLK_10		  0x02000000 /* core clock / 1   */
+#define	   L2CLK_15		  0x04000000 /*            / 1.5 */
+#define	   L2CLK_35		  0x06000000 /*            / 3.5 */
+#define	   L2CLK_20		  0x08000000 /*            / 2   */
+#define	   L2CLK_25		  0x0a000000 /*            / 2.5 */
+#define	   L2CLK_30		  0x0c000000 /*            / 3   */
+#define	   L2CLK_40		  0x0e000000 /*            / 4   */
+#define	  L2CR_L2RAM		  0x01800000 /* 7-8: L2 RAM type */
+#define	   L2RAM_FLOWTHRU_BURST	  0x00000000
+#define	   L2RAM_PIPELINE_BURST	  0x01000000
+#define	   L2RAM_PIPELINE_LATE	  0x01800000
+#define	  L2CR_L2DO		  0x00400000 /* 9: L2 data-only.
+				      Setting this bit disables instruction
+				      caching. */
+#define	  L2CR_L2I		  0x00200000 /* 10: L2 global invalidate. */
+#define	  L2CR_L2CTL		  0x00100000 /* 11: L2 RAM control (ZZ enable).
+				      Enables automatic operation of the
+				      L2ZZ (low-power mode) signal. */
+#define	  L2CR_L2WT		  0x00080000 /* 12: L2 write-through. */
+#define	  L2CR_L2TS		  0x00040000 /* 13: L2 test support. */
+#define	  L2CR_L2OH		  0x00030000 /* 14-15: L2 output hold. */
+#define	  L2CR_L2SL		  0x00008000 /* 16: L2 DLL slow. */
+#define	  L2CR_L2DF		  0x00004000 /* 17: L2 differential clock. */
+#define	  L2CR_L2BYP		  0x00002000 /* 18: L2 DLL bypass. */
+#define	  L2CR_L2FA		  0x00001000 /* 19: L2 flush assist (for software flush). */
+#define	  L2CR_L2HWF		  0x00000800 /* 20: L2 hardware flush. */
+#define	  L2CR_L2IO		  0x00000400 /* 21: L2 instruction-only. */
+#define	  L2CR_L2CLKSTP		  0x00000200 /* 22: L2 clock stop. */
+#define	  L2CR_L2DRO		  0x00000100 /* 23: L2DLL rollover checkstop enable. */
+#define	  L2CR_L2IP		  0x00000001 /* 31: L2 global invalidate in */
+					     /*     progress (read only). */
+#define	SPR_L3CR		0x3fa	/* ..6. L3 Control Register */
+#define	  L3CR_RESERVED		  0x0438003a /* Reserved bits in L3CR */
+#define	  L3CR_L3E		  0x80000000 /* 0: L3 enable */
+#define	  L3CR_L3PE		  0x40000000 /* 1: L3 data parity checking enable */
+#define	  L3CR_L3APE		  0x20000000 /* 2: L3 address parity checking enable */
+#define	  L3CR_L3SIZ		  0x10000000 /* 3: L3 size (0=1MB, 1=2MB) */
+#define	   L3SIZ_1M		  0x00000000
+#define	   L3SIZ_2M		  0x10000000
+#define	  L3CR_L3CLKEN		  0x08000000 /* 4: Enables the L3_CLK[0:1] signals */
+#define	  L3CR_L3CLK		  0x03800000 /* 6-8: L3 clock ratio */
+#define	   L3CLK_60		  0x00000000 /* core clock / 6   */
+#define	   L3CLK_20		  0x01000000 /*            / 2   */
+#define	   L3CLK_25		  0x01800000 /*            / 2.5 */
+#define	   L3CLK_30		  0x02000000 /*            / 3   */
+#define	   L3CLK_35		  0x02800000 /*            / 3.5 */
+#define	   L3CLK_40		  0x03000000 /*            / 4   */
+#define	   L3CLK_50		  0x03800000 /*            / 5   */
+#define	  L3CR_L3IO		  0x00400000 /* 9: L3 instruction-only mode */
+#define	  L3CR_L3SPO		  0x00040000 /* 13: L3 sample point override */
+#define	  L3CR_L3CKSP		  0x00030000 /* 14-15: L3 clock sample point */
+#define	   L3CKSP_2		  0x00000000 /* 2 clocks */
+#define	   L3CKSP_3		  0x00010000 /* 3 clocks */
+#define	   L3CKSP_4		  0x00020000 /* 4 clocks */
+#define	   L3CKSP_5		  0x00030000 /* 5 clocks */
+#define	  L3CR_L3PSP		  0x0000e000 /* 16-18: L3 P-clock sample point */
+#define	   L3PSP_0		  0x00000000 /* 0 clocks */
+#define	   L3PSP_1		  0x00002000 /* 1 clocks */
+#define	   L3PSP_2		  0x00004000 /* 2 clocks */
+#define	   L3PSP_3		  0x00006000 /* 3 clocks */
+#define	   L3PSP_4		  0x00008000 /* 4 clocks */
+#define	   L3PSP_5		  0x0000a000 /* 5 clocks */
+#define	  L3CR_L3REP		  0x00001000 /* 19: L3 replacement algorithm (0=default, 1=alternate) */
+#define	  L3CR_L3HWF		  0x00000800 /* 20: L3 hardware flush */
+#define	  L3CR_L3I		  0x00000400 /* 21: L3 global invalidate */
+#define	  L3CR_L3RT		  0x00000300 /* 22-23: L3 SRAM type */
+#define	   L3RT_MSUG2_DDR	  0x00000000 /* MSUG2 DDR SRAM */
+#define	   L3RT_PIPELINE_LATE	  0x00000100 /* Pipelined (register-register) synchronous late-write SRAM */
+#define	   L3RT_PB2_SRAM	  0x00000300 /* PB2 SRAM */
+#define	  L3CR_L3NIRCA		  0x00000080 /* 24: L3 non-integer ratios clock adjustment for the SRAM */
+#define	  L3CR_L3DO		  0x00000040 /* 25: L3 data-only mode */
+#define	  L3CR_PMEN		  0x00000004 /* 29: Private memory enable */
+#define	  L3CR_PMSIZ		  0x00000004 /* 31: Private memory size (0=1MB, 1=2MB) */
+#define	SPR_THRM1		0x3fc	/* ..6. Thermal Management Register */
+#define	SPR_THRM2		0x3fd	/* ..6. Thermal Management Register */
+#define	 SPR_THRM_TIN		  0x80000000 /* Thermal interrupt bit (RO) */
+#define	 SPR_THRM_TIV		  0x40000000 /* Thermal interrupt valid (RO) */
+#define	 SPR_THRM_THRESHOLD(x)	  ((x) << 23) /* Thermal sensor threshold */
+#define	 SPR_THRM_TID		  0x00000004 /* Thermal interrupt direction */
+#define	 SPR_THRM_TIE		  0x00000002 /* Thermal interrupt enable */
+#define	 SPR_THRM_VALID		  0x00000001 /* Valid bit */
+#define	SPR_THRM3		0x3fe	/* ..6. Thermal Management Register */
+#define	 SPR_THRM_TIMER(x)	  ((x) << 1) /* Sampling interval timer */
+#define	 SPR_THRM_ENABLE       	  0x00000001 /* TAU Enable */
+#define	SPR_FPECR		0x3fe	/* ..6. Floating-Point Exception Cause Register */
+#define	SPR_PIR			0x3ff	/* ..6. Processor Identification Register */
+
+/* Performance counter declarations */
+#define	PMC_OVERFLOW	  	0x80000000 /* Counter has overflowed */
+
+/* The first five countable [non-]events are common to all the PMC's */
+#define	PMCN_NONE		 0 /* Count nothing */
+#define	PMCN_CYCLES		 1 /* Processor cycles */
+#define	PMCN_ICOMP		 2 /* Instructions completed */
+#define	PMCN_TBLTRANS		 3 /* TBL bit transitions */
+#define	PCMN_IDISPATCH		 4 /* Instructions dispatched */
+
+#endif /* !_POWERPC_SPR_H_ */

Reply via email to