diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
index 3a74cf59f5c85fea216f6822b1efe6ddff757f0e..b030bd3dce52c7a1e8836ee26c8c803a50d9a53a 100644
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -1763,6 +1763,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 	if (vma_pagesize == PMD_SIZE ||
 	    (vma_pagesize == PUD_SIZE && kvm_stage2_has_pmd(kvm)))
 		gfn = (fault_ipa & huge_page_mask(hstate_vma(vma))) >> PAGE_SHIFT;
+
+	/* Only enable PUD_SIZE huge mapping on 1620 serial boards */
+	if (vma_pagesize == PUD_SIZE && !kvm_ncsnp_support) {
+		vma_pagesize = PMD_SIZE;
+		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
+	}
+
 	up_read(&current->mm->mmap_sem);
 
 	/* We need minimum second+third level pages */