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

Commit f437c517 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/paca' into next 

Bring in yet another series that touches KVM code, and might need to
be merged into the kvm-ppc branch to resolve conflicts.

This required some changes in pnv_power9_force_smt4_catch/release()
due to the paca array becomming an array of pointers.
parents 872a100a 29ab6c47

arch/powerpc/include/asm/book3s/64/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ extern int __meminit hash__vmemmap_create_mapping(unsigned long start, 
extern void hash__vmemmap_remove_mapping(unsigned long start,

				     unsigned long page_size);



int hash__create_section_mapping(unsigned long start, unsigned long end);

int hash__create_section_mapping(unsigned long start, unsigned long end, int nid);

int hash__remove_section_mapping(unsigned long start, unsigned long end);



#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/book3s/64/radix.h

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static inline unsigned long radix__get_tree_size(void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int radix__create_section_mapping(unsigned long start, unsigned long end);

int radix__create_section_mapping(unsigned long start, unsigned long end, int nid);

int radix__remove_section_mapping(unsigned long start, unsigned long end);

#endif /* CONFIG_MEMORY_HOTPLUG */

#endif /* __ASSEMBLY__ */

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

+13 −13
Original line number Diff line number Diff line
@@ -36,14 +36,16 @@ 
#include <asm/mmu.h>



/*

 * We only have to have statically allocated lppaca structs on

 * legacy iSeries, which supports at most 64 cpus.

 */

#define NR_LPPACAS	1



/*

 * The Hypervisor barfs if the lppaca crosses a page boundary.  A 1k

 * alignment is sufficient to prevent this

 * The lppaca is the "virtual processor area" registered with the hypervisor,

 * H_REGISTER_VPA etc.

 *

 * According to PAPR, the structure is 640 bytes long, must be L1 cache line

 * aligned, and must not cross a 4kB boundary. Its size field must be at

 * least 640 bytes (but may be more).

 *

 * Pre-v4.14 KVM hypervisors reject the VPA if its size field is smaller than

 * 1kB, so we dynamically allocate 1kB and advertise size as 1kB, but keep

 * this structure as the canonical 640 byte size.

 */

struct lppaca {

	/* cacheline 1 contains read-only data */
@@ -99,11 +101,9 @@ struct lppaca { 
	u8	reserved11[148];

	volatile __be64 dtl_idx;	/* Dispatch Trace Log head index */

	u8	reserved12[96];

} __attribute__((__aligned__(0x400)));



extern struct lppaca lppaca[];

} ____cacheline_aligned;



#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

+16 −6
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */ 
#define get_paca()	local_paca

#endif



#ifdef CONFIG_PPC_PSERIES

#define get_lppaca()	(get_paca()->lppaca_ptr)

#endif



#define get_slb_shadow()	(get_paca()->slb_shadow_ptr)



struct task_struct;
@@ -59,7 +62,7 @@ struct task_struct; 
 * processor.

 */

struct paca_struct {

#ifdef CONFIG_PPC_BOOK3S

#ifdef CONFIG_PPC_PSERIES

	/*

	 * Because hw_cpu_id, unlike other paca fields, is accessed

	 * routinely from other CPUs (from the IRQ code), we stick to
@@ -68,7 +71,8 @@ struct paca_struct { 
	 */



	struct lppaca *lppaca_ptr;	/* Pointer to LpPaca for PLIC */

#endif /* CONFIG_PPC_BOOK3S */

#endif /* CONFIG_PPC_PSERIES */



	/*

	 * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 

	 * load lock_token and paca_index with a single lwz
@@ -161,10 +165,14 @@ struct paca_struct { 
	u64 saved_msr;			/* MSR saved here by enter_rtas */

	u16 trap_save;			/* Used when bad stack is encountered */

	u8 irq_soft_mask;		/* mask for irq soft masking */

	u8 soft_enabled;		/* irq soft-enable flag */

	u8 irq_happened;		/* irq happened while soft-disabled */

	u8 io_sync;			/* writel() needs spin_unlock sync */

	u8 irq_work_pending;		/* IRQ_WORK interrupt while soft-disable */

	u8 nap_state_lost;		/* NV GPR values lost in power7_idle */

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	u8 pmcregs_in_use;		/* pseries puts this in lppaca */

#endif

	u64 sprg_vdso;			/* Saved user-visible sprg */

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	u64 tm_scratch;                 /* TM scratch area for reclaim */
@@ -244,18 +252,20 @@ 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);

extern void allocate_paca_ptrs(void);

extern void allocate_paca(int cpu);

extern void free_unused_pacas(void);



#else /* CONFIG_PPC64 */



static inline void allocate_pacas(void) { };

static inline void allocate_paca_ptrs(void) { };

static inline void allocate_paca(int cpu) { };

static inline void free_unused_pacas(void) { };



#endif /* CONFIG_PPC64 */