* [PATCH] iommu: dmar -- remove warning for HPET scope type
@ 2013-04-23 18:26 Linn Crosetto
2013-04-24 9:31 ` [tip:x86/mm] x86/iommu/dmar: Remove " tip-bot for Linn Crosetto
2013-04-24 17:54 ` [PATCH] iommu: dmar -- remove " Joerg Roedel
0 siblings, 2 replies; 3+ messages in thread
From: Linn Crosetto @ 2013-04-23 18:26 UTC (permalink / raw)
To: joro, mingo, ddutile, suresh.b.siddha; +Cc: linux-kernel, Linn Crosetto
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>
---
drivers/iommu/dmar.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index e5cdaf8..b8008f6 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;
--
1.7.11.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:x86/mm] x86/iommu/dmar: Remove warning for HPET scope type
2013-04-23 18:26 [PATCH] iommu: dmar -- remove warning for HPET scope type Linn Crosetto
@ 2013-04-24 9:31 ` tip-bot for Linn Crosetto
2013-04-24 17:54 ` [PATCH] iommu: dmar -- remove " Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Linn Crosetto @ 2013-04-24 9:31 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, linn, tglx
Commit-ID: 13f72756da86f155898e2c2022f7b3a106c3742e
Gitweb: http://git.kernel.org/tip/13f72756da86f155898e2c2022f7b3a106c3742e
Author: Linn Crosetto <linn@hp.com>
AuthorDate: Tue, 23 Apr 2013 12:26:45 -0600
Committer: Ingo Molnar <mingo@kernel.org>
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.
Signed-off-by: Linn Crosetto <linn@hp.com>
Cc: joro@8bytes.org
Cc: ddutile@redhat.com
Cc: suresh.b.siddha@intel.com
Link: http://lkml.kernel.org/r/1366741605-71293-1-git-send-email-linn@hp.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/iommu/dmar.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index e5cdaf8..b8008f6 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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] iommu: dmar -- remove warning for HPET scope type
2013-04-23 18:26 [PATCH] iommu: dmar -- remove warning for HPET scope type Linn Crosetto
2013-04-24 9:31 ` [tip:x86/mm] x86/iommu/dmar: Remove " tip-bot for Linn Crosetto
@ 2013-04-24 17:54 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2013-04-24 17:54 UTC (permalink / raw)
To: Linn Crosetto; +Cc: mingo, ddutile, suresh.b.siddha, linux-kernel
On Tue, Apr 23, 2013 at 12:26:45PM -0600, Linn Crosetto wrote:
> 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>
Applied to x86/vt-d, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-24 17:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-23 18:26 [PATCH] iommu: dmar -- remove warning for HPET scope type Linn Crosetto
2013-04-24 9:31 ` [tip:x86/mm] x86/iommu/dmar: Remove " tip-bot for Linn Crosetto
2013-04-24 17:54 ` [PATCH] iommu: dmar -- remove " Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox