Commit 75b93da4 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/powernv: Detect OPAL v3 API version 



Future firmwares will support that new version

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent af945cf4

arch/powerpc/include/asm/firmware.h

+3 −1
Original line number Diff line number Diff line
@@ -52,6 +52,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_OPALv3	ASM_CONST(0x0000000400000000)



#ifndef __ASSEMBLY__
@@ -69,7 +70,8 @@ enum { 
		FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY |

		FW_FEATURE_TYPE1_AFFINITY | FW_FEATURE_PRRN,

	FW_FEATURE_PSERIES_ALWAYS = 0,

	FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2,

	FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2 |

		FW_FEATURE_OPALv3,

	FW_FEATURE_POWERNV_ALWAYS = 0,

	FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,

	FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,

arch/powerpc/include/asm/opal.h

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ enum OpalMCE_TlbErrorType { 


enum OpalThreadStatus {

	OPAL_THREAD_INACTIVE = 0x0,

	OPAL_THREAD_STARTED = 0x1

	OPAL_THREAD_STARTED = 0x1,

	OPAL_THREAD_UNAVAILABLE = 0x2 /* opal-v3 */

};



enum OpalPciBusCompare {

arch/powerpc/platforms/powernv/opal.c

+5 −1
Original line number Diff line number Diff line
@@ -56,7 +56,11 @@ int __init early_init_dt_scan_opal(unsigned long node, 
		 opal.entry, entryp, entrysz);



	powerpc_firmware_features |= FW_FEATURE_OPAL;

	if (of_flat_dt_is_compatible(node, "ibm,opal-v2")) {

	if (of_flat_dt_is_compatible(node, "ibm,opal-v3")) {

		powerpc_firmware_features |= FW_FEATURE_OPALv2;

		powerpc_firmware_features |= FW_FEATURE_OPALv3;

		printk("OPAL V3 detected !\n");

	} else if (of_flat_dt_is_compatible(node, "ibm,opal-v2")) {

		powerpc_firmware_features |= FW_FEATURE_OPALv2;

		printk("OPAL V2 detected !\n");

	} else {

arch/powerpc/platforms/powernv/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ static void pnv_show_cpuinfo(struct seq_file *m) 
	if (root)

		model = of_get_property(root, "model", NULL);

	seq_printf(m, "machine\t\t: PowerNV %s\n", model);

	if (firmware_has_feature(FW_FEATURE_OPALv2))

	if (firmware_has_feature(FW_FEATURE_OPALv3))

		seq_printf(m, "firmware\t: OPAL v3\n");

	else if (firmware_has_feature(FW_FEATURE_OPALv2))

		seq_printf(m, "firmware\t: OPAL v2\n");

	else if (firmware_has_feature(FW_FEATURE_OPAL))

		seq_printf(m, "firmware\t: OPAL v1\n");