powerpc/pseries: Move mm/book3s64/vphn.c under platforms/pseries/ (5a1ea477) · Commits · 戴 / test

arch/powerpc/include/asm/lppaca.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,29 @@
		*/
		#ifndef _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__

		/*
		@@ -179,6 +202,7 @@ extern void (dtl_consumer)(struct dtl_entry entry, u64 index);

		extern void register_dtl_buffer(int cpu);
		extern void alloc_dtl_buffers(void);
		extern long hcall_vphn(unsigned long cpu, u64 flags, __be32 *associativity);

		#endif /* CONFIG_PPC_BOOK3S */
		#endif /* __KERNEL__ */

+0 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ obj-$(CONFIG_PPC_NATIVE) += hash_native.o
		obj-$(CONFIG_PPC_RADIX_MMU) += radix_pgtable.o radix_tlb.o
		obj-$(CONFIG_PPC_4K_PAGES) += hash_4k.o
		obj-$(CONFIG_PPC_64K_PAGES) += hash_64k.o
		obj-$(CONFIG_PPC_SPLPAR) += vphn.o
		obj-$(CONFIG_HUGETLB_PAGE) += hash_hugetlbpage.o
		ifdef CONFIG_HUGETLB_PAGE
		obj-$(CONFIG_PPC_RADIX_MMU) += radix_hugetlbpage.o

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef _ARCH_POWERPC_MM_VPHN_H_
		#define _ARCH_POWERPC_MM_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

		extern int vphn_unpack_associativity(const long packed, __be32 unpacked);

		#endif

+0 −14

Original line number	Diff line number	Diff line
		@@ -1067,9 +1067,6 @@ u64 memory_hotplug_max(void)

		/* Virtual Processor Home Node (VPHN) support */
		#ifdef CONFIG_PPC_SPLPAR

		#include "book3s64/vphn.h"

		struct topology_update_data {
		struct topology_update_data *next;
		unsigned int cpu;
		@@ -1087,17 +1084,6 @@ static void reset_topology_timer(void);
		static int topology_timer_secs = 1;
		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.
		*/

+1 −0