forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

of: use __be32 for cell value accessors

Browse source 
Currently, we're using u32 for cell values, and hence assuming
host-endian device trees.

As we'd like to support little-endian platforms, use a __be32 for cell
values, and convert in the cell accessors.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Jeremy Kerr 2010-01-30 01:41:49 -07:00 • committed by Grant Likely
commit 2e89e685a8
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/of/fdt.c
View file

@ -431,9 +431,9 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname,
return 1; return 1;
} }
u64 __init dt_mem_next_cell(int s, u32 **cellp) u64 __init dt_mem_next_cell(int s, __be32 **cellp)
{ {
u32 *p = *cellp; __be32 *p = *cellp;
*cellp = p + s; *cellp = p + s;
return of_read_number(p, s); return of_read_number(p, s);

8
include/linux/of.h
View file

@ -20,6 +20,8 @@
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <asm/byteorder.h>
typedef u32 phandle; typedef u32 phandle;
typedef u32 ihandle; typedef u32 ihandle;
@ -95,16 +97,16 @@ extern void of_node_put(struct device_node *node);
*/ */
/* Helper to read a big number; size is in cells (not bytes) */ /* Helper to read a big number; size is in cells (not bytes) */
static inline u64 of_read_number(const u32 *cell, int size) static inline u64 of_read_number(const __be32 *cell, int size)
{ {
u64 r = 0; u64 r = 0;
while (size--) while (size--)
r = (r << 32) | *(cell++); r = (r << 32) | be32_to_cpu(*(cell++));
return r; return r;
} }
/* Like of_read_number, but we want an unsigned long result */ /* Like of_read_number, but we want an unsigned long result */
static inline unsigned long of_read_ulong(const u32 *cell, int size) static inline unsigned long of_read_ulong(const __be32 *cell, int size)
{ {
/* toss away upper bits if unsigned long is smaller than u64 */ /* toss away upper bits if unsigned long is smaller than u64 */
return of_read_number(cell, size); return of_read_number(cell, size);

2
include/linux/of_fdt.h
View file

@ -78,7 +78,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node);
extern int early_init_dt_scan_memory(unsigned long node, const char *uname, extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
int depth, void *data); int depth, void *data);
extern void early_init_dt_add_memory_arch(u64 base, u64 size); extern void early_init_dt_add_memory_arch(u64 base, u64 size);
extern u64 dt_mem_next_cell(int s, u32 **cellp); extern u64 dt_mem_next_cell(int s, __be32 **cellp);
/* /*
* If BLK_DEV_INITRD, the fdt early init code will call this function, * If BLK_DEV_INITRD, the fdt early init code will call this function,