From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 27 Mar 2020 10:33:27 +0000 (+0100)
Subject: Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff68eb23308e6538ec7864c83d39540f423bbe90;p=people%2Fms%2Flinux.git

Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next
---

ff68eb23308e6538ec7864c83d39540f423bbe90
diff --cc drivers/iommu/arm-smmu-v3.c
index aa3ac2a03807,aa3ac2a03807,aa3ac2a03807,aa3ac2a03807,a7222dd5b117,aa3ac2a03807,aa3ac2a03807,aa3ac2a03807,2b68498dfb66..82508730feb7
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@@@@@@@@@ -2850,9 -2850,9 -2850,9 -2850,9 -2990,11 -2850,9 -2850,9 -2850,9 -2850,9 +2990,11 @@@@@@@@@@ static int arm_smmu_add_device(struct d
         
         err_unlink:
         	iommu_device_unlink(&smmu->iommu, dev);
++++ ++++err_disable_pasid:
++++ ++++	arm_smmu_disable_pasid(master);
         err_free_master:
         	kfree(master);
-------- 	fwspec->iommu_priv = NULL;
++++++++ 	dev_iommu_priv_set(dev, NULL);
         	return ret;
         }