Commit 0616ea3f authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge branch 'for-next/esr-elx-64-bit' into for-next/core 

* for-next/esr-elx-64-bit:
  : Treat ESR_ELx as a 64-bit register.
  KVM: arm64: uapi: Add kvm_debug_exit_arch.hsr_high
  KVM: arm64: Treat ESR_EL2 as a 64-bit register
  arm64: Treat ESR_ELx as a 64-bit register
  arm64: compat: Do not treat syscall number as ESR_ELx for a bad syscall
  arm64: Make ESR_ELx_xVC_IMM_MASK compatible with assembly
parents d6fc5db0 18f3976f

Documentation/virt/kvm/api.rst

+2 −0
Original line number Diff line number Diff line
@@ -5713,6 +5713,8 @@ affect the device's behavior. Current defined flags:: 
  #define KVM_RUN_X86_SMM     (1 << 0)

  /* x86, set if bus lock detected in VM */

  #define KVM_RUN_BUS_LOCK    (1 << 1)

  /* arm64, set for KVM_EXIT_DEBUG */

  #define KVM_DEBUG_ARCH_HSR_HIGH_VALID  (1 << 0)



::

arch/arm64/include/asm/debug-monitors.h

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct task_struct; 


struct step_hook {

	struct list_head node;

	int (*fn)(struct pt_regs *regs, unsigned int esr);

	int (*fn)(struct pt_regs *regs, unsigned long esr);

};



void register_user_step_hook(struct step_hook *hook);
@@ -75,7 +75,7 @@ void unregister_kernel_step_hook(struct step_hook *hook); 


struct break_hook {

	struct list_head node;

	int (*fn)(struct pt_regs *regs, unsigned int esr);

	int (*fn)(struct pt_regs *regs, unsigned long esr);

	u16 imm;

	u16 mask; /* These bits are ignored when comparing with imm */

};

arch/arm64/include/asm/esr.h

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
#define ESR_ELx_WFx_ISS_TI	(UL(1) << 0)

#define ESR_ELx_WFx_ISS_WFI	(UL(0) << 0)

#define ESR_ELx_WFx_ISS_WFE	(UL(1) << 0)

#define ESR_ELx_xVC_IMM_MASK	((1UL << 16) - 1)

#define ESR_ELx_xVC_IMM_MASK	((UL(1) << 16) - 1)



#define DISR_EL1_IDS		(UL(1) << 24)

/*
@@ -341,14 +341,14 @@ 
#ifndef __ASSEMBLY__

#include <asm/types.h>



static inline bool esr_is_data_abort(u32 esr)

static inline bool esr_is_data_abort(unsigned long esr)

{

	const u32 ec = ESR_ELx_EC(esr);

	const unsigned long ec = ESR_ELx_EC(esr);



	return ec == ESR_ELx_EC_DABT_LOW || ec == ESR_ELx_EC_DABT_CUR;

}



const char *esr_get_class_string(u32 esr);

const char *esr_get_class_string(unsigned long esr);

#endif /* __ASSEMBLY */



#endif /* __ASM_ESR_H */

arch/arm64/include/asm/exception.h

+15 −15
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#define __exception_irq_entry	__kprobes

#endif



static inline u32 disr_to_esr(u64 disr)

static inline unsigned long disr_to_esr(u64 disr)

{

	unsigned int esr = ESR_ELx_EC_SERROR << ESR_ELx_EC_SHIFT;

	unsigned long esr = ESR_ELx_EC_SERROR << ESR_ELx_EC_SHIFT;



	if ((disr & DISR_EL1_IDS) == 0)

		esr |= (disr & DISR_EL1_ESR_MASK);
@@ -57,24 +57,24 @@ asmlinkage void call_on_irq_stack(struct pt_regs *regs, 
				  void (*func)(struct pt_regs *));

asmlinkage void asm_exit_to_user_mode(struct pt_regs *regs);



void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs);

void do_mem_abort(unsigned long far, unsigned long esr, struct pt_regs *regs);

void do_undefinstr(struct pt_regs *regs);

void do_bti(struct pt_regs *regs);

void do_debug_exception(unsigned long addr_if_watchpoint, unsigned int esr,

void do_debug_exception(unsigned long addr_if_watchpoint, unsigned long esr,

			struct pt_regs *regs);

void do_fpsimd_acc(unsigned int esr, struct pt_regs *regs);

void do_sve_acc(unsigned int esr, struct pt_regs *regs);

void do_sme_acc(unsigned int esr, struct pt_regs *regs);

void do_fpsimd_exc(unsigned int esr, struct pt_regs *regs);

void do_sysinstr(unsigned int esr, struct pt_regs *regs);

void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);

void bad_el0_sync(struct pt_regs *regs, int reason, unsigned int esr);

void do_cp15instr(unsigned int esr, struct pt_regs *regs);

void do_fpsimd_acc(unsigned long esr, struct pt_regs *regs);

void do_sve_acc(unsigned long esr, struct pt_regs *regs);

void do_sme_acc(unsigned long esr, struct pt_regs *regs);

void do_fpsimd_exc(unsigned long esr, struct pt_regs *regs);

void do_sysinstr(unsigned long esr, struct pt_regs *regs);

void do_sp_pc_abort(unsigned long addr, unsigned long esr, struct pt_regs *regs);

void bad_el0_sync(struct pt_regs *regs, int reason, unsigned long esr);

void do_cp15instr(unsigned long esr, struct pt_regs *regs);

void do_el0_svc(struct pt_regs *regs);

void do_el0_svc_compat(struct pt_regs *regs);

void do_ptrauth_fault(struct pt_regs *regs, unsigned int esr);

void do_serror(struct pt_regs *regs, unsigned int esr);

void do_ptrauth_fault(struct pt_regs *regs, unsigned long esr);

void do_serror(struct pt_regs *regs, unsigned long esr);

void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags);



void panic_bad_stack(struct pt_regs *regs, unsigned int esr, unsigned long far);

void panic_bad_stack(struct pt_regs *regs, unsigned long esr, unsigned long far);

#endif	/* __ASM_EXCEPTION_H */

arch/arm64/include/asm/kvm_emulate.h

+3 −3
Original line number Diff line number Diff line
@@ -235,14 +235,14 @@ static inline bool vcpu_mode_priv(const struct kvm_vcpu *vcpu) 
	return mode != PSR_MODE_EL0t;

}



static __always_inline u32 kvm_vcpu_get_esr(const struct kvm_vcpu *vcpu)

static __always_inline u64 kvm_vcpu_get_esr(const struct kvm_vcpu *vcpu)

{

	return vcpu->arch.fault.esr_el2;

}



static __always_inline int kvm_vcpu_get_condition(const struct kvm_vcpu *vcpu)

{

	u32 esr = kvm_vcpu_get_esr(vcpu);

	u64 esr = kvm_vcpu_get_esr(vcpu);



	if (esr & ESR_ELx_CV)

		return (esr & ESR_ELx_COND_MASK) >> ESR_ELx_COND_SHIFT;
@@ -373,7 +373,7 @@ static __always_inline bool kvm_vcpu_abt_issea(const struct kvm_vcpu *vcpu) 


static __always_inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)

{

	u32 esr = kvm_vcpu_get_esr(vcpu);

	u64 esr = kvm_vcpu_get_esr(vcpu);

	return ESR_ELx_SYS64_ISS_RT(esr);

}