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

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

Merge branch 'topic/ppc-kvm' into fixes 

Merge the topic branch with share with the kvm-ppc tree. In this case
we need to share the definition of a new hypervisor call and
associated flags.
parents e2d59152 191eccb1

arch/powerpc/include/asm/hvcall.h

+17 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ 
#define H_GET_HCA_INFO          0x1B8

#define H_GET_PERF_COUNT        0x1BC

#define H_MANAGE_TRACE          0x1C0

#define H_GET_CPU_CHARACTERISTICS 0x1C8

#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4

#define H_QUERY_INT_STATE       0x1E4

#define H_POLL_PENDING		0x1D8
@@ -330,6 +331,17 @@ 
#define H_SIGNAL_SYS_RESET_ALL_OTHERS		-2

/* >= 0 values are CPU number */



/* H_GET_CPU_CHARACTERISTICS return values */

#define H_CPU_CHAR_SPEC_BAR_ORI31	(1ull << 63) // IBM bit 0

#define H_CPU_CHAR_BCCTRL_SERIALISED	(1ull << 62) // IBM bit 1

#define H_CPU_CHAR_L1D_FLUSH_ORI30	(1ull << 61) // IBM bit 2

#define H_CPU_CHAR_L1D_FLUSH_TRIG2	(1ull << 60) // IBM bit 3

#define H_CPU_CHAR_L1D_THREAD_PRIV	(1ull << 59) // IBM bit 4



#define H_CPU_BEHAV_FAVOUR_SECURITY	(1ull << 63) // IBM bit 0

#define H_CPU_BEHAV_L1D_FLUSH_PR	(1ull << 62) // IBM bit 1

#define H_CPU_BEHAV_BNDS_CHK_SPEC_BAR	(1ull << 61) // IBM bit 2



/* Flag values used in H_REGISTER_PROC_TBL hcall */

#define PROC_TABLE_OP_MASK	0x18

#define PROC_TABLE_DEREG	0x10
@@ -436,6 +448,11 @@ static inline unsigned int get_longbusy_msecs(int longbusy_rc) 
	}

}



struct h_cpu_char_result {

	u64 character;

	u64 behaviour;

};



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_HVCALL_H */

arch/powerpc/include/asm/plpar_wrappers.h

+14 −0
Original line number Diff line number Diff line
@@ -326,4 +326,18 @@ static inline long plapr_signal_sys_reset(long cpu) 
	return plpar_hcall_norets(H_SIGNAL_SYS_RESET, cpu);

}



static inline long plpar_get_cpu_characteristics(struct h_cpu_char_result *p)

{

	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];

	long rc;



	rc = plpar_hcall(H_GET_CPU_CHARACTERISTICS, retbuf);

	if (rc == H_SUCCESS) {

		p->character = retbuf[0];

		p->behaviour = retbuf[1];

	}



	return rc;

}



#endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */