[XenPPC] [pushed] [ppc] build grant_table code, not complete

[jimix@xxxxxxxxxxxxxx]

changeset:   10380:710f58157b56d26ab91a8fabc98e94f27436f634
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Tue May 23 10:22:20 2006 -0400
files:       xen/arch/ppc/domain.c xen/arch/ppc/mm.c 
xen/include/asm-ppc/grant_table.h xen/include/asm-ppc/mm.h 
xen/include/public/grant_table.h
description:
[ppc] build grant_table code, not complete
  lowest part of setting up translations fro gratn tables to be
  implemented when understanding is achieved.


diff -r b551a6e96c11117c0a8dac11c27e92069e7784d5 -r 
710f58157b56d26ab91a8fabc98e94f27436f634 xen/arch/ppc/domain.c
--- a/xen/arch/ppc/domain.c     Tue May 23 10:20:01 2006 -0400
+++ b/xen/arch/ppc/domain.c     Tue May 23 10:22:20 2006 -0400
@@ -265,23 +265,3 @@ void arch_dump_domain_info(struct domain
 void arch_dump_domain_info(struct domain *d)
 {
 }
-
-/* until common/grant_table.c works */
-int 
-grant_table_create(
-    struct domain *d)
-{
-    return 0;
-}
-
-void
-grant_table_destroy(
-    struct domain *d)
-{
-}
-
-void
-gnttab_release_mappings(
-    struct domain *d)
-{
-}
diff -r b551a6e96c11117c0a8dac11c27e92069e7784d5 -r 
710f58157b56d26ab91a8fabc98e94f27436f634 xen/arch/ppc/mm.c
--- a/xen/arch/ppc/mm.c Tue May 23 10:20:01 2006 -0400
+++ b/xen/arch/ppc/mm.c Tue May 23 10:22:20 2006 -0400
@@ -30,22 +30,29 @@ unsigned long frame_table_size;
 unsigned long frame_table_size;
 unsigned long max_page;
 
-
-int get_page_type(struct page_info *page, u32 type)
+int create_grant_host_mapping(
+    unsigned long addr, unsigned long frame, unsigned int flags)
 {
     panic("%s called\n", __func__);
     return 1;
 }
 
-void synchronise_pagetables(unsigned long cpu_mask)
+int destroy_grant_host_mapping(
+    unsigned long addr, unsigned long frame, unsigned int flags)
 {
     panic("%s called\n", __func__);
+    return 1;
 }
 
-int update_grant_va_mapping(unsigned long va,
-                            unsigned long _nl1e, 
-                            struct domain *d,
-                            struct vcpu *v)
+int steal_page_for_grant_transfer(
+    struct domain *d, struct page_info *page)
+{
+    panic("%s called\n", __func__);
+    return 1;
+}
+
+
+int get_page_type(struct page_info *page, u32 type)
 {
     panic("%s called\n", __func__);
     return 1;
diff -r b551a6e96c11117c0a8dac11c27e92069e7784d5 -r 
710f58157b56d26ab91a8fabc98e94f27436f634 xen/include/asm-ppc/grant_table.h
--- a/xen/include/asm-ppc/grant_table.h Tue May 23 10:20:01 2006 -0400
+++ b/xen/include/asm-ppc/grant_table.h Tue May 23 10:22:20 2006 -0400
@@ -1,40 +1,9 @@
-/******************************************************************************
- * include/asm-x86/grant_table.h
- * 
- * Copyright (c) 2004-2005 K A Fraser
- */
-
-#ifndef __ASM_GRANT_TABLE_H__
-#define __ASM_GRANT_TABLE_H__
+#ifndef __ASM_PPC_GRANT_TABLE_H__
+#define __ASM_PPC_GRANT_TABLE_H__
 
 #include <asm/mm.h>
 
-#define ORDER_GRANT_FRAMES 2
+#define mark_dirty(d, f) ((void )0)
+#include "../asm-x86/grant_table.h"
 
-/*
- * Caller must own caller's BIGLOCK, is responsible for flushing the TLB, and
- * must hold a reference to the page.
- */
-int create_grant_host_mapping(
-    unsigned long addr, unsigned long frame, unsigned int flags);
-int destroy_grant_host_mapping(
-    unsigned long addr, unsigned long frame, unsigned int flags);
-
-int steal_page_for_grant_transfer(
-    struct domain *d, struct page_info *page);
-
-#define gnttab_create_shared_mfn(d, t, i)                                \
-    do {                                                                 \
-        SHARE_PFN_WITH_DOMAIN(                                           \
-            virt_to_page((char *)(t)->shared + ((i) * PAGE_SIZE)), (d)); \
-        set_pfn_from_mfn(                                                \
-            (virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i),             \
-            INVALID_M2P_ENTRY);                                          \
-    } while ( 0 )
-
-#define gnttab_shared_mfn(d, t, i)                      \
-    ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i))
-
-#define gnttab_log_dirty(d, f) mark_dirty((d), (f))
-
-#endif /* __ASM_GRANT_TABLE_H__ */
+#endif  /* __ASM_PPC_GRANT_TABLE_H__ */
diff -r b551a6e96c11117c0a8dac11c27e92069e7784d5 -r 
710f58157b56d26ab91a8fabc98e94f27436f634 xen/include/asm-ppc/mm.h
--- a/xen/include/asm-ppc/mm.h  Tue May 23 10:20:01 2006 -0400
+++ b/xen/include/asm-ppc/mm.h  Tue May 23 10:22:20 2006 -0400
@@ -212,4 +212,6 @@ static inline unsigned long gmfn_to_mfn(
        return pfn2mfn(d, gmfn, NULL);
 }
 
-#endif
+#define mfn_to_gmfn(_d, mfn) (mfn)
+
+#endif
diff -r b551a6e96c11117c0a8dac11c27e92069e7784d5 -r 
710f58157b56d26ab91a8fabc98e94f27436f634 xen/include/public/grant_table.h
--- a/xen/include/public/grant_table.h  Tue May 23 10:20:01 2006 -0400
+++ b/xen/include/public/grant_table.h  Tue May 23 10:22:20 2006 -0400
@@ -73,7 +73,11 @@
  */
 typedef struct grant_entry {
     /* GTF_xxx: various type and flag information.  [XEN,GST] */
+#if defined(__powerpc__)
+    ulong flags;
+#else
     uint16_t flags;
+#endif
     /* The domain being granted foreign privileges. [GST] */
     domid_t  domid;
     /*



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