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

Commit 36f567b4 authored by Jesse Larrew's avatar Jesse Larrew Committed by Benjamin Herrenschmidt
Browse files

powerpc: Add VPHN firmware feature 



This simple patch adds the firmware feature for VPHN to the firmware
features bitmask.

Signed-off-by: default avatarJesse Larrew <jlarrew@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 698193d8

arch/powerpc/include/asm/firmware.h

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#define FW_FEATURE_PS3_LV1	ASM_CONST(0x0000000000800000)

#define FW_FEATURE_BEAT		ASM_CONST(0x0000000001000000)

#define FW_FEATURE_CMO		ASM_CONST(0x0000000002000000)

#define FW_FEATURE_VPHN		ASM_CONST(0x0000000004000000)



#ifndef __ASSEMBLY__
@@ -59,7 +60,7 @@ enum { 
		FW_FEATURE_VIO | FW_FEATURE_RDMA | FW_FEATURE_LLAN |

		FW_FEATURE_BULK_REMOVE | FW_FEATURE_XDABR |

		FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR |

		FW_FEATURE_CMO,

		FW_FEATURE_CMO | FW_FEATURE_VPHN,

	FW_FEATURE_PSERIES_ALWAYS = 0,

	FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,

	FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,

arch/powerpc/include/asm/hvcall.h

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ 
#define H_GET_EM_PARMS		0x2B8

#define H_SET_MPP		0x2D0

#define H_GET_MPP		0x2D4

#define H_HOME_NODE_ASSOCIATIVITY 0x2EC

#define H_BEST_ENERGY		0x2F4

#define MAX_HCALL_OPCODE	H_BEST_ENERGY

arch/powerpc/platforms/pseries/firmware.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = { 
	{FW_FEATURE_XDABR,		"hcall-xdabr"},

	{FW_FEATURE_MULTITCE,		"hcall-multi-tce"},

	{FW_FEATURE_SPLPAR,		"hcall-splpar"},

	{FW_FEATURE_VPHN,		"hcall-vphn"},

};



/* Build up the firmware features bitmask using the contents of