diff --git a/kernel/init/boot/boot.h b/kernel/init/boot/boot.h
index 45a7c3d6..f76be84e 100644
--- a/kernel/init/boot/boot.h
+++ b/kernel/init/boot/boot.h
@@ -45,7 +45,7 @@
 #define SBIT_SIZE 0
 #else
 #define BOOT_TLBLO ((1 << BOOT_TLB_PGSIZE) | (BOOT_CACHE_ATTR << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
-#define BOOT_TLBLO_DEV ((1 << SIZE_1M) | (DEVICE_TYPE << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
+#define BOOT_TLBLO_DEV ((1 << SIZE_4M) | (DEVICE_TYPE << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
 #define BOOT_TLBLO_ANGEL ((1 << SIZE_4K) | (DEVICE_TYPE << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
 #define SBIT_SIZE 1
 #endif
diff --git a/kernel/init/boot/boot.ref.S b/kernel/init/boot/boot.ref.S
index 2ed83d78..d98a2e7d 100644
--- a/kernel/init/boot/boot.ref.S
+++ b/kernel/init/boot/boot.ref.S
@@ -25,8 +25,8 @@
 
 #define MAKE_TLBLO_DEV(DST,SRCVAL,TMPREG) \
 	SETCONST(DST,BOOT_TLBLO_DEV) ; \
-	TMPREG = lsr(SRCVAL, #  BOOT_TLB_OFFSET_BITS_1M); \
-	DST |= asl(TMPREG, #  BOOT_TLB_SHIFT_1M + SBIT_SIZE);
+	TMPREG = lsr(SRCVAL, #  BOOT_TLB_OFFSET_BITS_4M); \
+	DST |= asl(TMPREG, #  BOOT_TLB_SHIFT_4M + SBIT_SIZE);
 
 #define MAKE_TLBLO_ANGEL(DST,SRCVAL,TMPREG) \
 	SETCONST(DST,BOOT_TLBLO_ANGEL) ; \
@@ -427,7 +427,7 @@ boot_continuation:
 	if (!p0) jump:t .Ltlb_init
 
 	// entry for L2 interrupt controller
-	MAKE_TLBHI(TLB_HI, Q6_SS_BASE_VA, BOOT_TLB_OFFSET_BITS_1M, BOOT_TLB_SHIFT_1M)
+	MAKE_TLBHI(TLB_HI, Q6_SS_BASE_VA, BOOT_TLB_OFFSET_BITS_4M, BOOT_TLB_SHIFT_4M)
 	// SS_BASE == SSBASE (PRIV_BASE)
 	// apply offet to get PUB_BASE
 	SS_BASE = add(SS_BASE, ##-QDSP6SS_PUB_PRIV_OFFSET)
diff --git a/kernel/util/max/max.h b/kernel/util/max/max.h
index 9c187bf9..d56a46ec 100644
--- a/kernel/util/max/max.h
+++ b/kernel/util/max/max.h
@@ -95,7 +95,7 @@
 	 map QDSP6SS_PUB_BASE to Q6_SS_BASE_VA so we can get at the public registers.
 	 FIXME? Is the QDSP6SS_PUB_PRIV_OFFSET the same for all subsystems? */
 
-#define DEVICE_PAGE_SIZE SIZE_1M
+#define DEVICE_PAGE_SIZE SIZE_4M
 
 #define Q6_SS_BASE_VA 0xffc00000  // leaves at most 4M for tmpmap at 0xff800000
 #define QDSP6SS_PUB_PRIV_OFFSET 0x80000