From patchwork Mon Dec 15 09:53:05 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: 5491781 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45327BEEA8 for ; Mon, 15 Dec 2014 09:55:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7884D20A01 for ; Mon, 15 Dec 2014 09:55:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 954A8209E3 for ; Mon, 15 Dec 2014 09:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752336AbaLOJz3 (ORCPT ); Mon, 15 Dec 2014 04:55:29 -0500 Received: from g9t1613g.houston.hp.com ([15.240.0.71]:55967 "EHLO g9t1613g.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752234AbaLOJyw (ORCPT ); Mon, 15 Dec 2014 04:54:52 -0500 Received: from g2t2353.austin.hp.com (g2t2353.austin.hp.com [15.217.128.52]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by g9t1613g.houston.hp.com (Postfix) with ESMTPS id 725A162671; Mon, 15 Dec 2014 09:54:52 +0000 (UTC) Received: from g2t2360.austin.hp.com (g2t2360.austin.hp.com [16.197.8.247]) by g2t2353.austin.hp.com (Postfix) with ESMTP id 57424C8; Mon, 15 Dec 2014 09:54:51 +0000 (UTC) Received: from piepie.asiapacific.hpqcorp.net (piepie.asiapacific.hpqcorp.net [16.187.246.131]) by g2t2360.austin.hp.com (Postfix) with ESMTP id 6AD156E; Mon, 15 Dec 2014 09:54:46 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , , , Cc: , , , , , , , , , , , , Subject: [PATCH 09/10] iommu/vt-d: Copy functions for irte Date: Mon, 15 Dec 2014 17:53:05 +0800 Message-Id: <1418637186-9988-10-git-send-email-zhen-hual@hp.com> X-Mailer: git-send-email 2.0.0-rc0 In-Reply-To: <1418637186-9988-1-git-send-email-zhen-hual@hp.com> References: <1418637186-9988-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 | 57 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 4 +++ 2 files changed, 61 insertions(+) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 27541d4..090ba32 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -17,6 +18,11 @@ #include "irq_remapping.h" +#ifdef CONFIG_CRASH_DUMP +static int __iommu_load_old_irte(struct intel_iommu *iommu); +static int __iommu_update_old_irte(struct intel_iommu *iommu, int index); +#endif /* CONFIG_CRASH_DUMP */ + struct ioapic_scope { struct intel_iommu *iommu; unsigned int id; @@ -1296,3 +1302,54 @@ int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert) return ret; } + +#ifdef CONFIG_CRASH_DUMP + +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)); + + 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); + + return 0; +} +#endif /* CONFIG_CRASH_DUMP */ diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 8e29b97..76c6ea5 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -290,6 +290,10 @@ struct q_inval { struct ir_table { struct irte *base; unsigned long *bitmap; +#ifdef CONFIG_CRASH_DUMP + void __iomem *base_old_virt; + unsigned long base_old_phys; +#endif }; #endif