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

Commit be6641a7 authored by Michael Neuling's avatar Michael Neuling Committed by Greg Kroah-Hartman
Browse files

powerpc/pseries: Add H_GET_CPU_CHARACTERISTICS flags & wrapper 



commit 191eccb1580939fb0d47deb405b82a85b0379070 upstream.

A new hypervisor call has been defined to communicate various
characteristics of the CPU to guests. Add definitions for the hcall
number, flags and a wrapper function.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
[Balbir fixed conflicts in backport]
Signed-off-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 331b057d

arch/powerpc/include/asm/hvcall.h

+17 −0
Original line number Diff line number Diff line
@@ -240,6 +240,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
@@ -306,6 +307,17 @@ 
#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE	3

#define H_SET_MODE_RESOURCE_LE			4



/* 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



#ifndef __ASSEMBLY__



/**
@@ -433,6 +445,11 @@ static inline unsigned long cmo_get_page_size(void) 
}

#endif /* CONFIG_PPC_PSERIES */



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
@@ -340,4 +340,18 @@ static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawr 
	return plpar_set_mode(0, H_SET_MODE_RESOURCE_SET_DAWR, dawr0, dawrx0);

}



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 */