From patchwork Mon Dec 15 09:52:59 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: 5491821 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 6727DBEEA8 for ; Mon, 15 Dec 2014 09:56:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 962BF209FD for ; Mon, 15 Dec 2014 09:56:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B066C209E3 for ; Mon, 15 Dec 2014 09:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752045AbaLOJyX (ORCPT ); Mon, 15 Dec 2014 04:54:23 -0500 Received: from g2t1383g.austin.hp.com ([15.217.136.92]:41832 "EHLO g2t1383g.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894AbaLOJyU (ORCPT ); Mon, 15 Dec 2014 04:54:20 -0500 Received: from g2t2352.austin.hp.com (g2t2352.austin.hp.com [15.217.128.51]) (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 4E3633C5D; Mon, 15 Dec 2014 09:54:20 +0000 (UTC) Received: from g2t2360.austin.hp.com (g2t2360.austin.hp.com [16.197.8.247]) by g2t2352.austin.hp.com (Postfix) with ESMTP id 56894BB; Mon, 15 Dec 2014 09:54:19 +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 790074B; Mon, 15 Dec 2014 09:54:14 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , , , Cc: , , , , , , , , , , , , Subject: [PATCH 03/10] iommu/vt-d: Add domain-id functions Date: Mon, 15 Dec 2014 17:52:59 +0800 Message-Id: <1418637186-9988-4-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 Interfaces for when a new domain in the crashdump kernel needs some values from the panicked kernel's context entries. Signed-off-by: Bill Sumner --- drivers/iommu/intel-iommu.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 5ce2850..c0bebd6 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -381,6 +381,13 @@ struct domain_values_entry { 2 == 1GiB, 3 == 512GiB, 4 == 1TiB */ }; +static struct domain_values_entry *intel_iommu_did_to_domain_values_entry( + int did, struct intel_iommu *iommu); + +static int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu); + +static int device_to_domain_id(struct intel_iommu *iommu, u8 bus, u8 devfn); + #endif /* CONFIG_CRASH_DUMP */ /* @@ -4832,3 +4839,58 @@ static void __init check_tylersburg_isoch(void) printk(KERN_WARNING "DMAR: Recommended TLB entries for ISOCH unit is 16; your BIOS set %d\n", vtisochctrl); } + +#ifdef CONFIG_CRASH_DUMP + +/* + * Interfaces for when a new domain in the crashdump kernel needs some + * values from the panicked kernel's context entries + * + */ +static 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. + */ +static 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; +} + +static int device_to_domain_id(struct intel_iommu *iommu, u8 bus, u8 devfn) +{ + int did = -1; /* domain-id returned */ + struct root_entry *root; + struct context_entry *context; + unsigned long flags; + + spin_lock_irqsave(&iommu->lock, flags); + root = &iommu->root_entry[bus]; + context = get_context_addr_from_root(root); + if (context && context_present(context+devfn)) + did = context_domain_id(context+devfn); + spin_unlock_irqrestore(&iommu->lock, flags); + return did; +} + +#endif /* CONFIG_CRASH_DUMP */