From patchwork Sat Apr 13 08:27:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10899379 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37B11186E for ; Sat, 13 Apr 2019 08:28:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 226D528E85 for ; Sat, 13 Apr 2019 08:28:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D96A28E96; Sat, 13 Apr 2019 08:28:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97C5E28E85 for ; Sat, 13 Apr 2019 08:28:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727356AbfDMI2S (ORCPT ); Sat, 13 Apr 2019 04:28:18 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38902 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727350AbfDMI2R (ORCPT ); Sat, 13 Apr 2019 04:28:17 -0400 Received: by mail-pf1-f193.google.com with SMTP id 10so6246949pfo.5; Sat, 13 Apr 2019 01:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i23+oyBgEnXB9qRq+mm3/3KuLAYqITPcLrHTT0eBkK4=; b=a6UMSAM6IZ1Jwtu3fFmUlSxvbOYNpjBOxgMFxIbQg+MFsUP6y9csAR4Opb7bx08011 8f2jwshad/s4lECcglUWC7GT4plQn5ll6eH313BPfQ5LDUMolpULiJx2qLwhp4AhwCQv 9hNm2SVACXXVG4SdNussjRekBGn8kThAM5AC5umoy6ukZiwby39Bj/TFEmO8dkxDfVSJ A0sjBYBbe9QrQ5VNmKXrvI8ghO7gbc54XR8K4t2LmnSAeT77QNyy9YzNenrrr0xt22zA fwSQfUg04Kj13TzV3nQTcNiPHHeg90AlOUn+mqh4f4v4hpFIJd97TjUHZ/bccCbHez0Z SMBQ== 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:mime-version:content-transfer-encoding; bh=i23+oyBgEnXB9qRq+mm3/3KuLAYqITPcLrHTT0eBkK4=; b=nZ93r88BVuUzzoKkDHB/wW83qX3lL6I4ZOU16gsIFAYi4mmnvX+VQDdiOaiGdCeNgx tblTcNAh7e2NuaP+efndKS/3MTjxt9alEkh2F63OHVXvXmcH/qDDZoC0CTWTpRCSelpr VXysZldEKua1d9jgBwjIctag2FBqYcjsdmSEYjrYi2jo4FkGqwH9ky3RSqzQ2gIhLTz2 NQ93+sbph8NwqLI+mWg+bx56VUUwtq4Pq6Bw1YUXN8fq2dVBHj5/+4xgWk8mrsNiGvEc hHa80mmnI7re2j94QLkGHMYX08m+xEZ0Qot/jZkDwZOF06wGpKp1mIGXrYoEWa0zHyeO O4PQ== X-Gm-Message-State: APjAAAVqMgrqDlvAwef3RMGO/L33HPGR+H2x38Knao24Ka+aSq2jeO4G uOuDN5xkEMtGD5K2FMsoXdq9n2sy X-Google-Smtp-Source: APXvYqzt6+UZ4YN+Y2WMXaFTJ7g5XJlXxthGjIf2OL0UMXHpo/ERjVEYVYKBXewxrG17urRSbypUyQ== X-Received: by 2002:a63:4e10:: with SMTP id c16mr58046205pgb.302.1555144096688; Sat, 13 Apr 2019 01:28:16 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id z20sm58261328pgf.70.2019.04.13.01.28.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 01:28:15 -0700 (PDT) From: Andrey Smirnov To: linux-pm@vger.kernel.org Cc: Andrey Smirnov , Chris Healy , Lucas Stach , Eduardo Valentin , Daniel Lezcano , Angus Ainslie , linux-imx@nxp.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 09/12] thermal: qoriq: Enable all sensors before registering them Date: Sat, 13 Apr 2019 01:27:45 -0700 Message-Id: <20190413082748.29990-10-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190413082748.29990-1-andrew.smirnov@gmail.com> References: <20190413082748.29990-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Tmu_get_temp will get called as a part of sensor registration via devm_thermal_zone_of_sensor_register(). To prevent it from retruning bogus data we need to enable sensor monitoring before that. Looking at the datasheet (i.MX8MQ RM) there doesn't seem to be any harm in enabling them all, so, for the sake of simplicity, change the code to do just that. Signed-off-by: Andrey Smirnov Cc: Chris Healy Cc: Lucas Stach Cc: Eduardo Valentin Cc: Daniel Lezcano Cc: Angus Ainslie (Purism) Cc: linux-imx@nxp.com Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/thermal/qoriq_thermal.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index 9774323a17bf..abbbfe88422e 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -23,6 +23,7 @@ #define TMR_DISABLE 0x0 #define TMR_ME 0x80000000 #define TMR_ALPF 0x0c000000 +#define TMR_MSITE_ALL GENMASK(15, 0) #define REGS_TMTMIR 0x008 /* Temperature measurement interval Register */ #define TMTMIR_DEFAULT 0x0000000f @@ -61,28 +62,28 @@ static const struct thermal_zone_of_device_ops tmu_tz_ops = { static int qoriq_tmu_register_tmu_zone(struct device *dev, struct qoriq_tmu_data *qdata) { - int id, sites = 0; + int id, ret; + + regmap_write(qdata->regmap, REGS_TMR, + TMR_MSITE_ALL | TMR_ME | TMR_ALPF); for (id = 0; id < SITES_MAX; id++) { struct thermal_zone_device *tzd; tzd = devm_thermal_zone_of_sensor_register(dev, id, qdata, &tmu_tz_ops); - if (IS_ERR(tzd)) { - if (PTR_ERR(tzd) == -ENODEV) - continue; - else - return PTR_ERR(tzd); + ret = PTR_ERR_OR_ZERO(tzd); + switch (ret) { + case -ENODEV: + continue; + case 0: + break; + default: + regmap_write(qdata->regmap, REGS_TMR, TMR_DISABLE); + return ret; } - - sites |= 0x1 << (15 - id); } - /* Enable monitoring */ - if (sites != 0) - regmap_write(qdata->regmap, REGS_TMR, - sites | TMR_ME | TMR_ALPF); - return 0; }