Skip to contentSkip to conversation

iommu: dmar -- remove warning for HPET scope type

PATCH Applied Linn Crosetto 3 participants 3 messages Apr 23, 2013 – Apr 24, 2013 IOMMU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu: dmar -- remove warning for HPET scope type

ACPI_DMAR_SCOPE_TYPE_HPET is parsed by ir_parse_ioapic_hpet_scope() and should not be flagged as an unsupported type.

---
 drivers/iommu/dmar.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/dmar.c +2 -1
index e5cdaf8..b8008f6 100644
@@ -129,7 +129,8 @@ int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
 		if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
 		    scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
 			(*cnt)++;
-		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) {
+		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC &&
+			scope->entry_type != ACPI_DMAR_SCOPE_TYPE_HPET) {
 			pr_warn("Unsupported device scope\n");
 		}
 		start += scope->length;
Signature · 1 line
1.7.11.3
#1 lore raw

[tip:x86/mm] x86/iommu/dmar: Remove warning for HPET scope type

x86/iommu/dmar: Remove warning for HPET scope type
Commit-ID:  13f72756da86f155898e2c2022f7b3a106c3742e
Gitweb:     http://git.kernel.org/tip/13f72756da86f155898e2c2022f7b3a106c3742e
Author:     Linn Crosetto <[email protected]>
AuthorDate: Tue, 23 Apr 2013 12:26:45 -0600
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 24 Apr 2013 08:45:47 +0200

x86/iommu/dmar: Remove warning for HPET scope type

ACPI_DMAR_SCOPE_TYPE_HPET is parsed by ir_parse_ioapic_hpet_scope() and should not be flagged as an unsupported type.

---
 drivers/iommu/dmar.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/dmar.c +2 -1
index e5cdaf8..b8008f6 100644
@@ -129,7 +129,8 @@ int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
 		if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
 		    scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
 			(*cnt)++;
-		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) {
+		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC &&
+			scope->entry_type != ACPI_DMAR_SCOPE_TYPE_HPET) {
 			pr_warn("Unsupported device scope\n");
 		}
 		start += scope->length;