# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 1bb8eff867204b362e5e4aa018432959b4f64930
# Parent f8dff648bc0a7ad4ba241f9adfd9696c0f26ea62
# Parent 62b83c54213f723d54c92a49a7908e6c5c5b0cad
[ppc] merge
---
xen/include/public/of-devtree.h | 137 --------------------------------
buildconfigs/mk.linux-2.6-xen | 2
tools/python/xen/xend/tests/__init__.py | 1
xen/arch/ppc/boot_of.c | 2
xen/arch/ppc/dart.c | 2
xen/arch/ppc/mpic_init.c | 2
xen/arch/ppc/of-devtree.c | 2
xen/arch/ppc/of-devtree.h | 137 ++++++++++++++++++++++++++++++++
xen/arch/ppc/of-devwalk.c | 2
xen/arch/ppc/of_handler/Makefile | 2
xen/arch/ppc/of_handler/devtree.c | 2
xen/arch/ppc/of_handler/ofh.h | 2
xen/arch/ppc/ofd_fixup.c | 2
xen/arch/ppc/setup.c | 2
xen/arch/x86/i8259.c | 1
15 files changed, 150 insertions(+), 148 deletions(-)
diff -r f8dff648bc0a -r 1bb8eff86720 buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen Thu Jun 08 17:08:59 2006 -0400
+++ b/buildconfigs/mk.linux-2.6-xen Thu Jun 08 17:20:11 2006 -0400
@@ -17,7 +17,7 @@ build: $(LINUX_DIR)/include/linux/autoco
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR)
vmlinuz
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR)
install
-$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
+$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
rm -rf $(LINUX_DIR)
cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/boot_of.c
--- a/xen/arch/ppc/boot_of.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/boot_of.c Thu Jun 08 17:20:11 2006 -0400
@@ -24,10 +24,10 @@
#include <xen/compile.h>
#include <xen/spinlock.h>
#include <xen/serial.h>
-#include <public/of-devtree.h>
#include <asm/page.h>
#include <asm/io.h>
#include "exceptions.h"
+#include "of-devtree.h"
static ulong of_vec;
static ulong of_msr;
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/dart.c
--- a/xen/arch/ppc/dart.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/dart.c Thu Jun 08 17:20:11 2006 -0400
@@ -20,11 +20,11 @@
#include <xen/mm.h>
#include <asm/cache.h>
#include <xen/init.h>
-#include <public/of-devtree.h>
#include "tce.h"
#include "iommu.h"
#include "dart.h"
#include "oftree.h"
+#include "of-devtree.h"
#undef DEBUG
#ifdef DEBUG
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/mpic_init.c
--- a/xen/arch/ppc/mpic_init.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/mpic_init.c Thu Jun 08 17:20:11 2006 -0400
@@ -3,10 +3,10 @@
#include <xen/init.h>
#include <xen/lib.h>
#include <xen/compile.h>
-#include <public/of-devtree.h>
#include <asm/mpic.h>
#include "mpic_init.h"
#include "oftree.h"
+#include "of-devtree.h"
#undef DEBUG
#ifdef DEBUG
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/of-devtree.c
--- a/xen/arch/ppc/of-devtree.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/of-devtree.c Thu Jun 08 17:20:11 2006 -0400
@@ -28,7 +28,7 @@
#include <xen/config.h>
#include <xen/init.h>
#include <xen/lib.h>
-#include <public/of-devtree.h>
+#include "of-devtree.h"
static int (*ofd_write)(const char *, size_t len) = NULL;
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/of-devwalk.c
--- a/xen/arch/ppc/of-devwalk.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/of-devwalk.c Thu Jun 08 17:20:11 2006 -0400
@@ -22,7 +22,7 @@
#include <xen/lib.h>
#include <xen/ctype.h>
#include <xen/kernel.h>
-#include <public/of-devtree.h>
+#include "of-devtree.h"
void ofd_prop_print(
const char *head,
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/of_handler/Makefile
--- a/xen/arch/ppc/of_handler/Makefile Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/of_handler/Makefile Thu Jun 08 17:20:11 2006 -0400
@@ -1,6 +1,8 @@
#
# Build the Open Firmware handler
#
+
+CFLAGS += -I..
# head.o must be first
obj-y = head.o
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/of_handler/devtree.c
--- a/xen/arch/ppc/of_handler/devtree.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/of_handler/devtree.c Thu Jun 08 17:20:11 2006 -0400
@@ -18,7 +18,7 @@
*/
#include "ofh.h"
-#include <public/of-devtree.h>
+#include <of-devtree.h>
s32
ofh_peer(u32 nargs, u32 nrets, s32 argp[], s32 retp[], ulong b)
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/of_handler/ofh.h
--- a/xen/arch/ppc/of_handler/ofh.h Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/of_handler/ofh.h Thu Jun 08 17:20:11 2006 -0400
@@ -21,9 +21,9 @@
#define _PFW_H
#include <xen/types.h>
-#include <public/of-devtree.h>
#include <public/xencomm.h>
#include <public/io/console.h>
+#include <of-devtree.h>
#define MIN(x,y) (((x)<(y))?(x):(y))
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/ofd_fixup.c
--- a/xen/arch/ppc/ofd_fixup.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/ofd_fixup.c Thu Jun 08 17:20:11 2006 -0400
@@ -22,7 +22,7 @@
#include <xen/sched.h>
#include <xen/compile.h>
#include <public/xen.h>
-#include <public/of-devtree.h>
+#include "of-devtree.h"
#ifdef PAPR_VTERM
static ofdn_t ofd_vdevice_vty(void *m, ofdn_t p, struct domain *d)
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/setup.c
--- a/xen/arch/ppc/setup.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/ppc/setup.c Thu Jun 08 17:20:11 2006 -0400
@@ -30,7 +30,6 @@
#include <xen/domain.h>
#include <xen/gdbstub.h>
#include <xen/symbols.h>
-#include <public/of-devtree.h>
#include <public/version.h>
#include <asm/processor.h>
#include <asm/desc.h>
@@ -38,6 +37,7 @@
#include <asm/debugger.h>
#include <asm/delay.h>
#include "exceptions.h"
+#include "of-devtree.h"
#define DEBUG
unsigned long xenheap_phys_end;
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/x86/i8259.c
--- a/xen/arch/x86/i8259.c Thu Jun 08 17:08:59 2006 -0400
+++ b/xen/arch/x86/i8259.c Thu Jun 08 17:20:11 2006 -0400
@@ -130,7 +130,6 @@ static unsigned int startup_8259A_vector
static struct hw_interrupt_type i8259A_irq_type = {
.typename = "XT-PIC",
- .status = IRQ_EDGE, /* EDGE and ANY_CPU */
.startup = startup_8259A_vector,
.shutdown = disable_8259A_vector,
.enable = enable_8259A_vector,
diff -r f8dff648bc0a -r 1bb8eff86720 tools/python/xen/xend/tests/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/python/xen/xend/tests/__init__.py Thu Jun 08 17:20:11 2006 -0400
@@ -0,0 +1,1 @@
+
diff -r f8dff648bc0a -r 1bb8eff86720 xen/arch/ppc/of-devtree.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/arch/ppc/of-devtree.h Thu Jun 08 17:20:11 2006 -0400
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005 Jimi Xenidis <jimix@xxxxxxxxxxxxxx>, IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#ifndef _OF_DEVTREE_H
+#define _OF_DEVTREE_H
+
+#include <xen/types.h>
+#include <public/xen.h>
+
+enum {
+ OF_FAILURE = -1,
+ OF_SUCCESS = 0,
+};
+
+union of_pci_hi {
+ u32 word;
+ struct {
+ u32 opa_n: 1; /* relocatable */
+ u32 opa_p: 1; /* prefetchable */
+ u32 opa_t: 1; /* aliased */
+ u32 _opa_res: 3;
+ u32 opa: 2; /* space code */
+ u32 opa_b: 8; /* bus number */
+ u32 opa_d: 5; /* device number */
+ u32 opa_f: 3; /* function number */
+ u32 opa_r: 8; /* register number */
+ } bits;
+};
+
+struct of_pci_addr {
+ union of_pci_hi opa_hi;
+ u32 opa_mid;
+ u32 opa_lo;
+};
+
+struct of_pci_range32 {
+ struct of_pci_addr opr_addr;
+ u32 opr_phys;
+ u32 opr_size;
+};
+
+struct of_pci_range64 {
+ struct of_pci_addr opr_addr;
+ u32 opr_phys_hi;
+ u32 opr_phys_lo;
+ u32 opr_size_hi;
+ u32 opr_size_lo;
+};
+
+struct of_pci_addr_range64 {
+ struct of_pci_addr opr_addr;
+ u32 opr_size_hi;
+ u32 opr_size_lo;
+};
+
+struct reg_property32 {
+ u32 address;
+ u32 size;
+};
+
+typedef s32 ofdn_t;
+
+#define OFD_ROOT 1
+#define OFD_DUMP_NAMES 0x1
+#define OFD_DUMP_VALUES 0x2
+#define OFD_DUMP_ALL (OFD_DUMP_VALUES|OFD_DUMP_NAMES)
+
+extern void *ofd_create(void *mem, size_t sz);
+extern ofdn_t ofd_node_parent(void *mem, ofdn_t n);
+extern ofdn_t ofd_node_peer(void *mem, ofdn_t n);
+extern ofdn_t ofd_node_child(void *mem, ofdn_t p);
+extern const char *ofd_node_path(void *mem, ofdn_t p);
+extern int ofd_node_to_path(void *mem, ofdn_t p, void *buf, size_t sz);
+extern ofdn_t ofd_node_child_create(void *mem, ofdn_t parent,
+ const char *path, size_t pathlen);
+extern ofdn_t ofd_node_peer_create(void *mem, ofdn_t sibling,
+ const char *path, size_t pathlen);
+extern ofdn_t ofd_node_find(void *mem, const char *devspec);
+extern ofdn_t ofd_node_add(void *m, ofdn_t n, const char *path, size_t sz);
+extern int ofd_node_prune(void *m, ofdn_t n);
+extern int ofd_prune_path(void *m, const char *path);
+extern ofdn_t ofd_node_io(void *mem, ofdn_t n);
+
+extern ofdn_t ofd_nextprop(void *mem, ofdn_t n, const char *prev, char *name);
+extern ofdn_t ofd_prop_find(void *mem, ofdn_t n, const char *name);
+extern int ofd_getprop(void *mem, ofdn_t n, const char *name,
+ void *buf, size_t sz);
+extern int ofd_getproplen(void *mem, ofdn_t n, const char *name);
+
+extern int ofd_setprop(void *mem, ofdn_t n, const char *name,
+ const void *buf, size_t sz);
+extern void ofd_prop_remove(void *mem, ofdn_t node, ofdn_t prop);
+extern ofdn_t ofd_prop_add(void *mem, ofdn_t n, const char *name,
+ const void *buf, size_t sz);
+extern ofdn_t ofd_io_create(void *m, ofdn_t node, u64 open);
+extern u32 ofd_io_open(void *mem, ofdn_t n);
+extern void ofd_io_close(void *mem, ofdn_t n);
+
+
+typedef void (*walk_fn)(void *m, ofdn_t p, int arg);
+extern void ofd_dump_props(void *m, ofdn_t p, int dump);
+
+extern void ofd_walk(void *m, ofdn_t p, walk_fn fn, int arg);
+
+
+/* Recursively look up #address_cells and #size_cells properties */
+extern int ofd_getcells(void *mem, ofdn_t n,
+ u32 *addr_cells, u32 *size_cells);
+
+extern size_t ofd_size(void *mem);
+extern size_t ofd_space(void *mem);
+
+extern void ofd_prop_print(const char *head, const char *path,
+ const char *name, const char *prop, size_t sz);
+
+extern ofdn_t ofd_node_find_by_prop(void *mem, ofdn_t n, const char *name,
+ const void *val, size_t sz);
+extern ofdn_t ofd_node_find_next(void *mem, ofdn_t n);
+extern ofdn_t ofd_node_find_prev(void *mem, ofdn_t n);
+extern void ofd_init(int (*write)(const char *, size_t len));
+
+#endif /* _OF_DEVTREE_H */
diff -r f8dff648bc0a -r 1bb8eff86720 xen/include/public/of-devtree.h
--- a/xen/include/public/of-devtree.h Thu Jun 08 17:08:59 2006 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2005 Jimi Xenidis <jimix@xxxxxxxxxxxxxx>, IBM Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#ifndef _OF_DEVTREE_H
-#define _OF_DEVTREE_H
-
-#include <xen/types.h>
-#include <public/xen.h>
-
-enum {
- OF_FAILURE = -1,
- OF_SUCCESS = 0,
-};
-
-union of_pci_hi {
- u32 word;
- struct {
- u32 opa_n: 1; /* relocatable */
- u32 opa_p: 1; /* prefetchable */
- u32 opa_t: 1; /* aliased */
- u32 _opa_res: 3;
- u32 opa: 2; /* space code */
- u32 opa_b: 8; /* bus number */
- u32 opa_d: 5; /* device number */
- u32 opa_f: 3; /* function number */
- u32 opa_r: 8; /* register number */
- } bits;
-};
-
-struct of_pci_addr {
- union of_pci_hi opa_hi;
- u32 opa_mid;
- u32 opa_lo;
-};
-
-struct of_pci_range32 {
- struct of_pci_addr opr_addr;
- u32 opr_phys;
- u32 opr_size;
-};
-
-struct of_pci_range64 {
- struct of_pci_addr opr_addr;
- u32 opr_phys_hi;
- u32 opr_phys_lo;
- u32 opr_size_hi;
- u32 opr_size_lo;
-};
-
-struct of_pci_addr_range64 {
- struct of_pci_addr opr_addr;
- u32 opr_size_hi;
- u32 opr_size_lo;
-};
-
-struct reg_property32 {
- u32 address;
- u32 size;
-};
-
-typedef s32 ofdn_t;
-
-#define OFD_ROOT 1
-#define OFD_DUMP_NAMES 0x1
-#define OFD_DUMP_VALUES 0x2
-#define OFD_DUMP_ALL (OFD_DUMP_VALUES|OFD_DUMP_NAMES)
-
-extern void *ofd_create(void *mem, size_t sz);
-extern ofdn_t ofd_node_parent(void *mem, ofdn_t n);
-extern ofdn_t ofd_node_peer(void *mem, ofdn_t n);
-extern ofdn_t ofd_node_child(void *mem, ofdn_t p);
-extern const char *ofd_node_path(void *mem, ofdn_t p);
-extern int ofd_node_to_path(void *mem, ofdn_t p, void *buf, size_t sz);
-extern ofdn_t ofd_node_child_create(void *mem, ofdn_t parent,
- const char *path, size_t pathlen);
-extern ofdn_t ofd_node_peer_create(void *mem, ofdn_t sibling,
- const char *path, size_t pathlen);
-extern ofdn_t ofd_node_find(void *mem, const char *devspec);
-extern ofdn_t ofd_node_add(void *m, ofdn_t n, const char *path, size_t sz);
-extern int ofd_node_prune(void *m, ofdn_t n);
-extern int ofd_prune_path(void *m, const char *path);
-extern ofdn_t ofd_node_io(void *mem, ofdn_t n);
-
-extern ofdn_t ofd_nextprop(void *mem, ofdn_t n, const char *prev, char *name);
-extern ofdn_t ofd_prop_find(void *mem, ofdn_t n, const char *name);
-extern int ofd_getprop(void *mem, ofdn_t n, const char *name,
- void *buf, size_t sz);
-extern int ofd_getproplen(void *mem, ofdn_t n, const char *name);
-
-extern int ofd_setprop(void *mem, ofdn_t n, const char *name,
- const void *buf, size_t sz);
-extern void ofd_prop_remove(void *mem, ofdn_t node, ofdn_t prop);
-extern ofdn_t ofd_prop_add(void *mem, ofdn_t n, const char *name,
- const void *buf, size_t sz);
-extern ofdn_t ofd_io_create(void *m, ofdn_t node, u64 open);
-extern u32 ofd_io_open(void *mem, ofdn_t n);
-extern void ofd_io_close(void *mem, ofdn_t n);
-
-
-typedef void (*walk_fn)(void *m, ofdn_t p, int arg);
-extern void ofd_dump_props(void *m, ofdn_t p, int dump);
-
-extern void ofd_walk(void *m, ofdn_t p, walk_fn fn, int arg);
-
-
-/* Recursively look up #address_cells and #size_cells properties */
-extern int ofd_getcells(void *mem, ofdn_t n,
- u32 *addr_cells, u32 *size_cells);
-
-extern size_t ofd_size(void *mem);
-extern size_t ofd_space(void *mem);
-
-extern void ofd_prop_print(const char *head, const char *path,
- const char *name, const char *prop, size_t sz);
-
-extern ofdn_t ofd_node_find_by_prop(void *mem, ofdn_t n, const char *name,
- const void *val, size_t sz);
-extern ofdn_t ofd_node_find_next(void *mem, ofdn_t n);
-extern ofdn_t ofd_node_find_prev(void *mem, ofdn_t n);
-extern void ofd_init(int (*write)(const char *, size_t len));
-
-#endif /* _OF_DEVTREE_H */
_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel
|
Home