From patchwork Sat Oct 22 12:56:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 13015966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE762C04A95 for ; Sat, 22 Oct 2022 12:57:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229808AbiJVM5M (ORCPT ); Sat, 22 Oct 2022 08:57:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229732AbiJVM5M (ORCPT ); Sat, 22 Oct 2022 08:57:12 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A1831E3EC; Sat, 22 Oct 2022 05:57:11 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id m16so15241289edc.4; Sat, 22 Oct 2022 05:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z7rhD1WXk3L0TCFvw5pkhsK28oe7XUuV2gNiSIm6BKo=; b=esAkwKbUQ2Fp7FXLvBIFGLPS8xQkqN/MCR8znYnQ587k2ew1B13CDmrIfKxlE+A1Yh 8HDoPbeYBfwo3DsT35M4ad4fnZqin4fznFbQgnVsFt9GE/3NUo0Ce59M1SwFY0ISuL85 WukPVszZOtG4hEOnPN0Py4lJrpHGHQxLKhcYpaRl0qNvf+iNQfJilgcee/xct/0QZ6ig qYWZQuq33njWgbBOAjK8VnJMjuaGzGEE/7GZqjA7VN95Gwck+CW0GV+i50uR3fWfdGeg umBJl9s4Qt3/YWfjJ+vpB+A4GXGfVe87yA4uoYlJKBfrXkZlA/NmX+H7UyufVfgmbcqg l5EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z7rhD1WXk3L0TCFvw5pkhsK28oe7XUuV2gNiSIm6BKo=; b=6omnLgrTnn6y55G09SCEsZU+22ouVZPVRaYp871tunemdpTBwzpIF9H1QMpEKOOqCN QVqEa3COJSI9rsV7uxx57Z502HRVivHv6lRjJRDfJq2xJH6JJNgmVg7PXJyuWMDMseYH mux7caDzejASfL1nH/OoMKKbDhGgnOicvHrcdbnd0K6wDIKqF9KEbx/tVTr5cKy67j63 HfHQlUk7it9IJV3Y8mhhk9t2KcORN3s6vxPsN+v4ESo+JclP39FG6KtDT1tVP/gNMj/k d+U57dN2SeAAn3jo7RSA1vGv7avnbM/WeISvRbFJcXYUHvdOnVy/T9PgswYPqzSurlqD kkkA== X-Gm-Message-State: ACrzQf0ItWUYM4oadgfEfosCdmFtmk2sCJHxUnREssqYfnsSjNNcy1MG 5MvHqDKI7usljuYky/YFV6E= X-Google-Smtp-Source: AMsMyM57ZLgGMNp1ECg8RqK2wZI1OnoPsaCLo9cWpduwDaCGRUFMAe1lfAxwK9rEkTOVv6osgPuXOg== X-Received: by 2002:a17:907:75c6:b0:79c:d3f4:4a14 with SMTP id jl6-20020a17090775c600b0079cd3f44a14mr5975122ejc.61.1666443429649; Sat, 22 Oct 2022 05:57:09 -0700 (PDT) Received: from localhost.localdomain (93-42-70-134.ip85.fastwebnet.it. [93.42.70.134]) by smtp.googlemail.com with ESMTPSA id t29-20020a056402241d00b0045ce419ecffsm15173970eda.58.2022.10.22.05.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 05:57:09 -0700 (PDT) From: Christian Marangi To: Amit Kucheria , Thara Gopinath , Andy Gross , Bjorn Andersson , Konrad Dybcio , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi , Thara Gopinath Subject: [PATCH v3 1/3] thermal: qcom: tsens: init debugfs only with successful probe Date: Sat, 22 Oct 2022 14:56:55 +0200 Message-Id: <20221022125657.22530-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221022125657.22530-1-ansuelsmth@gmail.com> References: <20221022125657.22530-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org calibrate and tsens_register can fail or PROBE_DEFER. This will cause a double or a wrong init of the debugfs information. Init debugfs only with successful probe fixing warning about directory already present. Signed-off-by: Christian Marangi Acked-by: Thara Gopinath --- drivers/thermal/qcom/tsens.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index b1b10005fb28..af688ce4d14d 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -918,8 +918,6 @@ int __init init_common(struct tsens_priv *priv) if (tsens_version(priv) >= VER_0_1) tsens_enable_irq(priv); - tsens_debug_init(op); - err_put_device: put_device(&op->dev); return ret; @@ -1153,7 +1151,11 @@ static int tsens_probe(struct platform_device *pdev) } } - return tsens_register(priv); + ret = tsens_register(priv); + if (!ret) + tsens_debug_init(pdev); + + return ret; } static int tsens_remove(struct platform_device *pdev) From patchwork Sat Oct 22 12:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 13015967 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C61EC433FE for ; Sat, 22 Oct 2022 12:57:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbiJVM5P (ORCPT ); Sat, 22 Oct 2022 08:57:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229770AbiJVM5O (ORCPT ); Sat, 22 Oct 2022 08:57:14 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7F2922B38C; Sat, 22 Oct 2022 05:57:12 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id a13so15438604edj.0; Sat, 22 Oct 2022 05:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=elZSYe3VbormSDAP7uv9H4cczBV3tZh4oUja1hlsR2Q=; b=GwyVQomAlS8vYmx2ITPLDkpqc3PV5qR/XCYkut01ioy6GM8244F3+2JhfruEja8STG FUSztCJZi6vCpT28wtHY4VLFqJTElNMYw8gmFACKtsgs8hNsaP4CeC1L5va3heoAMawY SZQQdpvzs6ttUtCyKkU9mgZeQQBpnGmVddREnT487+9nY14DZMItEgC6C/eetzdyiJMS LD9l7saXsjjxvmoImhjLZHoHkKaS53lees9iMDh/dR6/4Yif5xFvtlpsrxFUBZkWqYol SErJlRJyfQQT0Pln3duYpIpWTRLndBPOTkJclSJX0UH7ZjLWC2egs/F7wIix0YXHQ0ui RdiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=elZSYe3VbormSDAP7uv9H4cczBV3tZh4oUja1hlsR2Q=; b=UXYi6NbkvVJ0rVnY2ICIXYFfhm/0GOjEIEAW0e9Q3wOedgr6zDO5VOZmcFbVDMZbYu sUPsB5TY/32EDc71fuWt5gXVZfq8dENDv8z3PZJPe1Xxu4G4k6vr15lHGGheZ0II3glb 2Jol4s2yDLvMr+pFOSncn4H1lqDJFPEWD0NxfolWqmQzmrLRRXob9RRkSe/VCQR7/yoo RoxiX0+ygpGjXPr/bFcStIHDNDU85ibmWrJM2hvktVXxr6czmRoSGdCBKSHUIzcp54YL H7Cozw1uu2OWoo0jPMxvmEauMFTF/CwcbHqr3Lgb0ImzzQGVyTmfl7mxRIzSMTsNiFRg CmuA== X-Gm-Message-State: ACrzQf3fJ46NVgVvEti9IcK2wILh3H5Fn44ICYL93rgTFUJBpjm4G0VU 95mEelmewR2aWKPfAvCUBD4= X-Google-Smtp-Source: AMsMyM4B0jHt87VsmbrfC+qSz9CqM6sfozpwpf91yweEP6Fjk2wo+qqPUL683+TVj3rBql/pcsyZ6w== X-Received: by 2002:a17:906:9bc3:b0:78d:816f:3743 with SMTP id de3-20020a1709069bc300b0078d816f3743mr20100171ejc.380.1666443431241; Sat, 22 Oct 2022 05:57:11 -0700 (PDT) Received: from localhost.localdomain (93-42-70-134.ip85.fastwebnet.it. [93.42.70.134]) by smtp.googlemail.com with ESMTPSA id t29-20020a056402241d00b0045ce419ecffsm15173970eda.58.2022.10.22.05.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 05:57:10 -0700 (PDT) From: Christian Marangi To: Amit Kucheria , Thara Gopinath , Andy Gross , Bjorn Andersson , Konrad Dybcio , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 2/3] thermal: qcom: tsens: fix wrong version id dbg_version_show Date: Sat, 22 Oct 2022 14:56:56 +0200 Message-Id: <20221022125657.22530-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221022125657.22530-1-ansuelsmth@gmail.com> References: <20221022125657.22530-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org For VER_0 the version was incorrectly reported as 0.1.0. Fix that and correctly report the major version for this old tsens revision. Signed-off-by: Christian Marangi --- drivers/thermal/qcom/tsens.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index af688ce4d14d..467585c45d34 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -692,7 +692,7 @@ static int dbg_version_show(struct seq_file *s, void *data) return ret; seq_printf(s, "%d.%d.%d\n", maj_ver, min_ver, step_ver); } else { - seq_puts(s, "0.1.0\n"); + seq_printf(s, "0.%d.0\n", priv->feat->ver_major); } return 0; From patchwork Sat Oct 22 12:56:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 13015968 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 047B7C433FE for ; Sat, 22 Oct 2022 12:57:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229918AbiJVM5Z (ORCPT ); Sat, 22 Oct 2022 08:57:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229876AbiJVM5Q (ORCPT ); Sat, 22 Oct 2022 08:57:16 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 190A822B7AE; Sat, 22 Oct 2022 05:57:15 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id m15so15295125edb.13; Sat, 22 Oct 2022 05:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vfeD3Vie7kg8iBMU4bkz+AYFFromxwoh/hIWgeFhX/4=; b=C25zegeG71PPfAEE2c+D+wLiz7zAx/3KhgWHknRipTMUBTCQNNzbai4ngRH7syML4C Zoi7cwUtl1Gcs3mLf8u2nEd42RZ6TmKYokdY9wce00/FXONAg6+ePfxMI3yKrl0ihnlv jBLDEF6ADT65ExUTwIuaQPj2IFXIIUpfWtFIYhqikSsg095U4mGRVwz6Bqkmb3OxrDYQ wDzdhqmHcdgUpbVRwswZOMknMJAkcjQ4vUf+xFOs86VNIxRiBf9WEEgl63FDSd2PUJrZ eNQ5HVioybp84avkdM3PrK0nT8qNvtMBTnK3eqS/eaI8+2hiUt6bNL/tbSA/1B9ftySj Hgew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vfeD3Vie7kg8iBMU4bkz+AYFFromxwoh/hIWgeFhX/4=; b=D8FFlbr+vaSoZjACpxYxOp/yOu1uW3BnB95l9/RENgQhdD2j8lVqSPum2U2nPKmkC5 r8+JpgR6JOB796qIYwg4Lsr7aqQcRg1tnzj6mQRny3CWGxwCJroOPlRml4LepmNsHKQ0 QE2sCVCEX0Wiy926byDfD94QuN3c1EyeF6PDwGEKWYmkLkWmJUs/lN0PRTxdghtTZDmw FyNHAZo+vhq2pXkETx8RWI7w/ziT/c+dE2zK9FqH+HVFETYD69XZpYJ/gwo6s5nTq7jI 7/kHn246HqAcV9NRTXp4NJuIBGYH6Fb0hTV85uottkgap0jAoRJOZNfC0bv8v0LuMG8t SFdw== X-Gm-Message-State: ACrzQf2K1ygGHvCdlJmtocMFA4wBX71GtfLushBQ6zVOOoLTw59CWGB0 1giWkyCpAZ6UuAo4CWLEf/Q= X-Google-Smtp-Source: AMsMyM4jRHLbhVT3BOYqYw8t6Kk5iE5G5XJrfuMXsPdVuaayzQ0ZePMqdu1S5M398MVACvFI0RHIpg== X-Received: by 2002:a17:906:c152:b0:78d:9dbb:150b with SMTP id dp18-20020a170906c15200b0078d9dbb150bmr18972923ejc.542.1666443433316; Sat, 22 Oct 2022 05:57:13 -0700 (PDT) Received: from localhost.localdomain (93-42-70-134.ip85.fastwebnet.it. [93.42.70.134]) by smtp.googlemail.com with ESMTPSA id t29-20020a056402241d00b0045ce419ecffsm15173970eda.58.2022.10.22.05.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 05:57:12 -0700 (PDT) From: Christian Marangi To: Amit Kucheria , Thara Gopinath , Andy Gross , Bjorn Andersson , Konrad Dybcio , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 3/3] thermal: qcom: tsens: rework debugfs file structure Date: Sat, 22 Oct 2022 14:56:57 +0200 Message-Id: <20221022125657.22530-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221022125657.22530-1-ansuelsmth@gmail.com> References: <20221022125657.22530-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The current tsens debugfs structure is composed by: - a tsens dir in debugfs with a version file - a directory for each tsens istance with sensors file to dump all the sensors value. This works on the assumption that we have the same version for each istance but this assumption seems fragile and with more than one tsens istance results in the version file not tracking each of them. A better approach is to just create a subdirectory for each tsens istance and put there version and sensors debugfs file. Using this new implementation results in less code since debugfs entry are created only on successful tsens probe. Signed-off-by: Christian Marangi --- drivers/thermal/qcom/tsens.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 467585c45d34..fc12d7c07de4 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -704,21 +704,14 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors); static void tsens_debug_init(struct platform_device *pdev) { struct tsens_priv *priv = platform_get_drvdata(pdev); - struct dentry *root, *file; - root = debugfs_lookup("tsens", NULL); - if (!root) + priv->debug_root = debugfs_lookup("tsens", NULL); + if (!priv->debug_root) priv->debug_root = debugfs_create_dir("tsens", NULL); - else - priv->debug_root = root; - - file = debugfs_lookup("version", priv->debug_root); - if (!file) - debugfs_create_file("version", 0444, priv->debug_root, - pdev, &dbg_version_fops); /* A directory for each instance of the TSENS IP */ priv->debug = debugfs_create_dir(dev_name(&pdev->dev), priv->debug_root); + debugfs_create_file("version", 0444, priv->debug, pdev, &dbg_version_fops); debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops); } #else