diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 07:48:11 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 16:14:27 -0600 |
| commit | 154063a9c03d31228b6f9366d2ffc2b7c4961698 (patch) | |
| tree | 10b33509876ef5b4a59f22ee88586ab2dfbbd999 /drivers | |
| parent | dbbdee94734bf6f1db7af42008a53655e77cab8f (diff) | |
of/address: little-endian fixes
Fix some endian issues in the OF address translation code.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michal Simek <monstr@monstr.eu>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/address.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 2a905d560c1..0b04137f04f 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -22,7 +22,7 @@ static void of_dump_addr(const char *s, const u32 *addr, int na) { printk(KERN_DEBUG "%s", s); while (na--) - printk(" %08x", *(addr++)); + printk(" %08x", be32_to_cpu(*(addr++))); printk("\n"); } #else @@ -79,8 +79,8 @@ static int of_bus_default_translate(u32 *addr, u64 offset, int na) memset(addr, 0, na * 4); a += offset; if (na > 1) - addr[na - 2] = a >> 32; - addr[na - 1] = a & 0xffffffffu; + addr[na - 2] = cpu_to_be32(a >> 32); + addr[na - 1] = cpu_to_be32(a & 0xffffffffu); return 0; } @@ -190,14 +190,16 @@ const u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size, psize /= 4; onesize = na + ns; - for (i = 0; psize >= onesize; psize -= onesize, prop += onesize, i++) - if ((prop[0] & 0xff) == ((bar_no * 4) + PCI_BASE_ADDRESS_0)) { + for (i = 0; psize >= onesize; psize -= onesize, prop += onesize, i++) { + u32 val = be32_to_cpu(prop[0]); + if ((val & 0xff) == ((bar_no * 4) + PCI_BASE_ADDRESS_0)) { if (size) *size = of_read_number(prop + na, ns); if (flags) *flags = bus->get_flags(prop); return prop; } + } return NULL; } EXPORT_SYMBOL(of_get_pci_address); |