iommu/vt-d: 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.

Signed-off-by: Linn Crosetto <linn@hp.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index f7890edb22f5e9f8c5697f37c72ed6c328dae1e6..a7967ceb79e6f20336354c14ae9511eb3e79c20b 100644 (file)
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -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;