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

Commit beff8237 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman
Browse files

powerpc: Update cpu_user_features2 in scan_features() 



scan_features() updates cpu_user_features but not cpu_user_features2.

Amongst other things, cpu_user_features2 contains the user TM feature
bits which we must keep in sync with the kernel TM feature bit.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6997e57d

arch/powerpc/kernel/prom.c

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

	unsigned long	cpu_features;	/* CPU_FTR_xxx bit */

	unsigned long	mmu_features;	/* MMU_FTR_xxx bit */

	unsigned long	mmu_features;	/* MMU_FTR_xxx bit */

	unsigned int	cpu_user_ftrs;	/* PPC_FEATURE_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	pabyte;		/* byte number in ibm,pa-features */

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

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

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

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

} ibm_pa_features[] __initdata = {

} ibm_pa_features[] __initdata = {

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

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

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

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

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

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

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

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

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

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

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

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

	{CPU_FTR_REAL_LE, 0, PPC_FEATURE_TRUE_LE, 5, 0, 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),

	 * 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

	 * 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.

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

	 */

	 */

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

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

};

};





static void __init scan_features(unsigned long node, const unsigned char *ftrs,

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

		if (bit ^ fp->invert) {

			cur_cpu_spec->cpu_features |= fp->cpu_features;

			cur_cpu_spec->cpu_features |= fp->cpu_features;

			cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftrs;

			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;

			cur_cpu_spec->mmu_features |= fp->mmu_features;

		} else {

		} else {

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

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

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

			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;

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

		}

		}

	}

	}