From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751586AbdBUPSz (ORCPT <rfc822;w@1wt.eu>);
        Tue, 21 Feb 2017 10:18:55 -0500
Received: from mx2.suse.de ([195.135.220.15]:47767 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751387AbdBUPSm (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 21 Feb 2017 10:18:42 -0500
Date: Tue, 21 Feb 2017 16:19:26 +0100
From: Joerg Roedel <jroedel@suse.de>
To: Mike Galbraith <efault@gmx.de>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: Re: [bisection] b0119e87083  iommu: Introduce new 'struct
 iommu_device' ==> boom
Message-ID: <20170221151926.GB4154@suse.de>
References: <1487688906.21852.11.camel@gmx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1487688906.21852.11.camel@gmx.de>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Mike,

thanks for the report, this didn't trigger in my local testing here.
Loosk like I need to test without intel_iommu=on too :/

Anyway, can you check whether the attached patch helps?

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index d9c0decfc91a..a74fec8d266a 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1108,8 +1108,10 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
 
 static void free_iommu(struct intel_iommu *iommu)
 {
-	iommu_device_sysfs_remove(&iommu->iommu);
-	iommu_device_unregister(&iommu->iommu);
+	if (intel_iommu_enabled) {
+		iommu_device_sysfs_remove(&iommu->iommu);
+		iommu_device_unregister(&iommu->iommu);
+	}
 
 	if (iommu->irq) {
 		if (iommu->pr_irq) {