Index: sys/arm64/arm64/pmap.c
===================================================================
--- sys/arm64/arm64/pmap.c
+++ sys/arm64/arm64/pmap.c
@@ -1255,8 +1255,7 @@
 	vm_offset_t off;
 	vm_page_t m;
 	int lvl;
-
-	PMAP_ASSERT_STAGE1(pmap);
+	bool wire;
 
 	m = NULL;
 	PMAP_LOCK(pmap);
@@ -1271,8 +1270,19 @@
 		    (lvl < 3 && (tpte & ATTR_DESCR_MASK) == L1_BLOCK),
 		    ("pmap_extract_and_hold: Invalid pte at L%d: %lx", lvl,
 		     tpte & ATTR_DESCR_MASK));
-		if (((tpte & ATTR_S1_AP_RW_BIT) == ATTR_S1_AP(ATTR_S1_AP_RW)) ||
-		    ((prot & VM_PROT_WRITE) == 0)) {
+
+		wire = false;
+		if ((prot & VM_PROT_WRITE) == 0)
+			wire = true;
+		else if (pmap->pm_stage == PM_STAGE1 &&
+		    (tpte & ATTR_S1_AP_RW_BIT) == ATTR_S1_AP(ATTR_S1_AP_RW))
+			wire = true;
+		else if (pmap->pm_stage == PM_STAGE2 &&
+		    ((tpte & ATTR_S2_S2AP(ATTR_S2_S2AP_WRITE)) ==
+		     ATTR_S2_S2AP(ATTR_S2_S2AP_WRITE)))
+			wire = true;
+
+		if (wire) {
 			switch(lvl) {
 			case 1:
 				off = va & L1_OFFSET;