From patchwork Mon Oct 21 10:35:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 177055 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3224615ill; Mon, 21 Oct 2019 03:36:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqyJY6gXRwM57SwdoezkSZoEMh/L7I9oykz1euXec/z+LhK0T5cEEhNXNjaS6cnprNTlc4GR X-Received: by 2002:a17:906:c49:: with SMTP id t9mr21347620ejf.267.1571654196839; Mon, 21 Oct 2019 03:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571654196; cv=none; d=google.com; s=arc-20160816; b=DtPoCQ2OOdKeCkVJmnvD0qRjObgujE9vmCH3hfTlIrfF54+aBJRoBYb/YEHToG3Axo HRCgjm1Z630qcBN9OGrjl4Crukdy05HQYDz4viYzbdlVnppI3eVB6b+5aXSP0bkueS2T bdtXHkmy5pXUMhVmtVnd9xYSNHyMjhEDmONxW83dmejeTa9VKBK7StNIHaoIYZwLFly9 ADHG49+zhqftxZ9clW5rrT65iS60LcxzQUEaW3ud4I/U/wAsascT+8I8ukKJxFz8wZpL Pdn3LQGxY7BMOmTbT5C11+ekdhxo/62Txfzy/WhUWsnBcmk9ZuCdi5sHiRa4MFzOrtmJ Txsg== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=0WsTUto1EYkvMJZ+e6vQdDqYayMlmhgUas0MuLlp+q8=; b=U3t1FWvEvI0NeveAOGzp3g9fLjWrn02+ISELS3nUvu42+W77WRZFOpSmraYmps4I0I iONMWgD3rkc8GsZPKqBSvY0rmez03Siu8trmOdYMGJC6geAI2leH8sS2kUL0qXYNBcqP eWlJNoe3CSqUntUkQxdaOpyaqfZ1yc6mXGMz8JfVn+UrLnezowshNX7ZX71dlfu4+24u Ly7N9JkgHLKdgdqpgBeSnMgJMBaJMsjOILGQc1ZedjXPL/l/3tDUEyRN4MduvEVFyRbK M3y6qud1glXHM6UpAkp5m+ODVUrpDYiz9JRNfYK2M0zHzeRq2juwVuzkAFZ426wu39uv M5rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BuiQwH1N; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 jx7si8421643ejb.84.2019.10.21.03.36.36; Mon, 21 Oct 2019 03:36:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=BuiQwH1N; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S1728400AbfJUKge (ORCPT + 15 others); Mon, 21 Oct 2019 06:36:34 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45549 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728396AbfJUKgd (ORCPT ); Mon, 21 Oct 2019 06:36:33 -0400 Received: by mail-pl1-f195.google.com with SMTP id y24so2471820plr.12 for ; Mon, 21 Oct 2019 03:36:33 -0700 (PDT) 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 :in-reply-to:references; bh=0WsTUto1EYkvMJZ+e6vQdDqYayMlmhgUas0MuLlp+q8=; b=BuiQwH1NuI9rAQ1fNEk95k5s7p7HCgQHuiuf4lSnqToB9zfnVQdTxIWcYh+AzYJSgi 6DZcFpM5mQXM44D1usVII25lesoY3vJwT6lG85Waj5JbOt1YjwX76iaevWi1k0gnAatK CemNiPO51im7lMFWfCPsXl00qbm4xeNUKbEFuCnTlIQuLYTLTvQBMxhIZl9dteKECikG Zd5tv/df2quGJ+fm4aHBG99HtO8UwW4+HWLe8zO3gHPDaRTEYCsX1+LimJXozZcZ8aiz AOttS8XF14h9IVT+9Rwpb5GOtd62RRHXezu86KXVDqW/xqhsej+GFW/fzWyuCgy9HhB7 2OZg== 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:in-reply-to:references; bh=0WsTUto1EYkvMJZ+e6vQdDqYayMlmhgUas0MuLlp+q8=; b=NuVXa8nN7khxk7yqfqoyVvkmKCwc1wyl5fyoMqa2ESNCmEoP8aMEJ8aVvxqKu49+pJ +M3wXFaohLL/Gl5LPxCia/5h/tllp/1oGnvxymd6paEJ+P/2H701K2vcAMTI3jzywagn l3icEgTv0C/hzrstRVXWCSUBDTF6ZIeF1Syij2m5wVJXBcmS+CmgG+TjkJIAVPqySh4M 1DwHbFs1+zEHBqhEoQ0NG0am4R2RF0QkMf3Hds94PDEJZXd0rWA5UUr9u6vnqadjV9BM rZBmAeKDHjS/8JQCtpvsOnfLCI4YphW6E5yelGgBhpMNgkC3lU8GhSTmXgI4JzJNmW6m pJoA== X-Gm-Message-State: APjAAAWzULt/82TSoC7RozPU7nziZ07PfKtaXFm3tLkLsiBKV+3VBHP8 /UPzUXkp2j5b/LnXabGfQPKOpw== X-Received: by 2002:a17:902:a618:: with SMTP id u24mr23620577plq.112.1571654192631; Mon, 21 Oct 2019 03:36:32 -0700 (PDT) Received: from localhost ([49.248.62.222]) by smtp.gmail.com with ESMTPSA id p36sm6572055pgm.55.2019.10.21.03.36.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Oct 2019 03:36:32 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, agross@kernel.org, masneyb@onstation.org, swboyd@chromium.org, julia.lawall@lip6.fr, Amit Kucheria , Daniel Lezcano , Mark Rutland , Rob Herring , Zhang Rui Cc: linux-pm@vger.kernel.org Subject: [PATCH v6 14/15] drivers: thermal: tsens: Create function to return sign-extended temperature Date: Mon, 21 Oct 2019 16:05:33 +0530 Message-Id: <0689917475cf83b7e01f6978504fd37352a5e3ca.1571652874.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hide the details of how to convert values read from TSENS HW to mCelsius behind a function. All versions of the IP can be supported as a result. Signed-off-by: Amit Kucheria Reviewed-by: Stephen Boyd --- drivers/thermal/qcom/tsens-common.c | 49 ++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 14 deletions(-) -- 2.17.1 diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c index ea2c46cc6a66a..c34a1a26ce298 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c @@ -84,13 +84,46 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s) return degc; } +/** + * tsens_hw_to_mC - Return sign-extended temperature in mCelsius. + * @s: Pointer to sensor struct + * @field: Index into regmap_field array pointing to temperature data + * + * This function handles temperature returned in ADC code or deciCelsius + * depending on IP version. + * + * Return: Temperature in milliCelsius on success, a negative errno will + * be returned in error cases + */ +static int tsens_hw_to_mC(struct tsens_sensor *s, int field) +{ + struct tsens_priv *priv = s->priv; + u32 resolution; + u32 temp = 0; + int ret; + + resolution = priv->fields[LAST_TEMP_0].msb - + priv->fields[LAST_TEMP_0].lsb; + + ret = regmap_field_read(priv->rf[field], &temp); + if (ret) + return ret; + + /* Convert temperature from ADC code to milliCelsius */ + if (priv->feat->adc) + return code_to_degc(temp, s) * 1000; + + /* deciCelsius -> milliCelsius along with sign extension */ + return sign_extend32(temp, resolution) * 100; +} + int get_temp_tsens_valid(struct tsens_sensor *s, int *temp) { struct tsens_priv *priv = s->priv; int hw_id = s->hw_id; u32 temp_idx = LAST_TEMP_0 + hw_id; u32 valid_idx = VALID_0 + hw_id; - u32 last_temp = 0, valid, mask; + u32 valid; int ret; ret = regmap_field_read(priv->rf[valid_idx], &valid); @@ -108,19 +141,7 @@ int get_temp_tsens_valid(struct tsens_sensor *s, int *temp) } /* Valid bit is set, OK to read the temperature */ - ret = regmap_field_read(priv->rf[temp_idx], &last_temp); - if (ret) - return ret; - - if (priv->feat->adc) { - /* Convert temperature from ADC code to milliCelsius */ - *temp = code_to_degc(last_temp, s) * 1000; - } else { - mask = GENMASK(priv->fields[LAST_TEMP_0].msb, - priv->fields[LAST_TEMP_0].lsb); - /* Convert temperature from deciCelsius to milliCelsius */ - *temp = sign_extend32(last_temp, fls(mask) - 1) * 100; - } + *temp = tsens_hw_to_mC(s, temp_idx); return 0; }