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

Commit 0cb99013 authored by Joel Schopp's avatar Joel Schopp Committed by Paul Mackerras
Browse files

powerpc: Tell firmware we support architecture V2.06 



Add the bits to the architecture-vec so that ibm,client-architecture
lets the firmware know we support the 2.06 architecture.

Signed-off-by: default avatarJoel Schopp <jschopp@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 635f5a63

arch/powerpc/kernel/prom_init.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -620,6 +620,7 @@ static void __init early_cmdline_parse(void) 
#define OV1_PPC_2_03		0x10	/* set if we support PowerPC 2.03 */

#define OV1_PPC_2_03		0x10	/* set if we support PowerPC 2.03 */

#define OV1_PPC_2_04		0x08	/* set if we support PowerPC 2.04 */

#define OV1_PPC_2_04		0x08	/* set if we support PowerPC 2.04 */

#define OV1_PPC_2_05		0x04	/* set if we support PowerPC 2.05 */

#define OV1_PPC_2_05		0x04	/* set if we support PowerPC 2.05 */

#define OV1_PPC_2_06		0x02	/* set if we support PowerPC 2.06 */





/* Option vector 2: Open Firmware options supported */

/* Option vector 2: Open Firmware options supported */

#define OV2_REAL_MODE		0x20	/* set if we want OF in real mode */

#define OV2_REAL_MODE		0x20	/* set if we want OF in real mode */
@@ -651,6 +652,7 @@ static unsigned char ibm_architecture_vec[] = { 
	W(0xfffe0000), W(0x003a0000),	/* POWER5/POWER5+ */

	W(0xfffe0000), W(0x003a0000),	/* POWER5/POWER5+ */

	W(0xffff0000), W(0x003e0000),	/* POWER6 */

	W(0xffff0000), W(0x003e0000),	/* POWER6 */

	W(0xffff0000), W(0x003f0000),	/* POWER7 */

	W(0xffff0000), W(0x003f0000),	/* POWER7 */

	W(0xffffffff), W(0x0f000003),	/* all 2.06-compliant */

	W(0xffffffff), W(0x0f000002),	/* all 2.05-compliant */

	W(0xffffffff), W(0x0f000002),	/* all 2.05-compliant */

	W(0xfffffffe), W(0x0f000001),	/* all 2.04-compliant and earlier */

	W(0xfffffffe), W(0x0f000001),	/* all 2.04-compliant and earlier */

	5 - 1,				/* 5 option vectors */

	5 - 1,				/* 5 option vectors */
@@ -659,7 +661,7 @@ static unsigned char ibm_architecture_vec[] = { 
	3 - 2,				/* length */

	3 - 2,				/* length */

	0,				/* don't ignore, don't halt */

	0,				/* don't ignore, don't halt */

	OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |

	OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |

	OV1_PPC_2_04 | OV1_PPC_2_05,

	OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06,





	/* option vector 2: Open Firmware options supported */

	/* option vector 2: Open Firmware options supported */

	34 - 2,				/* length */

	34 - 2,				/* length */