Skip to content

Commit

Permalink
[PATCH] powerpc: Fix machine detection in prom_init.c
Browse files Browse the repository at this point in the history
In e822250 the detection of machine types
in prom_init broke for some machines. We should be checking /device_type
instead of /model. This should make Power3 and Power4 boot again. Haven't
been able to test this.  We also need to relocate before comparing.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Apr 13, 2006
1 parent 132058f commit 6f806ce
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/powerpc/kernel/prom_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -1528,12 +1528,11 @@ static int __init prom_find_machine_type(void)
* non-IBM designs !
* - it has /rtas
*/
len = prom_getprop(_prom->root, "model",
len = prom_getprop(_prom->root, "device_type",
compat, sizeof(compat)-1);
if (len <= 0)
return PLATFORM_GENERIC;
compat[len] = 0;
if (strcmp(compat, "chrp"))
if (strncmp(compat, RELOC("chrp"), 4))
return PLATFORM_GENERIC;

/* Default to pSeries. We need to know if we are running LPAR */
Expand Down

0 comments on commit 6f806ce

Please sign in to comment.