powerpc/processor: Move cpu_relax() into asm/vdso/processor.h (8f8cffd9) · Commits · 戴 / test

arch/powerpc/include/asm/processor.h

+2 −11

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		* Copyright (C) 2001 PPC 64 Team, IBM Corp
		*/

		#include <vdso/processor.h>

		#include <asm/reg.h>

		#ifdef CONFIG_VSX
		@@ -63,14 +65,6 @@ extern int _chrp_type;

		#endif /* defined(__KERNEL__) && defined(CONFIG_PPC32) */

		/* Macros for adjusting thread priority (hardware multi-threading) */
		#define HMT_very_low() asm volatile("or 31,31,31 # very low priority")
		#define HMT_low() asm volatile("or 1,1,1 # low priority")
		#define HMT_medium_low() asm volatile("or 6,6,6 # medium low priority")
		#define HMT_medium() asm volatile("or 2,2,2 # medium priority")
		#define HMT_medium_high() asm volatile("or 5,5,5 # medium high priority")
		#define HMT_high() asm volatile("or 3,3,3 # high priority")

		#ifdef __KERNEL__

		#ifdef CONFIG_PPC64
		@@ -344,7 +338,6 @@ static inline unsigned long __pack_fe01(unsigned int fpmode)
		}

		#ifdef CONFIG_PPC64
		#define cpu_relax() do { HMT_low(); HMT_medium(); barrier(); } while (0)

		#define spin_begin() HMT_low()

		@@ -363,8 +356,6 @@ do { \
		} \
		} while (0)

		#else
		#define cpu_relax() barrier()
		#endif

		/* Check that a certain kernel stack pointer is valid in task_struct p */

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		#ifndef _ASM_POWERPC_VDSO_PROCESSOR_H
		#define _ASM_POWERPC_VDSO_PROCESSOR_H

		#ifndef __ASSEMBLY__

		/* Macros for adjusting thread priority (hardware multi-threading) */
		#define HMT_very_low() asm volatile("or 31, 31, 31 # very low priority")
		#define HMT_low() asm volatile("or 1, 1, 1 # low priority")
		#define HMT_medium_low() asm volatile("or 6, 6, 6 # medium low priority")
		#define HMT_medium() asm volatile("or 2, 2, 2 # medium priority")
		#define HMT_medium_high() asm volatile("or 5, 5, 5 # medium high priority")
		#define HMT_high() asm volatile("or 3, 3, 3 # high priority")

		#ifdef CONFIG_PPC64
		#define cpu_relax() do { HMT_low(); HMT_medium(); barrier(); } while (0)
		#else
		#define cpu_relax() barrier()
		#endif

		#endif /* __ASSEMBLY__ */

		#endif /* _ASM_POWERPC_VDSO_PROCESSOR_H */