vmxnet3: Disable napi in suspend, reenable in resume.
[linux-2.6.git] / drivers / of / pdt.c
index c3c2d70..28295d0 100644 (file)
@@ -1,4 +1,4 @@
-/* prom_common.c: OF device tree support common code.
+/* pdt.c: OF PROM device tree support code.
  *
  * Paul Mackerras      August 1996.
  * Copyright (C) 1996-2005 Paul Mackerras.
@@ -7,6 +7,7 @@
  *    {engebret|bergner}@us.ibm.com
  *
  *  Adapted for sparc by David S. Miller davem@davemloft.net
+ *  Adapted for multiple architectures by Andres Salomon <dilinger@queued.net>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/of_pdt.h>
 #include <asm/prom.h>
-#include <asm/oplib.h>
-#include <asm/leon.h>
 
-void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp);
+static struct of_pdt_ops *of_pdt_prom_ops __initdata;
 
-unsigned int prom_unique_id;
+void __initdata (*of_pdt_build_more)(struct device_node *dp,
+               struct device_node ***nextp);
 
-static struct property * __init build_one_prop(phandle node, char *prev,
+#if defined(CONFIG_SPARC)
+unsigned int of_pdt_unique_id __initdata;
+
+#define of_pdt_incr_unique_id(p) do { \
+       (p)->unique_id = of_pdt_unique_id++; \
+} while (0)
+
+static inline const char *of_pdt_node_name(struct device_node *dp)
+{
+       return dp->path_component_name;
+}
+
+#else
+
+static inline void of_pdt_incr_unique_id(void *p) { }
+static inline void irq_trans_init(struct device_node *dp) { }
+
+static inline const char *of_pdt_node_name(struct device_node *dp)
+{
+       return dp->name;
+}
+
+#endif /* !CONFIG_SPARC */
+
+static struct property * __init of_pdt_build_one_prop(phandle node, char *prev,
                                               char *special_name,
                                               void *special_val,
                                               int special_len)
 {
        static struct property *tmp = NULL;
        struct property *p;
-       const char *name;
+       int err;
 
        if (tmp) {
                p = tmp;
@@ -43,7 +68,7 @@ static struct property * __init build_one_prop(phandle node, char *prev,
                tmp = NULL;
        } else {
                p = prom_early_alloc(sizeof(struct property) + 32);
-               p->unique_id = prom_unique_id++;
+               of_pdt_incr_unique_id(p);
        }
 
        p->name = (char *) (p + 1);
@@ -53,28 +78,20 @@ static struct property * __init build_one_prop(phandle node, char *prev,
                p->value = prom_early_alloc(special_len);
                memcpy(p->value, special_val, special_len);
        } else {
-               if (prev == NULL) {
-                       name = prom_firstprop(node, p->name);
-               } else {
-                       name = prom_nextprop(node, prev, p->name);
-               }
-
-               if (!name || strlen(name) == 0) {
+               err = of_pdt_prom_ops->nextprop(node, prev, p->name);
+               if (err) {
                        tmp = p;
                        return NULL;
                }
-#ifdef CONFIG_SPARC32
-               strcpy(p->name, name);
-#endif
-               p->length = prom_getproplen(node, p->name);
+               p->length = of_pdt_prom_ops->getproplen(node, p->name);
                if (p->length <= 0) {
                        p->length = 0;
                } else {
                        int len;
 
                        p->value = prom_early_alloc(p->length + 1);
-                       len = prom_getproperty(node, p->name, p->value,
-                                              p->length);
+                       len = of_pdt_prom_ops->getproperty(node, p->name,
+                                       p->value, p->length);
                        if (len <= 0)
                                p->length = 0;
                        ((unsigned char *)p->value)[p->length] = '\0';
@@ -83,17 +100,17 @@ static struct property * __init build_one_prop(phandle node, char *prev,
        return p;
 }
 
-static struct property * __init build_prop_list(phandle node)
+static struct property * __init of_pdt_build_prop_list(phandle node)
 {
        struct property *head, *tail;
 
-       head = tail = build_one_prop(node, NULL,
+       head = tail = of_pdt_build_one_prop(node, NULL,
                                     ".node", &node, sizeof(node));
 
-       tail->next = build_one_prop(node, NULL, NULL, NULL, 0);
+       tail->next = of_pdt_build_one_prop(node, NULL, NULL, NULL, 0);
        tail = tail->next;
        while(tail) {
-               tail->next = build_one_prop(node, tail->name,
+               tail->next = of_pdt_build_one_prop(node, tail->name,
                                            NULL, NULL, 0);
                tail = tail->next;
        }
@@ -101,21 +118,62 @@ static struct property * __init build_prop_list(phandle node)
        return head;
 }
 
-static char * __init get_one_property(phandle node, const char *name)
+static char * __init of_pdt_get_one_property(phandle node, const char *name)
 {
        char *buf = "<NULL>";
        int len;
 
-       len = prom_getproplen(node, name);
+       len = of_pdt_prom_ops->getproplen(node, name);
        if (len > 0) {
                buf = prom_early_alloc(len);
-               len = prom_getproperty(node, name, buf, len);
+               len = of_pdt_prom_ops->getproperty(node, name, buf, len);
        }
 
        return buf;
 }
 
-static struct device_node * __init prom_create_node(phandle node,
+static char * __init of_pdt_try_pkg2path(phandle node)
+{
+       char *res, *buf = NULL;
+       int len;
+
+       if (!of_pdt_prom_ops->pkg2path)
+               return NULL;
+
+       if (of_pdt_prom_ops->pkg2path(node, buf, 0, &len))
+               return NULL;
+       buf = prom_early_alloc(len + 1);
+       if (of_pdt_prom_ops->pkg2path(node, buf, len, &len)) {
+               pr_err("%s: package-to-path failed\n", __func__);
+               return NULL;
+       }
+
+       res = strrchr(buf, '/');
+       if (!res) {
+               pr_err("%s: couldn't find / in %s\n", __func__, buf);
+               return NULL;
+       }
+       return res+1;
+}
+
+/*
+ * When fetching the node's name, first try using package-to-path; if
+ * that fails (either because the arch hasn't supplied a PROM callback,
+ * or some other random failure), fall back to just looking at the node's
+ * 'name' property.
+ */
+static char * __init of_pdt_build_name(phandle node)
+{
+       char *buf;
+
+       buf = of_pdt_try_pkg2path(node);
+       if (!buf)
+               buf = of_pdt_get_one_property(node, "name");
+
+       return buf;
+}
+
+static struct device_node * __init of_pdt_create_node(phandle node,
                                                    struct device_node *parent)
 {
        struct device_node *dp;
@@ -124,29 +182,29 @@ static struct device_node * __init prom_create_node(phandle node,
                return NULL;
 
        dp = prom_early_alloc(sizeof(*dp));
-       dp->unique_id = prom_unique_id++;
+       of_pdt_incr_unique_id(dp);
        dp->parent = parent;
 
        kref_init(&dp->kref);
 
-       dp->name = get_one_property(node, "name");
-       dp->type = get_one_property(node, "device_type");
+       dp->name = of_pdt_build_name(node);
+       dp->type = of_pdt_get_one_property(node, "device_type");
        dp->phandle = node;
 
-       dp->properties = build_prop_list(node);
+       dp->properties = of_pdt_build_prop_list(node);
 
        irq_trans_init(dp);
 
        return dp;
 }
 
-char * __init build_full_name(struct device_node *dp)
+static char * __init of_pdt_build_full_name(struct device_node *dp)
 {
        int len, ourlen, plen;
        char *n;
 
        plen = strlen(dp->parent->full_name);
-       ourlen = strlen(dp->path_component_name);
+       ourlen = strlen(of_pdt_node_name(dp));
        len = ourlen + plen + 2;
 
        n = prom_early_alloc(len);
@@ -155,12 +213,12 @@ char * __init build_full_name(struct device_node *dp)
                strcpy(n + plen, "/");
                plen++;
        }
-       strcpy(n + plen, dp->path_component_name);
+       strcpy(n + plen, of_pdt_node_name(dp));
 
        return n;
 }
 
-static struct device_node * __init prom_build_tree(struct device_node *parent,
+static struct device_node * __init of_pdt_build_tree(struct device_node *parent,
                                                   phandle node,
                                                   struct device_node ***nextp)
 {
@@ -168,7 +226,7 @@ static struct device_node * __init prom_build_tree(struct device_node *parent,
        struct device_node *dp;
 
        while (1) {
-               dp = prom_create_node(node, parent);
+               dp = of_pdt_create_node(node, parent);
                if (!dp)
                        break;
 
@@ -182,34 +240,37 @@ static struct device_node * __init prom_build_tree(struct device_node *parent,
                *(*nextp) = dp;
                *nextp = &dp->allnext;
 
+#if defined(CONFIG_SPARC)
                dp->path_component_name = build_path_component(dp);
-               dp->full_name = build_full_name(dp);
+#endif
+               dp->full_name = of_pdt_build_full_name(dp);
 
-               dp->child = prom_build_tree(dp, prom_getchild(node), nextp);
+               dp->child = of_pdt_build_tree(dp,
+                               of_pdt_prom_ops->getchild(node), nextp);
 
-               if (prom_build_more)
-                       prom_build_more(dp, nextp);
+               if (of_pdt_build_more)
+                       of_pdt_build_more(dp, nextp);
 
-               node = prom_getsibling(node);
+               node = of_pdt_prom_ops->getsibling(node);
        }
 
        return ret;
 }
 
-void __init prom_build_devicetree(void)
+void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops)
 {
        struct device_node **nextp;
 
-       allnodes = prom_create_node(prom_root_node, NULL);
+       BUG_ON(!ops);
+       of_pdt_prom_ops = ops;
+
+       allnodes = of_pdt_create_node(root_node, NULL);
+#if defined(CONFIG_SPARC)
        allnodes->path_component_name = "";
+#endif
        allnodes->full_name = "/";
 
        nextp = &allnodes->allnext;
-       allnodes->child = prom_build_tree(allnodes,
-                                         prom_getchild(allnodes->phandle),
-                                         &nextp);
-       of_console_init();
-
-       printk("PROM: Built device tree with %u bytes of memory.\n",
-              prom_early_allocated);
+       allnodes->child = of_pdt_build_tree(allnodes,
+                       of_pdt_prom_ops->getchild(allnodes->phandle), &nextp);
 }