Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp4142752imc; Sun, 24 Feb 2019 22:52:03 -0800 (PST) X-Google-Smtp-Source: AHgI3IaDooic3DoHZq1yWpc0tR7EFx523itK+voXTdIvDENlc1HM7VVbbP5BsySWAFe1TcX56vw0 X-Received: by 2002:a62:388a:: with SMTP id f132mr18643114pfa.150.1551077523148; Sun, 24 Feb 2019 22:52:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551077523; cv=none; d=google.com; s=arc-20160816; b=bkyrIMYwF6MPe02zhEhQGEM1gg442qadyBNS8nhNoRibaT/YUk1TwtPWkgoo5et7CJ yqHyCbJIul34UQ2gWiMWStc5VQGyrbBV5GdJSFnqAlZxmwAand0zjYNl0kXrizXquUhY vo67tsNPtFDXXHAyhVDaDIc9/ud4TIBcwMAsTAKty5/uEyFufeOl5lcb1ezwSl20U7zn VEhyO+O9sUXRJ2NJn3XXmPbq+yC35JpWrqSiyOuQApeW8RVn9P2EF7D52u+KswXLLIDI xlZWke4hMWyoStBj8Fk4HbjTh69neb9eEPSGC35qBz+w7oqaPJ8Ln3gdzZ+UyHmJ2vdZ iYog== 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=WgMiTupxL1h7FFD3rtr3bGCDzKlQIo5tIk2sc+S1nSg=; b=EYSmka1TkIr/1G7/k0lEB9YM0+PfQ0uVOv5ibPLc6fmE4XZ0CKmXcrQgG7RqK27JkV fouQXg6p4jQwjFg98a7sp8MlPh7KWHrjpqwXdV6O8goJ9GD/4PJKcC7RMl0qgsxsdSDk oIU+Cyf5uWuzN6Plh2kANbVLR/HRxHoBh0kbqyl21DOCRGFnC/OP+BxLFuOrdmLHM7rK aaE3qBaRTnNwfnIqHYJiLJ80U9aE96V8L93bXpNW+tthDdIRfHV+bibUFKDbRF5QSIbJ sNZfOVSjnHvKdtfAoEFc5rLXABXCKWNaKyCTQHx3wJGETT7CnrvH2oKioTkbhvBLhPUY 48/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FdO1DHFN; 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 m26si9088963pfi.247.2019.02.24.22.51.47; Sun, 24 Feb 2019 22:52:03 -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=FdO1DHFN; 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 S1728637AbfBYGvL (ORCPT + 99 others); Mon, 25 Feb 2019 01:51:11 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:38896 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728599AbfBYGvK (ORCPT ); Mon, 25 Feb 2019 01:51:10 -0500 Received: by mail-pl1-f193.google.com with SMTP id g37so1223380plb.5 for ; Sun, 24 Feb 2019 22:51:10 -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=WgMiTupxL1h7FFD3rtr3bGCDzKlQIo5tIk2sc+S1nSg=; b=FdO1DHFNOnygWfF55GpRHTpUNEuHzrQ9OEo1DmmVJ4gvci3exQZ+qNNK1GCUHwL5s1 L199Vx3ivwsAU4suYq/y7GW52YJzDHtp7sHD8YP1odjX3gp2fU5pAm8U3mRtm9HJNRVD gOVi4o6QC0wA9cHmKK98C4CD6cG279MWkZPurqNe5+i+a3QsbWrgBvip+JDPL9o4SoNT 2d1IzFvJP+TOBLS5uABsNy/D5hECFBDirqoayX83iRqWuuoEbCs5iKD8NT3JLoAvLoRh fUb5nJgOt/h3BR5bdn2vh9ozDQJh1av4SUNbAbl2fGLbzLmd7rVSNgHCaQHZGkDybH4y niyQ== 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=WgMiTupxL1h7FFD3rtr3bGCDzKlQIo5tIk2sc+S1nSg=; b=GiSGs506GUw250gwgfux6xEEnFlG3JGf7iuZR69csCRUHFx1vwsiK3eklLI6UGAnAB WYg5VbIqueBf9mr669btf/ysaHyGcAG4ksEIgGUR2Q+273x018ha3UFsn0NuSVbOjvuL q18z7mrg2yDXCwIC8KppMvVDqe5HquRm+cTv1i/mH7H1L02SJKXOuY5zZDd+C8Zlkfst bKdaN+53A1FtFptxQcukRsLf6I86zsSqMpfdEL3klNydJxwvhoQCXfCns7dfuCPKn/zV fRii3ELqh6VwlaQX1Eg9VQjQlK4UIw6/uo2lWT3qIwE3jF4oKzYUDuWePYM51MOs8ORC YarA== X-Gm-Message-State: AHQUAuaMbkqDV1o7D5uj23i4OrhQ2Lsrm6xo6pQdxlMbJ+YUG9wi3yt8 rXnKG7CiQ4OGgX1pONzuYXPRMg== X-Received: by 2002:a17:902:33c1:: with SMTP id b59mr18560941plc.220.1551077469814; Sun, 24 Feb 2019 22:51:09 -0800 (PST) Received: from localhost.localdomain ([116.75.87.120]) by smtp.gmail.com with ESMTPSA id f16sm9990021pgg.20.2019.02.24.22.51.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Feb 2019 22:51:09 -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 v4 4/5] soc: qcom: socinfo: Expose custom attributes Date: Mon, 25 Feb 2019 12:20:43 +0530 Message-Id: <20190225065044.11023-5-vaishali.thakkar@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190225065044.11023-1-vaishali.thakkar@linaro.org> References: <20190225065044.11023-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 Qualcomm socinfo provides a number of additional attributes, add these to the socinfo driver and expose them via debugfs functionality. Signed-off-by: Vaishali Thakkar --- Changes since v3: - Fix compilation error in function signatures when debugfs is disabled Changes since v2: - None Changes since v1: - Remove unnecessary debugfs dir creation check - Align ifdefs to left - Fix function signatures for debugfs init/exit --- drivers/soc/qcom/socinfo.c | 198 +++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 02078049fac7..ccadeba69a81 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -4,6 +4,7 @@ * Copyright (c) 2017-2019, Linaro Ltd. */ +#include #include #include #include @@ -29,6 +30,28 @@ */ #define SMEM_HW_SW_BUILD_ID 137 +#ifdef CONFIG_DEBUG_FS +/* pmic model info */ +static const char *const pmic_model[] = { + [0] = "Unknown PMIC model", + [9] = "PM8994", + [11] = "PM8916", + [13] = "PM8058", + [14] = "PM8028", + [15] = "PM8901", + [16] = "PM8027", + [17] = "ISL9519", + [18] = "PM8921", + [19] = "PM8018", + [20] = "PM8015", + [21] = "PM8014", + [22] = "PM8821", + [23] = "PM8038", + [24] = "PM8922", + [25] = "PM8917", +}; +#endif /* CONFIG_DEBUG_FS */ + /* Socinfo SMEM item structure */ struct socinfo { __le32 fmt; @@ -70,6 +93,10 @@ struct socinfo { struct qcom_socinfo { struct soc_device *soc_dev; struct soc_device_attribute attr; +#ifdef CONFIG_DEBUG_FS + struct dentry *dbg_root; +#endif /* CONFIG_DEBUG_FS */ + struct socinfo *socinfo; }; struct soc_of_id { @@ -133,6 +160,171 @@ static const char *socinfo_machine(struct device *dev, unsigned int id) return NULL; } +#ifdef CONFIG_DEBUG_FS + +#define UINT_SHOW(name, attr) \ +static int qcom_show_##name(struct seq_file *seq, void *p) \ +{ \ + struct socinfo *socinfo = seq->private; \ + seq_printf(seq, "%u\n", le32_to_cpu(socinfo->attr)); \ + return 0; \ +} \ +static int qcom_open_##name(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, qcom_show_##name, inode->i_private); \ +} \ + \ +static const struct file_operations qcom_ ##name## _ops = { \ + .open = qcom_open_##name, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} + +#define DEBUGFS_UINT_ADD(name) \ + debugfs_create_file(__stringify(name), 0400, \ + qcom_socinfo->dbg_root, \ + qcom_socinfo->socinfo, &qcom_ ##name## _ops) + +#define HEX_SHOW(name, attr) \ +static int qcom_show_##name(struct seq_file *seq, void *p) \ +{ \ + struct socinfo *socinfo = seq->private; \ + seq_printf(seq, "0x%x\n", le32_to_cpu(socinfo->attr)); \ + return 0; \ +} \ +static int qcom_open_##name(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, qcom_show_##name, inode->i_private); \ +} \ + \ +static const struct file_operations qcom_ ##name## _ops = { \ + .open = qcom_open_##name, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} + +#define DEBUGFS_HEX_ADD(name) \ + debugfs_create_file(__stringify(name), 0400, \ + qcom_socinfo->dbg_root, \ + qcom_socinfo->socinfo, &qcom_ ##name## _ops) + + +#define QCOM_OPEN(name, _func) \ +static int qcom_open_##name(struct inode *inode, struct file *file) \ +{ \ + return single_open(file, _func, inode->i_private); \ +} \ + \ +static const struct file_operations qcom_ ##name## _ops = { \ + .open = qcom_open_##name, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +} + +#define DEBUGFS_ADD(name) \ + debugfs_create_file(__stringify(name), 0400, \ + qcom_socinfo->dbg_root, \ + qcom_socinfo->socinfo, &qcom_ ##name## _ops) + + +static int qcom_show_build_id(struct seq_file *seq, void *p) +{ + struct socinfo *socinfo = seq->private; + + seq_printf(seq, "%s\n", socinfo->build_id); + + return 0; +} + +static int qcom_show_accessory_chip(struct seq_file *seq, void *p) +{ + struct socinfo *socinfo = seq->private; + + seq_printf(seq, "%d\n", le32_to_cpu(socinfo->accessory_chip)); + + return 0; +} + +static int qcom_show_platform_subtype(struct seq_file *seq, void *p) +{ + struct socinfo *socinfo = seq->private; + int subtype = le32_to_cpu(socinfo->hw_plat_subtype); + + if (subtype < 0) + return -EINVAL; + + seq_printf(seq, "%u\n", subtype); + + return 0; +} + +static int qcom_show_pmic_model(struct seq_file *seq, void *p) +{ + struct socinfo *socinfo = seq->private; + int model = SOCINFO_MINOR(le32_to_cpu(socinfo->pmic_model)); + + if (model < 0) + return -EINVAL; + + seq_printf(seq, "%s\n", pmic_model[model]); + + return 0; +} + +static int qcom_show_pmic_die_revision(struct seq_file *seq, void *p) +{ + struct socinfo *socinfo = seq->private; + + seq_printf(seq, "%u.%u\n", + SOCINFO_MAJOR(le32_to_cpu(socinfo->pmic_die_rev)), + SOCINFO_MINOR(le32_to_cpu(socinfo->pmic_die_rev))); + + return 0; +} + +UINT_SHOW(raw_version, raw_ver); +UINT_SHOW(hardware_platform, hw_plat); +UINT_SHOW(platform_version, plat_ver); +UINT_SHOW(foundry_id, foundry_id); +HEX_SHOW(chip_family, chip_family); +HEX_SHOW(raw_device_family, raw_device_family); +HEX_SHOW(raw_device_number, raw_device_num); +QCOM_OPEN(build_id, qcom_show_build_id); +QCOM_OPEN(accessory_chip, qcom_show_accessory_chip); +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); + +static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo) +{ + qcom_socinfo->dbg_root = debugfs_create_dir("qcom_socinfo", NULL); + + DEBUGFS_UINT_ADD(raw_version); + DEBUGFS_UINT_ADD(hardware_platform); + DEBUGFS_UINT_ADD(platform_version); + DEBUGFS_UINT_ADD(foundry_id); + DEBUGFS_HEX_ADD(chip_family); + DEBUGFS_HEX_ADD(raw_device_family); + DEBUGFS_HEX_ADD(raw_device_number); + DEBUGFS_ADD(build_id); + DEBUGFS_ADD(accessory_chip); + DEBUGFS_ADD(pmic_model); + DEBUGFS_ADD(platform_subtype); + DEBUGFS_ADD(pmic_die_revision); +} + +static void socinfo_debugfs_exit(struct qcom_socinfo *qcom_socinfo) +{ + debugfs_remove_recursive(qcom_socinfo->dbg_root); +} +#else +static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo) { } +static void socinfo_debugfs_exit(struct qcom_socinfo *qcom_socinfo) { } +#endif /* CONFIG_DEBUG_FS */ + static int qcom_socinfo_probe(struct platform_device *pdev) { struct qcom_socinfo *qs; @@ -165,6 +357,10 @@ static int qcom_socinfo_probe(struct platform_device *pdev) if (IS_ERR(qs->soc_dev)) return PTR_ERR(qs->soc_dev); + qs->socinfo = info; + + socinfo_debugfs_init(qs); + /* Feed the soc specific unique data into entropy pool */ add_device_randomness(info, item_size); @@ -179,6 +375,8 @@ static int qcom_socinfo_remove(struct platform_device *pdev) soc_device_unregister(qs->soc_dev); + socinfo_debugfs_exit(qs); + return 0; } -- 2.17.1