Commit e51a1ac2 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar

x86, olpc: fix endian bug in openfirmware workaround

Boardrev is always treated as a u32 everywhere else, no reason to
byteswap the 0xc2 value.  The only use is to print out if it is
a prerelease board, the test being:

(olpc_platform_info.boardrev & 0xf) < 8

Which is currently always true as be32_to_cpu(0xc2) & 0xf = 0
but I doubt that was the intention here.  The consequences of the bug
are pretty minor though (incorrect boardrev displayed in dmesg when
ofw support not configured)

Also annotate the temporary used to read the boardrev in the ofw
case.

The confusion was noticed by Sparse:

  arch/x86/kernel/olpc.c:206:32: warning: cast to restricted __be32
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fb478da5
...@@ -190,12 +190,12 @@ EXPORT_SYMBOL_GPL(olpc_ec_cmd); ...@@ -190,12 +190,12 @@ EXPORT_SYMBOL_GPL(olpc_ec_cmd);
static void __init platform_detect(void) static void __init platform_detect(void)
{ {
size_t propsize; size_t propsize;
u32 rev; __be32 rev;
if (ofw("getprop", 4, 1, NULL, "board-revision-int", &rev, 4, if (ofw("getprop", 4, 1, NULL, "board-revision-int", &rev, 4,
&propsize) || propsize != 4) { &propsize) || propsize != 4) {
printk(KERN_ERR "ofw: getprop call failed!\n"); printk(KERN_ERR "ofw: getprop call failed!\n");
rev = 0; rev = cpu_to_be32(0);
} }
olpc_platform_info.boardrev = be32_to_cpu(rev); olpc_platform_info.boardrev = be32_to_cpu(rev);
} }
...@@ -203,7 +203,7 @@ static void __init platform_detect(void) ...@@ -203,7 +203,7 @@ static void __init platform_detect(void)
static void __init platform_detect(void) static void __init platform_detect(void)
{ {
/* stopgap until OFW support is added to the kernel */ /* stopgap until OFW support is added to the kernel */
olpc_platform_info.boardrev = be32_to_cpu(0xc2); olpc_platform_info.boardrev = 0xc2;
} }
#endif #endif
......
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