Commit 7c09c186 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Rename plapr routines to plpar 



Back in 2013 we added some hypercall wrappers which misspelled
"plpar" (P-series Logical PARtition) as "plapr".

Visually they're hard to distinguish and it almost doesn't matter, but
it is confusing when grepping to miss some calls because of the typo.

They've also started spreading, so before they take over let's fix
them all to be "plpar".

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5017e875

arch/powerpc/include/asm/plpar_wrappers.h

+3 −3
Original line number Diff line number Diff line
@@ -305,17 +305,17 @@ static inline long enable_little_endian_exceptions(void) 
	return plpar_set_mode(1, H_SET_MODE_RESOURCE_LE, 0, 0);

}



static inline long plapr_set_ciabr(unsigned long ciabr)

static inline long plpar_set_ciabr(unsigned long ciabr)

{

	return plpar_set_mode(0, H_SET_MODE_RESOURCE_SET_CIABR, ciabr, 0);

}



static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawrx0)

static inline long plpar_set_watchpoint0(unsigned long dawr0, unsigned long dawrx0)

{

	return plpar_set_mode(0, H_SET_MODE_RESOURCE_SET_DAWR, dawr0, dawrx0);

}



static inline long plapr_signal_sys_reset(long cpu)

static inline long plpar_signal_sys_reset(long cpu)

{

	return plpar_hcall_norets(H_SIGNAL_SYS_RESET, cpu);

}

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static int pseries_set_dawr(unsigned long dawr, unsigned long dawrx) 
	/* PAPR says we can't set HYP */

	dawrx &= ~DAWRX_HYP;



	return  plapr_set_watchpoint0(dawr, dawrx);

	return  plpar_set_watchpoint0(dawr, dawrx);

}



#define CMO_CHARACTERISTICS_TOKEN 44

arch/powerpc/platforms/pseries/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int pseries_cause_nmi_ipi(int cpu) 
		hwcpu = get_hard_smp_processor_id(cpu);

	}



	if (plapr_signal_sys_reset(hwcpu) == H_SUCCESS)

	if (plpar_signal_sys_reset(hwcpu) == H_SUCCESS)

		return 1;



	return 0;

arch/powerpc/xmon/xmon.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#if defined(CONFIG_PPC_SPLPAR)

#include <asm/plpar_wrappers.h>

#else

static inline long plapr_set_ciabr(unsigned long ciabr) {return 0; };

static inline long plpar_set_ciabr(unsigned long ciabr) {return 0; };

#endif



#include "nonstdio.h"
@@ -328,7 +328,7 @@ static void write_ciabr(unsigned long ciabr) 
		mtspr(SPRN_CIABR, ciabr);

		return;

	}

	plapr_set_ciabr(ciabr);

	plpar_set_ciabr(ciabr);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE