From: Suresh Siddha <suresh.b.siddha@intel.com>
To: mingo@elte.hu, hpa@zytor.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, dwmw2@infradead.org,
Yinghai Lu <yhlu.kernel@gmail.com>,
Suresh Siddha <suresh.b.siddha@intel.com>
Subject: [patch 2/5] dmar: fix using early fixmap mapping for DMAR table parsing
Date: Wed, 03 Sep 2008 16:58:32 -0700 [thread overview]
Message-ID: <20080904000237.895621000@linux-os.sc.intel.com> (raw)
In-Reply-To: 20080904000237.746216000@linux-os.sc.intel.com
[-- Attachment #1: dmar_fix_fixmap_mapping.patch --]
[-- Type: text/plain, Size: 3011 bytes --]
From: Yinghai Lu <yhlu.kernel@gmail.com>
Subject: dmar: fix using early fixmap mapping for DMAR table parsing
Very early detection of the DMAR tables will setup fixmap mapping. For
parsing these tables later (while enabling dma and/or interrupt remapping),
early fixmap mapping shouldn't be used. Fix it by calling table detection
routines again, which will call generic apci_get_table() for setting up
the correct mapping.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---
Index: tip/drivers/pci/dmar.c
===================================================================
--- tip.orig/drivers/pci/dmar.c 2008-09-02 16:04:04.000000000 -0700
+++ tip/drivers/pci/dmar.c 2008-09-02 16:41:31.000000000 -0700
@@ -289,6 +289,24 @@
}
}
+/**
+ * dmar_table_detect - checks to see if the platform supports DMAR devices
+ */
+static int __init dmar_table_detect(void)
+{
+ acpi_status status = AE_OK;
+
+ /* if we could find DMAR table, then there are DMAR devices */
+ status = acpi_get_table(ACPI_SIG_DMAR, 0,
+ (struct acpi_table_header **)&dmar_tbl);
+
+ if (ACPI_SUCCESS(status) && !dmar_tbl) {
+ printk (KERN_WARNING PREFIX "Unable to map DMAR\n");
+ status = AE_NOT_FOUND;
+ }
+
+ return (ACPI_SUCCESS(status) ? 1 : 0);
+}
/**
* parse_dmar_table - parses the DMA reporting table
@@ -300,6 +318,12 @@
struct acpi_dmar_header *entry_header;
int ret = 0;
+ /*
+ * Do it again, earlier dmar_tbl mapping could be mapped with
+ * fixed map.
+ */
+ dmar_table_detect();
+
dmar = (struct acpi_table_dmar *)dmar_tbl;
if (!dmar)
return -ENODEV;
@@ -430,30 +454,11 @@
return 0;
}
-/**
- * early_dmar_detect - checks to see if the platform supports DMAR devices
- */
-int __init early_dmar_detect(void)
-{
- acpi_status status = AE_OK;
-
- /* if we could find DMAR table, then there are DMAR devices */
- status = acpi_get_table(ACPI_SIG_DMAR, 0,
- (struct acpi_table_header **)&dmar_tbl);
-
- if (ACPI_SUCCESS(status) && !dmar_tbl) {
- printk (KERN_WARNING PREFIX "Unable to map DMAR\n");
- status = AE_NOT_FOUND;
- }
-
- return (ACPI_SUCCESS(status) ? 1 : 0);
-}
-
void __init detect_intel_iommu(void)
{
int ret;
- ret = early_dmar_detect();
+ ret = dmar_table_detect();
#ifdef CONFIG_DMAR
{
@@ -479,14 +484,16 @@
" x2apic support\n");
dmar_disabled = 1;
- return;
+ goto end;
}
if (ret && !no_iommu && !iommu_detected && !swiotlb &&
!dmar_disabled)
iommu_detected = 1;
}
+end:
#endif
+ dmar_tbl = NULL;
}
Index: tip/include/linux/dmar.h
===================================================================
--- tip.orig/include/linux/dmar.h 2008-09-02 16:04:04.000000000 -0700
+++ tip/include/linux/dmar.h 2008-09-02 16:40:40.000000000 -0700
@@ -45,7 +45,6 @@
list_for_each_entry(drhd, &dmar_drhd_units, list)
extern int dmar_table_init(void);
-extern int early_dmar_detect(void);
extern int dmar_dev_scope_init(void);
/* Intel IOMMU detection */
--
next prev parent reply other threads:[~2008-09-04 0:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-03 23:58 [patch 1/5] x2apic: fix reserved APIC register accesses in print_local_APIC() Suresh Siddha
2008-09-03 23:58 ` Suresh Siddha [this message]
2008-09-03 23:58 ` [patch 3/5] dmar: initialize the return value in dmar_parse_dev() Suresh Siddha
2008-09-03 23:58 ` [patch 4/5] dmar: use list_for_each_entry_safe() in dmar_dev_scope_init() Suresh Siddha
2008-09-03 23:58 ` [patch 5/5] dmar: fix dmar_parse_dev() devices_cnt error condition check Suresh Siddha
2008-09-04 11:06 ` [patch 1/5] x2apic: fix reserved APIC register accesses in print_local_APIC() Ingo Molnar
2008-09-04 17:51 ` Suresh Siddha
2008-09-05 8:10 ` Ingo Molnar
2008-09-05 9:18 ` Jesse Barnes
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=20080904000237.895621000@linux-os.sc.intel.com \
--to=suresh.b.siddha@intel.com \
--cc=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=yhlu.kernel@gmail.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