From patchwork Fri Jan 10 22:07:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sumner, William" X-Patchwork-Id: 3468161 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 D34A3C02DC for ; Fri, 10 Jan 2014 22:08:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9D752013D for ; Fri, 10 Jan 2014 22:07:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BC892015A for ; Fri, 10 Jan 2014 22:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758197AbaAJWHx (ORCPT ); Fri, 10 Jan 2014 17:07:53 -0500 Received: from g5t0006.atlanta.hp.com ([15.192.0.43]:43742 "EHLO g5t0006.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758152AbaAJWHt (ORCPT ); Fri, 10 Jan 2014 17:07:49 -0500 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g5t0006.atlanta.hp.com (Postfix) with ESMTP id 33C67C00C; Fri, 10 Jan 2014 22:07:49 +0000 (UTC) Received: from lxbuild.fcux.usa.hp.com (swa01lbdc1025-026-vl250-snat2.atlanta.hp.com [16.228.13.92]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 38A4614002; Fri, 10 Jan 2014 22:07:48 +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: [PATCHv3 5/6] Crashdump-Accepting-Active-IOMMU-Debug-Print-IOMMU Date: Fri, 10 Jan 2014 15:07:31 -0700 Message-Id: <1389391652-52422-6-git-send-email-bill.sumner@hp.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1389391652-52422-1-git-send-email-bill.sumner@hp.com> References: <1389391652-52422-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.0 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 This patch contains a function to print the hardware registers of each IOMMU onto the system console during crashdump kernel initialization. This function seemed far too useful to leave out. v1->v2: Updated patch description Fixed: "Advanced Fault Log register" v2->v3: No change Signed-off-by: Bill Sumner --- drivers/iommu/intel-iommu.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 6737550..457ac80b 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5325,3 +5325,79 @@ static int copy_intel_iommu_translation_tables(struct dmar_drhd_unit *drhd, return 0; } #endif /* CONFIG_CRASH_DUMP */ +#ifdef CONFIG_CRASH_DUMP + + +/* ========================================================================= + * Diagnostic print + * ------------------------------------------------------------------------ + */ + +static struct intel_iommu_register_print { + int len; /* Length of register */ + int idx; /* Index to read register */ + char reg[20]; /* Linux name of register */ + char txt[40]; /* Description */ +} intel_iommu_register_print_v[] = { + {1, DMAR_VER_REG, "DMAR_VER_REG", "Arch version supported by this IOMMU"}, + {2, DMAR_CAP_REG, "DMAR_CAP_REG", "Hardware supported capabilities"}, + {2, DMAR_ECAP_REG, "DMAR_ECAP_REG", "Extended capabilities supported"}, + {1, DMAR_GCMD_REG, "DMAR_GCMD_REG", "Global command register"}, + {1, DMAR_GSTS_REG, "DMAR_GSTS_REG", "Global status register "}, + {2, DMAR_RTADDR_REG, "DMAR_RTADDR_REG", "Root entry table"}, + {2, DMAR_CCMD_REG, "DMAR_CCMD_REG", "Context command reg"}, + {1, DMAR_FSTS_REG, "DMAR_FSTS_REG", "Fault Status register"}, + {1, DMAR_FECTL_REG, "DMAR_FECTL_REG", "Fault control register"}, + {1, DMAR_FEDATA_REG, "DMAR_FEDATA_REG", "Fault event interrupt data register"}, + {1, DMAR_FEADDR_REG, "DMAR_FEADDR_REG", "Fault event interrupt addr register"}, + {1, DMAR_FEUADDR_REG, "DMAR_FEUADDR_REG", "Upper address register"}, + {2, DMAR_AFLOG_REG, "DMAR_AFLOG_REG", "Advanced Fault Log register"}, + {1, DMAR_PMEN_REG, "DMAR_PMEN_REG", "Enable Protected Memory Region"}, + {1, DMAR_PLMBASE_REG, "DMAR_PLMBASE_REG", "PMRR Low addr"}, + {1, DMAR_PLMLIMIT_REG, "DMAR_PLMLIMIT_REG", "PMRR low limit"}, + {2, DMAR_PHMBASE_REG, "DMAR_PHMBASE_REG", "pmrr high base addr"}, + {2, DMAR_PHMLIMIT_REG, "DMAR_PHMLIMIT_REG", "pmrr high limit"}, + {2, DMAR_IQH_REG, "DMAR_IQH_REG", "Invalidation queue head register"}, + {2, DMAR_IQT_REG, "DMAR_IQT_REG", "Invalidation queue tail register"}, + {2, DMAR_IQA_REG, "DMAR_IQA_REG", "Invalidation queue addr register"}, + {1, DMAR_ICS_REG, "DMAR_ICS_REG", "Invalidation complete status register"}, + {2, DMAR_IRTA_REG, "DMAR_IRTA_REG", "Interrupt remapping table addr register"}, +}; + +static void print_intel_iommu_registers(struct dmar_drhd_unit *drhd) +{ + struct intel_iommu *iommu; /* Virt adr(iommu hardware registers) */ + unsigned long long q; /* quadword scratch */ + u32 ver; /* DMAR_VER_REG */ + + int m = sizeof(intel_iommu_register_print_v) / + sizeof(intel_iommu_register_print_v[0]); + struct intel_iommu_register_print *p = &intel_iommu_register_print_v[0]; + + iommu = drhd->iommu; + + pr_debug("ENTER %s\n", __func__); + ver = readl(iommu->reg + DMAR_VER_REG); + pr_debug("IOMMU %d: reg_base_addr %llx ver %d:%d cap %llx ecap %llx\n", + iommu->seq_id, + (unsigned long long)drhd->reg_base_addr, + DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver), + (unsigned long long)iommu->cap, + (unsigned long long)iommu->ecap); + + q = readq(iommu->reg + DMAR_RTADDR_REG); + pr_debug("IOMMU %d: DMAR_RTADDR_REG:0x%16.16llx\n", iommu->seq_id, q); + + for (; p < &intel_iommu_register_print_v[m]; p++) + if (p->len == 2) + pr_debug("0x%16.16llx %-20s %-40s\n", + (u64)readq(iommu->reg + p->idx), p->reg, + p->txt); + else + pr_debug(" 0x%8.8x %-20s %-40s\n", + (u32)readl(iommu->reg + p->idx), p->reg, + p->txt); + + pr_debug("LEAVE %s\n", __func__); +} +#endif /* CONFIG_CRASH_DUMP */