From 033aea1f46af1feb86552e90de8a75392cb3c7e3 Mon Sep 17 00:00:00 2001
From: andrew <andrew@FreeBSD.org>
Date: Sat, 17 Oct 2015 19:52:17 +0000
Subject: [PATCH] Replace build_section_pagetable with build_l1_block_pagetable
 as it takes an extra argument to specify the number of 1GiB pages to map.
 This should be a nop as we are only mapping a single page, but when we move
 to use an extra level of page tables we will be able to map a second block,
 e.g. if the kernel was loaded over a 1GiB boundary.

---
 sys/arm64/arm64/locore.S | 82 ++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 33 deletions(-)

diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index 7226d9d39c4a..204306d063c8 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -379,7 +379,8 @@ create_pagetables:
 	mov	x7, #DEVICE_MEM
 	mov	x8, #(SOCDEV_VA)	/* VA start */
 	mov	x9, #(SOCDEV_PA)	/* PA start */
-	bl	build_section_pagetable
+	mov	x10, #1
+	bl	build_l1_block_pagetable
 #endif
 
 	/* Create the VA = PA map */
@@ -387,47 +388,18 @@ create_pagetables:
 	mov	x7, #NORMAL_UNCACHED /* Uncached as it's only needed early on */
 	mov	x9, x27
 	mov	x8, x9		/* VA start (== PA start) */
-	bl	build_section_pagetable
+	mov	x10, #1
+	bl	build_l1_block_pagetable
 
 	/* Restore the Link register */
 	mov	x30, x5
 	ret
 
-/*
- * Builds a 1 GiB page table entry
- *  x6 = L1 table
- *  x7 = Type (0 = Device, 1 = Normal)
- *  x8 = VA start
- *  x9 = PA start (trashed)
- *  x11, x12 and x13 are trashed
- */
-build_section_pagetable:
-	/*
-	 * Build the L1 table entry.
-	 */
-	/* Find the table index */
-	lsr	x11, x8, #L1_SHIFT
-	and	x11, x11, #Ln_ADDR_MASK
-
-	/* Build the L1 block entry */
-	lsl	x12, x7, #2
-	orr	x12, x12, #L1_BLOCK
-	orr	x12, x12, #(ATTR_AF)
-
-	/* Only use the output address bits */
-	lsr	x9, x9, #L1_SHIFT
-	orr	x12, x12, x9, lsl #L1_SHIFT
-
-	/* Store the entry */
-	str	x12, [x6, x11, lsl #3]
-
-	ret
-
 /*
  * Builds an L1 -> L2 table descriptor
  *
  * This is a link for a 1GiB block of memory with up to 2MiB regions mapped
- * within it by build_l1_block_pagetable.
+ * within it by build_l2_block_pagetable.
  *
  *  x6  = L1 table
  *  x8  = Virtual Address
@@ -454,6 +426,50 @@ link_l1_pagetable:
 
 	ret
 
+/*
+ * Builds count 1 GiB page table entry
+ *  x6  = L1 table
+ *  x7  = Type (0 = Device, 1 = Normal)
+ *  x8  = VA start
+ *  x9  = PA start (trashed)
+ *  x10 = Entry count (TODO)
+ *  x11, x12 and x13 are trashed
+ */
+build_l1_block_pagetable:
+	/*
+	 * Build the L1 table entry.
+	 */
+	/* Find the table index */
+	lsr	x11, x8, #L1_SHIFT
+	and	x11, x11, #Ln_ADDR_MASK
+
+	/* Build the L1 block entry */
+	lsl	x12, x7, #2
+	orr	x12, x12, #L1_BLOCK
+	orr	x12, x12, #(ATTR_AF)
+#ifdef SMP
+	orr	x12, x12, ATTR_SH(ATTR_SH_IS)
+#endif
+
+	/* Only use the output address bits */
+	lsr	x9, x9, #L1_SHIFT
+
+	/* Set the physical address for this virtual address */
+1:	orr	x12, x12, x9, lsl #L1_SHIFT
+
+	/* Store the entry */
+	str	x12, [x6, x11, lsl #3]
+
+	/* Clear the address bits */
+	and	x12, x12, #ATTR_MASK_L
+
+	sub	x10, x10, #1
+	add	x11, x11, #1
+	add	x9, x9, #1
+	cbnz	x10, 1b
+
+2:	ret
+
 /*
  * Builds count 2 MiB page table entry
  *  x6  = L2 table