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

Commit cbbc6f1b authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Benjamin Herrenschmidt
Browse files

powerpc/cputable: Reserve bits in HWCAP2 for new features 



Also, make HTM's presence dependent on the .config option.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent d82fb31a

arch/powerpc/include/asm/cputable.h

+2 −0
Original line number Diff line number Diff line
@@ -224,8 +224,10 @@ extern const char *powerpc_base_platform; 
/* We only set the TM feature if the kernel was compiled with TM supprt */

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

#define CPU_FTR_TM_COMP		CPU_FTR_TM

#define PPC_FEATURE2_HTM_COMP	PPC_FEATURE2_HTM

#else

#define CPU_FTR_TM_COMP		0

#define PPC_FEATURE2_HTM_COMP	0

#endif



/* We need to mark all pages as being coherent if we're SMP or we have a

arch/powerpc/include/uapi/asm/cputable.h

+9 −0
Original line number Diff line number Diff line 
#ifndef _UAPI__ASM_POWERPC_CPUTABLE_H

#define _UAPI__ASM_POWERPC_CPUTABLE_H



/* in AT_HWCAP */

#define PPC_FEATURE_32			0x80000000

#define PPC_FEATURE_64			0x40000000

#define PPC_FEATURE_601_INSTR		0x20000000
@@ -33,4 +34,12 @@ 
#define PPC_FEATURE_TRUE_LE		0x00000002

#define PPC_FEATURE_PPC_LE		0x00000001



/* in AT_HWCAP2 */

#define PPC_FEATURE2_ARCH_2_07		0x80000000

#define PPC_FEATURE2_HTM		0x40000000

#define PPC_FEATURE2_DSCR		0x20000000

#define PPC_FEATURE2_EBB		0x10000000

#define PPC_FEATURE2_ISEL		0x08000000

#define PPC_FEATURE2_TAR		0x04000000



#endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */