diff --git a/bindings/iommu/arm,smmu.txt b/bindings/iommu/arm,smmu.txt
index 354338a0..afda2218 100644
--- a/bindings/iommu/arm,smmu.txt
+++ b/bindings/iommu/arm,smmu.txt
@@ -131,6 +131,10 @@ conditions.
 		  a four level page table configuration. Set to use a three
 		  level page table instead.
 
+- qcom,context-fault-retry:
+		  Retry iommu faults after a tlb invalidate, if stall-on-fault
+		  is enabled.
+
 - qcom,no-asid-retention:
 		  Some hardware may lose internal state for asid after
 		  retention. No cache invalidation operations involving asid
diff --git a/qcom/msm-arm-smmu-waipio.dtsi b/qcom/msm-arm-smmu-waipio.dtsi
index 9b48f93c..254c15ee 100644
--- a/qcom/msm-arm-smmu-waipio.dtsi
+++ b/qcom/msm-arm-smmu-waipio.dtsi
@@ -92,6 +92,7 @@
 		#iommu-cells = <2>;
 		qcom,skip-init;
 		qcom,use-3-lvl-tables;
+		qcom,context-fault-retry;
 		qcom,num-context-banks-override = <0x4e>;
 		qcom,num-smr-override = <0x78>;
 		qcom,handoff-smrs = <3>;