From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Li, Zhen-Hua" Subject: [PATCH v11 10/10] iommu/vt-d: Use old irte in kdump kernel Date: Mon, 11 May 2015 17:52:54 +0800 Message-ID: <1431337974-545-11-git-send-email-zhen-hual@hp.com> References: <1431337974-545-1-git-send-email-zhen-hual@hp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1431337974-545-1-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, indou.takao-+CUm20s59erQFUHtdCDX3A@public.gmane.org, bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org, vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Cc: tom.vaden-VXdhtT5mjnY@public.gmane.org, rwright-VXdhtT5mjnY@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, lisa.mitchell-VXdhtT5mjnY@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, zhen-hual-VXdhtT5mjnY@public.gmane.org, doug.hatch-VXdhtT5mjnY@public.gmane.org, ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org, bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, li.zhang6-VXdhtT5mjnY@public.gmane.org List-Id: iommu@lists.linux-foundation.org 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 --- 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