diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-03-15 18:57:23 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-03-15 18:57:23 +0000 |
| commit | eedcbe070ed694448d085ab2751855e6373dc882 (patch) | |
| tree | 4e6c13f7bd721fdf6c8b8858a43ab963d8424c0b /sys/arch/mips64 | |
| parent | 582f87978beb9c9f7445650954ace087e85f9398 (diff) | |
uncached_base was introduced early in IP27 support, since these designs use
subspaces in the CCA_NC uncached memory space. However, being coherent,
there was never a need for bus_dma to use uncached addresses.
This means that, on the only systems where uncached_base was not set to
PHYS_TO_XKPHYS(0, CCA_NC), it was never used.
Remove the variable, and replace PHYS_TO_UNCACHED() with
PHYS_TO_XKPHYS(, CCA_NC). No functional change.
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 548434d5e07..26da2d06345 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.72 2011/06/24 19:47:48 naddy Exp $ */ +/* $OpenBSD: cpu.h,v 1.73 2012/03/15 18:57:22 miod Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -100,8 +100,6 @@ #define SP_SPECIAL 2UL /* Memory Special space */ #define SP_NC 3UL /* Memory Uncached space */ -extern vaddr_t uncached_base; - #define XKSSSEG_BASE 0x4000000000000000UL #define XKPHYS_BASE 0x8000000000000000UL #define XKSSEG_BASE 0xc000000000000000UL @@ -110,7 +108,6 @@ extern vaddr_t uncached_base; #define PHYS_TO_XKPHYS(x,c) ((paddr_t)(x) | XKPHYS_BASE | ((c) << 59)) #define PHYS_TO_XKPHYS_UNCACHED(x,s) \ (PHYS_TO_XKPHYS(x, CCA_NC) | ((s) << 57)) -#define PHYS_TO_UNCACHED(x) ((paddr_t)(x) | uncached_base) #define IS_XKPHYS(va) (((va) >> 62) == 2) #define XKPHYS_TO_CCA(x) (((x) >> 59) & 0x07) #define XKPHYS_TO_SP(x) (((x) >> 57) & 0x03) |