[Xen-changelog] [xen-unstable] [IA64] do not export XSI_BASE, use set_shared_info_va

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 92bd25c46f2731af83f7a7099a6a0705e6772a47
# Parent  f6007621cc0c0e4d44050e356f228cd7be483c47
[IA64] do not export XSI_BASE, use set_shared_info_va

Until now, the set_shared_info_va hypercall was never used.
This patch remove XSI_BASE and use this hypercall to set the xsi address.
Because xsi is now in the top 1MB (before percpu space), linux code should be 
slightly more compact (addl instead of movl).

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>
---
 linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S      |    7 +++----
 linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h |    3 ---
 xen/include/public/arch-ia64.h                     |    4 ----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff -r f6007621cc0c -r 92bd25c46f27 
linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S     Sun Oct 01 11:05:24 
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S     Sun Oct 01 11:09:54 
2006 -0600
@@ -23,12 +23,11 @@ GLOBAL_ENTRY(early_xen_setup)
        
        mov cr.iva=r10
 
-#if XSI_BASE != 0xf100000000000000UL
-       /* Backward compatibility.  */
-(isBP) mov r2=0x600
+       /* Set xsi base.  */
+#define FW_HYPERCALL_SET_SHARED_INFO_VA                        0x600
+(isBP) mov r2=FW_HYPERCALL_SET_SHARED_INFO_VA
 (isBP) movl r28=XSI_BASE;;
 (isBP) break 0x1000;;
-#endif
 
        br.ret.sptk.many rp
        ;;
diff -r f6007621cc0c -r 92bd25c46f27 
linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h        Sun Oct 01 
11:05:24 2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h        Sun Oct 01 
11:09:54 2006 -0600
@@ -14,12 +14,9 @@
 
 #define IA64_PARAVIRTUALIZED
 
-#if 0
-#undef XSI_BASE
 /* At 1 MB, before per-cpu space but still addressable using addl instead
    of movl. */
 #define XSI_BASE                               0xfffffffffff00000
-#endif
 
 /* Address of mapped regs.  */
 #define XMAPPEDREGS_BASE               (XSI_BASE + XSI_SIZE)
diff -r f6007621cc0c -r 92bd25c46f27 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Sun Oct 01 11:05:24 2006 -0600
+++ b/xen/include/public/arch-ia64.h    Sun Oct 01 11:09:54 2006 -0600
@@ -395,10 +395,6 @@ struct xen_ia64_boot_param {
 
 #endif /* !__ASSEMBLY__ */
 
-/* Address of shared_info in domain virtual space.
-   This is the default address, for compatibility only.  */
-#define XSI_BASE                       0xf100000000000000
-
 /* Size of the shared_info area (this is not related to page size).  */
 #define XSI_SHIFT                      14
 #define XSI_SIZE                       (1 << XSI_SHIFT)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog