From: Linn Crosetto <linn@hp.com>
Date: Tue, 23 Apr 2013 18:26:45 +0000 (-0600)
Subject: iommu/vt-d: Remove warning for HPET scope type
X-Git-Tag: upstream/snapshot3+hdmi~5178^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae3e7f3aba4441eca7a1ff5cb3e089824318ba79;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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 f7890ed..a7967ce 100644
--- 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;