[XenPPC] [xenppc-unstable] [XEN]

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

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID c836899002deb97bb9601d247f6e078d201aeff5
# Parent  e30376a0abc39117f604b0f6cc7817deb3eb9079
[XEN]

The following patch allows for an architecture to decorate the
dev_bus_addr returned by a gnttab mapping.

Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
---
 xen/common/grant_table.c      |    2 +-
 xen/include/xen/grant_table.h |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff -r e30376a0abc3 -r c836899002de xen/common/grant_table.c
--- a/xen/common/grant_table.c  Sat Oct 07 16:25:46 2006 -0400
+++ b/xen/common/grant_table.c  Sun Oct 08 11:32:53 2006 -0400
@@ -280,7 +280,7 @@ __gnttab_map_grant_ref(
     ld->grant_table->maptrack[handle].ref   = op->ref;
     ld->grant_table->maptrack[handle].flags = op->flags;
 
-    op->dev_bus_addr = (u64)frame << PAGE_SHIFT;
+    op->dev_bus_addr = GNTTAB_DEV_BUS((u64)frame << PAGE_SHIFT);
     op->handle       = handle;
     op->status       = GNTST_okay;
 
diff -r e30376a0abc3 -r c836899002de xen/include/xen/grant_table.h
--- a/xen/include/xen/grant_table.h     Sat Oct 07 16:25:46 2006 -0400
+++ b/xen/include/xen/grant_table.h     Sun Oct 08 11:32:53 2006 -0400
@@ -96,4 +96,8 @@ gnttab_release_mappings(
 gnttab_release_mappings(
     struct domain *d);
 
+#ifndef GNTTAB_DEV_BUS
+#define GNTTAB_DEV_BUS(f) (f)
+#endif
+
 #endif /* __XEN_GRANT_TABLE_H__ */

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