diff --git a/[refs] b/[refs]
index dad2e1949232..5aa864e1c4c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb452a4040bb051d92e85d6e7eb60c11734c1781
+refs/heads/master: 1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb
diff --git a/trunk/drivers/pci/iova.c b/trunk/drivers/pci/iova.c
index 9606e599a475..c5c274ab5c5a 100644
--- a/trunk/drivers/pci/iova.c
+++ b/trunk/drivers/pci/iova.c
@@ -63,8 +63,16 @@ __cached_rbnode_delete_update(struct iova_domain *iovad, struct iova *free)
 	curr = iovad->cached32_node;
 	cached_iova = container_of(curr, struct iova, node);
 
-	if (free->pfn_lo >= cached_iova->pfn_lo)
-		iovad->cached32_node = rb_next(&free->node);
+	if (free->pfn_lo >= cached_iova->pfn_lo) {
+		struct rb_node *node = rb_next(&free->node);
+		struct iova *iova = container_of(node, struct iova, node);
+
+		/* only cache if it's below 32bit pfn */
+		if (node && iova->pfn_lo < iovad->dma_32bit_pfn)
+			iovad->cached32_node = node;
+		else
+			iovad->cached32_node = NULL;
+	}
 }
 
 /* Computes the padding size required, to make the