Commit 40765d2b authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Cleanup vpa code 



register_vpa() doesn't actually do a VPA register call it just uses the flags
you pass it, so rename it to vpa_call() to be clearer.

We can then define register_vpa() and unregister_vpa() which are both simple
wrappers around vpa_call(). (we'll need unregister_vpa() for kexec soon)

We can then cleanup vpa_init(), and because vpa_init() is only called from
platforms/pseries we remove the definition in asm-ppc64/smp.h.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
parent c87ef117

arch/powerpc/platforms/pseries/lpar.c

+3 −7
Original line number Diff line number Diff line
@@ -261,22 +261,18 @@ out: 
void vpa_init(int cpu)

{

	int hwcpu = get_hard_smp_processor_id(cpu);

	unsigned long vpa = (unsigned long)&(paca[cpu].lppaca);

	unsigned long vpa = __pa(&paca[cpu].lppaca);

	long ret;

	unsigned long flags;



	/* Register the Virtual Processor Area (VPA) */

	flags = 1UL << (63 - 18);



	if (cpu_has_feature(CPU_FTR_ALTIVEC))

		paca[cpu].lppaca.vmxregs_in_use = 1;



	ret = register_vpa(flags, hwcpu, __pa(vpa));

	ret = register_vpa(hwcpu, vpa);



	if (ret)

		printk(KERN_ERR "WARNING: vpa_init: VPA registration for "

				"cpu %d (hw %d) of area %lx returns %ld\n",

				cpu, hwcpu, __pa(vpa), ret);

				cpu, hwcpu, vpa, ret);

}



long pSeries_lpar_hpte_insert(unsigned long hpte_group,

arch/powerpc/platforms/pseries/plpar_wrappers.h

+16 −3
Original line number Diff line number Diff line
@@ -21,13 +21,26 @@ static inline long cede_processor(void) 
	return 0;

}



static inline long register_vpa(unsigned long flags, unsigned long proc,

static inline long vpa_call(unsigned long flags, unsigned long cpu,

		unsigned long vpa)

{

	return plpar_hcall_norets(H_REGISTER_VPA, flags, proc, vpa);

	/* flags are in bits 16-18 (counting from most significant bit) */

	flags = flags << (63 - 18);



	return plpar_hcall_norets(H_REGISTER_VPA, flags, cpu, vpa);

}



static inline long unregister_vpa(unsigned long cpu, unsigned long vpa)

{

	return vpa_call(0x5, cpu, vpa);

}



static inline long register_vpa(unsigned long cpu, unsigned long vpa)

{

	return vpa_call(0x1, cpu, vpa);

}



void vpa_init(int cpu);

extern void vpa_init(int cpu);



static inline long plpar_pte_remove(unsigned long flags, unsigned long ptex,

		unsigned long avpn, unsigned long *old_pteh_ret,

include/asm-ppc64/smp.h

+0 −8
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ extern void smp_generic_take_timebase(void); 


extern struct smp_ops_t *smp_ops;



#ifdef CONFIG_PPC_PSERIES

void vpa_init(int cpu);

#else

static inline void vpa_init(int cpu)

{

}

#endif /* CONFIG_PPC_PSERIES */



#endif /* __ASSEMBLY__ */



#endif /* !(_PPC64_SMP_H) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE