Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f806cee authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Fix machine detection in prom_init.c 



In e8222502 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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 132058f7

arch/powerpc/kernel/prom_init.c

+2 −3
Original line number Diff line number Diff line
@@ -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 */