* clean up sn2 region definitions
@ 2005-08-19 21:52 Greg Edwards
2005-08-19 22:06 ` Jesse Barnes
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Greg Edwards @ 2005-08-19 21:52 UTC (permalink / raw)
To: linux-ia64
Clean up some region definitions we had in sn2 code. Requires Peter's
patch:
Rationalise Region Definitions
http://marc.theaimsgroup.com/?l=linux-ia64&m\x112424745806814&w=2
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
include/asm-ia64/sn/addrs.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: git-linus/include/asm-ia64/sn/addrs.h
=================================--- git-linus.orig/include/asm-ia64/sn/addrs.h 2005-08-19 16:06:57.517692735 -0500
+++ git-linus/include/asm-ia64/sn/addrs.h 2005-08-19 16:12:34.967177871 -0500
@@ -65,7 +65,7 @@
#define NASID_MASK ((u64)NASID_BITMASK << NASID_SHIFT)
#define AS_MASK ((u64)AS_BITMASK << AS_SHIFT)
-#define REGION_BITS 0xe000000000000000UL
+#define REGION_BITS RGN_BASE(KHIGH)
/*
@@ -82,9 +82,9 @@
/*
* Base addresses for various address ranges.
*/
-#define CACHED 0xe000000000000000UL
-#define UNCACHED 0xc000000000000000UL
-#define UNCACHED_PHYS 0x8000000000000000UL
+#define CACHED RGN_BASE(RGN_KERNEL)
+#define UNCACHED RGN_BASE(RGN_UNCACHED)
+#define UNCACHED_PHYS RGN_BASE(RGN_HPAGE)
/*
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: clean up sn2 region definitions
2005-08-19 21:52 clean up sn2 region definitions Greg Edwards
@ 2005-08-19 22:06 ` Jesse Barnes
2005-08-20 1:50 ` Greg Edwards
2005-08-22 16:56 ` Greg Edwards
2 siblings, 0 replies; 4+ messages in thread
From: Jesse Barnes @ 2005-08-19 22:06 UTC (permalink / raw)
To: linux-ia64
On Friday, August 19, 2005 2:52 pm, Greg Edwards wrote:
> -#define CACHED 0xe000000000000000UL
> -#define UNCACHED 0xc000000000000000UL
> -#define UNCACHED_PHYS 0x8000000000000000UL
> +#define CACHED RGN_BASE(RGN_KERNEL)
> +#define UNCACHED RGN_BASE(RGN_UNCACHED)
> +#define UNCACHED_PHYS RGN_BASE(RGN_HPAGE)
You could also just rip out these redundant sn2 definitions and replace
them by the ia64 ones... :)
Jesse
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: clean up sn2 region definitions
2005-08-19 21:52 clean up sn2 region definitions Greg Edwards
2005-08-19 22:06 ` Jesse Barnes
@ 2005-08-20 1:50 ` Greg Edwards
2005-08-22 16:56 ` Greg Edwards
2 siblings, 0 replies; 4+ messages in thread
From: Greg Edwards @ 2005-08-20 1:50 UTC (permalink / raw)
To: linux-ia64
On Fri, Aug 19, 2005 at 03:06:26PM -0700, Jesse Barnes wrote:
| On Friday, August 19, 2005 2:52 pm, Greg Edwards wrote:
| > -#define CACHED 0xe000000000000000UL
| > -#define UNCACHED 0xc000000000000000UL
| > -#define UNCACHED_PHYS 0x8000000000000000UL
| > +#define CACHED RGN_BASE(RGN_KERNEL)
| > +#define UNCACHED RGN_BASE(RGN_UNCACHED)
| > +#define UNCACHED_PHYS RGN_BASE(RGN_HPAGE)
|
| You could also just rip out these redundant sn2 definitions and replace
| them by the ia64 ones... :)
Yeah, but that would make too much sense. ;) I'll send out a new patch
shortly.
Greg
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: clean up sn2 region definitions
2005-08-19 21:52 clean up sn2 region definitions Greg Edwards
2005-08-19 22:06 ` Jesse Barnes
2005-08-20 1:50 ` Greg Edwards
@ 2005-08-22 16:56 ` Greg Edwards
2 siblings, 0 replies; 4+ messages in thread
From: Greg Edwards @ 2005-08-22 16:56 UTC (permalink / raw)
To: linux-ia64
Clean up some duplicate region definitions in sn2 code. Requires Peter's
patch:
Rationalise Region Definitions
http://marc.theaimsgroup.com/?l=linux-ia64&m\x112424745806814&w=2
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
include/asm-ia64/page.h | 4 ++--
include/asm-ia64/sn/addrs.h | 33 ++++++++++++---------------------
2 files changed, 14 insertions(+), 23 deletions(-)
Index: git-linus/include/asm-ia64/sn/addrs.h
=================================--- git-linus.orig/include/asm-ia64/sn/addrs.h 2005-08-22 11:04:29.433021279 -0500
+++ git-linus/include/asm-ia64/sn/addrs.h 2005-08-22 11:36:05.949306622 -0500
@@ -65,7 +65,6 @@
#define NASID_MASK ((u64)NASID_BITMASK << NASID_SHIFT)
#define AS_MASK ((u64)AS_BITMASK << AS_SHIFT)
-#define REGION_BITS 0xe000000000000000UL
/*
@@ -79,38 +78,30 @@
#define AS_CAC_SPACE (AS_CAC_VAL << AS_SHIFT)
-/*
- * Base addresses for various address ranges.
- */
-#define CACHED 0xe000000000000000UL
-#define UNCACHED 0xc000000000000000UL
-#define UNCACHED_PHYS 0x8000000000000000UL
-
-
/*
* Virtual Mode Local & Global MMR space.
*/
#define SH1_LOCAL_MMR_OFFSET 0x8000000000UL
#define SH2_LOCAL_MMR_OFFSET 0x0200000000UL
#define LOCAL_MMR_OFFSET (is_shub2() ? SH2_LOCAL_MMR_OFFSET : SH1_LOCAL_MMR_OFFSET)
-#define LOCAL_MMR_SPACE (UNCACHED | LOCAL_MMR_OFFSET)
-#define LOCAL_PHYS_MMR_SPACE (UNCACHED_PHYS | LOCAL_MMR_OFFSET)
+#define LOCAL_MMR_SPACE (__IA64_UNCACHED_OFFSET | LOCAL_MMR_OFFSET)
+#define LOCAL_PHYS_MMR_SPACE (RGN_BASE(RGN_HPAGE) | LOCAL_MMR_OFFSET)
#define SH1_GLOBAL_MMR_OFFSET 0x0800000000UL
#define SH2_GLOBAL_MMR_OFFSET 0x0300000000UL
#define GLOBAL_MMR_OFFSET (is_shub2() ? SH2_GLOBAL_MMR_OFFSET : SH1_GLOBAL_MMR_OFFSET)
-#define GLOBAL_MMR_SPACE (UNCACHED | GLOBAL_MMR_OFFSET)
+#define GLOBAL_MMR_SPACE (__IA64_UNCACHED_OFFSET | GLOBAL_MMR_OFFSET)
/*
* Physical mode addresses
*/
-#define GLOBAL_PHYS_MMR_SPACE (UNCACHED_PHYS | GLOBAL_MMR_OFFSET)
+#define GLOBAL_PHYS_MMR_SPACE (RGN_BASE(RGN_HPAGE) | GLOBAL_MMR_OFFSET)
/*
* Clear region & AS bits.
*/
-#define TO_PHYS_MASK (~(REGION_BITS | AS_MASK))
+#define TO_PHYS_MASK (~(RGN_BITS | AS_MASK))
/*
@@ -134,10 +125,10 @@
/*
* general address defines
*/
-#define CAC_BASE (CACHED | AS_CAC_SPACE)
-#define AMO_BASE (UNCACHED | AS_AMO_SPACE)
-#define AMO_PHYS_BASE (UNCACHED_PHYS | AS_AMO_SPACE)
-#define GET_BASE (CACHED | AS_GET_SPACE)
+#define CAC_BASE (PAGE_OFFSET | AS_CAC_SPACE)
+#define AMO_BASE (__IA64_UNCACHED_OFFSET | AS_AMO_SPACE)
+#define AMO_PHYS_BASE (RGN_BASE(RGN_HPAGE) | AS_AMO_SPACE)
+#define GET_BASE (PAGE_OFFSET | AS_GET_SPACE)
/*
* Convert Memory addresses between various addressing modes.
@@ -164,8 +155,8 @@
/*
* Macros to test for address type.
*/
-#define IS_AMO_ADDRESS(x) (((u64)(x) & (REGION_BITS | AS_MASK)) = AMO_BASE)
-#define IS_AMO_PHYS_ADDRESS(x) (((u64)(x) & (REGION_BITS | AS_MASK)) = AMO_PHYS_BASE)
+#define IS_AMO_ADDRESS(x) (((u64)(x) & (RGN_BITS | AS_MASK)) = AMO_BASE)
+#define IS_AMO_PHYS_ADDRESS(x) (((u64)(x) & (RGN_BITS | AS_MASK)) = AMO_PHYS_BASE)
/*
@@ -180,7 +171,7 @@
#define TIO_SWIN_BASE(n, w) (TIO_IO_BASE(n) + \
((u64) (w) << TIO_SWIN_SIZE_BITS))
#define NODE_IO_BASE(n) (GLOBAL_MMR_SPACE | NASID_SPACE(n))
-#define TIO_IO_BASE(n) (UNCACHED | NASID_SPACE(n))
+#define TIO_IO_BASE(n) (__IA64_UNCACHED_OFFSET | NASID_SPACE(n))
#define BWIN_SIZE (1UL << BWIN_SIZE_BITS)
#define NODE_BWIN_BASE0(n) (NODE_IO_BASE(n) + BWIN_SIZE)
#define NODE_BWIN_BASE(n, w) (NODE_BWIN_BASE0(n) + ((u64) (w) << BWIN_SIZE_BITS))
Index: git-linus/include/asm-ia64/page.h
=================================--- git-linus.orig/include/asm-ia64/page.h 2005-08-22 11:04:47.017198369 -0500
+++ git-linus/include/asm-ia64/page.h 2005-08-22 11:40:46.383166216 -0500
@@ -17,9 +17,9 @@
* Different regions are assigned to different purposes.
*/
#define RGN_SHIFT (61)
-#define RGN_BASE(r) (__IA64_UL_CONST(r)<<RGN_SHIFT)
+#define RGN_BASE(r) (__IA64_UL_CONST(r)<<RGN_SHIFT)
+#define RGN_BITS (RGN_BASE(-1))
-#define KHIGH -1 /* high three bits of Kernel virtual address */
#define RGN_KERNEL 7 /* Identity mapped region */
#define RGN_UNCACHED 6 /* Identity mapped I/O region */
#define RGN_GATE 5 /* Gate page, Kernel text, etc */
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-08-22 16:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-19 21:52 clean up sn2 region definitions Greg Edwards
2005-08-19 22:06 ` Jesse Barnes
2005-08-20 1:50 ` Greg Edwards
2005-08-22 16:56 ` Greg Edwards
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox