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

powerpc/pseries: Move VPHN constants into vphn.h 



These don't have any particularly good reason to belong in lppaca.h,
move them into their own header.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230823055317.751786-1-mpe@ellerman.id.au
parent fe329452

arch/powerpc/include/asm/lppaca.h

+0 −22
Original line number Original line Diff line number Diff line
@@ -6,28 +6,6 @@ 
#ifndef _ASM_POWERPC_LPPACA_H

#ifndef _ASM_POWERPC_LPPACA_H

#define _ASM_POWERPC_LPPACA_H

#define _ASM_POWERPC_LPPACA_H





/*

 * The below VPHN macros are outside the __KERNEL__ check since these are

 * used for compiling the vphn selftest in userspace

 */



/* The H_HOME_NODE_ASSOCIATIVITY h_call returns 6 64-bit registers. */

#define VPHN_REGISTER_COUNT 6



/*

 * 6 64-bit registers unpacked into up to 24 be32 associativity values. To

 * form the complete property we have to add the length in the first cell.

 */

#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



#ifdef __KERNEL__

#ifdef __KERNEL__





/*

/*

arch/powerpc/include/asm/vphn.h

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _ASM_POWERPC_VPHN_H

#define _ASM_POWERPC_VPHN_H



/* The H_HOME_NODE_ASSOCIATIVITY h_call returns 6 64-bit registers. */

#define VPHN_REGISTER_COUNT 6



/*

 * 6 64-bit registers unpacked into up to 24 be32 associativity values. To

 * form the complete property we have to add the length in the first cell.

 */

#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



#endif // _ASM_POWERPC_VPHN_H

arch/powerpc/mm/numa.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/hvcall.h>

#include <asm/hvcall.h>

#include <asm/setup.h>

#include <asm/setup.h>

#include <asm/vdso.h>

#include <asm/vdso.h>

#include <asm/vphn.h>

#include <asm/drmem.h>

#include <asm/drmem.h>





static int numa_enabled = 1;

static int numa_enabled = 1;

arch/powerpc/platforms/pseries/lpar.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/kexec.h>

#include <asm/kexec.h>

#include <asm/fadump.h>

#include <asm/fadump.h>

#include <asm/dtl.h>

#include <asm/dtl.h>

#include <asm/vphn.h>





#include "pseries.h"

#include "pseries.h"

arch/powerpc/platforms/pseries/vas.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/hvcall.h>

#include <asm/hvcall.h>

#include <asm/plpar_wrappers.h>

#include <asm/plpar_wrappers.h>

#include <asm/firmware.h>

#include <asm/firmware.h>

#include <asm/vphn.h>

#include <asm/vas.h>

#include <asm/vas.h>

#include "vas.h"

#include "vas.h"