From patchwork Fri Apr 10 08:42:12 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: 6193181 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 3BA049F2E9 for ; Fri, 10 Apr 2015 08:44:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DAA9203DA for ; Fri, 10 Apr 2015 08:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 591D320353 for ; Fri, 10 Apr 2015 08:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754776AbbDJIoP (ORCPT ); Fri, 10 Apr 2015 04:44:15 -0400 Received: from g2t1383g.austin.hp.com ([15.217.136.92]:36390 "EHLO g2t1383g.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754773AbbDJIoN (ORCPT ); Fri, 10 Apr 2015 04:44:13 -0400 Received: from g1t5424.austin.hp.com (g1t5424.austin.hp.com [15.216.225.54]) (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 B8BD8992; Fri, 10 Apr 2015 08:44:12 +0000 (UTC) Received: from g5t1633.atlanta.hp.com (g5t1633.atlanta.hp.com [16.201.144.132]) by g1t5424.austin.hp.com (Postfix) with ESMTP id CB79989; Fri, 10 Apr 2015 08:44:11 +0000 (UTC) Received: from localhost.localdomain (linuxtest.chn.hp.com [16.155.255.10]) by g5t1633.atlanta.hp.com (Postfix) with ESMTP id 6E2CA78; Fri, 10 Apr 2015 08:44:04 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , , , Subject: [PATCH v10 09/10] iommu/vt-d: Copy functions for irte Date: Fri, 10 Apr 2015 16:42:12 +0800 Message-Id: <1428655333-19504-10-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 Functions to copy the irte data from the old kernel into the kdump kernel. Signed-off-by: Li, Zhen-Hua --- drivers/iommu/intel_irq_remapping.c | 68 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 4 +++ 2 files changed, 72 insertions(+) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 14de1ab..e6426a0 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -17,6 +17,10 @@ #include "irq_remapping.h" +static int __iommu_load_old_irte(struct intel_iommu *iommu); +static int __iommu_update_old_irte(struct intel_iommu *iommu, int index); +static void iommu_check_pre_ir_status(struct intel_iommu *iommu); + struct ioapic_scope { struct intel_iommu *iommu; unsigned int id; @@ -1302,3 +1306,67 @@ int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert) return ret; } + +static int __iommu_load_old_irte(struct intel_iommu *iommu) +{ + if ((!iommu) + || (!iommu->ir_table) + || (!iommu->ir_table->base) + || (!iommu->ir_table->base_old_phys) + || (!iommu->ir_table->base_old_virt)) + return -1; + + memcpy(iommu->ir_table->base, + iommu->ir_table->base_old_virt, + INTR_REMAP_TABLE_ENTRIES*sizeof(struct irte)); + + __iommu_flush_cache(iommu, iommu->ir_table->base, + INTR_REMAP_TABLE_ENTRIES*sizeof(struct irte)); + + return 0; +} + +static int __iommu_update_old_irte(struct intel_iommu *iommu, int index) +{ + int start; + unsigned long size; + void __iomem *to; + void *from; + + if ((!iommu) + || (!iommu->ir_table) + || (!iommu->ir_table->base) + || (!iommu->ir_table->base_old_phys) + || (!iommu->ir_table->base_old_virt)) + return -1; + + if (index < -1 || index >= INTR_REMAP_TABLE_ENTRIES) + return -1; + + if (index == -1) { + start = 0; + size = INTR_REMAP_TABLE_ENTRIES * sizeof(struct irte); + } else { + start = index * sizeof(struct irte); + size = sizeof(struct irte); + } + + to = iommu->ir_table->base_old_virt; + from = iommu->ir_table->base; + memcpy(to + start, from + start, size); + + __iommu_flush_cache(iommu, to + start, size); + + return 0; +} + +static void iommu_check_pre_ir_status(struct intel_iommu *iommu) +{ + u32 sts; + + sts = readl(iommu->reg + DMAR_GSTS_REG); + if (sts & DMA_GSTS_IRES) { + pr_info("IR is enabled prior to OS.\n"); + iommu->pre_enabled_ir = 1; + } +} diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 9ca025a..d7ee5ba 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -289,6 +289,8 @@ struct q_inval { struct ir_table { struct irte *base; unsigned long *bitmap; + void __iomem *base_old_virt; + unsigned long base_old_phys; }; #endif @@ -330,6 +332,8 @@ struct intel_iommu { /* whether translation is enabled prior to OS*/ u8 pre_enabled_trans; + /* whether interrupt remapping is enabled prior to OS*/ + u8 pre_enabled_ir; void __iomem *root_entry_old_virt; /* mapped from old root entry */ unsigned long root_entry_old_phys; /* root entry in old kernel */