From fc9da4861697cf844844fc8dcc8916df0b5eb560 Mon Sep 17 00:00:00 2001
From: Dean Nelson <dcn@sgi.com>
Date: Mon, 4 Apr 2005 13:14:00 -0700
Subject: [PATCH] --- yaml --- r: 911 b: refs/heads/master c:
 3a7d555bfc4d4631d9118fb4d0ed7ab62cc2ca1c h: refs/heads/master i:   909:
 c0f9ec94a913f31c564a99afa3c2b8e69dd32c83   907:
 de1b5e1ac5c9d390fed8d04f7e646bda063f2541   903:
 979daf977270ea542d9eb40ffc0dc28b47df2e62   895:
 2daf7c485a483665c9e7214a6fc7fc8a617729c0 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/ia64/sn/kernel/xpc_partition.c | 15 ++++++++++++++-
 trunk/include/asm-ia64/sn/addrs.h         |  8 ++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 92fdfc5a2dee..0b096331dcaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d974da0afe659cff98913184a97c0ee686d02b
+refs/heads/master: 3a7d555bfc4d4631d9118fb4d0ed7ab62cc2ca1c
diff --git a/trunk/arch/ia64/sn/kernel/xpc_partition.c b/trunk/arch/ia64/sn/kernel/xpc_partition.c
index b31d9988a37a..2c3c4a8af553 100644
--- a/trunk/arch/ia64/sn/kernel/xpc_partition.c
+++ b/trunk/arch/ia64/sn/kernel/xpc_partition.c
@@ -204,6 +204,19 @@ xpc_rsvd_page_init(void)
 				return NULL;
 			}
 		}
+	} else if (!IS_AMO_ADDRESS((u64) amos_page)) {
+		/*
+		 * EFI's XPBOOT can also set amos_page in the reserved page,
+		 * but it happens to leave it as an uncached physical address
+		 * and we need it to be an uncached virtual, so we'll have to
+		 * convert it.
+		 */
+		if (!IS_AMO_PHYS_ADDRESS((u64) amos_page)) {
+			dev_err(xpc_part, "previously used amos_page address "
+				"is bad = 0x%p\n", (void *) amos_page);
+			return NULL;
+		}
+		amos_page = (AMO_t *) TO_AMO((u64) amos_page);
 	}
 
 	memset(xpc_vars, 0, sizeof(struct xpc_vars));
@@ -944,7 +957,7 @@ xpc_discovery(void)
 
 /*
  * Given a partid, get the nasids owned by that partition from the
- * remote partitions reserved page.
+ * remote partition's reserved page.
  */
 enum xpc_retval
 xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask)
diff --git a/trunk/include/asm-ia64/sn/addrs.h b/trunk/include/asm-ia64/sn/addrs.h
index 960d626ee589..1bfdfb4d7b01 100644
--- a/trunk/include/asm-ia64/sn/addrs.h
+++ b/trunk/include/asm-ia64/sn/addrs.h
@@ -136,6 +136,7 @@
  */
 #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)
 
 /*
@@ -160,6 +161,13 @@
 #define PHYS_TO_DMA(x)          ( (((u64)(x) & NASID_MASK) >> 2) | NODE_OFFSET(x))
 
 
+/*
+ * 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)
+
+
 /*
  * The following definitions pertain to the IO special address
  * space.  They define the location of the big and little windows