From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 20 Oct 2015 15:33:34 +0000 (+0200)
Subject: iommu/amd: Do not BUG_ON in __detach_device()
X-Git-Tag: v4.14-rc1~4399^2^7~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f34c73f55a06ac443c492fc11b85f7a44dfdc112;p=platform%2Fkernel%2Flinux-rpi.git

iommu/amd: Do not BUG_ON in __detach_device()

The condition in the BUG_ON is an indicator of a BUG, but no
reason to kill the code path. Turn it into a WARN_ON and
bail out if it is hit.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index f82060e7..6070b15 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2204,7 +2204,8 @@ static void __detach_device(struct iommu_dev_data *dev_data)
 	struct protection_domain *domain;
 	unsigned long flags;
 
-	BUG_ON(!dev_data->domain);
+	if (WARN_ON(!dev_data->domain))
+		return;
 
 	domain = dev_data->domain;