From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967164AbdEWI7N (ORCPT ); Tue, 23 May 2017 04:59:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40075 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967148AbdEWI7J (ORCPT ); Tue, 23 May 2017 04:59:09 -0400 Date: Tue, 23 May 2017 01:53:26 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: torvalds@linux-foundation.org, peterz@infradead.org, gregkh@linuxfoundation.org, mingo@kernel.org, joro@8bytes.org, rostedt@goodmis.org, mark.rutland@arm.com, hpa@zytor.com, robin.murphy@arm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: gregkh@linuxfoundation.org, mingo@kernel.org, joro@8bytes.org, rostedt@goodmis.org, torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mark.rutland@arm.com In-Reply-To: <20170516184735.788023442@linutronix.de> References: <20170516184735.788023442@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] iommu/of: Adjust system_state check Git-Commit-ID: b903dfb277c09e53d499480e9670557dcce36fbd 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: b903dfb277c09e53d499480e9670557dcce36fbd Gitweb: http://git.kernel.org/tip/b903dfb277c09e53d499480e9670557dcce36fbd Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:42 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:37 +0200 iommu/of: Adjust system_state check 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 check in of_iommu_driver_present() to handle the extra states. Tested-by: Mark Rutland Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Joerg Roedel Acked-by: Robin Murphy Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Cc: iommu@lists.linux-foundation.org Link: http://lkml.kernel.org/r/20170516184735.788023442@linutronix.de Signed-off-by: Ingo Molnar --- drivers/iommu/of_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 9f44ee8..b8dcf44 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -103,7 +103,7 @@ static bool of_iommu_driver_present(struct device_node *np) * it never will be. We don't want to defer indefinitely, nor attempt * to dereference __iommu_of_table after it's been freed. */ - if (system_state > SYSTEM_BOOTING) + if (system_state >= SYSTEM_RUNNING) return false; return of_match_node(&__iommu_of_table, np);