Skip to content

L
linux-davinci
Commit 5b659531 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

powerpc: OF convert to atomic lock 

Replaced the RW lock for now with atomic_spinlock. We have no
atomic_rwlocks in -rt right now and I doubt that the OF path is
performance critical.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2126c312
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
arch/powerpc/kernel/prom.c
View file @ 5b659531
......@@ -81,7 +81,7 @@ struct boot_param_header *initial_boot_params;
extern struct device_node *allnodes; /* temporary while merging */
extern rwlock_t devtree_lock; /* temporary while merging */
extern atomic_spinlock_t devtree_lock; /* temporary while merging */
/* export that to outside world */
struct device_node *of_chosen;
......@@ -1275,12 +1275,12 @@ struct device_node *of_find_node_by_phandle(phandle handle)
{
struct device_node *np;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
for (np = allnodes; np != 0; np = np->allnext)
if (np->linux_phandle == handle)
break;
of_node_get(np);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_node_by_phandle);
......@@ -1328,13 +1328,13 @@ struct device_node *of_find_all_nodes(struct device_node *prev)
{
struct device_node *np;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = prev ? prev->allnext : allnodes;
for (; np != 0; np = np->allnext)
if (of_node_get(np))
break;
of_node_put(prev);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_all_nodes);
......@@ -1419,12 +1419,12 @@ void of_attach_node(struct device_node *np)
{
unsigned long flags;
write_lock_irqsave(&devtree_lock, flags);
atomic_spin_lock_irqsave(&devtree_lock, flags);
np->sibling = np->parent->child;
np->allnext = allnodes;
np->parent->child = np;
allnodes = np;
write_unlock_irqrestore(&devtree_lock, flags);
atomic_spin_unlock_irqrestore(&devtree_lock, flags);
}
/*
......@@ -1437,7 +1437,7 @@ void of_detach_node(struct device_node *np)
struct device_node *parent;
unsigned long flags;
write_lock_irqsave(&devtree_lock, flags);
atomic_spin_lock_irqsave(&devtree_lock, flags);
parent = np->parent;
if (!parent)
......@@ -1468,7 +1468,7 @@ void of_detach_node(struct device_node *np)
of_node_set_flag(np, OF_DETACHED);
out_unlock:
write_unlock_irqrestore(&devtree_lock, flags);
atomic_spin_unlock_irqrestore(&devtree_lock, flags);
}
#ifdef CONFIG_PPC_PSERIES
......@@ -1552,18 +1552,18 @@ int prom_add_property(struct device_node* np, struct property* prop)
unsigned long flags;
prop->next = NULL;
write_lock_irqsave(&devtree_lock, flags);
atomic_spin_lock_irqsave(&devtree_lock, flags);
next = &np->properties;
while (*next) {
if (strcmp(prop->name, (*next)->name) == 0) {
/* duplicate ! don't insert it */
write_unlock_irqrestore(&devtree_lock, flags);
atomic_spin_unlock_irqrestore(&devtree_lock, flags);
return -1;
}
next = &(*next)->next;
}
*next = prop;
write_unlock_irqrestore(&devtree_lock, flags);
atomic_spin_unlock_irqrestore(&devtree_lock, flags);
#ifdef CONFIG_PROC_DEVICETREE
/* try to add to proc as well if it was initialized */
......@@ -1586,7 +1586,7 @@ int prom_remove_property(struct device_node *np, struct property *prop)
unsigned long flags;
int found = 0;
write_lock_irqsave(&devtree_lock, flags);
atomic_spin_lock_irqsave(&devtree_lock, flags);
next = &np->properties;
while (*next) {
if (*next == prop) {
......@@ -1599,7 +1599,7 @@ int prom_remove_property(struct device_node *np, struct property *prop)
}
next = &(*next)->next;
}
write_unlock_irqrestore(&devtree_lock, flags);
atomic_spin_unlock_irqrestore(&devtree_lock, flags);
if (!found)
return -ENODEV;
......@@ -1628,7 +1628,7 @@ int prom_update_property(struct device_node *np,
unsigned long flags;
int found = 0;
write_lock_irqsave(&devtree_lock, flags);
atomic_spin_lock_irqsave(&devtree_lock, flags);
next = &np->properties;
while (*next) {
if (*next == oldprop) {
......@@ -1642,7 +1642,7 @@ int prom_update_property(struct device_node *np,
}
next = &(*next)->next;
}
write_unlock_irqrestore(&devtree_lock, flags);
atomic_spin_unlock_irqrestore(&devtree_lock, flags);
if (!found)
return -ENODEV;
......
drivers/of/base.c
View file @ 5b659531
......@@ -25,7 +25,7 @@ struct device_node *allnodes;
/* use when traversing tree through the allnext, child, sibling,
* or parent members of struct device_node.
*/
DEFINE_RWLOCK(devtree_lock);
DEFINE_ATOMIC_SPINLOCK(devtree_lock);
int of_n_addr_cells(struct device_node *np)
{
......@@ -68,7 +68,7 @@ struct property *of_find_property(const struct device_node *np,
if (!np)
return NULL;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
for (pp = np->properties; pp != 0; pp = pp->next) {
if (of_prop_cmp(pp->name, name) == 0) {
if (lenp != 0)
......@@ -76,7 +76,7 @@ struct property *of_find_property(const struct device_node *np,
break;
}
}
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return pp;
}
......@@ -159,9 +159,9 @@ struct device_node *of_get_parent(const struct device_node *node)
if (!node)
return NULL;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = of_node_get(node->parent);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_get_parent);
......@@ -184,10 +184,10 @@ struct device_node *of_get_next_parent(struct device_node *node)
if (!node)
return NULL;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
parent = of_node_get(node->parent);
of_node_put(node);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return parent;
}
......@@ -204,13 +204,13 @@ struct device_node *of_get_next_child(const struct device_node *node,
{
struct device_node *next;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
next = prev ? prev->sibling : node->child;
for (; next; next = next->sibling)
if (of_node_get(next))
break;
of_node_put(prev);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return next;
}
EXPORT_SYMBOL(of_get_next_child);
......@@ -226,13 +226,13 @@ struct device_node *of_find_node_by_path(const char *path)
{
struct device_node *np = allnodes;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
for (; np; np = np->allnext) {
if (np->full_name && (of_node_cmp(np->full_name, path) == 0)
&& of_node_get(np))
break;
}
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_node_by_path);
......@@ -253,14 +253,14 @@ struct device_node *of_find_node_by_name(struct device_node *from,
{
struct device_node *np;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = from ? from->allnext : allnodes;
for (; np; np = np->allnext)
if (np->name && (of_node_cmp(np->name, name) == 0)
&& of_node_get(np))
break;
of_node_put(from);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_node_by_name);
......@@ -282,14 +282,14 @@ struct device_node *of_find_node_by_type(struct device_node *from,
{
struct device_node *np;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = from ? from->allnext : allnodes;
for (; np; np = np->allnext)
if (np->type && (of_node_cmp(np->type, type) == 0)
&& of_node_get(np))
break;
of_node_put(from);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_node_by_type);
......@@ -313,7 +313,7 @@ struct device_node *of_find_compatible_node(struct device_node *from,
{
struct device_node *np;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = from ? from->allnext : allnodes;
for (; np; np = np->allnext) {
if (type
......@@ -323,7 +323,7 @@ struct device_node *of_find_compatible_node(struct device_node *from,
break;
}
of_node_put(from);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_compatible_node);
......@@ -346,7 +346,7 @@ struct device_node *of_find_node_with_property(struct device_node *from,
struct device_node *np;
struct property *pp;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = from ? from->allnext : allnodes;
for (; np; np = np->allnext) {
for (pp = np->properties; pp != 0; pp = pp->next) {
......@@ -358,7 +358,7 @@ struct device_node *of_find_node_with_property(struct device_node *from,
}
out:
of_node_put(from);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_node_with_property);
......@@ -409,14 +409,14 @@ struct device_node *of_find_matching_node(struct device_node *from,
{
struct device_node *np;
read_lock(&devtree_lock);
atomic_spin_lock(&devtree_lock);
np = from ? from->allnext : allnodes;
for (; np; np = np->allnext) {
if (of_match_node(matches, np) && of_node_get(np))
break;
}
of_node_put(from);
read_unlock(&devtree_lock);
atomic_spin_unlock(&devtree_lock);
return np;
}
EXPORT_SYMBOL(of_find_matching_node);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment