From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967133AbdEWI6m (ORCPT ); Tue, 23 May 2017 04:58:42 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49789 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967063AbdEWI6i (ORCPT ); Tue, 23 May 2017 04:58:38 -0400 Date: Tue, 23 May 2017 01:52:53 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: mark.rutland@arm.com, joro@8bytes.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, tglx@linutronix.de, mingo@kernel.org, dwmw2@infradead.org, hpa@zytor.com, rostedt@goodmis.org, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, mark.rutland@arm.com, joro@8bytes.org, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, dwmw2@infradead.org, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, rostedt@goodmis.org, tglx@linutronix.de In-Reply-To: <20170516184735.712365947@linutronix.de> References: <20170516184735.712365947@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] iommu/vt-d: Adjust system_state checks Git-Commit-ID: b608fe356fe8328665445a26ec75dfac918c8c5d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b608fe356fe8328665445a26ec75dfac918c8c5d Gitweb: http://git.kernel.org/tip/b608fe356fe8328665445a26ec75dfac918c8c5d Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:41 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:36 +0200 iommu/vt-d: Adjust system_state checks To enable smp_processor_id() and might_sleep() debug checks earlier, it's required to add system states between SYSTEM_BOOTING and SYSTEM_RUNNING. Adjust the system_state checks in dmar_parse_one_atsr() and dmar_iommu_notify_scope_dev() to handle the extra states. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Joerg Roedel Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Mark Rutland Cc: Peter Zijlstra Cc: Steven Rostedt Cc: iommu@lists.linux-foundation.org Link: http://lkml.kernel.org/r/20170516184735.712365947@linutronix.de Signed-off-by: Ingo Molnar --- drivers/iommu/intel-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index fc2765c..8500ded 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4315,7 +4315,7 @@ int dmar_parse_one_atsr(struct acpi_dmar_header *hdr, void *arg) struct acpi_dmar_atsr *atsr; struct dmar_atsr_unit *atsru; - if (system_state != SYSTEM_BOOTING && !intel_iommu_enabled) + if (system_state >= SYSTEM_RUNNING && !intel_iommu_enabled) return 0; atsr = container_of(hdr, struct acpi_dmar_atsr, header); @@ -4565,7 +4565,7 @@ int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info) struct acpi_dmar_atsr *atsr; struct acpi_dmar_reserved_memory *rmrr; - if (!intel_iommu_enabled && system_state != SYSTEM_BOOTING) + if (!intel_iommu_enabled && system_state >= SYSTEM_RUNNING) return 0; list_for_each_entry(rmrru, &dmar_rmrr_units, list) {