public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Youquan Song <youquan.song@intel.com>
To: mingo@elte.hu, hpa@zytor.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, dwmw2@infradead.org,
	Suresh Siddha <suresh.b.siddha@intel.com>,
	youqun.song@intel.com
Subject: Fix interrupt remapping hang if interrupt remapping disable in BIOS
Date: Mon, 7 Sep 2009 10:13:13 -0400	[thread overview]
Message-ID: <20090907141313.GA26091@youquan-linux.bj.intel.com> (raw)

BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current
kernel only check interrupt remapping(IR) flag in DRHD's extended capability 
register to decide interrupt remapping support or not. But IR flag will not 
affected by BIOS setting. 

So though BIOS disable interrupt remapping feature, However, 
intr_remapping_supported function will report interrupt supported. On this 
cases, it will continue to enable interrupt remapping result kernel hang. 
This bug exists on most platforms support interrupt remapping.      

This patch add DMAR table INTR_REMAP flag check before enable interrup remapping

Signed-off-by: Youquan Song <youquan.song@intel.com>
---

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index a8a4383..78f4ca8 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -43,7 +43,7 @@
  */
 LIST_HEAD(dmar_drhd_units);
 
-static struct acpi_table_header * __initdata dmar_tbl;
+struct acpi_table_header * __initdata dmar_tbl;
 static acpi_size dmar_tbl_size;
 
 static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index ebfa47b..97d1561 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -16,6 +16,7 @@
 static struct ioapic_scope ir_ioapic[MAX_IO_APICS];
 static int ir_ioapic_num;
 int intr_remapping_enabled;
+extern struct acpi_table_header *__initdata dmar_tbl;
 
 static int disable_intremap;
 static __init int setup_nointremap(char *str)
@@ -607,9 +608,14 @@ end:
 int __init intr_remapping_supported(void)
 {
 	struct dmar_drhd_unit *drhd;
-
+	struct acpi_table_dmar *dmar;
+
 	if (disable_intremap)
 		return 0;
+
+	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	if (!(dmar->flags & 0x1))
+		return 0;
 
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;

             reply	other threads:[~2009-09-07  6:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-07 14:13 Youquan Song [this message]
2009-09-07 14:59 ` Fix interrupt remapping hang if interrupt remapping disable in BIOS Cyrill Gorcunov
2009-09-09 10:46   ` Youquan,Song

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=20090907141313.GA26091@youquan-linux.bj.intel.com \
    --to=youquan.song@intel.com \
    --cc=dwmw2@infradead.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=suresh.b.siddha@intel.com \
    --cc=tglx@linutronix.de \
    --cc=youqun.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