iommu/of: Adjust system_state check
authorThomas Gleixner <tglx@linutronix.de>
Tue, 16 May 2017 18:42:42 +0000 (20:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 23 May 2017 08:01:37 +0000 (10:01 +0200)
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 <mark.rutland@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: iommu@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/20170516184735.788023442@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/iommu/of_iommu.c

index 9f44ee8ea1bc8a10a6ff4c0dad297b78b8c2f57a..b8dcf44df441cef860faf854ff7d3ddd8989231e 100644 (file)
@@ -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);