From patchwork Wed Oct 16 07:34:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 176426 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp6992508ill; Wed, 16 Oct 2019 00:34:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqwo+ghJlMVkT8tpFH3SX+iol0pqkyXfR9WQS1SzyRDxpxTthZSXE6T9573QL7gx4CGZmxbo X-Received: by 2002:aa7:d955:: with SMTP id l21mr37634226eds.179.1571211269035; Wed, 16 Oct 2019 00:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571211269; cv=none; d=google.com; s=arc-20160816; b=Cdsk1CRfyF6Kn6lfroCCDNL/yaigPZUXi2BLU4wvKIMH1CFcGqSzti/NNMd9lgxmVU rhdEt/LcvvcxI/0jzJ6lX1+aMVFjP8DlSteTxSuMaRezmv5dIZqeWDfYKCcm3vd6zTE5 wli9eIcjgI/1jHRC2VkBEQpbRPL0wSLqc+kczrCsEtnO9jSNop4eWUuUILwkm/jPqN6e +1eZwfnRJeOJ1Molo0vsAz7a6P+FuEa0xvSswL1ru9oPRp/7gtfRnH9+YSsPPRvkQxnA hoQ3fdsnnNCs8cI7wqR+IfnwcEK3rS2+KZGURTkma0345CEZ9IClPad0nkAZqTtP/lLo H/lQ== 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=rO1z1JlGDHGdy6zVD5fls33iWqIXWjt9KmTfIa3Qj2w=; b=Jy8oWmLQojSuHHGJ1esY+Nel3bl4s8FSXKdX7GFppj1AHSUl1a4NJMlRbLsgBIUzWy 1BPRn8XzGMKlmrYn8JPWbRU6E62fRSB5XkJOiZQ9x1g6WyRKyyNHNSYDHs4DO9X+x/vT Ktch7qM3+cL/Xzd3Nb2Aq627qEJnETximjKTyCiVFKNqQy01nfUFpT8ZyNi/je2jyNMK LilhQgXzKNUeN3lT6qBJ9j4Laca3HIKnjMS8RpDB4YyDbGNz4H1YnQTuTTUAGD7qW6VY emzLVEVbOmFr2U6UShRVvXV0ujfIkPOlFDTivA6kTBmaG8HK5Q4bftlE7NoSjg2CXNLR pL2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LzUjZmEp; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 h43si15559069ede.142.2019.10.16.00.34.28; Wed, 16 Oct 2019 00:34:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=LzUjZmEp; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1732041AbfJPHe2 (ORCPT + 10 others); Wed, 16 Oct 2019 03:34:28 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36258 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732033AbfJPHe1 (ORCPT ); Wed, 16 Oct 2019 03:34:27 -0400 Received: by mail-pg1-f193.google.com with SMTP id 23so13769970pgk.3 for ; Wed, 16 Oct 2019 00:34:27 -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=rO1z1JlGDHGdy6zVD5fls33iWqIXWjt9KmTfIa3Qj2w=; b=LzUjZmEpb4CTUq2TAze15TIpVNPb2PZBWKXXlGpSIhPM3RX/9Bu0Wrgugkkp90yLqT BfxN2xeveGkUuIU73q0mnw3Ech8CAmdOtynmdYGHsKBNCZQRoSab+Z4w3Gfh2eSAyaQC TsPy3rAJw8IgC92PZ8CkB+/FOioFXftl/mIa2RJBB5bjE/q0lBMg5IzZj8XVlUldPZj+ vV5+m5AToJemzw9OeoNCDDzdt9jdjFLwQMU7Q8XoXDHp53b96yxNQrAL7o8hpq6AHNAY HCo0S3C1mYgINkInHdzjMVtXnqV54cj7y0Jgaq/CxJINOepTF3rOji2yuv5X6SQJ8UdG ApyQ== 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=rO1z1JlGDHGdy6zVD5fls33iWqIXWjt9KmTfIa3Qj2w=; b=tqt8Kb0m33AsFv+0dXm4nkh97P1ctqOGbuUvMua0mugzuO6t8rZqavGb7RyyORCVaJ sfreELqwj79rW6nvoCq74hanU5Vwrj0Z0iDZ0f3MDRmKipRejyd7V7/o1A3EV7kxYjCj khLfdBIhNRj/mX9FYweLOrLUC1x3Xgi+wQQhdXV4bfqdiIyTcTEuICOKpqFi7MwQSacd MJphPrS7FNsd+r/5zm7pSVLlMEoPWxSCJzmZT4ssldWRbuuix9aGntvfV07P/8h9x8sk Th/x/TrxxVa+MHWVcRjW8XeKCVPM02HRW8IRFnkLhOM6+k+zZ9JCV1cnOHxSsQ0kKHYP jmKw== X-Gm-Message-State: APjAAAXXNI1AfjvKJjmJhgfGCHfY5Y6JLCTDbkg3WRMsziWyuEZfuT4Y peag8i1dp+LAcDhY1DrKfqUSTA== X-Received: by 2002:a63:8541:: with SMTP id u62mr41548173pgd.377.1571211266665; Wed, 16 Oct 2019 00:34:26 -0700 (PDT) Received: from localhost ([49.248.175.127]) by smtp.gmail.com with ESMTPSA id s141sm30601856pfs.13.2019.10.16.00.34.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Oct 2019 00:34:26 -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, Amit Kucheria , Daniel Lezcano , Mark Rutland , Rob Herring , Zhang Rui Cc: linux-pm@vger.kernel.org Subject: [PATCH 01/15] drivers: thermal: tsens: Get rid of id field in tsens_sensor Date: Wed, 16 Oct 2019 13:04:00 +0530 Message-Id: <30206cd47d303d2dcaef87f4e3c7173481a0bddd.1571210269.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org There are two fields - id and hw_id - to track what sensor an action was to performed on. This was because the sensors connected to a TSENS IP might not be contiguous i.e. 1, 2, 4, 5 with 3 being skipped. This causes confusion in the code which uses hw_id sometimes and id other times (tsens_get_temp, tsens_get_trend). Switch to only using the hw_id field to track the physical ID of the sensor. When we iterate through all the sensors connected to an IP block, we use an index i to loop through the list of sensors, and then return the actual hw_id that is registered on that index. Signed-off-by: Amit Kucheria Reviewed-by: Stephen Boyd Reviewed-by: Daniel Lezcano --- drivers/thermal/qcom/tsens-8960.c | 4 ++-- drivers/thermal/qcom/tsens-common.c | 16 +++++++++------- drivers/thermal/qcom/tsens.c | 11 +++++------ drivers/thermal/qcom/tsens.h | 10 ++++------ 4 files changed, 20 insertions(+), 21 deletions(-) -- 2.17.1 diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c index e46a4e3f25c4..fb77acb8d13b 100644 --- a/drivers/thermal/qcom/tsens-8960.c +++ b/drivers/thermal/qcom/tsens-8960.c @@ -245,11 +245,11 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s) return adc_code * slope + offset; } -static int get_temp_8960(struct tsens_priv *priv, int id, int *temp) +static int get_temp_8960(struct tsens_sensor *s, int *temp) { int ret; u32 code, trdy; - const struct tsens_sensor *s = &priv->sensor[id]; + struct tsens_priv *priv = s->priv; unsigned long timeout; timeout = jiffies + usecs_to_jiffies(TIMEOUT_US); diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c index 528df8801254..c037bdf92c66 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c @@ -83,11 +83,12 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s) return degc; } -int get_temp_tsens_valid(struct tsens_priv *priv, int i, int *temp) +int get_temp_tsens_valid(struct tsens_sensor *s, int *temp) { - struct tsens_sensor *s = &priv->sensor[i]; - u32 temp_idx = LAST_TEMP_0 + s->hw_id; - u32 valid_idx = VALID_0 + s->hw_id; + 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; int ret; @@ -123,12 +124,13 @@ int get_temp_tsens_valid(struct tsens_priv *priv, int i, int *temp) return 0; } -int get_temp_common(struct tsens_priv *priv, int i, int *temp) +int get_temp_common(struct tsens_sensor *s, int *temp) { - struct tsens_sensor *s = &priv->sensor[i]; + struct tsens_priv *priv = s->priv; + int hw_id = s->hw_id; int last_temp = 0, ret; - ret = regmap_field_read(priv->rf[LAST_TEMP_0 + s->hw_id], &last_temp); + ret = regmap_field_read(priv->rf[LAST_TEMP_0 + hw_id], &last_temp); if (ret) return ret; diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 0627d8615c30..6ed687a6e53c 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -14,19 +14,19 @@ static int tsens_get_temp(void *data, int *temp) { - const struct tsens_sensor *s = data; + struct tsens_sensor *s = data; struct tsens_priv *priv = s->priv; - return priv->ops->get_temp(priv, s->id, temp); + return priv->ops->get_temp(s, temp); } static int tsens_get_trend(void *data, int trip, enum thermal_trend *trend) { - const struct tsens_sensor *s = data; + struct tsens_sensor *s = data; struct tsens_priv *priv = s->priv; if (priv->ops->get_trend) - return priv->ops->get_trend(priv, s->id, trend); + return priv->ops->get_trend(s, trend); return -ENOTSUPP; } @@ -86,8 +86,7 @@ static int tsens_register(struct tsens_priv *priv) for (i = 0; i < priv->num_sensors; i++) { priv->sensor[i].priv = priv; - priv->sensor[i].id = i; - tzd = devm_thermal_zone_of_sensor_register(priv->dev, i, + tzd = devm_thermal_zone_of_sensor_register(priv->dev, priv->sensor[i].hw_id, &priv->sensor[i], &tsens_of_ops); if (IS_ERR(tzd)) diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index b89083b61c38..84e5447c5686 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -32,7 +32,6 @@ enum tsens_ver { * @priv: tsens device instance that this sensor is connected to * @tzd: pointer to the thermal zone that this sensor is in * @offset: offset of temperature adjustment curve - * @id: Sensor ID * @hw_id: HW ID can be used in case of platform-specific IDs * @slope: slope of temperature adjustment curve * @status: 8960-specific variable to track 8960 and 8660 status register offset @@ -41,7 +40,6 @@ struct tsens_sensor { struct tsens_priv *priv; struct thermal_zone_device *tzd; int offset; - unsigned int id; unsigned int hw_id; int slope; u32 status; @@ -62,13 +60,13 @@ struct tsens_ops { /* mandatory callbacks */ int (*init)(struct tsens_priv *priv); int (*calibrate)(struct tsens_priv *priv); - int (*get_temp)(struct tsens_priv *priv, int i, int *temp); + int (*get_temp)(struct tsens_sensor *s, int *temp); /* optional callbacks */ int (*enable)(struct tsens_priv *priv, int i); void (*disable)(struct tsens_priv *priv); int (*suspend)(struct tsens_priv *priv); int (*resume)(struct tsens_priv *priv); - int (*get_trend)(struct tsens_priv *priv, int i, enum thermal_trend *trend); + int (*get_trend)(struct tsens_sensor *s, enum thermal_trend *trend); }; #define REG_FIELD_FOR_EACH_SENSOR11(_name, _offset, _startbit, _stopbit) \ @@ -314,8 +312,8 @@ struct tsens_priv { char *qfprom_read(struct device *dev, const char *cname); void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 mode); int init_common(struct tsens_priv *priv); -int get_temp_tsens_valid(struct tsens_priv *priv, int i, int *temp); -int get_temp_common(struct tsens_priv *priv, int i, int *temp); +int get_temp_tsens_valid(struct tsens_sensor *s, int *temp); +int get_temp_common(struct tsens_sensor *s, int *temp); /* TSENS target */ extern const struct tsens_plat_data data_8960;