Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b608fe35 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJoerg 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: default avatarIngo Molnar <mingo@kernel.org>
parent d04e31a2

drivers/iommu/intel-iommu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -4315,7 +4315,7 @@ int dmar_parse_one_atsr(struct acpi_dmar_header *hdr, void *arg) 
	struct acpi_dmar_atsr *atsr;

	struct acpi_dmar_atsr *atsr;

	struct dmar_atsr_unit *atsru;

	struct dmar_atsr_unit *atsru;





	if (system_state != SYSTEM_BOOTING && !intel_iommu_enabled)

	if (system_state >= SYSTEM_RUNNING && !intel_iommu_enabled)

		return 0;

		return 0;





	atsr = container_of(hdr, struct acpi_dmar_atsr, header);

	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_atsr *atsr;

	struct acpi_dmar_reserved_memory *rmrr;

	struct acpi_dmar_reserved_memory *rmrr;





	if (!intel_iommu_enabled && system_state != SYSTEM_BOOTING)

	if (!intel_iommu_enabled && system_state >= SYSTEM_RUNNING)

		return 0;

		return 0;





	list_for_each_entry(rmrru, &dmar_rmrr_units, list) {

	list_for_each_entry(rmrru, &dmar_rmrr_units, list) {