[patch 18/20] Fix sparc64 device register probing

Greg KH
2007-03-10T06:21:56Z

[-- Attachment #1: fix-sparc64-device-register-probing.patch --]
[-- Type: text/plain, Size: 2531 bytes --]

-stable review patch. If anyone has any objections, please let us know.

------------------
From: David Miller <davem@davemloft.net>

[SPARC]: Fix bus handling in build_device_resources().

We mistakedly modify 'bus' in the innermost loop. What
should happen is that at each register index iteration,
we start with the same 'bus'.

So preserve it's value at the top level, and use a loop
local variable 'dbus' for iteration.

This bug causes registers other than the first to be
decoded improperly.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
arch/sparc/kernel/of_device.c | 7 ++++---
arch/sparc64/kernel/of_device.c | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)

--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -495,7 +495,7 @@ static void __init build_device_resource
u32 *reg = (preg + (index * ((na + ns) * 4)));
struct device_node *dp = op->node;
struct device_node *pp = p_op->node;
- struct of_bus *pbus;
+ struct of_bus *pbus, *dbus;
u64 size, result = OF_BAD_ADDR;
unsigned long flags;
int dna, dns;
@@ -516,6 +516,7 @@ static void __init build_device_resource

dna = na;
dns = ns;
+ dbus = bus;

while (1) {
dp = pp;
@@ -528,13 +529,13 @@ static void __init build_device_resource
pbus = of_match_bus(pp);
pbus->count_cells(dp, &pna, &pns);

- if (build_one_resource(dp, bus, pbus, addr,
+ if (build_one_resource(dp, dbus, pbus, addr,
dna, dns, pna))
break;

dna = pna;
dns = pns;
- bus = pbus;
+ dbus = pbus;
}

build_res:
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -581,7 +581,7 @@ static void __init build_device_resource
u32 *reg = (preg + (index * ((na + ns) * 4)));
struct device_node *dp = op->node;
struct device_node *pp = p_op->node;
- struct of_bus *pbus;
+ struct of_bus *pbus, *dbus;
u64 size, result = OF_BAD_ADDR;
unsigned long flags;
int dna, dns;
@@ -599,6 +599,7 @@ static void __init build_device_resource

dna = na;
dns = ns;
+ dbus = bus;

while (1) {
dp = pp;
@@ -611,13 +612,13 @@ static void __init build_device_resource
pbus = of_match_bus(pp);
pbus->count_cells(dp, &pna, &pns);

- if (build_one_resource(dp, bus, pbus, addr,
+ if (build_one_resource(dp, dbus, pbus, addr,
dna, dns, pna))
break;

dna = pna;
dns = pns;
- bus = pbus;
+ dbus = pbus;
}

build_res:

--