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

Commit 0c38ed6f authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Michael Ellerman
Browse files

powerpc/pseries: Enable support of ibm,dynamic-memory-v2 



Add required bits to the architecture vector to enable support
of the ibm,dynamic-memory-v2 device tree property.

Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2b31e3ae

arch/powerpc/include/asm/firmware.h

+2 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define FW_FEATURE_BEST_ENERGY	ASM_CONST(0x0000000080000000)

#define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000)

#define FW_FEATURE_PRRN		ASM_CONST(0x0000000200000000)

#define FW_FEATURE_DRMEM_V2	ASM_CONST(0x0000000400000000)



#ifndef __ASSEMBLY__
@@ -67,7 +68,7 @@ enum { 
		FW_FEATURE_CMO | FW_FEATURE_VPHN | FW_FEATURE_XCMO |

		FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY |

		FW_FEATURE_TYPE1_AFFINITY | FW_FEATURE_PRRN |

		FW_FEATURE_HPT_RESIZE,

		FW_FEATURE_HPT_RESIZE | FW_FEATURE_DRMEM_V2,

	FW_FEATURE_PSERIES_ALWAYS = 0,

	FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL,

	FW_FEATURE_POWERNV_ALWAYS = 0,

arch/powerpc/include/asm/prom.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ extern int of_get_ibm_chip_id(struct device_node *np); 
#define OV5_PFO_HW_842		0x1140	/* PFO Compression Accelerator */

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

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

#define OV5_DRMEM_V2		0x1680	/* ibm,dynamic-reconfiguration-v2 */

#define OV5_XIVE_SUPPORT	0x17C0	/* XIVE Exploitation Support Mask */

#define OV5_XIVE_LEGACY		0x1700	/* XIVE legacy mode Only */

#define OV5_XIVE_EXPLOIT	0x1740	/* XIVE exploitation mode Only */

arch/powerpc/kernel/prom_init.c

+1 −0
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = { 
		.reserved2 = 0,

		.reserved3 = 0,

		.subprocessors = 1,

		.byte22 = OV5_FEAT(OV5_DRMEM_V2),

		.intarch = 0,

		.mmu = 0,

		.hash_ext = 0,

arch/powerpc/platforms/pseries/firmware.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static __initdata struct vec5_fw_feature 
vec5_fw_features_table[] = {

	{FW_FEATURE_TYPE1_AFFINITY,	OV5_TYPE1_AFFINITY},

	{FW_FEATURE_PRRN,		OV5_PRRN},

	{FW_FEATURE_DRMEM_V2,		OV5_DRMEM_V2},

};



static void __init fw_vec5_feature_init(const char *vec5, unsigned long len)