Merge branch 'kvm-ppc-next' of... (6d5315b3) · Commits · e / devices / android_kernel_teracube_2e

arch/powerpc/include/asm/hmi.h

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Hypervisor Maintenance Interrupt header file.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program.
		*
		* Copyright 2015 IBM Corporation
		* Author: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
		*/

		#ifndef __ASM_PPC64_HMI_H__
		#define __ASM_PPC64_HMI_H__

		#ifdef CONFIG_PPC_BOOK3S_64

		#define CORE_TB_RESYNC_REQ_BIT 63
		#define MAX_SUBCORE_PER_CORE 4

		/*
		* sibling_subcore_state structure is used to co-ordinate all threads
		* during HMI to avoid TB corruption. This structure is allocated once
		* per each core and shared by all threads on that core.
		*/
		struct sibling_subcore_state {
		unsigned long flags;
		u8 in_guest[MAX_SUBCORE_PER_CORE];
		};

		extern void wait_for_subcore_guest_exit(void);
		extern void wait_for_tb_resync(void);
		#else
		static inline void wait_for_subcore_guest_exit(void) { }
		static inline void wait_for_tb_resync(void) { }
		#endif
		#endif /* __ASM_PPC64_HMI_H__ */

arch/powerpc/include/asm/paca.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
		#include <asm/kvm_book3s_asm.h>
		#endif
		#include <asm/hmi.h>

		register struct paca_struct *local_paca asm("r13");

		@@ -181,6 +182,11 @@ struct paca_struct {
		*/
		u16 in_mce;
		u8 hmi_event_available; /* HMI event is available */
		/*
		* Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for
		* more details
		*/
		struct sibling_subcore_state *sibling_subcore_state;
		#endif

		/* Stuff for accurate time accounting */

arch/powerpc/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ obj-$(CONFIG_VDSO32) += vdso32/
		obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
		obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o
		obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o
		obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o
		obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o hmi.o
		obj64-$(CONFIG_RELOCATABLE) += reloc_64.o
		obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o
		obj-$(CONFIG_PPC64) += vdso64/

arch/powerpc/kernel/exceptions-64s.S

+3 −1

Original line number	Diff line number	Diff line
		@@ -680,6 +680,8 @@ _GLOBAL(__replay_interrupt)
		BEGIN_FTR_SECTION
		cmpwi r3,0xe80
		beq h_doorbell_common
		cmpwi r3,0xe60
		beq hmi_exception_common
		FTR_SECTION_ELSE
		cmpwi r3,0xa00
		beq doorbell_super_common
		@@ -1172,7 +1174,7 @@ fwnmi_data_area:

		.globl hmi_exception_early
		hmi_exception_early:
		EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, 0xe60)
		EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST, 0xe62)
		mr r10,r1 /* Save r1 */
		ld r1,PACAEMERGSP(r13) /* Use emergency stack */
		subi r1,r1,INT_FRAME_SIZE /* alloc stack frame */

arch/powerpc/kernel/hmi.c

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Hypervisor Maintenance Interrupt (HMI) handling.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program.
		*
		* Copyright 2015 IBM Corporation
		* Author: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
		*/

		#undef DEBUG

		#include <linux/types.h>
		#include <linux/compiler.h>
		#include <asm/paca.h>
		#include <asm/hmi.h>

		void wait_for_subcore_guest_exit(void)
		{
		int i;

		/*
		* NULL bitmap pointer indicates that KVM module hasn't
		* been loaded yet and hence no guests are running.
		* If no KVM is in use, no need to co-ordinate among threads
		* as all of them will always be in host and no one is going
		* to modify TB other than the opal hmi handler.
		* Hence, just return from here.
		*/
		if (!local_paca->sibling_subcore_state)
		return;

		for (i = 0; i < MAX_SUBCORE_PER_CORE; i++)
		while (local_paca->sibling_subcore_state->in_guest[i])
		cpu_relax();
		}

		void wait_for_tb_resync(void)
		{
		if (!local_paca->sibling_subcore_state)
		return;

		while (test_bit(CORE_TB_RESYNC_REQ_BIT,
		&local_paca->sibling_subcore_state->flags))
		cpu_relax();
		}