--- zzzz-none-000/linux-2.4.17/include/asm-mips/addrspace.h	2001-07-02 20:56:40.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/asm-mips/addrspace.h	2004-11-24 13:21:33.000000000 +0000
@@ -8,52 +8,55 @@
  *
  * Defitions for the address spaces of the MIPS CPUs.
  */
-#ifndef __ASM_MIPS_ADDRSPACE_H
-#define __ASM_MIPS_ADDRSPACE_H
+#ifndef __ASM_ADDRSPACE_H
+#define __ASM_ADDRSPACE_H
 
 /*
- * Memory segments (32bit kernel mode addresses)
+ *  Configure language
  */
-#define KUSEG                   0x00000000
-#define KSEG0                   0x80000000
-#define KSEG1                   0xa0000000
-#define KSEG2                   0xc0000000
-#define KSEG3                   0xe0000000
 
-#define K0BASE  KSEG0
+#ifdef __ASSEMBLER__
+#define _ATYPE_
+#define _ATYPE32_
+#define _ATYPE64_
+#else
+#define _ATYPE_		(__SIZE_TYPE__)
+#define _ATYPE32_	(int)
+#define _ATYPE64_	(long long)
+#endif
 
 /*
- * Returns the kernel segment base of a given address
+ *  32-bit MIPS Address Spaces
  */
-#ifndef __ASSEMBLY__
-#define KSEGX(a)                (((unsigned long)(a)) & 0xe0000000)
+
+#ifdef __ASSEMBLER__
+#define _ACAST32_
+#define _ACAST64_
 #else
-#define KSEGX(a)                ((a) & 0xe0000000)
+#define _ACAST32_		_ATYPE_ _ATYPE32_	/* widen if necessary */
+#define _ACAST64_		_ATYPE64_		/* do _not_ narrow */
 #endif
 
 /*
- * Returns the physical address of a KSEG0/KSEG1 address
+ * Memory segments (32bit kernel mode addresses)
  */
-#ifndef __ASSEMBLY__
-#define PHYSADDR(a)		(((unsigned long)(a)) & 0x1fffffff)
-#else
-#define PHYSADDR(a)		((a) & 0x1fffffff)
-#endif
+#define KUSEG                   0x00000000
+#define KSEG0                   0x80000000
+#define KSEG1                   0xa0000000
+#define KSEG2                   0xc0000000
+#define KSEG3                   0xe0000000
+
+#define K0BASE			KSEG0
 
 /*
- * Map an address to a certain kernel segment
+ * Returns the kernel segment base of a given address
  */
-#ifndef __ASSEMBLY__
-#define KSEG0ADDR(a)		((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG0))
-#define KSEG1ADDR(a)		((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG1))
-#define KSEG2ADDR(a)		((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG2))
-#define KSEG3ADDR(a)		((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) | KSEG3))
-#else
-#define KSEG0ADDR(a)		(((a) & 0x1fffffff) | KSEG0)
-#define KSEG1ADDR(a)		(((a) & 0x1fffffff) | KSEG1)
-#define KSEG2ADDR(a)		(((a) & 0x1fffffff) | KSEG2)
-#define KSEG3ADDR(a)		(((a) & 0x1fffffff) | KSEG3)
-#endif
+#define KSEGX(a)             ((_ACAST32_ (a)) & 0xe0000000)
+#define PHYSADDR(a)		     ((_ACAST32_ (a)) & 0x1fffffff)
+#define KSEG0ADDR(a)		(((_ACAST32_ (a)) & 0x1fffffff) | KSEG0)
+#define KSEG1ADDR(a)		(((_ACAST32_ (a)) & 0x1fffffff) | KSEG1)
+#define KSEG2ADDR(a)		(((_ACAST32_ (a)) & 0x1fffffff) | KSEG2)
+#define KSEG3ADDR(a)		(((_ACAST32_ (a)) & 0x1fffffff) | KSEG3)
 
 /*
  * Memory segments (64bit kernel mode addresses)
@@ -67,4 +70,26 @@
 #define CKSSEG                  0xffffffffc0000000
 #define CKSEG3                  0xffffffffe0000000
 
-#endif /* __ASM_MIPS_ADDRSPACE_H */
+/*
+ * Cache modes for XKPHYS address conversion macros
+ */
+#define K_CALG_COH_EXCL1_NOL2	0
+#define K_CALG_COH_SHRL1_NOL2	1
+#define K_CALG_UNCACHED		2
+#define K_CALG_NONCOHERENT	3
+#define K_CALG_COH_EXCL		4
+#define K_CALG_COH_SHAREABLE	5
+#define K_CALG_NOTUSED		6
+#define K_CALG_UNCACHED_ACCEL	7
+
+#define TO_PHYS_MASK		0xfffffffff			/* 36 bit */
+
+/*
+ * 64-bit address conversions
+ */
+#define PHYS_TO_XKSEG_UNCACHED(p)	PHYS_TO_XKPHYS(K_CALG_UNCACHED,(p))
+#define PHYS_TO_XKSEG_CACHED(p)		PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE,(p))
+#define XKPHYS_TO_PHYS(p)		((p) & TO_PHYS_MASK)
+#define PHYS_TO_XKPHYS(cm,a)		(0x8000000000000000 | ((cm)<<59) | (a))
+
+#endif /* __ASM_ADDRSPACE_H */