From patchwork Sat Apr 13 08:27:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10899375 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 AB84317E0 for ; Sat, 13 Apr 2019 08:28:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 904F328E85 for ; Sat, 13 Apr 2019 08:28:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84D4F28E87; Sat, 13 Apr 2019 08:28:47 +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 6E6CC28E85 for ; Sat, 13 Apr 2019 08:28:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726953AbfDMI2k (ORCPT ); Sat, 13 Apr 2019 04:28:40 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:46900 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727382AbfDMI2T (ORCPT ); Sat, 13 Apr 2019 04:28:19 -0400 Received: by mail-pf1-f194.google.com with SMTP id 9so6217193pfj.13; Sat, 13 Apr 2019 01:28:19 -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=Fa9VbtAEA5XxQk9udn1SCQKBpCj0lIUFDw7+3syeD9M=; b=cIZedw5EAO3l9Jp8aV2T0bXUIyd4bK7Yoqd4/4TlC3Bw6PAB5RBCfhEPMCQiKhXu33 hU56UMgs685hBDwQkJSKkG5JogJek94vg0slSj3qriFzdfugZadKrJxoBED3wZbrDvdu z2CpAn0wC6kR79yXyEmbcYayUKiLkRU8BKvqIATnOWzHKA4RZ5HK12Oe799Lpe+6nSd2 40bAIAKfgnO0ad1zVrF/WPJGC4417YG5LdOWfTVoGwlmpo1ShX6hAaoYGf+ymKVzUtDX 1cNtdBAgFIuROUxPAUZBVBHXqCy0UOBwPOazdLzMLb3s653OJ2WCit32bGf31cpwgKpx wewg== 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=Fa9VbtAEA5XxQk9udn1SCQKBpCj0lIUFDw7+3syeD9M=; b=jZMvIDzSwFdChbriShYMGXgugPjOcAApHi32YNk9uk0HAJFY5PgQvRoH22rcyLVv9Z T4NHYghIU+oSk106Yk3GgpMOx+MfuVInHIPsyCBbgsu1UhUIgKyFWquYIrep9ewySZp0 17ESvB8wYj4kJjurDXtWed8o9unsvkBTmarUuYLyDSxfQijDDcZ5gsz/jUJW9lDJ3Kdb FMOll1rXymw+yRpGxKjFaTmXZVaKDHmmT+BWZ8UDRgfPiNpvJTdnDaofcytSH5uUBWtI 0ukcmOSEAcMtj0QjSKY0VyXErY2rLkd/ayGa5h7UwcdLRSoiGJTNYRjDvg49upToy2Vt Ldpg== X-Gm-Message-State: APjAAAVlYuP3XFkRXYX57Su99POg0ztV85/+WwHsVqaJ+GPiIKuYrCn4 idwQ0KWLJHRx4PF+wUuaEKD75Vth X-Google-Smtp-Source: APXvYqypU3Fpoc0fnbetc8eAplZiNuSLI/O77OXWw48TbSU9zR+w8fxQRO7aMGWPO2Y9HM4Rj6NvvA== X-Received: by 2002:a63:6842:: with SMTP id d63mr56387934pgc.49.1555144097924; Sat, 13 Apr 2019 01:28:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 01:28:16 -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 10/12] thermal: qoriq: Do not report invalid temperature reading Date: Sat, 13 Apr 2019 01:27:46 -0700 Message-Id: <20190413082748.29990-11-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 Before returning measured temperature data to upper layer we need to make sure that the reading was marked as "valid" to avoid reporting bogus data. 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 Reviewed-by: Daniel Lezcano --- drivers/thermal/qoriq_thermal.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index abbbfe88422e..5c459a9d0db3 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -37,6 +37,7 @@ #define REGS_TRITSR(n) (0x100 + 16 * (n)) /* Immediate Temperature * Site Register */ +#define TRITSR_V BIT(31) #define REGS_TTRnCR(n) (0xf10 + 4 * (n)) /* Temperature Range n * Control Register */ @@ -48,10 +49,25 @@ static int tmu_get_temp(int id, void *p, int *temp) { struct qoriq_tmu_data *qdata = p; u32 val; + /* + * REGS_TRITSR(id) has the following layout: + * + * 31 ... 7 6 5 4 3 2 1 0 + * V TEMP + * + * Where V bit signifies if the measurement is ready and is + * within sensor range. TEMP is an 8 bit value representing + * temperature in C. + */ + if (regmap_read_poll_timeout(qdata->regmap, + REGS_TRITSR(id), + val, + val & TRITSR_V, + USEC_PER_MSEC, + 10 * USEC_PER_MSEC)) + return -ENODATA; - regmap_read(qdata->regmap, REGS_TRITSR(id), &val); *temp = (val & 0xff) * 1000; - return 0; }