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

Commit ff061624 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Three powerpc cpu feature fixes from Anton Blanchard:

   - scan_features() updated incorrect bits for REAL_LE

   - update cpu_user_features2 in scan_features()

   - update TM user feature bits in scan_features()"

* tag 'powerpc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Update TM user feature bits in scan_features()
  powerpc: Update cpu_user_features2 in scan_features()
  powerpc: scan_features() updates incorrect bits for REAL_LE
parents 7c5047a1 4705e024

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

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define PPC_FEATURE_PSERIES_PERFMON_COMPAT \

					0x00000040



/* Reserved - do not use		0x00000004 */

#define PPC_FEATURE_TRUE_LE		0x00000002

#define PPC_FEATURE_PPC_LE		0x00000001

arch/powerpc/kernel/prom.c

+15 −11
Original line number Diff line number Diff line
@@ -148,23 +148,25 @@ static struct ibm_pa_feature { 
	unsigned long	cpu_features;	/* CPU_FTR_xxx bit */

	unsigned long	mmu_features;	/* MMU_FTR_xxx bit */

	unsigned int	cpu_user_ftrs;	/* PPC_FEATURE_xxx bit */

	unsigned int	cpu_user_ftrs2;	/* PPC_FEATURE2_xxx bit */

	unsigned char	pabyte;		/* byte number in ibm,pa-features */

	unsigned char	pabit;		/* bit number (big-endian) */

	unsigned char	invert;		/* if 1, pa bit set => clear feature */

} ibm_pa_features[] __initdata = {

	{0, 0, PPC_FEATURE_HAS_MMU,	0, 0, 0},

	{0, 0, PPC_FEATURE_HAS_FPU,	0, 1, 0},

	{CPU_FTR_CTRL, 0, 0,		0, 3, 0},

	{CPU_FTR_NOEXECUTE, 0, 0,	0, 6, 0},

	{CPU_FTR_NODSISRALIGN, 0, 0,	1, 1, 1},

	{0, MMU_FTR_CI_LARGE_PAGE, 0,	1, 2, 0},

	{CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},

	{0, 0, PPC_FEATURE_HAS_MMU, 0,		0, 0, 0},

	{0, 0, PPC_FEATURE_HAS_FPU, 0,		0, 1, 0},

	{CPU_FTR_CTRL, 0, 0, 0,			0, 3, 0},

	{CPU_FTR_NOEXECUTE, 0, 0, 0,		0, 6, 0},

	{CPU_FTR_NODSISRALIGN, 0, 0, 0,		1, 1, 1},

	{0, MMU_FTR_CI_LARGE_PAGE, 0, 0,		1, 2, 0},

	{CPU_FTR_REAL_LE, 0, PPC_FEATURE_TRUE_LE, 0, 5, 0, 0},

	/*

	 * If the kernel doesn't support TM (ie. CONFIG_PPC_TRANSACTIONAL_MEM=n),

	 * we don't want to turn on CPU_FTR_TM here, so we use CPU_FTR_TM_COMP

	 * which is 0 if the kernel doesn't support TM.

	 * If the kernel doesn't support TM (ie CONFIG_PPC_TRANSACTIONAL_MEM=n),

	 * we don't want to turn on TM here, so we use the *_COMP versions

	 * which are 0 if the kernel doesn't support TM.

	 */

	{CPU_FTR_TM_COMP, 0, 0,		22, 0, 0},

	{CPU_FTR_TM_COMP, 0, 0,

	 PPC_FEATURE2_HTM_COMP|PPC_FEATURE2_HTM_NOSC_COMP, 22, 0, 0},

};



static void __init scan_features(unsigned long node, const unsigned char *ftrs,
@@ -195,10 +197,12 @@ static void __init scan_features(unsigned long node, const unsigned char *ftrs, 
		if (bit ^ fp->invert) {

			cur_cpu_spec->cpu_features |= fp->cpu_features;

			cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftrs;

			cur_cpu_spec->cpu_user_features2 |= fp->cpu_user_ftrs2;

			cur_cpu_spec->mmu_features |= fp->mmu_features;

		} else {

			cur_cpu_spec->cpu_features &= ~fp->cpu_features;

			cur_cpu_spec->cpu_user_features &= ~fp->cpu_user_ftrs;

			cur_cpu_spec->cpu_user_features2 &= ~fp->cpu_user_ftrs2;

			cur_cpu_spec->mmu_features &= ~fp->mmu_features;

		}

	}