| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 16 May 2017 20:42:41 +0200 |
| Subject: [PATCH 10/17] 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 <tglx@linutronix.de> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Acked-by: Joerg Roedel <joro@8bytes.org> |
| Cc: David Woodhouse <dwmw2@infradead.org> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| 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.712365947@linutronix.de |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| --- |
| drivers/iommu/intel-iommu.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/iommu/intel-iommu.c |
| +++ b/drivers/iommu/intel-iommu.c |
| @@ -4310,7 +4310,7 @@ int dmar_parse_one_atsr(struct acpi_dmar |
| 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); |
| @@ -4560,7 +4560,7 @@ int dmar_iommu_notify_scope_dev(struct d |
| 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) { |
