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

Commit d2e60075 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64: Use array of paca pointers and allocate pacas individually 



Change the paca array into an array of pointers to pacas. Allocate
pacas individually.

This allows flexibility in where the PACAs are allocated. Future work
will allocate them node-local. Platforms that don't have address limits
on PACAs would be able to defer PACA allocations until later in boot
rather than allocate all possible ones up-front then freeing unused.

This is slightly more overhead (one additional indirection) for cross
CPU paca references, but those aren't too common.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8e0b634b

arch/powerpc/include/asm/kvm_ppc.h

+4 −4
Original line number Diff line number Diff line
@@ -436,15 +436,15 @@ struct openpic; 
extern void kvm_cma_reserve(void) __init;

static inline void kvmppc_set_xics_phys(int cpu, unsigned long addr)

{

	paca[cpu].kvm_hstate.xics_phys = (void __iomem *)addr;

	paca_ptrs[cpu]->kvm_hstate.xics_phys = (void __iomem *)addr;

}



static inline void kvmppc_set_xive_tima(int cpu,

					unsigned long phys_addr,

					void __iomem *virt_addr)

{

	paca[cpu].kvm_hstate.xive_tima_phys = (void __iomem *)phys_addr;

	paca[cpu].kvm_hstate.xive_tima_virt = virt_addr;

	paca_ptrs[cpu]->kvm_hstate.xive_tima_phys = (void __iomem *)phys_addr;

	paca_ptrs[cpu]->kvm_hstate.xive_tima_virt = virt_addr;

}



static inline u32 kvmppc_get_xics_latch(void)
@@ -458,7 +458,7 @@ static inline u32 kvmppc_get_xics_latch(void) 


static inline void kvmppc_set_host_ipi(int cpu, u8 host_ipi)

{

	paca[cpu].kvm_hstate.host_ipi = host_ipi;

	paca_ptrs[cpu]->kvm_hstate.host_ipi = host_ipi;

}



static inline void kvmppc_fast_vcpu_kick(struct kvm_vcpu *vcpu)

arch/powerpc/include/asm/lppaca.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ struct lppaca { 


extern struct lppaca lppaca[];



#define lppaca_of(cpu)	(*paca[cpu].lppaca_ptr)

#define lppaca_of(cpu)	(*paca_ptrs[cpu]->lppaca_ptr)



/*

 * We are using a non architected field to determine if a partition is

arch/powerpc/include/asm/paca.h

+2 −2
Original line number Diff line number Diff line
@@ -249,10 +249,10 @@ struct paca_struct { 
	void *rfi_flush_fallback_area;

	u64 l1d_flush_size;

#endif

};

} ____cacheline_aligned;



extern void copy_mm_to_paca(struct mm_struct *mm);

extern struct paca_struct *paca;

extern struct paca_struct **paca_ptrs;

extern void initialise_paca(struct paca_struct *new_paca, int cpu);

extern void setup_paca(struct paca_struct *new_paca);

extern void allocate_pacas(void);

arch/powerpc/include/asm/smp.h

+2 −2
Original line number Diff line number Diff line
@@ -170,12 +170,12 @@ static inline const struct cpumask *cpu_sibling_mask(int cpu) 
#ifdef CONFIG_PPC64

static inline int get_hard_smp_processor_id(int cpu)

{

	return paca[cpu].hw_cpu_id;

	return paca_ptrs[cpu]->hw_cpu_id;

}



static inline void set_hard_smp_processor_id(int cpu, int phys)

{

	paca[cpu].hw_cpu_id = phys;

	paca_ptrs[cpu]->hw_cpu_id = phys;

}

#else

/* 32-bit */

arch/powerpc/kernel/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static void __maybe_unused crash_kexec_wait_realmode(int cpu) 
		if (i == cpu)

			continue;



		while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {

		while (paca_ptrs[i]->kexec_state < KEXEC_STATE_REAL_MODE) {

			barrier();

			if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0))

				break;