powerpc: Inline doorbell sending functions (1f0ce497) · Commits · 戴 / test

arch/powerpc/include/asm/dbell.h

+61 −3

Original line number	Diff line number	Diff line
		@@ -11,8 +11,10 @@
		#include <linux/smp.h>
		#include <linux/threads.h>

		#include <asm/cputhreads.h>
		#include <asm/ppc-opcode.h>
		#include <asm/feature-fixups.h>
		#include <asm/kvm_ppc.h>

		#define PPC_DBELL_MSG_BRDCAST (0x04000000)
		#define PPC_DBELL_TYPE(x) (((x) & 0xf) << (63-36))
		@@ -87,9 +89,6 @@ static inline void ppc_msgsync(void)

		#endif /* CONFIG_PPC_BOOK3S */

		extern void doorbell_global_ipi(int cpu);
		extern void doorbell_core_ipi(int cpu);
		extern int doorbell_try_core_ipi(int cpu);
		extern void doorbell_exception(struct pt_regs *regs);

		static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)
		@@ -100,4 +99,63 @@ static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)
		_ppc_msgsnd(msg);
		}

		#ifdef CONFIG_SMP

		/*
		* Doorbells must only be used if CPU_FTR_DBELL is available.
		* msgsnd is used in HV, and msgsndp is used in !HV.
		*
		* These should be used by platform code that is aware of restrictions.
		* Other arch code should use ->cause_ipi.
		*
		* doorbell_global_ipi() sends a dbell to any target CPU.
		* Must be used only by architectures that address msgsnd target
		* by PIR/get_hard_smp_processor_id.
		*/
		static inline void doorbell_global_ipi(int cpu)
		{
		u32 tag = get_hard_smp_processor_id(cpu);

		kvmppc_set_host_ipi(cpu);
		/* Order previous accesses vs. msgsnd, which is treated as a store */
		ppc_msgsnd_sync();
		ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
		}

		/*
		* doorbell_core_ipi() sends a dbell to a target CPU in the same core.
		* Must be used only by architectures that address msgsnd target
		* by TIR/cpu_thread_in_core.
		*/
		static inline void doorbell_core_ipi(int cpu)
		{
		u32 tag = cpu_thread_in_core(cpu);

		kvmppc_set_host_ipi(cpu);
		/* Order previous accesses vs. msgsnd, which is treated as a store */
		ppc_msgsnd_sync();
		ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
		}

		/*
		* Attempt to cause a core doorbell if destination is on the same core.
		* Returns 1 on success, 0 on failure.
		*/
		static inline int doorbell_try_core_ipi(int cpu)
		{
		int this_cpu = get_cpu();
		int ret = 0;

		if (cpumask_test_cpu(cpu, cpu_sibling_mask(this_cpu))) {
		doorbell_core_ipi(cpu);
		ret = 1;
		}

		put_cpu();

		return ret;
		}

		#endif /* CONFIG_SMP */

		#endif /* _ASM_POWERPC_DBELL_H */

arch/powerpc/include/asm/kvm_booke.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -89,10 +89,12 @@ static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu)
		return vcpu->arch.regs.nip;
		}

		#ifdef CONFIG_BOOKE
		static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)
		{
		return vcpu->arch.fault_dear;
		}
		#endif

		static inline bool kvmppc_supports_magic_page(struct kvm_vcpu *vcpu)
		{

arch/powerpc/kernel/dbell.c

+0 −55

Original line number	Diff line number	Diff line
		@@ -18,61 +18,6 @@

		#ifdef CONFIG_SMP

		/*
		* Doorbells must only be used if CPU_FTR_DBELL is available.
		* msgsnd is used in HV, and msgsndp is used in !HV.
		*
		* These should be used by platform code that is aware of restrictions.
		* Other arch code should use ->cause_ipi.
		*
		* doorbell_global_ipi() sends a dbell to any target CPU.
		* Must be used only by architectures that address msgsnd target
		* by PIR/get_hard_smp_processor_id.
		*/
		void doorbell_global_ipi(int cpu)
		{
		u32 tag = get_hard_smp_processor_id(cpu);

		kvmppc_set_host_ipi(cpu);
		/* Order previous accesses vs. msgsnd, which is treated as a store */
		ppc_msgsnd_sync();
		ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
		}

		/*
		* doorbell_core_ipi() sends a dbell to a target CPU in the same core.
		* Must be used only by architectures that address msgsnd target
		* by TIR/cpu_thread_in_core.
		*/
		void doorbell_core_ipi(int cpu)
		{
		u32 tag = cpu_thread_in_core(cpu);

		kvmppc_set_host_ipi(cpu);
		/* Order previous accesses vs. msgsnd, which is treated as a store */
		ppc_msgsnd_sync();
		ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
		}

		/*
		* Attempt to cause a core doorbell if destination is on the same core.
		* Returns 1 on success, 0 on failure.
		*/
		int doorbell_try_core_ipi(int cpu)
		{
		int this_cpu = get_cpu();
		int ret = 0;

		if (cpumask_test_cpu(cpu, cpu_sibling_mask(this_cpu))) {
		doorbell_core_ipi(cpu);
		ret = 1;
		}

		put_cpu();

		return ret;
		}

		void doorbell_exception(struct pt_regs *regs)
		{
		struct pt_regs *old_regs = set_irq_regs(regs);

Admin message