Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02e32e36 authored by Isaku Yamahata's avatar Isaku Yamahata Committed by Tony Luck
Browse files

[IA64] pvops: paravirtualize minstate.h. 



paravirtualize minstate.h which are hand written assembly code.
They include sensitive or performance critical privileged
instructions. So that they are appropriate for paravirtualization.

Cc: Keith Owens <kaos@ocs.com.au>
Cc: Akio Takebe <takebe_akio@jp.fujitsu.com>
Signed-off-by: default avatarYaozu (Eddie) Dong <eddie.dong@intel.com>
Signed-off-by: default avatarIsaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent e92e8c68

arch/ia64/kernel/minstate.h

+7 −6
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <asm/cache.h>



#include "entry.h"

#include "paravirt_inst.h"



#ifdef CONFIG_VIRT_CPU_ACCOUNTING

/* read ar.itc in advance, and use it before leaving bank 0 */
@@ -43,16 +44,16 @@ 
 * Note that psr.ic is NOT turned on by this macro.  This is so that

 * we can pass interruption state as arguments to a handler.

 */

#define DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA,WORKAROUND)						\

#define IA64_NATIVE_DO_SAVE_MIN(__COVER,SAVE_IFS,EXTRA,WORKAROUND)				\

	mov r16=IA64_KR(CURRENT);	/* M */							\

	mov r27=ar.rsc;			/* M */							\

	mov r20=r1;			/* A */							\

	mov r25=ar.unat;		/* M */							\

	mov r29=cr.ipsr;		/* M */							\

	MOV_FROM_IPSR(p0,r29);		/* M */							\

	mov r26=ar.pfs;			/* I */							\

	mov r28=cr.iip;			/* M */							\

	MOV_FROM_IIP(r28);			/* M */						\

	mov r21=ar.fpsr;		/* M */							\

	COVER;				/* B;; (or nothing) */					\

	__COVER;				/* B;; (or nothing) */				\

	;;											\

	adds r16=IA64_TASK_THREAD_ON_USTACK_OFFSET,r16;						\

	;;											\
@@ -244,6 +245,6 @@ 
1:						\

	.pred.rel "mutex", pKStk, pUStk



#define SAVE_MIN_WITH_COVER	DO_SAVE_MIN(cover, mov r30=cr.ifs, , RSE_WORKAROUND)

#define SAVE_MIN_WITH_COVER_R19	DO_SAVE_MIN(cover, mov r30=cr.ifs, mov r15=r19, RSE_WORKAROUND)

#define SAVE_MIN_WITH_COVER	DO_SAVE_MIN(COVER, mov r30=cr.ifs, , RSE_WORKAROUND)

#define SAVE_MIN_WITH_COVER_R19	DO_SAVE_MIN(COVER, mov r30=cr.ifs, mov r15=r19, RSE_WORKAROUND)

#define SAVE_MIN			DO_SAVE_MIN(     , mov r30=r0, , )

arch/ia64/kernel/paravirt_inst.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/******************************************************************************

 * linux/arch/ia64/xen/paravirt_inst.h

 *

 * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>

 *                    VA Linux Systems Japan K.K.

 *

 * 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; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 */



#ifdef __IA64_ASM_PARAVIRTUALIZED_XEN

#include <asm/xen/inst.h>

#include <asm/xen/minstate.h>

#else

#include <asm/native/inst.h>

#endif

include/asm-ia64/native/inst.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
 *

 */



#define DO_SAVE_MIN		IA64_NATIVE_DO_SAVE_MIN



#ifdef CONFIG_PARAVIRT_GUEST_ASM_CLOBBER_CHECK

# define PARAVIRT_POISON	0xdeadbeefbaadf00d

# define CLOBBER(clob)				\