Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Jul 2021 13:12:02 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: c0edde302190 - main - Fix the name of the arm64 SCTLR_E0E register
Message-ID:  <202107081312.168DC2dx022308@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=c0edde3021900b80fec4e6360d97ba9d9e50d4fd

commit c0edde3021900b80fec4e6360d97ba9d9e50d4fd
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2021-07-07 23:12:50 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2021-07-07 23:18:04 +0000

    Fix the name of the arm64 SCTLR_E0E register
    
    The character between the E's was the letter O, however in the Arm
    Documentation and XML the character is the number 0 (zero).
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/arm64/arm64/locore.S   | 2 +-
 sys/arm64/include/armreg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index 472a052e9903..a7e0c87bec0e 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -727,7 +727,7 @@ sctlr_set:
 	    SCTLR_M | SCTLR_CP15BEN)
 sctlr_clear:
 	/* Bits to clear */
-	.quad (SCTLR_EE | SCTLR_EOE | SCTLR_IESB | SCTLR_WXN | SCTLR_UMA | \
+	.quad (SCTLR_EE | SCTLR_E0E | SCTLR_IESB | SCTLR_WXN | SCTLR_UMA | \
 	    SCTLR_ITD | SCTLR_A)
 LEND(start_mmu)
 
diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index 8a2bbb60f3d0..58b6c2f637f0 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -831,7 +831,7 @@
 #define	SCTLR_IESB	0x00200000 /* ARMv8.2 */
 /* Bit 22 is reserved */
 #define	SCTLR_SPAN	0x00800000 /* ARMv8.1 */
-#define	SCTLR_EOE	0x01000000
+#define	SCTLR_E0E	0x01000000
 #define	SCTLR_EE	0x02000000
 #define	SCTLR_UCI	0x04000000
 #define	SCTLR_EnDA	0x08000000 /* ARMv8.3 */


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107081312.168DC2dx022308>