Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 123375
b: refs/heads/master
c: 6524036
h: refs/heads/master
i:
  123373: 5cb4c27
  123371: 514a40d
  123367: e6ed837
  123359: 786d32c
v: v3
  • Loading branch information
David S. Miller committed Dec 6, 2008
1 parent 6d7ee18 commit d94bfad
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 133 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4aef8c53fe517542d8185b7d771f291865b49177
refs/heads/master: 6524036a1e5736a07466208362d83ddf31aae3ac
17 changes: 15 additions & 2 deletions trunk/arch/sparc/kernel/prom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,20 @@ extern void irq_trans_init(struct device_node *dp);

extern unsigned int prom_unique_id;

extern struct device_node * __init create_node(phandle node,
struct device_node *parent);
static inline int is_root_node(const struct device_node *dp)
{
if (!dp)
return 0;

return (dp->parent == NULL);
}

extern char *build_path_component(struct device_node *dp);

extern struct device_node * __init prom_create_node(phandle node,
struct device_node *parent);

extern struct device_node * __init prom_build_tree(struct device_node *parent,
phandle node,
struct device_node ***nextp);
#endif /* __PROM_H */
69 changes: 5 additions & 64 deletions trunk/arch/sparc/kernel/prom_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ void * __init prom_early_alloc(unsigned long size)
return ret;
}

static int is_root_node(const struct device_node *dp)
{
if (!dp)
return 0;

return (dp->parent == NULL);
}

/* The following routines deal with the black magic of fully naming a
* node.
*
Expand Down Expand Up @@ -161,7 +153,7 @@ static void __init __build_path_component(struct device_node *dp, char *tmp_buf)
return sparc32_path_component(dp, tmp_buf);
}

static char * __init build_path_component(struct device_node *dp)
char * __init build_path_component(struct device_node *dp)
{
char tmp_buf[64], *n;

Expand All @@ -176,57 +168,6 @@ static char * __init build_path_component(struct device_node *dp)
return n;
}

static char * __init 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);
len = ourlen + plen + 2;

n = prom_early_alloc(len);
strcpy(n, dp->parent->full_name);
if (!is_root_node(dp->parent)) {
strcpy(n + plen, "/");
plen++;
}
strcpy(n + plen, dp->path_component_name);

return n;
}

static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)
{
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;

while (1) {
dp = create_node(node, parent);
if (!dp)
break;

if (prev_sibling)
prev_sibling->sibling = dp;

if (!ret)
ret = dp;
prev_sibling = dp;

*(*nextp) = dp;
*nextp = &dp->allnext;

dp->path_component_name = build_path_component(dp);
dp->full_name = build_full_name(dp);

dp->child = build_tree(dp, prom_getchild(node), nextp);

node = prom_getsibling(node);
}

return ret;
}

struct device_node *of_console_device;
EXPORT_SYMBOL(of_console_device);

Expand Down Expand Up @@ -360,14 +301,14 @@ void __init prom_build_devicetree(void)
{
struct device_node **nextp;

allnodes = create_node(prom_root_node, NULL);
allnodes = prom_create_node(prom_root_node, NULL);
allnodes->path_component_name = "";
allnodes->full_name = "/";

nextp = &allnodes->allnext;
allnodes->child = build_tree(allnodes,
prom_getchild(allnodes->node),
&nextp);
allnodes->child = prom_build_tree(allnodes,
prom_getchild(allnodes->node),
&nextp);
of_console_init();

printk("PROM: Built device tree with %u bytes of memory.\n",
Expand Down
69 changes: 5 additions & 64 deletions trunk/arch/sparc/kernel/prom_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ void * __init prom_early_alloc(unsigned long size)
return ret;
}

static int is_root_node(const struct device_node *dp)
{
if (!dp)
return 0;

return (dp->parent == NULL);
}

/* The following routines deal with the black magic of fully naming a
* node.
*
Expand Down Expand Up @@ -364,7 +356,7 @@ static void __init __build_path_component(struct device_node *dp, char *tmp_buf)
}
}

static char * __init build_path_component(struct device_node *dp)
char * __init build_path_component(struct device_node *dp)
{
char tmp_buf[64], *n;

Expand All @@ -379,57 +371,6 @@ static char * __init build_path_component(struct device_node *dp)
return n;
}

static char * __init 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);
len = ourlen + plen + 2;

n = prom_early_alloc(len);
strcpy(n, dp->parent->full_name);
if (!is_root_node(dp->parent)) {
strcpy(n + plen, "/");
plen++;
}
strcpy(n + plen, dp->path_component_name);

return n;
}

static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)
{
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;

while (1) {
dp = create_node(node, parent);
if (!dp)
break;

if (prev_sibling)
prev_sibling->sibling = dp;

if (!ret)
ret = dp;
prev_sibling = dp;

*(*nextp) = dp;
*nextp = &dp->allnext;

dp->path_component_name = build_path_component(dp);
dp->full_name = build_full_name(dp);

dp->child = build_tree(dp, prom_getchild(node), nextp);

node = prom_getsibling(node);
}

return ret;
}

static const char *get_mid_prop(void)
{
return (tlb_type == spitfire ? "upa-portid" : "portid");
Expand Down Expand Up @@ -640,14 +581,14 @@ void __init prom_build_devicetree(void)
{
struct device_node **nextp;

allnodes = create_node(prom_root_node, NULL);
allnodes = prom_create_node(prom_root_node, NULL);
allnodes->path_component_name = "";
allnodes->full_name = "/";

nextp = &allnodes->allnext;
allnodes->child = build_tree(allnodes,
prom_getchild(allnodes->node),
&nextp);
allnodes->child = prom_build_tree(allnodes,
prom_getchild(allnodes->node),
&nextp);
of_console_init();

printk("PROM: Built device tree with %u bytes of memory.\n",
Expand Down
57 changes: 55 additions & 2 deletions trunk/arch/sparc/kernel/prom_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ static char * __init get_one_property(phandle node, const char *name)
return buf;
}

struct device_node * __init create_node(phandle node,
struct device_node *parent)
struct device_node * __init prom_create_node(phandle node,
struct device_node *parent)
{
struct device_node *dp;

Expand All @@ -240,3 +240,56 @@ struct device_node * __init create_node(phandle node,

return dp;
}

static char * __init 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);
len = ourlen + plen + 2;

n = prom_early_alloc(len);
strcpy(n, dp->parent->full_name);
if (!is_root_node(dp->parent)) {
strcpy(n + plen, "/");
plen++;
}
strcpy(n + plen, dp->path_component_name);

return n;
}

struct device_node * __init prom_build_tree(struct device_node *parent,
phandle node,
struct device_node ***nextp)
{
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;

while (1) {
dp = prom_create_node(node, parent);
if (!dp)
break;

if (prev_sibling)
prev_sibling->sibling = dp;

if (!ret)
ret = dp;
prev_sibling = dp;

*(*nextp) = dp;
*nextp = &dp->allnext;

dp->path_component_name = build_path_component(dp);
dp->full_name = build_full_name(dp);

dp->child = prom_build_tree(dp, prom_getchild(node), nextp);

node = prom_getsibling(node);
}

return ret;
}

0 comments on commit d94bfad

Please sign in to comment.