openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/pseries: Generalize hcall_vphn() 

H_HOME_NODE_ASSOCIATIVITY hcall can take two different flags and return
different associativity information in each case. Generalize the
existing hcall_vphn() function to take flags as an argument and to
return the result. Update the only existing user to pass the proper
arguments.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Naveen N. Rao 2019-07-03 22:33:58 +05:30 committed by Michael Ellerman
parent 06220d78f2
commit ef34e0efa2
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/mm/book3s64/vphn.h
View File

@ -11,6 +11,14 @@
*/ */
#define VPHN_ASSOC_BUFSIZE (VPHN_REGISTER_COUNT*sizeof(u64)/sizeof(u16) + 1) #define VPHN_ASSOC_BUFSIZE (VPHN_REGISTER_COUNT*sizeof(u64)/sizeof(u16) + 1)
/*
* The H_HOME_NODE_ASSOCIATIVITY hcall takes two values for flags:
* 1 for retrieving associativity information for a guest cpu
* 2 for retrieving associativity information for a host/hypervisor cpu
*/
#define VPHN_FLAG_VCPU 1
#define VPHN_FLAG_PCPU 2
extern int vphn_unpack_associativity(const long *packed, __be32 *unpacked); extern int vphn_unpack_associativity(const long *packed, __be32 *unpacked);
#endif #endif

27
arch/powerpc/mm/numa.c
View File

@ -1087,6 +1087,17 @@ static void reset_topology_timer(void);
static int topology_timer_secs = 1; static int topology_timer_secs = 1;
static int topology_inited; static int topology_inited;
static long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity)
{
long rc;
long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
rc = plpar_hcall9(H_HOME_NODE_ASSOCIATIVITY, retbuf, flags, cpu);
vphn_unpack_associativity(retbuf, associativity);
return rc;
}
/* /*
* Change polling interval for associativity changes. * Change polling interval for associativity changes.
*/ */
@ -1165,25 +1176,13 @@ static int update_cpu_associativity_changes_mask(void)
* Retrieve the new associativity information for a virtual processor's * Retrieve the new associativity information for a virtual processor's
* home node. * home node.
*/ */
static long hcall_vphn(unsigned long cpu, __be32 *associativity)
{
long rc;
long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
u64 flags = 1;
int hwcpu = get_hard_smp_processor_id(cpu);
rc = plpar_hcall9(H_HOME_NODE_ASSOCIATIVITY, retbuf, flags, hwcpu);
vphn_unpack_associativity(retbuf, associativity);
return rc;
}
static long vphn_get_associativity(unsigned long cpu, static long vphn_get_associativity(unsigned long cpu,
__be32 *associativity) __be32 *associativity)
{ {
long rc; long rc;
rc = hcall_vphn(cpu, associativity); rc = hcall_vphn(get_hard_smp_processor_id(cpu),
VPHN_FLAG_VCPU, associativity);
switch (rc) { switch (rc) {
case H_FUNCTION: case H_FUNCTION: