svn commit: r368445 - head/sys/arm64/arm64

Andrew Turner andrew at FreeBSD.org
Tue Dec 8 15:51:13 UTC 2020


Author: andrew
Date: Tue Dec  8 15:51:05 2020
New Revision: 368445
URL: https://svnweb.freebsd.org/changeset/base/368445

Log:
  Use a macro to find the offset of kern_ttbr0
  
  Rather than hard coding the offset of kern_ttbr0 within arm64_bootparams
  use a macro like the other fields.
  
  Sponsored by:	Innovate UK

Modified:
  head/sys/arm64/arm64/genassym.c
  head/sys/arm64/arm64/locore.S

Modified: head/sys/arm64/arm64/genassym.c
==============================================================================
--- head/sys/arm64/arm64/genassym.c	Tue Dec  8 15:41:18 2020	(r368444)
+++ head/sys/arm64/arm64/genassym.c	Tue Dec  8 15:51:05 2020	(r368445)
@@ -45,6 +45,7 @@ ASSYM(BP_KERN_L1PT, offsetof(struct arm64_bootparams, 
 ASSYM(BP_KERN_DELTA, offsetof(struct arm64_bootparams, kern_delta));
 ASSYM(BP_KERN_STACK, offsetof(struct arm64_bootparams, kern_stack));
 ASSYM(BP_KERN_L0PT, offsetof(struct arm64_bootparams, kern_l0pt));
+ASSYM(BP_KERN_TTBR0, offsetof(struct arm64_bootparams, kern_ttbr0));
 ASSYM(BP_BOOT_EL, offsetof(struct arm64_bootparams, boot_el));
 
 ASSYM(TDF_ASTPENDING, TDF_ASTPENDING);

Modified: head/sys/arm64/arm64/locore.S
==============================================================================
--- head/sys/arm64/arm64/locore.S	Tue Dec  8 15:41:18 2020	(r368444)
+++ head/sys/arm64/arm64/locore.S	Tue Dec  8 15:51:05 2020	(r368445)
@@ -166,8 +166,8 @@ virtdone:
 	adr	x25, initstack
 	str	x25, [x0, #BP_KERN_STACK]
 	str	x24, [x0, #BP_KERN_L0PT]
+	str	x27, [x0, #BP_KERN_TTBR0]
 	str	x23, [x0, #BP_BOOT_EL]
-	str	x27, [x0, 40]	/* kern_ttbr0 */
 
 	/* trace back starts here */
 	mov	fp, #0


More information about the svn-src-head mailing list