arm64: add macro to extract ESR_ELx.EC

mrutland-arm · ctmarinas · commit 275f344bec51 · 2016-06-21T17:07:09.000+01:00
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: Mark Rutland &lt;mark.rutland@arm.com&gt;
Tested-by: Huang Shijie &lt;shijie.huang@arm.com&gt;
Cc: Dave P Martin &lt;dave.martin@arm.com&gt;
Cc: James Morse &lt;james.morse@arm.com&gt;
Cc: Marc Zyngier &lt;marc.zyngier@arm.com&gt;
Cc: Will Deacon &lt;will.deacon@arm.com&gt;
Signed-off-by: Catalin Marinas &lt;catalin.marinas@arm.com&gt;
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
@@ -74,6 +74,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)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
@@ -456,7 +456,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)];
 }
 
 /*
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
@@ -244,7 +244,7 @@ static int __do_page_fault(struct mm_struct *mm, unsigned long addr,
 
 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);

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ static const char *esr_class_str[] = {`
`456`	`456`
`457`	`457`	`const char *esr_get_class_string(u32 esr)`
`458`	`458`	`{`
`459`		`- return esr_class_str[esr >> ESR_ELx_EC_SHIFT];`
	`459`	`+ return esr_class_str[ESR_ELx_EC(esr)];`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ static int __do_page_fault(struct mm_struct *mm, unsigned long addr,`
`244`	`244`
`245`	`245`	`static inline int permission_fault(unsigned int esr)`
`246`	`246`	`{`
`247`		`- unsigned int ec = (esr & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT;`
	`247`	`+ unsigned int ec = ESR_ELx_EC(esr);`
`248`	`248`	`unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;`
`249`	`249`
`250`	`250`	`return (ec == ESR_ELx_EC_DABT_CUR && fsc_type == ESR_ELx_FSC_PERM);`