From: Suresh Siddha <suresh.b.siddha@intel.com>
To: mingo@elte.hu
Cc: linux-kernel@vger.kernel.org, dwmw2@infradead.org,
youquan.song@intel.com, Suresh Siddha <suresh.b.siddha@intel.com>
Subject: [patch 4/4] tip, dmar: remove the quirk which disables dma-remapping when intr-remapping enabled
Date: Wed, 08 Oct 2008 14:01:05 -0700 [thread overview]
Message-ID: <20081008210526.258371000@linux-os.sc.intel.com> (raw)
In-Reply-To: <20081008210101.487661000@linux-os.sc.intel.com>
[-- Attachment #1: enable_dmar.patch --]
[-- Type: text/plain, Size: 1856 bytes --]
From: Youquan Song <youquan.song@intel.com>
Subject: remove the quirk which disables dma-remapping when intr-remapping enabled
Now that we have DMA-remapping support for queued invalidation, we
can enable both DMA-remapping and interrupt-remapping at the same time.
Signed-off-by: Youquan Song <youquan.song@intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---
Index: tip/drivers/pci/dmar.c
===================================================================
--- tip.orig/drivers/pci/dmar.c 2008-10-08 09:49:30.000000000 -0700
+++ tip/drivers/pci/dmar.c 2008-10-08 10:13:36.000000000 -0700
@@ -462,39 +462,22 @@
ret = dmar_table_detect();
-#ifdef CONFIG_DMAR
{
+#ifdef CONFIG_INTR_REMAP
struct acpi_table_dmar *dmar;
- /*
- * for now we will disable dma-remapping when interrupt
- * remapping is enabled.
- * When support for queued invalidation for IOTLB invalidation
- * is added, we will not need this any more.
- */
dmar = (struct acpi_table_dmar *) dmar_tbl;
- if (ret && cpu_has_x2apic && dmar->flags & 0x1) {
+ if (ret && cpu_has_x2apic && dmar->flags & 0x1)
printk(KERN_INFO
"Queued invalidation will be enabled to support "
"x2apic and Intr-remapping.\n");
- printk(KERN_INFO
- "Disabling IOMMU detection, because of missing "
- "queued invalidation support for IOTLB "
- "invalidation\n");
- printk(KERN_INFO
- "Use \"nox2apic\", if you want to use Intel "
- " IOMMU for DMA-remapping and don't care about "
- " x2apic support\n");
-
- dmar_disabled = 1;
- goto end;
- }
+#endif
+#ifdef CONFIG_DMAR
if (ret && !no_iommu && !iommu_detected && !swiotlb &&
!dmar_disabled)
iommu_detected = 1;
- }
-end:
#endif
+ }
if (dmar_tbl)
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
--
prev parent reply other threads:[~2008-10-08 21:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-08 21:01 [patch 0/4] tip, dmar: queued invalidation patches Suresh Siddha
2008-10-08 21:01 ` [patch 1/4] tip, dmar: use spin_lock_irqsave() in qi_submit_sync() Suresh Siddha
2008-10-08 21:01 ` [patch 2/4] tip, dmar: context cache and IOTLB invalidation using queued invalidation Suresh Siddha
2008-10-08 21:01 ` [patch 3/4] tip, dmar: Use queued invalidation interface for IOTLB and context invalidation Suresh Siddha
2008-10-08 21:01 ` Suresh Siddha [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081008210526.258371000@linux-os.sc.intel.com \
--to=suresh.b.siddha@intel.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=youquan.song@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®