1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
index 7914951ef29a..c5c274ab5c5a 100644
--- a/drivers/pci/iova.c
+++ b/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
@@ -391,7 +399,7 @@ reserve_iova(struct iova_domain *iovad,
                                 break;
         }
 
-        /* We are here either becasue this is the first reserver node
+        /* We are here either because this is the first reserver node
          * or need to insert remaining non overlap addr range
          */
         iova = __insert_new_range(iovad, pfn_lo, pfn_hi);