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

Commit 1c539731 authored Jul 07, 2015 by Anton Blanchard Committed by Michael Ellerman Jul 13, 2015

powerpc: Remove mtmsrd(), use existing mtmsr()



mtmsr() does the right thing on 32bit and 64bit, so use it everywhere.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent e8a4fd0a

arch/powerpc/include/asm/reg.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1193,8 +1193,7 @@
	#ifdef CONFIG_PPC_BOOK3S_64		#ifdef CONFIG_PPC_BOOK3S_64
	#define __mtmsrd(v, l) asm volatile("mtmsrd %0," __stringify(l) \		#define __mtmsrd(v, l) asm volatile("mtmsrd %0," __stringify(l) \
	: : "r" (v) : "memory")		: : "r" (v) : "memory")
	#define mtmsrd(v) __mtmsrd((v), 0)		#define mtmsr(v) __mtmsrd((v), 0)
	#define mtmsr(v) mtmsrd(v)
	#else		#else
	#define mtmsr(v) asm volatile("mtmsr %0" : \		#define mtmsr(v) asm volatile("mtmsr %0" : \
	: "r" ((unsigned long)(v)) \		: "r" ((unsigned long)(v)) \

arch/powerpc/oprofile/op_model_power4.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -207,7 +207,7 @@ static int power4_start(struct op_counter_config *ctr)
	unsigned int mmcr0;		unsigned int mmcr0;

	/* set the PMM bit (see comment below) */		/* set the PMM bit (see comment below) */
	mtmsrd(mfmsr() \| MSR_PMM);		mtmsr(mfmsr() \| MSR_PMM);

	for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {		for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
	if (ctr[i].enabled) {		if (ctr[i].enabled) {
	@@ -377,7 +377,7 @@ static void power4_handle_interrupt(struct pt_regs *regs,
	is_kernel = get_kernel(pc, mmcra);		is_kernel = get_kernel(pc, mmcra);

	/* set the PMM bit (see comment below) */		/* set the PMM bit (see comment below) */
	mtmsrd(mfmsr() \| MSR_PMM);		mtmsr(mfmsr() \| MSR_PMM);

	/* Check that the SIAR valid bit in MMCRA is set to 1. */		/* Check that the SIAR valid bit in MMCRA is set to 1. */
	if ((mmcra & MMCRA_SIAR_VALID_MASK) == MMCRA_SIAR_VALID_MASK)		if ((mmcra & MMCRA_SIAR_VALID_MASK) == MMCRA_SIAR_VALID_MASK)