From patchwork Thu Feb 21 16:24:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaishali Thakkar X-Patchwork-Id: 158924 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp678311jaa; Thu, 21 Feb 2019 08:24:52 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib0Bo95j1wXkuW5UBjuyuHFgGP+6QEIzD4woEkV+nvvKKSYKtKhS5sKZF0W/V0/dvI1uvtn X-Received: by 2002:a62:1ac3:: with SMTP id a186mr10487220pfa.48.1550766292453; Thu, 21 Feb 2019 08:24:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550766292; cv=none; d=google.com; s=arc-20160816; b=K7RCx+Jw3r7oE1ser9ox6t5zi1g2gW1JIhyXiEV0+tRThEeYYWQJpYMHp23qD4I9I5 am/XORNRlHMHGvEiuV5hcchL8si/ss7+FjMkNGbhc3QRwKLCZXZVgpIQftCZGO9e+rPt WTJ3QS118JZ9sTVFYJqfOnyuyBEsdnY9WB/ShwtoikYCAGiEbH4gje2DNUosbSoJbQoh O23xyucSf0DfUOLBBnUNCJ+k774JkhVGmUIceNA7+HANKDP3HSbcdF+4nnw/OUWukAmn n2qlmhdViGNJLi8yQq3TudkTnR033ciJpaJINQKxiS6T46ECG5jiecLIEdZSxcenIBWB dLsQ== 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:dkim-signature; bh=rlvsGRSh3G6WjLZNcIcj8XNsHwQFnfAHDnDC9UKd33s=; b=JCSFz/EW7CGSUgnadwJyESeimO3FIQLd3xtZ5d5FQ/dCl16ykjY/dpZ5QSyFgWs414 MG5BfV7eCgqmlLHcQ8p/jfHkswDnZ1nnWis/m14A+Mb1FL/CwZLdfJtM1S5QsiOFd0Xj rCEXQtZCzUGKikHK2oPBPSb2hD/r8+/wB/WxpWoWoBEoO7y2yr/LQ6IC/glq/PvucxER +IrWXssm9k6o6HsL+9tqVQHahU68gg6mXAxTLzm9YkdJkzp/4BlObg8bvaXKJtf1rd73 wWMTTpAl8gpL3jycqvRpSQMM8Pd6ZbsZqQvnv67hkjViCvT1Ip5HC4GPMWHhrNFSBb3W gwHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nvXzikna; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r16si14411907pgm.483.2019.02.21.08.24.51; Thu, 21 Feb 2019 08:24:52 -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; dkim=pass header.i=@linaro.org header.s=google header.b=nvXzikna; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728659AbfBUQYu (ORCPT + 32 others); Thu, 21 Feb 2019 11:24:50 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39200 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728515AbfBUQYr (ORCPT ); Thu, 21 Feb 2019 11:24:47 -0500 Received: by mail-pg1-f193.google.com with SMTP id r11so13914387pgp.6 for ; Thu, 21 Feb 2019 08:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rlvsGRSh3G6WjLZNcIcj8XNsHwQFnfAHDnDC9UKd33s=; b=nvXziknaaVshWu6Ezo3NvverMmrNNtpRS2Sc2DiZ1WEtW8H05P25ULr1FIBBpaekvC uXe5kQqhr5PD2+8SnxM50kt1xiuqO9x2AdgfPzzvoAdwF4rLjUBRFf7qDE2pvuB5ZPE8 8Opheva/dgHf1/snK8VeAar3GNXMAfUC8ATFKXlsFKqyO7UJ686a3CHv65xXmN/Yj5eP J5SFjm+2oAKAgHK4rciGM8fvPy5fHxsDVPUyyqTbW4LR2ac3SrdnJYUdZ/C2aldX0iu0 2gtWBP0A+S9hFDRfL5xJZcxBy3QJK7u7+J1FUCsSzHFQMgiei0YCZMEPpwW3dIfzbnx+ H/FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rlvsGRSh3G6WjLZNcIcj8XNsHwQFnfAHDnDC9UKd33s=; b=icKvHmWeuSEzSfnvf74go+Bh3Mb/JrcN2kp0xTc/y+KbbLqhawgtvqOyIzRa185Ltl tsMo/4is5siuiKtlc0pKxssJpoM3+7n29jmsH9nEmjPxk7QEnPQVCVBTUYd8KBmGTcXy nDsbgUYYyqHRw2W49UbKzYf5vZApV5PEtYmSpaKu++pcGXWmp5F+9e/E792fOKy8UdKj /X50PIEL0mCOAsSRWP91XKpIJpIBm61ivXrkZKYD1KR7o6gsaQ3MCrkOV3uKzxludbQd Q9A98oT5UIgfmjnM6mNSYpi/gr5z5iRv8vC9YsQaByAb3vh4HlxfiLPO0gVJjQ26PL3U PDsA== X-Gm-Message-State: AHQUAua8DB8mwC6muLhtsMeQoj0t9oDpk+tP0smom8f3Y96F/7yitaXq rIog4fZNT7qhAVKEy9YaGUoivA== X-Received: by 2002:a63:1625:: with SMTP id w37mr21612940pgl.13.1550766287013; Thu, 21 Feb 2019 08:24:47 -0800 (PST) Received: from localhost.localdomain ([116.75.87.120]) by smtp.gmail.com with ESMTPSA id 20sm21382910pfs.182.2019.02.21.08.24.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 08:24:46 -0800 (PST) From: Vaishali Thakkar To: andy.gross@linaro.org Cc: david.brown@linaro.org, gregkh@linuxfoundation.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, rafael@kernel.org, bjorn.andersson@linaro.org, vkoul@kernel.org, Vaishali Thakkar Subject: [PATCH v3 5/5] soc: qcom: socinfo: Expose image information Date: Thu, 21 Feb 2019 21:54:19 +0530 Message-Id: <20190221162419.32384-6-vaishali.thakkar@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190221162419.32384-1-vaishali.thakkar@linaro.org> References: <20190221162419.32384-1-vaishali.thakkar@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The socinfo driver provides information about version of the various images loaded in the system. Expose this to user space for debugging purpose. Signed-off-by: Vaishali Thakkar --- Changes since v2: - None Changes since v1: - None --- drivers/soc/qcom/socinfo.c | 210 +++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) -- 2.17.1 diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 5f4bef216ae1..f6a931ca8953 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -31,6 +31,25 @@ #define SMEM_HW_SW_BUILD_ID 137 #ifdef CONFIG_DEBUG_FS +#define SMEM_IMAGE_VERSION_BLOCKS_COUNT 32 +#define SMEM_IMAGE_VERSION_SIZE 4096 +#define SMEM_IMAGE_VERSION_NAME_SIZE 75 +#define SMEM_IMAGE_VERSION_VARIANT_SIZE 20 +#define SMEM_IMAGE_VERSION_OEM_SIZE 32 + +/* + * SMEM Image table indices + */ +#define SMEM_IMAGE_TABLE_BOOT_INDEX 0 +#define SMEM_IMAGE_TABLE_TZ_INDEX 1 +#define SMEM_IMAGE_TABLE_RPM_INDEX 3 +#define SMEM_IMAGE_TABLE_APPS_INDEX 10 +#define SMEM_IMAGE_TABLE_MPSS_INDEX 11 +#define SMEM_IMAGE_TABLE_ADSP_INDEX 12 +#define SMEM_IMAGE_TABLE_CNSS_INDEX 13 +#define SMEM_IMAGE_TABLE_VIDEO_INDEX 14 +#define SMEM_IMAGE_VERSION_TABLE 469 + /* pmic model info */ static const char *const pmic_model[] = { [0] = "Unknown PMIC model", @@ -90,11 +109,21 @@ struct socinfo { __le32 raw_device_num; }; +#ifdef CONFIG_DEBUG_FS +struct smem_image_version { + char name[SMEM_IMAGE_VERSION_NAME_SIZE]; + char variant[SMEM_IMAGE_VERSION_VARIANT_SIZE]; + char pad; + char oem[SMEM_IMAGE_VERSION_OEM_SIZE]; +}; +#endif /* CONFIG_DEBUG_FS */ + struct qcom_socinfo { struct soc_device *soc_dev; struct soc_device_attribute attr; #ifdef CONFIG_DEBUG_FS struct dentry *dbg_root; + struct dentry *boot, *tz, *rpm, *apps, *mpss, *adsp, *cnss, *video; #endif /* CONFIG_DEBUG_FS */ struct socinfo *socinfo; }; @@ -298,8 +327,97 @@ QCOM_OPEN(pmic_model, qcom_show_pmic_model); QCOM_OPEN(platform_subtype, qcom_show_platform_subtype); QCOM_OPEN(pmic_die_revision, qcom_show_pmic_die_revision); +#define IMAGE_SHOW_NAME(attr) \ +static int show_ ##attr## _name(struct seq_file *seq, void *p) \ +{ \ + struct smem_image_version *image_version = seq->private; \ + seq_puts(seq, image_version->name); \ + seq_puts(seq, "\n"); \ + return 0; \ +} \ +static int open_ ##attr## _name(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, show_ ##attr## _name, inode->i_private); \ +} \ + \ +static const struct file_operations qcom_ ##attr## _name_ops = { \ + .open = open_ ##attr## _name, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} \ + +#define DEBUGFS_IMAGE_NAME(fname, attr, index) \ +debugfs_create_file(__stringify(fname), 0400, qcom_socinfo->attr, \ + &smem_image_version[index], &qcom_ ##attr## _name_ops) + +#define IMAGE_SHOW_VARIANT(attr) \ +static int show_ ##attr## _variant(struct seq_file *seq, void *p) \ +{ \ + struct smem_image_version *image_version = seq->private; \ + seq_puts(seq, image_version->variant); \ + seq_puts(seq, "\n"); \ + return 0; \ +} \ +static int open_ ##attr## _variant(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, show_ ##attr## _variant, inode->i_private); \ +} \ + \ +static const struct file_operations qcom_ ##attr## _variant_ops = { \ + .open = open_ ##attr## _variant, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} + +#define DEBUGFS_IMAGE_VARIANT(fname, attr, index) \ +debugfs_create_file(__stringify(fname), 0400, qcom_socinfo->attr, \ + &smem_image_version[index], &qcom_ ##attr## _variant_ops) + +#define IMAGE_SHOW_OEM(attr) \ +static int show_ ##attr## _oem(struct seq_file *seq, void *p) \ +{ \ + struct smem_image_version *image_version = seq->private; \ + seq_puts(seq, image_version->oem); \ + seq_puts(seq, "\n"); \ + return 0; \ +} \ +static int open_ ##attr## _oem(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, show_ ##attr## _oem, inode->i_private); \ +} \ + \ +static const struct file_operations qcom_ ##attr## _oem_ops = { \ + .open = open_ ##attr## _oem, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} + +#define DEBUGFS_IMAGE_OEM(fname, attr, index) \ +debugfs_create_file(__stringify(fname), 0400, qcom_socinfo->attr, \ + &smem_image_version[index], &qcom_ ##attr## _oem_ops) + +#define IMAGE_SHOW(name) \ + IMAGE_SHOW_NAME(name); \ + IMAGE_SHOW_VARIANT(name); \ + IMAGE_SHOW_OEM(name) \ + +IMAGE_SHOW(boot); +IMAGE_SHOW(tz); +IMAGE_SHOW(rpm); +IMAGE_SHOW(apps); +IMAGE_SHOW(mpss); +IMAGE_SHOW(adsp); +IMAGE_SHOW(cnss); +IMAGE_SHOW(video); + static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo) { + struct smem_image_version *smem_image_version; + size_t size; + qcom_socinfo->dbg_root = debugfs_create_dir("qcom_socinfo", NULL); DEBUGFS_UINT_ADD(raw_version); @@ -314,6 +432,98 @@ static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo) DEBUGFS_ADD(pmic_model); DEBUGFS_ADD(platform_subtype); DEBUGFS_ADD(pmic_die_revision); + + smem_image_version = qcom_smem_get(QCOM_SMEM_HOST_ANY, + SMEM_IMAGE_VERSION_TABLE, + &size); + + qcom_socinfo->boot = debugfs_create_dir("boot", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->boot) { + pr_err("Cannot create boot image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, boot, SMEM_IMAGE_TABLE_BOOT_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, boot, SMEM_IMAGE_TABLE_BOOT_INDEX); + DEBUGFS_IMAGE_OEM(oem, boot, SMEM_IMAGE_TABLE_BOOT_INDEX); + + qcom_socinfo->tz = debugfs_create_dir("tz", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->tz) { + pr_err("Cannot create tz image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, tz, SMEM_IMAGE_TABLE_TZ_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, tz, SMEM_IMAGE_TABLE_TZ_INDEX); + DEBUGFS_IMAGE_OEM(oem, tz, SMEM_IMAGE_TABLE_TZ_INDEX); + + qcom_socinfo->rpm = debugfs_create_dir("rpm", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->rpm) { + pr_err("Cannot create rpm image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, rpm, SMEM_IMAGE_TABLE_RPM_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, rpm, SMEM_IMAGE_TABLE_RPM_INDEX); + DEBUGFS_IMAGE_OEM(oem, rpm, SMEM_IMAGE_TABLE_RPM_INDEX); + + qcom_socinfo->apps = debugfs_create_dir("apps", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->apps) { + pr_err("Cannot create apps image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, apps, SMEM_IMAGE_TABLE_APPS_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, apps, SMEM_IMAGE_TABLE_APPS_INDEX); + DEBUGFS_IMAGE_OEM(oem, apps, SMEM_IMAGE_TABLE_APPS_INDEX); + + qcom_socinfo->mpss = debugfs_create_dir("mpss", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->mpss) { + pr_err("Cannot create mpss image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, mpss, SMEM_IMAGE_TABLE_MPSS_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, mpss, SMEM_IMAGE_TABLE_MPSS_INDEX); + DEBUGFS_IMAGE_OEM(oem, mpss, SMEM_IMAGE_TABLE_MPSS_INDEX); + + qcom_socinfo->adsp = debugfs_create_dir("adsp", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->adsp) { + pr_err("Cannot create adsp image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, adsp, SMEM_IMAGE_TABLE_ADSP_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, adsp, SMEM_IMAGE_TABLE_ADSP_INDEX); + DEBUGFS_IMAGE_OEM(oem, adsp, SMEM_IMAGE_TABLE_ADSP_INDEX); + + qcom_socinfo->cnss = debugfs_create_dir("cnss", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->cnss) { + pr_err("Cannot create cnss image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, cnss, SMEM_IMAGE_TABLE_CNSS_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, cnss, SMEM_IMAGE_TABLE_CNSS_INDEX); + DEBUGFS_IMAGE_OEM(oem, cnss, SMEM_IMAGE_TABLE_CNSS_INDEX); + + qcom_socinfo->video = debugfs_create_dir("video", + qcom_socinfo->dbg_root); + if (!qcom_socinfo->video) { + pr_err("Cannot create video image directory\n"); + return; + } + + DEBUGFS_IMAGE_NAME(name, video, SMEM_IMAGE_TABLE_VIDEO_INDEX); + DEBUGFS_IMAGE_VARIANT(variant, video, SMEM_IMAGE_TABLE_VIDEO_INDEX); + DEBUGFS_IMAGE_OEM(oem, video, SMEM_IMAGE_TABLE_VIDEO_INDEX); } static void socinfo_debugfs_exit(struct qcom_socinfo *qcom_socinfo)