diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 07f491c2dc64..f8f54a4b1d8f 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2030,6 +2030,12 @@ static int __attach_device(struct iommu_dev_data *dev_data,
 {
 	int ret;
 
+	/*
+	 * Must be called with IRQs disabled. Warn here to detect early
+	 * when its not.
+	 */
+	WARN_ON(!irqs_disabled());
+
 	/* lock domain */
 	spin_lock(&domain->lock);
 
@@ -2190,6 +2196,12 @@ static void __detach_device(struct iommu_dev_data *dev_data)
 {
 	struct protection_domain *domain;
 
+	/*
+	 * Must be called with IRQs disabled. Warn here to detect early
+	 * when its not.
+	 */
+	WARN_ON(!irqs_disabled());
+
 	if (WARN_ON(!dev_data->domain))
 		return;