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

Commit 2e47d3e6 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: change irq functions to accomodate 64-bit 



This patch changes the irq handling function definitions
in paravirt.h (like raw_local_irq_disable) to accomodate for x86_64.
The differences are in the calling convention.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6057fc82

include/asm-x86/paravirt.h

+30 −13
Original line number Diff line number Diff line
@@ -1085,52 +1085,68 @@ struct paravirt_patch_site { 
extern struct paravirt_patch_site __parainstructions[],

	__parainstructions_end[];



#ifdef CONFIG_X86_32

#define PV_SAVE_REGS "pushl %%ecx; pushl %%edx;"

#define PV_RESTORE_REGS "popl %%edx; popl %%ecx"

#define PV_FLAGS_ARG "0"

#define PV_EXTRA_CLOBBERS

#define PV_VEXTRA_CLOBBERS

#else

/* We save some registers, but all of them, that's too much. We clobber all

 * caller saved registers but the argument parameter */

#define PV_SAVE_REGS "pushq %%rdi;"

#define PV_RESTORE_REGS "popq %%rdi;"

#define PV_EXTRA_CLOBBERS EXTRA_CLOBBERS, "rcx" , "rdx"

#define PV_VEXTRA_CLOBBERS EXTRA_CLOBBERS, "rdi", "rcx" , "rdx"

#define PV_FLAGS_ARG "D"

#endif



static inline unsigned long __raw_local_save_flags(void)

{

	unsigned long f;



	asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"

	asm volatile(paravirt_alt(PV_SAVE_REGS

				  PARAVIRT_CALL

				  "popl %%edx; popl %%ecx")

				  PV_RESTORE_REGS)

		     : "=a"(f)

		     : paravirt_type(pv_irq_ops.save_fl),

		       paravirt_clobber(CLBR_EAX)

		     : "memory", "cc");

		     : "memory", "cc" PV_VEXTRA_CLOBBERS);

	return f;

}



static inline void raw_local_irq_restore(unsigned long f)

{

	asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"

	asm volatile(paravirt_alt(PV_SAVE_REGS

				  PARAVIRT_CALL

				  "popl %%edx; popl %%ecx")

				  PV_RESTORE_REGS)

		     : "=a"(f)

		     : "0"(f),

		     : PV_FLAGS_ARG(f),

		       paravirt_type(pv_irq_ops.restore_fl),

		       paravirt_clobber(CLBR_EAX)

		     : "memory", "cc");

		     : "memory", "cc" PV_EXTRA_CLOBBERS);

}



static inline void raw_local_irq_disable(void)

{

	asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"

	asm volatile(paravirt_alt(PV_SAVE_REGS

				  PARAVIRT_CALL

				  "popl %%edx; popl %%ecx")

				  PV_RESTORE_REGS)

		     :

		     : paravirt_type(pv_irq_ops.irq_disable),

		       paravirt_clobber(CLBR_EAX)

		     : "memory", "eax", "cc");

		     : "memory", "eax", "cc" PV_EXTRA_CLOBBERS);

}



static inline void raw_local_irq_enable(void)

{

	asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"

	asm volatile(paravirt_alt(PV_SAVE_REGS

				  PARAVIRT_CALL

				  "popl %%edx; popl %%ecx")

				  PV_RESTORE_REGS)

		     :

		     : paravirt_type(pv_irq_ops.irq_enable),

		       paravirt_clobber(CLBR_EAX)

		     : "memory", "eax", "cc");

		     : "memory", "eax", "cc" PV_EXTRA_CLOBBERS);

}



static inline unsigned long __raw_local_irq_save(void)
@@ -1205,6 +1221,7 @@ static inline unsigned long __raw_local_irq_save(void) 
		  CLBR_NONE,						\

		  jmp *%cs:pv_cpu_ops+PV_CPU_irq_enable_syscall_ret)





#ifdef CONFIG_X86_32

#define GET_CR0_INTO_EAX			\

	push %ecx; push %edx;			\