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

Commit 1c6f8fea authored by Mark Rutland's avatar Mark Rutland Committed by Amit Pundir
Browse files

UPSTREAM: arm64: add macro to extract ESR_ELx.EC 



Several places open-code extraction of the EC field from an ESR_ELx
value, in subtly different ways. This is unfortunate duplication and
variation, and the precise logic used to extract the field is a
distraction.

This patch adds a new macro, ESR_ELx_EC(), to extract the EC field from
an ESR_ELx value in a consistent fashion.

Existing open-coded extractions in core arm64 code are moved over to the
new helper. KVM code is left as-is for the moment.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarHuang Shijie <shijie.huang@arm.com>
Cc: Dave P Martin <dave.martin@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>

Bug: 31432001
Change-Id: Ib634a4795277d243fce5dd30b139e2ec1465bee9
(cherry picked from commit 275f344bec51e9100bae81f3cc8c6940bbfb24c0)
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 7d278a36

arch/arm64/include/asm/esr.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 


#define ESR_ELx_EC_SHIFT	(26)

#define ESR_ELx_EC_MASK		(UL(0x3F) << ESR_ELx_EC_SHIFT)

#define ESR_ELx_EC(esr)		(((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT)



#define ESR_ELx_IL		(UL(1) << 25)

#define ESR_ELx_ISS_MASK	(ESR_ELx_IL - 1)

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static const char *esr_class_str[] = { 


const char *esr_get_class_string(u32 esr)

{

	return esr_class_str[esr >> ESR_ELx_EC_SHIFT];

	return esr_class_str[ESR_ELx_EC(esr)];

}



/*

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ out: 


static inline int permission_fault(unsigned int esr)

{

	unsigned int ec       = (esr & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT;

	unsigned int ec       = ESR_ELx_EC(esr);

	unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;



	return (ec == ESR_ELx_EC_DABT_CUR && fsc_type == ESR_ELx_FSC_PERM);