From patchwork Tue Apr 15 23:09:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sumner, William" X-Patchwork-Id: 3995941 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 742089F2BA for ; Tue, 15 Apr 2014 23:11:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0FDA2026C for ; Tue, 15 Apr 2014 23:11:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E44232025B for ; Tue, 15 Apr 2014 23:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332AbaDOXLk (ORCPT ); Tue, 15 Apr 2014 19:11:40 -0400 Received: from g4t3426.houston.hp.com ([15.201.208.54]:6270 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751744AbaDOXJe (ORCPT ); Tue, 15 Apr 2014 19:09:34 -0400 Received: from g9t2301.houston.hp.com (g9t2301.houston.hp.com [16.216.185.78]) by g4t3426.houston.hp.com (Postfix) with ESMTP id 460E9199; Tue, 15 Apr 2014 23:09:33 +0000 (UTC) Received: from lxbuild.fcux.usa.hp.com (unknown [16.78.34.175]) by g9t2301.houston.hp.com (Postfix) with ESMTP id A300766; Tue, 15 Apr 2014 23:09:32 +0000 (UTC) From: Bill Sumner To: dwmw2@infradead.org, indou.takao@jp.fujitsu.com, bhe@redhat.com, joro@8bytes.org Cc: iommu@lists.linux-foundation.org, kexec@lists.infradead.org, alex.williamson@redhat.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ddutile@redhat.com, ishii.hironobu@jp.fujitsu.com, bhelgaas@google.com, bill.sumner@hp.com, doug.hatch@hp.com, zhenhua@hp.com Subject: [PATCH 7/8] Add domain-id functions to intel-iommu-kdump.c Date: Tue, 15 Apr 2014 17:09:08 -0600 Message-Id: <1397603349-30930-8-git-send-email-bill.sumner@hp.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1397603349-30930-1-git-send-email-bill.sumner@hp.com> References: <1397603349-30930-1-git-send-email-bill.sumner@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=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 intel_iommu_did_to_domain_values_entry() intel_iommu_get_dids_from_old_kernel() Signed-off-by: Bill Sumner --- drivers/iommu/intel-iommu-kdump.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/iommu/intel-iommu-kdump.c b/drivers/iommu/intel-iommu-kdump.c index 4e653e048..f3c777e 100644 --- a/drivers/iommu/intel-iommu-kdump.c +++ b/drivers/iommu/intel-iommu-kdump.c @@ -53,6 +53,45 @@ static struct list_head *domain_values_list; /* ======================================================================== + * Interfaces for when a new domain in the crashdump kernel needs some + * values from the panicked kernel's context entries + * ------------------------------------------------------------------------ + */ + + +struct domain_values_entry *intel_iommu_did_to_domain_values_entry(int did, + struct intel_iommu *iommu) +{ + struct domain_values_entry *dve; /* iterator */ + + list_for_each_entry(dve, &domain_values_list[iommu->seq_id], link) + if (dve->did == did) + return dve; + return NULL; +} + + +/* Mark domain-id's from old kernel as in-use on this iommu so that a new + * domain-id is allocated in the case where there is a device in the new kernel + * that was not in the old kernel -- and therefore a new domain-id is needed. + */ +int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu) +{ + struct domain_values_entry *dve; /* iterator */ + + pr_info("IOMMU:%d Domain ids from panicked kernel:\n", iommu->seq_id); + + list_for_each_entry(dve, &domain_values_list[iommu->seq_id], link) { + set_bit(dve->did, iommu->domain_ids); + pr_info("DID did:%d(0x%4.4x)\n", dve->did, dve->did); + } + + pr_info("----------------------------------------\n"); + return 0; +} + + +/* ======================================================================== * Copy iommu translation tables from old kernel into new kernel. * Entry to this set of functions is: intel_iommu_copy_translation_tables() * ------------------------------------------------------------------------