From patchwork Thu Mar 2 12:15:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 9600155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00766600CB for ; Thu, 2 Mar 2017 12:34:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E198A2859F for ; Thu, 2 Mar 2017 12:34:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D67D6285B6; Thu, 2 Mar 2017 12:34:09 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 3C34E2859F for ; Thu, 2 Mar 2017 12:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751174AbdCBMeJ (ORCPT ); Thu, 2 Mar 2017 07:34:09 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33937 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbdCBMeI (ORCPT ); Thu, 2 Mar 2017 07:34:08 -0500 Received: by mail-wr0-f195.google.com with SMTP id u48so9322482wrc.1 for ; Thu, 02 Mar 2017 04:32:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OVNP1uLazeVAYhx1eG37GVvuDB/PxLMlxnIdJkDmZOw=; b=R4l/auU6AE+VA0Me1CcLxWhwDdmonU++rMTYp81J4JUacIucWw6/QrBx7wFd+nhw/c 21i/+6gbh4W0MxPN53GpdAQEaGDkxuXlTP/bmM9l41JCtWNm8owkH0q9GcjxlHegjTik 8EmvA2QszC3RyRR7TrvmTNemN99vZnOP2cjbVm75gZ8TMH67y0CfR4GmhT1NGNHWciBr 215AJ30yzw5+Er9rKbHTYNhYgODXlwFX+iNV2pBnr52aZ21c0PKtnGovRNQ+jf+CDWUc yhVsdu9XN/ubJaUeNBMtJtB0MQLSOJMjsmcL5I+zQzKQd5OF+mRPnMZPid7oqfsAGk6E tyNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=OVNP1uLazeVAYhx1eG37GVvuDB/PxLMlxnIdJkDmZOw=; b=EmyeNrjHV63lsLBWl2Aj5xuXTwrCC8rGn3yafPOSYm6zfdlYzs+M+2Ai6rNaPyjMpw ei9hDsW6m7O9hfixIqoQndE/RZOahn0f5RoDsUBH9kigZq78NKY6c8aAXgitRt8b6MJ5 r9kxcG0bio+ClDCW+2IPVcj4DoYgjf013M5WE1Ih8AXyv/zRTWZ4Jo3RzmpCV3JoOuok rf4/5wS5AKb6lD6O7lwOU8cvthK7TAF74KdQrcNHMM5WQLoJs7EZdOL1zCtbBKvAPj9c 9FPM1Ci1V5QhDErJeSnb2Ri4/N+NcvrVl0O1QcoclpUPcQQkhX5mzfgA2iDxhg/YFG6r 4GoA== X-Gm-Message-State: AMke39nfHDsJ/2YLGdi1X6jXZ6NzwAF11T3+1OP1dU+RV7f1r5qP+hDMB2bZPQbBoPEJug== X-Received: by 10.223.150.15 with SMTP id b15mr11772894wra.191.1488456318749; Thu, 02 Mar 2017 04:05:18 -0800 (PST) Received: from satan.homestation.setup ([151.45.79.45]) by smtp.gmail.com with ESMTPSA id 191sm10956689wmo.21.2017.03.02.04.05.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 04:05:18 -0800 (PST) From: Carlo Caione To: jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux@endlessm.com, punit.agrawal@arm.com, sudeep.holla@arm.com, robh+dt@kernel.org Cc: Carlo Caione Subject: [PATCH 2/2] hwmon: (scpi) Fix the scale of SCP sensor readings Date: Thu, 2 Mar 2017 13:15:00 +0100 Message-Id: <20170302121500.8121-3-carlo@caione.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170302121500.8121-1-carlo@caione.org> References: <20170302121500.8121-1-carlo@caione.org> 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 From: Carlo Caione The implementation details for SCPI seems to suggest that the sensor readings must be reported by SCP using a well defined scale (millidegree Celsius for temperature, millivolts for voltage, milliamperes for current, microwatts for power and microjoules for energy). This is also important for the interaction with other subsystems: for example both the thermal sub-system and the hwmon sysfs interface expect the temperature expressed in millidegree Celsius. Unfortunately since this behaviour is dependent on the firmware implementation there are cases where the sensor readings are reported using a different scale. For example in the Amlogic SoCs the temperature is reported in degree and not millidegree Celsius. To take into account this discrepancy and fixup the values reported by SCP a new DT property `scpi,sensors-scale' is introduced and used in this patch by the scpi-hwmon driver to convert the sensor readings to the expected scale. Signed-off-by: Carlo Caione --- drivers/hwmon/scpi-hwmon.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c index 094f948f99ff..64a51e06c8df 100644 --- a/drivers/hwmon/scpi-hwmon.c +++ b/drivers/hwmon/scpi-hwmon.c @@ -23,6 +23,7 @@ #include struct sensor_data { + unsigned int scale; struct scpi_sensor_info info; struct device_attribute dev_attr_input; struct device_attribute dev_attr_label; @@ -44,6 +45,14 @@ struct scpi_sensors { const struct attribute_group *groups[2]; }; +static const unsigned int scpi_scale[] = { + 1000, /* Temperature (millidegrees Celsius) */ + 1000, /* Voltage (millivolts) */ + 1000, /* Current (milliamperes) */ + 1000000, /* Power (microwatts) */ + 1000000, /* Energy (microjoules) */ +}; + static int scpi_read_temp(void *dev, int *temp) { struct scpi_thermal_zone *zone = dev; @@ -57,6 +66,11 @@ static int scpi_read_temp(void *dev, int *temp) if (ret) return ret; + if (scpi_scale[sensor->info.class] != sensor->scale) { + value *= scpi_scale[sensor->info.class]; + do_div(value, sensor->scale); + } + *temp = value; return 0; } @@ -77,6 +91,11 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf) if (ret) return ret; + if (scpi_scale[sensor->info.class] != sensor->scale) { + value *= scpi_scale[sensor->info.class]; + do_div(value, sensor->scale); + } + return sprintf(buf, "%llu\n", value); } @@ -97,6 +116,7 @@ static struct thermal_zone_of_device_ops scpi_sensor_ops = { static int scpi_hwmon_probe(struct platform_device *pdev) { u16 nr_sensors, i; + u32 scale[] = { 1000, 1000, 1000, 1000000, 1000000 }; int num_temp = 0, num_volt = 0, num_current = 0, num_power = 0; int num_energy = 0; struct scpi_ops *scpi_ops; @@ -131,6 +151,9 @@ static int scpi_hwmon_probe(struct platform_device *pdev) scpi_sensors->scpi_ops = scpi_ops; + of_property_read_u32_array(dev->of_node, "scpi,sensors-scale", + scale, ARRAY_SIZE(scale)); + for (i = 0, idx = 0; i < nr_sensors; i++) { struct sensor_data *sensor = &scpi_sensors->data[idx]; @@ -178,6 +201,8 @@ static int scpi_hwmon_probe(struct platform_device *pdev) continue; } + sensor->scale = scale[sensor->info.class]; + sensor->dev_attr_input.attr.mode = S_IRUGO; sensor->dev_attr_input.show = scpi_show_sensor; sensor->dev_attr_input.attr.name = sensor->input;