Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752993AbbFMGsr (ORCPT ); Sat, 13 Jun 2015 02:48:47 -0400 Received: from 8bytes.org ([81.169.241.247]:51445 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751962AbbFMGr4 (ORCPT ); Sat, 13 Jun 2015 02:47:56 -0400 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: David Woodhouse , zhen-hual@hp.com, bhe@redhat.com, ddutile@redhat.com, alex.williamson@redhat.com, dyoung@redhat.com, linux-kernel@vger.kernel.org, jroedel@8bytes.org, joro@8bytes.org, Joerg Roedel Subject: [PATCH 12/19] iommu/vt-d: Enable Translation only if it was previously disabled Date: Sat, 13 Jun 2015 08:47:20 +0200 Message-Id: <1434178047-17809-13-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434178047-17809-1-git-send-email-joro@8bytes.org> References: <1434178047-17809-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 902 Lines: 33 From: Joerg Roedel Do not touch the TE bit unless we know translation is disabled. Signed-off-by: Joerg Roedel --- drivers/iommu/intel-iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index b47def6..ad72c6d 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3184,7 +3184,9 @@ domains_done: if (ret) goto free_iommu; - iommu_enable_translation(iommu); + if (!translation_pre_enabled(iommu)) + iommu_enable_translation(iommu); + iommu_disable_protect_mem_regions(iommu); } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/