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

Commit df77c799 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Update ibm,architecture.vec for PAPR 2.7/POWER8 



Update ibm,architecture.vec for POWER8 and allows us to support more
than one parition per core.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 03737439

arch/powerpc/kernel/prom_init.c

+8 −3
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ static void __init early_cmdline_parse(void) 
#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_06		0x02	/* set if we support PowerPC 2.06 */

#define OV1_PPC_2_07		0x01	/* set if we support PowerPC 2.07 */



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

#define OV2_REAL_MODE		0x20	/* set if we want OF in real mode */
@@ -707,6 +708,7 @@ static void __init early_cmdline_parse(void) 
#define OV5_PFO_HW_RNG		0x80	/* PFO Random Number Generator */

#define OV5_PFO_HW_842		0x40	/* PFO Compression Accelerator */

#define OV5_PFO_HW_ENCR		0x20	/* PFO Encryption Accelerator */

#define OV5_SUB_PROCESSORS	0x01    /* 1,2,or 4 Sub-Processors supported */



/* Option Vector 6: IBM PAPR hints */

#define OV6_LINUX		0x02	/* Linux is our OS */
@@ -719,6 +721,8 @@ static unsigned char ibm_architecture_vec[] = { 
	W(0xfffe0000), W(0x003a0000),	/* POWER5/POWER5+ */

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

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

	W(0xffff0000), W(0x004b0000),	/* POWER8 */

	W(0xffffffff), W(0x0f000004),	/* all 2.07-compliant */

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

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

	W(0xfffffffe), W(0x0f000001),	/* all 2.04-compliant and earlier */
@@ -728,7 +732,7 @@ static unsigned char ibm_architecture_vec[] = { 
	3 - 2,				/* length */

	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_04 | OV1_PPC_2_05 | OV1_PPC_2_06,

	OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06 | OV1_PPC_2_07,



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

	34 - 2,				/* length */
@@ -755,7 +759,7 @@ static unsigned char ibm_architecture_vec[] = { 
	OV4_MIN_ENT_CAP,		/* minimum VP entitled capacity */



	/* option vector 5: PAPR/OF options */

	18 - 2,				/* length */

	19 - 2,				/* length */

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

	OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY |

	OV5_DONATE_DEDICATE_CPU | OV5_MSI,
@@ -769,13 +773,14 @@ static unsigned char ibm_architecture_vec[] = { 
	 * must match by the macro below. Update the definition if

	 * the structure layout changes.

	 */

#define IBM_ARCH_VEC_NRCORES_OFFSET	101

#define IBM_ARCH_VEC_NRCORES_OFFSET	117

	W(NR_CPUS),			/* number of cores supported */

	0,

	0,

	0,

	0,

	OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR | OV5_PFO_HW_842,

	OV5_SUB_PROCESSORS,

	/* option vector 6: IBM PAPR hints */

	4 - 2,				/* length */

	0,