Received: by 10.223.176.5 with SMTP id f5csp90661wra; Fri, 2 Feb 2018 17:29:25 -0800 (PST) X-Google-Smtp-Source: AH8x224+KtafNamG5B4EFH4CRTwqHXu20u+keTGZRsEnnRhCCnpKpZm/YTWyq26CujZ+BhbQiBGI X-Received: by 10.101.64.139 with SMTP id t11mr6170908pgp.162.1517621365817; Fri, 02 Feb 2018 17:29:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517621365; cv=none; d=google.com; s=arc-20160816; b=L8R4sGhvJxS0inS4KdmsY4PG82ki9ibNexq2ezFP043IE7YEA0JQydqY15j6RGa3Yu lvBaSUr1QKp+oGs05YQtlIum1H+wNfHZ0sb9EbrIUExMndVfNDySS5Rr9UBIOqCKBo5o L3TZpNTwFHsCTODUdKicNiv6KDl/PqMV72ET0PgYg8pYpCLkcI/57mKNzTQ31t+8hvRu DnIwvzhhEdkEDJjDmpEGcYATDZEnxACfEN4UD/5BipqX34yxbkl834dQWXkUx98IqMfj tc7epuZO8AOd3kD1iPBK8FYilOb9aftysOS/pjV9u34fUrc2UFU8cwGq8HmfOpvkbTbL joIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=JOMN+GmOYIG8ZbOgPKZtGKxguYSNklE2BZOZWAJfUts=; b=Jf6P30T0ZCiLFlizuHgDdon4VYDadah0IN0/hpPbZaqF7vzEajeQV7/KyRJEWKSVs8 SOXcJuHoAHQqT8YDUU/sQL0gtTjSi75EUVURydCDAha4YHsQwpbB5PFsaqklrp+rZKfe v5eH/2XzCBS8jKbutcxLS2KaQv7pQKr8koXrUIl4NKxZi9ByzywqgymT7Yk2ZaRKU1+B eHTlFeuz82e7eqI6ysO6az9ngsZUXx7a7WylIG2EKjb/aE5K4YgTfxGkRl3Uws2tyLDw VFsfUb8LRZkUnmYHP0ouJgXahoWHyI014tYADajhi9dN3BtgffzmLGPH7qxSH5rvrhBn bMxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n13si2005160pgc.528.2018.02.02.17.29.11; Fri, 02 Feb 2018 17:29:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753218AbeBCAuI (ORCPT + 99 others); Fri, 2 Feb 2018 19:50:08 -0500 Received: from mga18.intel.com ([134.134.136.126]:17233 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753156AbeBCAt1 (ORCPT ); Fri, 2 Feb 2018 19:49:27 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Feb 2018 16:49:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,452,1511856000"; d="scan'208";a="15086259" Received: from sohilbuildbox.sc.intel.com (HELO localhost.localdomain) ([172.25.110.4]) by fmsmga008.fm.intel.com with ESMTP; 02 Feb 2018 16:49:27 -0800 From: Sohil Mehta To: Joerg Roedel Cc: Alex Williamson , Ashok Raj , David Woodhouse , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Jacob Pan , Gayatri Kammela , Sohil Mehta , Ravi V Shankar , Andy Shevchenko , Lu Baolu , Fenghua Yu Subject: [PATCH v7 3/5] iommu/vt-d: Add debugfs support to show register contents Date: Fri, 2 Feb 2018 16:49:59 -0800 Message-Id: <1517619001-148586-4-git-send-email-sohil.mehta@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517619001-148586-1-git-send-email-sohil.mehta@intel.com> References: <1517619001-148586-1-git-send-email-sohil.mehta@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gayatri Kammela Debugfs extension to dump all the register contents for each IOMMU device to the user space via debugfs. Example: root@OTC-KBLH-01:~# cat /sys/kernel/debug/intel_iommu/iommu_regset DMAR: dmar0: Register Base Address fed90000 Name Offset Contents VER 0x00 0x0000000000000010 CAP 0x08 0x01c0000c40660462 ECAP 0x10 0x0000000000f0101a GCMD 0x18 0x0000000000000000 GSTS 0x1c 0x00000000c7000000 RTADDR 0x20 0x00000004071d3800 CCMD 0x28 0x0800000000000000 FSTS 0x34 0x0000000000000000 FECTL 0x38 0x0000000000000000 FEDATA 0x3c 0xfee0100400004021 Cc: Fenghua Yu Cc: Jacob Pan Cc: Ashok Raj Co-Developed-by: Sohil Mehta Signed-off-by: Sohil Mehta Signed-off-by: Gayatri Kammela --- v7: Use macro for register set definitions Fix compiler warning for readq with 32bit architecture Remove leading '\n' v6: No change v5: No change v4: Fix checkpatch.pl warnings Remove error reporting for debugfs_create_file function Remove redundant IOMMU null check under for_each_active_iommu v3: Use a macro for seq file operations Change the intel_iommu_regset file name to iommu_regset Add information for MTRR registers v2: Fix seq_printf formatting drivers/iommu/intel-iommu-debug.c | 84 +++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 2 + 2 files changed, 86 insertions(+) diff --git a/drivers/iommu/intel-iommu-debug.c b/drivers/iommu/intel-iommu-debug.c index 8253503..38651ad 100644 --- a/drivers/iommu/intel-iommu-debug.c +++ b/drivers/iommu/intel-iommu-debug.c @@ -38,6 +38,49 @@ static const struct file_operations __name ## _fops = \ .owner = THIS_MODULE, \ } +struct iommu_regset { + int offset; + const char *regs; +}; + +#define IOMMU_REGSET_ENTRY(_reg_) \ + { DMAR_##_reg_##_REG, __stringify(_reg_) } +static const struct iommu_regset iommu_regs[] = { + IOMMU_REGSET_ENTRY(VER), + IOMMU_REGSET_ENTRY(CAP), + IOMMU_REGSET_ENTRY(ECAP), + IOMMU_REGSET_ENTRY(GCMD), + IOMMU_REGSET_ENTRY(GSTS), + IOMMU_REGSET_ENTRY(RTADDR), + IOMMU_REGSET_ENTRY(CCMD), + IOMMU_REGSET_ENTRY(FSTS), + IOMMU_REGSET_ENTRY(FECTL), + IOMMU_REGSET_ENTRY(FEDATA), + IOMMU_REGSET_ENTRY(FEADDR), + IOMMU_REGSET_ENTRY(FEUADDR), + IOMMU_REGSET_ENTRY(AFLOG), + IOMMU_REGSET_ENTRY(PMEN), + IOMMU_REGSET_ENTRY(PLMBASE), + IOMMU_REGSET_ENTRY(PLMLIMIT), + IOMMU_REGSET_ENTRY(PHMBASE), + IOMMU_REGSET_ENTRY(PHMLIMIT), + IOMMU_REGSET_ENTRY(IQH), + IOMMU_REGSET_ENTRY(IQT), + IOMMU_REGSET_ENTRY(IQA), + IOMMU_REGSET_ENTRY(ICS), + IOMMU_REGSET_ENTRY(IRTA), + IOMMU_REGSET_ENTRY(PQH), + IOMMU_REGSET_ENTRY(PQT), + IOMMU_REGSET_ENTRY(PQA), + IOMMU_REGSET_ENTRY(PRS), + IOMMU_REGSET_ENTRY(PECTL), + IOMMU_REGSET_ENTRY(PEDATA), + IOMMU_REGSET_ENTRY(PEADDR), + IOMMU_REGSET_ENTRY(PEUADDR), + IOMMU_REGSET_ENTRY(MTRRCAP), + IOMMU_REGSET_ENTRY(MTRRDEF) +}; + static void ctx_tbl_entry_show(struct seq_file *m, struct intel_iommu *iommu, int bus, bool ext) { @@ -116,6 +159,45 @@ static int dmar_translation_struct_show(struct seq_file *m, void *unused) } DEFINE_SHOW_ATTRIBUTE(dmar_translation_struct); +static int iommu_regset_show(struct seq_file *m, void *unused) +{ + struct dmar_drhd_unit *drhd; + struct intel_iommu *iommu; + unsigned long long base; + int i, ret = 0; + u64 value; + + rcu_read_lock(); + for_each_active_iommu(iommu, drhd) { + if (!drhd->reg_base_addr) { + seq_puts(m, "IOMMU: Invalid base address\n"); + ret = -EINVAL; + goto out; + } + + base = drhd->reg_base_addr; + seq_printf(m, "DMAR: %s: Register Base Address %llx\n", + iommu->name, base); + seq_puts(m, "Name\t\t\tOffset\t\tContents\n"); + /* + * Publish the contents of the 64-bit hardware registers + * by adding the offset to the pointer (virtual address). + */ + for (i = 0 ; i < ARRAY_SIZE(iommu_regs); i++) { + value = dmar_readq(iommu->reg + iommu_regs[i].offset); + seq_printf(m, "%-8s\t\t0x%02x\t\t0x%016llx\n", + iommu_regs[i].regs, iommu_regs[i].offset, + value); + } + seq_putc(m, '\n'); + } +out: + rcu_read_unlock(); + + return ret; +} +DEFINE_SHOW_ATTRIBUTE(iommu_regset); + void __init intel_iommu_debugfs_init(void) { struct dentry *iommu_debug_root; @@ -126,4 +208,6 @@ void __init intel_iommu_debugfs_init(void) debugfs_create_file("dmar_translation_struct", 0444, iommu_debug_root, NULL, &dmar_translation_struct_fops); + debugfs_create_file("iommu_regset", 0444, iommu_debug_root, NULL, + &iommu_regset_fops); } diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 8968afa..1044a14 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -71,6 +71,8 @@ #define DMAR_PEDATA_REG 0xe4 /* Page request event interrupt data register */ #define DMAR_PEADDR_REG 0xe8 /* Page request event interrupt addr register */ #define DMAR_PEUADDR_REG 0xec /* Page request event Upper address register */ +#define DMAR_MTRRCAP_REG 0x100 /* Memory type range register capability register */ +#define DMAR_MTRRDEF_REG 0x108 /* Memory type range register default type register */ #define OFFSET_STRIDE (9) -- 2.7.4