summaryrefslogtreecommitdiff
path: root/sys/arch/mips64
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2007-07-18 20:03:52 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2007-07-18 20:03:52 +0000
commitb007e14e7536bea466ad35993456b451c6bff196 (patch)
tree718761e2b703db9c27a727711e3e4ffe8fa82212 /sys/arch/mips64
parent412985aa577b78a0e750c2e3dfbad1eb58a2410b (diff)
bus_dmamem_map() maps with a single segment in directly-translated XKPHYS
space, either cache coherent for regular mappings and uncached for BUS_DMA_COHERENT mappings, as done on all other platforms with direct mappings.
Diffstat (limited to 'sys/arch/mips64')
-rw-r--r--sys/arch/mips64/include/cpu.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 4b4b42c046a..7fbcc814a9f 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.19 2007/06/18 20:25:53 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.20 2007/07/18 20:03:50 miod Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -80,6 +80,7 @@
#define XKPHYS_TO_PHYS(x) ((paddr_t)(x) & 0x0000000fffffffffUL)
#define PHYS_TO_XKPHYS(x,c) ((paddr_t)(x) | XKPHYS_BASE | (c) << 59)
#define IS_XKPHYS(va) (((va) >> 62) == 2)
+#define XKPHYS_TO_CCA(x) (((x) >> 59) & 0x07)
#endif
#ifdef _KERNEL
@@ -519,14 +520,14 @@ extern u_int32_t cpu_counter_last; /* Last compare value loaded */
* Low level access routines to CPU registers
*/
-void setsoftintr0(void);
-void clearsoftintr0(void);
-void setsoftintr1(void);
-void clearsoftintr1(void);
+void setsoftintr0(void);
+void clearsoftintr0(void);
+void setsoftintr1(void);
+void clearsoftintr1(void);
u_int32_t enableintr(void);
u_int32_t disableintr(void);
u_int32_t updateimask(intrmask_t);
-void setsr(u_int32_t);
+void setsr(u_int32_t);
u_int32_t getsr(void);
#endif /* _KERNEL */