From patchwork Fri Apr 10 08:42:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Zhen-Hua" X-Patchwork-Id: 6193171 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8A1F39F2E9 for ; Fri, 10 Apr 2015 08:44:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3C4D203DA for ; Fri, 10 Apr 2015 08:44:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5FEB20353 for ; Fri, 10 Apr 2015 08:44:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755045AbbDJIo1 (ORCPT ); Fri, 10 Apr 2015 04:44:27 -0400 Received: from g2t1383g.austin.hp.com ([15.217.136.92]:36393 "EHLO g2t1383g.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755023AbbDJIoX (ORCPT ); Fri, 10 Apr 2015 04:44:23 -0400 Received: from g9t5008.houston.hp.com (g9t5008.houston.hp.com [15.240.92.66]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by g2t1383g.austin.hp.com (Postfix) with ESMTPS id E704B16B0; Fri, 10 Apr 2015 08:44:22 +0000 (UTC) Received: from g5t1633.atlanta.hp.com (g5t1633.atlanta.hp.com [16.201.144.132]) by g9t5008.houston.hp.com (Postfix) with ESMTP id A0561AA; Fri, 10 Apr 2015 08:44:18 +0000 (UTC) Received: from localhost.localdomain (linuxtest.chn.hp.com [16.155.255.10]) by g5t1633.atlanta.hp.com (Postfix) with ESMTP id E2DBB66; Fri, 10 Apr 2015 08:44:11 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , , , Subject: [PATCH v10 10/10] iommu/vt-d: Use old irte in kdump kernel Date: Fri, 10 Apr 2015 16:42:13 +0800 Message-Id: <1428655333-19504-11-git-send-email-zhen-hual@hp.com> X-Mailer: git-send-email 2.0.0-rc0 In-Reply-To: <1428655333-19504-1-git-send-email-zhen-hual@hp.com> References: <1428655333-19504-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 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 e6426a0..02615a6 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); } @@ -660,11 +667,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); } @@ -700,7 +709,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 = 1; }