From patchwork Wed May 8 17:00:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10936265 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 2343E13AD for ; Wed, 8 May 2019 17:00:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FF5228AAE for ; Wed, 8 May 2019 17:00:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D9C128B24; Wed, 8 May 2019 17:00:52 +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 A88A428ABC for ; Wed, 8 May 2019 17:00:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728917AbfEHRAm (ORCPT ); Wed, 8 May 2019 13:00:42 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36718 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728915AbfEHRAm (ORCPT ); Wed, 8 May 2019 13:00:42 -0400 Received: by mail-pg1-f195.google.com with SMTP id a3so1159356pgb.3; Wed, 08 May 2019 10:00:41 -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; bh=NxAUam5Dvt1HQoAAg/vTkC6mAACjVaJFnU6FSnpD4fQ=; b=CONn6uI3sZhY9txU/ul8dooJT4LHPM/v1iQbwxmzcfCSCqJxEvLpyFT+r0IJCqbZnR UMYqkdkJwC6Z0/v4EGaE4+OgaXaPXC0pCCp6gix4k9ei/QlppPaDr9lHho/mTnmGATqb /ojOjeotcLZO8xCQ7y7iD+eaPPIT578OR5uTMHwpu3ju2lTGQQohkrAeqcr999S0lkA8 M3L7TAvYbu/K+D6y3ZeVtDydVQ6ZzPPMNBy+h+gptyVzYHwBikC1EEe5bxWk77znoyhE 3s5+mLaK8GcdKKjjbSn06rCbopBCeGy6l/6JzhTgWI6bIORwtTSDK7REWPgrq+8n+HxN /hUw== 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; bh=NxAUam5Dvt1HQoAAg/vTkC6mAACjVaJFnU6FSnpD4fQ=; b=f0iFVUQtHYX3O15d2KVURMD3VSU7m8SKql9YJwEE93lo4eRcBIB2l0kNbV7BDhlavQ u3tTj1RrQYXasOFNTLfJdxNShXk0l6bktlru5wB7py9HnsvigZdgmhmCEhuolS95okSP hl2gBzLhqsnp+CzJCYvSLfb17Am3QRmz8EmYIP8uPSMqlod8D44r0cdfKv+Cg3sfKHLi XhRxVoubjD8mL/U4q30zQVvnFTXnyVnQ+TMk1rQzTMSyqZKs9tWja+JqX48J3ASECqga gxCZpWFXM6PB2T7xJgBC7fBgb12j9cGB4QBS/WUGWtyNhFkfS2izur+tadQNPczK0JC8 sVlw== X-Gm-Message-State: APjAAAVLcbEfNp/X4fLdUi7TjWuCNMmU8l0I8oUq5D0nii8iDAlNVA/j lbL7FkoIpUOu+dRQGl8apSjnYSua X-Google-Smtp-Source: APXvYqyidr30JBrMQn+0cCHfa68oqy10M/mQ+z/LUY0WKG2Rlh2YkbzPXibdIggDIJ8j9EoYNIzOZg== X-Received: by 2002:aa7:82d6:: with SMTP id f22mr49384376pfn.190.1557334840649; Wed, 08 May 2019 10:00:40 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id a80sm11347773pfj.105.2019.05.08.10.00.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 10:00:39 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Sudeep Holla , Jean Delvare , Guenter Roeck , linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org (open list:HARDWARE MONITORING) Subject: [PATCH v4 1/2] firmware: arm_scmi: Fetch and store sensor scale Date: Wed, 8 May 2019 10:00:34 -0700 Message-Id: <20190508170035.19671-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190508170035.19671-1-f.fainelli@gmail.com> References: <20190508170035.19671-1-f.fainelli@gmail.com> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for dealing with scales within the SCMI HWMON driver, fetch and store the sensor unit scale into the scmi_sensor_info structure. In order to simplify computations for upper layer, take care of sign extending the scale to a full 8-bit signed value. Signed-off-by: Florian Fainelli Reviewed-by: Guenter Roeck --- drivers/firmware/arm_scmi/sensors.c | 6 ++++++ include/linux/scmi_protocol.h | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c index b53d5cc9c9f6..21353470a740 100644 --- a/drivers/firmware/arm_scmi/sensors.c +++ b/drivers/firmware/arm_scmi/sensors.c @@ -34,6 +34,8 @@ struct scmi_msg_resp_sensor_description { __le32 attributes_high; #define SENSOR_TYPE(x) ((x) & 0xff) #define SENSOR_SCALE(x) (((x) >> 11) & 0x3f) +#define SENSOR_SCALE_SIGN BIT(5) +#define SENSOR_SCALE_EXTEND GENMASK(7, 6) #define SENSOR_UPDATE_SCALE(x) (((x) >> 22) & 0x1f) #define SENSOR_UPDATE_BASE(x) (((x) >> 27) & 0x1f) u8 name[SCMI_MAX_STR_SIZE]; @@ -140,6 +142,10 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, s = &si->sensors[desc_index + cnt]; s->id = le32_to_cpu(buf->desc[cnt].id); s->type = SENSOR_TYPE(attrh); + s->scale = SENSOR_SCALE(attrh); + /* Sign extend to a full s8 */ + if (s->scale & SENSOR_SCALE_SIGN) + s->scale |= SENSOR_SCALE_EXTEND; strlcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE); } diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index 3105055c00a7..9ff2e9357e9a 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -144,6 +144,7 @@ struct scmi_power_ops { struct scmi_sensor_info { u32 id; u8 type; + s8 scale; char name[SCMI_MAX_STR_SIZE]; }; From patchwork Wed May 8 17:00:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10936263 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 11A95933 for ; Wed, 8 May 2019 17:00:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F03E328A6D for ; Wed, 8 May 2019 17:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E41E528AF7; Wed, 8 May 2019 17:00:51 +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 0C0F228AF8 for ; Wed, 8 May 2019 17:00:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728935AbfEHRAo (ORCPT ); Wed, 8 May 2019 13:00:44 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39015 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728929AbfEHRAn (ORCPT ); Wed, 8 May 2019 13:00:43 -0400 Received: by mail-pg1-f193.google.com with SMTP id w22so9087360pgi.6; Wed, 08 May 2019 10:00:42 -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; bh=Arjf5SjBWyqdlOF7ZBaYh9oh1wq7UwM1Y2hcNdX8mds=; b=LH2En+8GU9Jfc/Y08z8NM3JMYSd06Otfgk9YajGHKw8GLCAsze8McVlMGwMZ+1Fr8k GwpRAjy7GW3i5/0cd/TcVwKOZM5xu7bSEZOwYHT0RxDGRLWBqZbMCONfJIBKj++/dw9D VU+3FqgafzKAclaP0BBGBoR61bg5WhqlCm3uMdspjdUWiOLt7xHwrbFSBpbloe5EpMul raX7pnci8OoUb+ESIOMhsHx3/zAokq6jhAJDzKXhD+DT35ynJJqX5vCAtOKpsJAAPrMh +9vUwl/2oQo5sYI/D6LXsGKcBT8YgHC00FzobxJIu87XWEuPqRLkcwlNNByutJzTMshY t+1g== 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; bh=Arjf5SjBWyqdlOF7ZBaYh9oh1wq7UwM1Y2hcNdX8mds=; b=Kdbp9gAbSTdJq0nao4HMoO439eSnBP5cvzaH3eP4+x0x9ra6HSilVohH5tUGuLjdL3 hrWLCmqgY9cOSGCRmc0I2/8XDkHK0dA9F+LWXEh9m/RCJpW1rDlKH3x+A0JgiNGshYIh g9aYNESmwLimRaJNg1vO64Il9NnfDY541nJQP8SABTrIwH4hgTk3npj+alyxOWdkfArN AldDnVXixbiMjpt++O47Scu6yXdI3eQyl9Y7u5jA4TrTAfMQy02uKRWzM9JXV4jnfilx JEhr5usw6uXXWuByjv1HlExxz/F+yvexX2cgHHty6zq4izIay0YVpqvqgVZmTr7eNSaX gdlQ== X-Gm-Message-State: APjAAAXJ3wkAOt9JT/IDcJOBzoMTi43D0hbzqH51+LZfwHD/zj4H0m/T fcI8UawwsSm3wPk+RK+0J8Sih3oe X-Google-Smtp-Source: APXvYqwl9CXMPkpW61t5Q7DpVogsdh0PvSav6XMhmjJj84u2l1Kj6Zj/6Czq4HsuCQ8DX4bCnY+48Q== X-Received: by 2002:a62:570a:: with SMTP id l10mr39828406pfb.151.1557334842162; Wed, 08 May 2019 10:00:42 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id a80sm11347773pfj.105.2019.05.08.10.00.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 10:00:41 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Sudeep Holla , Jean Delvare , Guenter Roeck , linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org (open list:HARDWARE MONITORING) Subject: [PATCH v4 2/2] hwmon: scmi: Scale values to target desired HWMON units Date: Wed, 8 May 2019 10:00:35 -0700 Message-Id: <20190508170035.19671-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190508170035.19671-1-f.fainelli@gmail.com> References: <20190508170035.19671-1-f.fainelli@gmail.com> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the SCMI firmware implementation is reporting values in a scale that is different from the HWMON units, we need to scale up or down the value according to how far appart they are. Signed-off-by: Florian Fainelli --- drivers/hwmon/scmi-hwmon.c | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c index a80183a488c5..4399372e2131 100644 --- a/drivers/hwmon/scmi-hwmon.c +++ b/drivers/hwmon/scmi-hwmon.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -18,6 +19,47 @@ struct scmi_sensors { const struct scmi_sensor_info **info[hwmon_max]; }; +static inline u64 __pow10(u8 x) +{ + u64 r = 1; + + while (x--) + r *= 10; + + return r; +} + +static int scmi_hwmon_scale(const struct scmi_sensor_info *sensor, u64 *value) +{ + s8 scale = sensor->scale; + u64 f; + + switch (sensor->type) { + case TEMPERATURE_C: + case VOLTAGE: + case CURRENT: + scale += 3; + break; + case POWER: + case ENERGY: + scale += 6; + break; + default: + break; + } + + f = __pow10(abs(scale)); + if (f == U64_MAX) + return -E2BIG; + + if (scale > 0) + *value *= f; + else + *value = div64_u64(*value, f); + + return 0; +} + static int scmi_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long *val) { @@ -29,6 +71,10 @@ static int scmi_hwmon_read(struct device *dev, enum hwmon_sensor_types type, sensor = *(scmi_sensors->info[type] + channel); ret = h->sensor_ops->reading_get(h, sensor->id, false, &value); + if (ret) + return ret; + + ret = scmi_hwmon_scale(sensor, value); if (!ret) *val = value;