From patchwork Mon Dec 22 09:15:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Zhen-Hua" X-Patchwork-Id: 5526451 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ECBC09F30B for ; Mon, 22 Dec 2014 09:17:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30A942017E for ; Mon, 22 Dec 2014 09:17:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E12420173 for ; Mon, 22 Dec 2014 09:17:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754395AbaLVJRZ (ORCPT ); Mon, 22 Dec 2014 04:17:25 -0500 Received: from g4t3426.houston.hp.com ([15.201.208.54]:55350 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754373AbaLVJRX (ORCPT ); Mon, 22 Dec 2014 04:17:23 -0500 Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3426.houston.hp.com (Postfix) with ESMTP id 4F39DAD; Mon, 22 Dec 2014 09:17:23 +0000 (UTC) Received: from piepie.asiapacific.hpqcorp.net (piepie.asiapacific.hpqcorp.net [16.187.246.131]) by g4t3433.houston.hp.com (Postfix) with ESMTP id 640BA82; Mon, 22 Dec 2014 09:17:18 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , , Subject: [PATCH 10/10] iommu/vt-d: Use old irte in kdump kernel Date: Mon, 22 Dec 2014 17:15:29 +0800 Message-Id: <1419239729-26529-11-git-send-email-zhen-hual@hp.com> X-Mailer: git-send-email 2.0.0-rc0 In-Reply-To: <1419239729-26529-1-git-send-email-zhen-hual@hp.com> References: <1419239729-26529-1-git-send-email-zhen-hual@hp.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 kdump kernel, do not disable and re-enable interrupt remapping. Signed-off-by: Li, Zhen-Hua --- drivers/iommu/intel_irq_remapping.c | 42 ++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 13f2034..e244186 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -198,6 +198,11 @@ static int modify_irte(int irq, struct irte *irte_modified) set_64bit(&irte->low, irte_modified->low); set_64bit(&irte->high, irte_modified->high); + +#ifdef CONFIG_CRASH_DUMP + if (is_kdump_kernel()) + __iommu_update_old_irte(iommu, index); +#endif __iommu_flush_cache(iommu, irte, sizeof(*irte)); rc = qi_flush_iec(iommu, index, 0); @@ -259,6 +264,11 @@ static int clear_entries(struct irq_2_iommu *irq_iommu) bitmap_release_region(iommu->ir_table->bitmap, index, irq_iommu->irte_mask); +#ifdef CONFIG_CRASH_DUMP + if (is_kdump_kernel()) + __iommu_update_old_irte(iommu, -1); +#endif + return qi_flush_iec(iommu, index, irq_iommu->irte_mask); } @@ -640,11 +650,20 @@ static int __init intel_enable_irq_remapping(void) */ dmar_fault(-1, iommu); - /* - * Disable intr remapping and queued invalidation, if already - * enabled prior to OS handover. - */ - iommu_disable_irq_remapping(iommu); +#ifdef CONFIG_CRASH_DUMP + if (is_kdump_kernel()) { + /* Do notdisable irq and then re-enable again. */ + } else { +#endif + /* + * Disable intr remapping and queued invalidation, + * if already enabled prior to OS handover. + */ + iommu_disable_irq_remapping(iommu); + +#ifdef CONFIG_CRASH_DUMP + } +#endif dmar_disable_qi(iommu); } @@ -687,7 +706,20 @@ static int __init intel_enable_irq_remapping(void) if (intel_setup_irq_remapping(iommu)) goto error; +#ifdef CONFIG_CRASH_DUMP + if (is_kdump_kernel()) { + 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 +#endif iommu_set_irq_remapping(iommu, eim); + setup = 1; }