From: "Li, Zhen-Hua" <zhen-hual@hp.com>
To: <dwmw2@infradead.org>, <indou.takao@jp.fujitsu.com>,
<bhe@redhat.com>, <joro@8bytes.org>, <vgoyal@redhat.com>,
<dyoung@redhat.com>
Cc: <iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<kexec@lists.infradead.org>, <alex.williamson@redhat.com>,
<ddutile@redhat.com>, <ishii.hironobu@jp.fujitsu.com>,
<bhelgaas@google.com>, <doug.hatch@hp.com>,
<jerry.hoemann@hp.com>, <tom.vaden@hp.com>, <li.zhang6@hp.com>,
<lisa.mitchell@hp.com>, <billsumnerlinux@gmail.com>,
<zhen-hual@hp.com>, <rwright@hp.com>
Subject: [PATCH v11 10/10] iommu/vt-d: Use old irte in kdump kernel
Date: Mon, 11 May 2015 17:52:54 +0800 [thread overview]
Message-ID: <1431337974-545-11-git-send-email-zhen-hual@hp.com> (raw)
In-Reply-To: <1431337974-545-1-git-send-email-zhen-hual@hp.com>
Fix the intr-remapping fault.
[1.594890] dmar: DRHD: handling fault status reg 2
[1.594894] dmar: INTR-REMAP: Request device [[41:00.0] fault index 4d
[1.594894] INTR-REMAP:[fault reason 34] Present field in the IRTE entry
is clear
Use old irte in second kernel, do not disable and re-enable interrupt
remapping.
Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com>
---
drivers/iommu/intel_irq_remapping.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index c2a4406..46d80ad 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -197,6 +197,10 @@ static int modify_irte(int irq, struct irte *irte_modified)
set_64bit(&irte->low, irte_modified->low);
set_64bit(&irte->high, irte_modified->high);
+
+ if (iommu->pre_enabled_ir)
+ __iommu_update_old_irte(iommu, index);
+
__iommu_flush_cache(iommu, irte, sizeof(*irte));
rc = qi_flush_iec(iommu, index, 0);
@@ -258,6 +262,9 @@ static int clear_entries(struct irq_2_iommu *irq_iommu)
bitmap_release_region(iommu->ir_table->bitmap, index,
irq_iommu->irte_mask);
+ if (iommu->pre_enabled_ir)
+ __iommu_update_old_irte(iommu, -1);
+
return qi_flush_iec(iommu, index, irq_iommu->irte_mask);
}
@@ -657,11 +664,13 @@ static int __init intel_enable_irq_remapping(void)
*/
dmar_fault(-1, iommu);
+ iommu_check_pre_ir_status(iommu);
+
/*
- * Disable intr remapping and queued invalidation, if already
- * enabled prior to OS handover.
+ * Here we do not disable intr remapping,
+ * if already enabled prior to OS handover.
*/
- iommu_disable_irq_remapping(iommu);
+ /* iommu_disable_irq_remapping(iommu); */
dmar_disable_qi(iommu);
}
@@ -697,7 +706,18 @@ static int __init intel_enable_irq_remapping(void)
* Setup Interrupt-remapping for all the DRHD's now.
*/
for_each_iommu(iommu, drhd) {
- iommu_set_irq_remapping(iommu, eim);
+ if (iommu->pre_enabled_ir) {
+ unsigned long long q;
+
+ q = dmar_readq(iommu->reg + DMAR_IRTA_REG);
+ iommu->ir_table->base_old_phys = q & VTD_PAGE_MASK;
+ iommu->ir_table->base_old_virt = ioremap_cache(
+ iommu->ir_table->base_old_phys,
+ INTR_REMAP_TABLE_ENTRIES*sizeof(struct irte));
+ __iommu_load_old_irte(iommu);
+ } else
+ iommu_set_irq_remapping(iommu, eim);
+
setup = true;
}
--
2.0.0-rc0
next prev parent reply other threads:[~2015-05-11 9:55 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 9:52 [PATCH v11 0/10] iommu/vt-d: Fix intel vt-d faults in kdump kernel Li, Zhen-Hua
2015-05-11 9:52 ` [PATCH v11 01/10] iommu/vt-d: New function to attach domain with id Li, Zhen-Hua
2015-05-11 9:52 ` [PATCH v11 02/10] iommu/vt-d: Items required for kdump Li, Zhen-Hua
2015-05-12 8:17 ` Dave Young
2015-05-13 1:45 ` Li, ZhenHua
2015-05-13 6:31 ` Alexander Duyck
2015-05-13 8:42 ` Dave Young
2015-05-11 9:52 ` [PATCH v11 03/10] iommu/vt-d: Function to get existing context entry Li, Zhen-Hua
2015-05-11 9:52 ` [PATCH v11 04/10] iommu/vt-d: functions to copy data from old mem Li, Zhen-Hua
2015-05-12 8:29 ` Dave Young
2015-05-13 9:00 ` Baoquan He
2015-05-13 9:13 ` Li, ZhenHua
2015-05-13 9:21 ` Baoquan He
2015-06-08 14:15 ` David Woodhouse
2015-06-08 15:21 ` Joerg Roedel
2015-06-08 15:44 ` David Woodhouse
2015-05-11 9:52 ` [PATCH v11 05/10] iommu/vt-d: Add functions to load and save old re Li, Zhen-Hua
2015-05-12 8:37 ` Dave Young
2015-05-13 1:47 ` Li, ZhenHua
2015-05-13 8:49 ` Dave Young
2015-05-11 9:52 ` [PATCH v11 06/10] iommu/vt-d: datatypes and functions used for kdump Li, Zhen-Hua
2015-05-12 8:48 ` Dave Young
2015-05-13 8:56 ` Baoquan He
2015-05-13 8:58 ` Li, ZhenHua
2015-05-13 9:10 ` Baoquan He
2015-05-11 9:52 ` [PATCH v11 07/10] iommu/vt-d: enable kdump support in iommu module Li, Zhen-Hua
2015-05-12 8:52 ` Dave Young
2015-05-13 2:10 ` Baoquan He
2015-05-13 2:28 ` Li, ZhenHua
2015-05-13 2:36 ` Baoquan He
2015-05-11 9:52 ` [PATCH v11 08/10] iommu/vt-d: assign new page table for dma_map Li, Zhen-Hua
2015-05-20 23:52 ` Baoquan He
2015-05-21 1:27 ` Li, ZhenHua
2015-05-21 6:54 ` Baoquan He
2015-05-21 8:40 ` Li, ZhenHua
2015-05-21 10:11 ` Baoquan He
2015-05-11 9:52 ` [PATCH v11 09/10] iommu/vt-d: Copy functions for irte Li, Zhen-Hua
2015-05-12 9:00 ` Dave Young
2015-05-11 9:52 ` Li, Zhen-Hua [this message]
2015-05-12 6:18 ` [PATCH v11 0/10] iommu/vt-d: Fix intel vt-d faults in kdump kernel Baoquan He
2015-05-12 9:04 ` Dave Young
2015-05-12 9:34 ` Li, Zhen-Hua
2015-05-13 1:54 ` Li, ZhenHua
2015-05-18 10:05 ` Li, ZhenHua
2015-05-19 1:13 ` Dave Young
2015-05-19 7:43 ` Li, ZhenHua
2015-05-29 16:21 ` Joerg Roedel
2015-05-30 11:23 ` Li, Zhen-Hua
2015-06-08 14:26 ` David Woodhouse
2015-06-08 15:29 ` Joerg Roedel
2015-06-08 15:50 ` David Woodhouse
2015-06-08 16:13 ` Joerg Roedel
2015-06-09 12:55 ` David Woodhouse
2015-06-10 9:21 ` Joerg Roedel
2015-06-10 9:32 ` Li, ZhenHua
2015-06-10 14:10 ` David Woodhouse
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=1431337974-545-11-git-send-email-zhen-hual@hp.com \
--to=zhen-hual@hp.com \
--cc=alex.williamson@redhat.com \
--cc=bhe@redhat.com \
--cc=bhelgaas@google.com \
--cc=billsumnerlinux@gmail.com \
--cc=ddutile@redhat.com \
--cc=doug.hatch@hp.com \
--cc=dwmw2@infradead.org \
--cc=dyoung@redhat.com \
--cc=indou.takao@jp.fujitsu.com \
--cc=iommu@lists.linux-foundation.org \
--cc=ishii.hironobu@jp.fujitsu.com \
--cc=jerry.hoemann@hp.com \
--cc=joro@8bytes.org \
--cc=kexec@lists.infradead.org \
--cc=li.zhang6@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lisa.mitchell@hp.com \
--cc=rwright@hp.com \
--cc=tom.vaden@hp.com \
--cc=vgoyal@redhat.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;
as well as URLs for NNTP newsgroup(s).