Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1843271pxj; Wed, 19 May 2021 15:31:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwztbzZQByV4bzV59wgUkQbhjPVdxpasW1dKcbBxz54ePY1gy+n5xp56CRCDQy8VXkDB9Hi X-Received: by 2002:a6b:5c18:: with SMTP id z24mr1894965ioh.127.1621463505793; Wed, 19 May 2021 15:31:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621463505; cv=none; d=google.com; s=arc-20160816; b=m7H9CIAHjTJwWIWTJrtgvhovJoCozIsn0mpjDUfHhh/iGKCa64mQfmGO6WLoBkrZ4v nAPTGmzAaEGAuywGECL7Tb1V1HhU0rSGrjV+6HkhEwNs3qHDC7cWrIZGsU6/Gk1Ge4/d jfy5myhzbwjFCA+e8qz1yTMAmwYaaBGS+EL6vWqibX+h0eO8ll4LSpmhlVKrLKUcgVU/ UKZX8XeSt0BHmIco4xXcfh7ooJe04e15AY5Z4hCJS236nhka9iD+t1A46j/alJUNbphM +a/d/U+qpz0i7d4e3VuI5Zj0teW+/gGaiYf4b+QTg2sOD3WKx+jzLWPlN06+FxPmQ0ZD k6NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GO2bx2JQ9NBxHgPEyfbaqkWN5p0BrrfFolR7teDCTtY=; b=NzCZn/RchhGGyfiO2TK6IVcsuk6gso3ho7EYseeSPTZuhR4mpwvX1fAq6y2RnDih1N 5bHXPf2d7FPbf8ygGDtZ77VtKMO8WtzSW0yXkGpzd4NsuDw4YqzULxd9TIKRQIlxmID/ Jt0SwO04Vwk8RZxnLe8owCMlu0QkLyuWQxKLTHRqI1UoCTaWieWQ2P0j79OBIPHKOdH4 91E2b8EvpJ+kmWF/0RZ2q/PgBCjv3g7aE8nESqUV300LGGSHnrqSVTwlG4e7nZ8WA+Yh /L65nPoeA94pJB1m7587HexvyVozLy1KWzCfYhVC0ypkYV2OJx1E9neLajIrs2p+QQbs EE1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DTPX3UGq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q3si1250520ilu.88.2021.05.19.15.31.32; Wed, 19 May 2021 15:31:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DTPX3UGq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230062AbhESWbR (ORCPT + 99 others); Wed, 19 May 2021 18:31:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230020AbhESWbP (ORCPT ); Wed, 19 May 2021 18:31:15 -0400 Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E892C06175F; Wed, 19 May 2021 15:29:54 -0700 (PDT) Received: by mail-qv1-xf35.google.com with SMTP id a7so3367123qvf.11; Wed, 19 May 2021 15:29:54 -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=GO2bx2JQ9NBxHgPEyfbaqkWN5p0BrrfFolR7teDCTtY=; b=DTPX3UGq+8Lpm2GfNDdPvsLT/kUyb3LHpNhAAL1bSrTtkXT9O7E1khmCMZkGd7dgIy YVEys8VldR/7wDqfUhUFzhmbi31PTClqO3CnrsVZljj410OIRdtFU51ixWvQQIQt+YJW z9pVvybB2MyGHHpF0HtKYDaa0dizpK18kDxq0TXf/mIBL2bDal527cVkJ0Fi03ZQno+b SX22eEvr8EtBCTp7ybDKSombJA5FZRDdfDmgVDc6f8Pkryq+zGflLku4IrGGyrps9fbP 1e1r07YAfIQt80M8AXcJZstngiFxeqnlOvdwHdz0G1SINj3WNBtKeLCJPgdtWEMTzjIY eAjQ== 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=GO2bx2JQ9NBxHgPEyfbaqkWN5p0BrrfFolR7teDCTtY=; b=X5BXJk3xNcI4kIgViXf7ryZi1u61+2h7megIhpZLVcibexLG1nQGgZptS+/9s05ACR 2ijwDgGLfCjaiOI52fjS7krhW9ESR+vZV1YQYXRVqokyhBUUanuWkElSl1FsKqLKgpFU XtwDzad2YgFkrDJxdQ0DKx4AQzIioSW87m5LPkcDY2RTqcni38wwbhpSVBXgiiBlin89 Ye/JHLNnVB/SzDDFzd7S/efxf/bpVhB3nm/YtxodawIImKf2aEXVyOzk5qMJHH+hogHe 7DjVWJkIerN63sR9tbWCcdZEOV0h9+DXfD1gPPbpyWKgwxV1CaTlmrsHNNbtmPNin1DX B5Rg== X-Gm-Message-State: AOAM532gMxiei7I4FFOhocvns8tQDlQ7Zi+DzTJyuyMuHVarsflA2nM5 /vJd8NSoUWV8V7GH1zHCI5s= X-Received: by 2002:a0c:e34b:: with SMTP id a11mr2146164qvm.24.1621463393373; Wed, 19 May 2021 15:29:53 -0700 (PDT) Received: from LuizSampaio-PC.localdomain ([2804:214:8175:da27:c352:bf96:2102:fa64]) by smtp.gmail.com with ESMTPSA id d18sm823716qkc.28.2021.05.19.15.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 15:29:53 -0700 (PDT) From: Luiz Sampaio To: zbr@ioremap.net Cc: corbet@lwn.net, rikard.falkeborn@gmail.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Luiz Sampaio Subject: [PATCH v8 6/6] w1: ds2438: support for writing to offset register Date: Wed, 19 May 2021 19:30:46 -0300 Message-Id: <20210519223046.13798-7-sampaio.ime@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210519223046.13798-1-sampaio.ime@gmail.com> References: <20210409031533.442123-1-sampaio.ime@gmail.com> <20210519223046.13798-1-sampaio.ime@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Added a sysfs entry to support writing to the offset register on page1. This register is used to calibrate the chip canceling offset errors in the current ADC. This means that, over time, reading the IAD register will not return the correct current measurement, it will have an offset. Writing to the offset register if the two's complement of the current register while passing zero current to the load will calibrate the measurements. This change was tested on real hardware and it was able to calibrate the chip correctly. Signed-off-by: Luiz Sampaio --- .../ABI/stable/sysfs-driver-w1_ds2438 | 7 +++ Documentation/w1/slaves/w1_ds2438.rst | 11 ++++- drivers/w1/slaves/w1_ds2438.c | 49 +++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/stable/sysfs-driver-w1_ds2438 b/Documentation/ABI/stable/sysfs-driver-w1_ds2438 index fa47437c11d9..d2e7681cc287 100644 --- a/Documentation/ABI/stable/sysfs-driver-w1_ds2438 +++ b/Documentation/ABI/stable/sysfs-driver-w1_ds2438 @@ -4,3 +4,10 @@ Contact: Luiz Sampaio Description: read the contents of the page1 of the DS2438 see Documentation/w1/slaves/w1_ds2438.rst for detailed information Users: any user space application which wants to communicate with DS2438 + +What: /sys/bus/w1/devices/.../offset +Date: April 2021 +Contact: Luiz Sampaio +Description: write the contents to the offset register of the DS2438 + see Documentation/w1/slaves/w1_ds2438.rst for detailed information +Users: any user space application which wants to communicate with DS2438 diff --git a/Documentation/w1/slaves/w1_ds2438.rst b/Documentation/w1/slaves/w1_ds2438.rst index ac8d0d4b0d0e..5c5573991351 100644 --- a/Documentation/w1/slaves/w1_ds2438.rst +++ b/Documentation/w1/slaves/w1_ds2438.rst @@ -22,7 +22,7 @@ is also often used in weather stations and applications such as: rain gauge, wind speed/direction measuring, humidity sensing, etc. Current support is provided through the following sysfs files (all files -except "iad" are readonly): +except "iad" and "offset" are readonly): "iad" ----- @@ -52,6 +52,15 @@ Internally when this file is read, the additional CRC byte is also obtained from the slave device. If it is correct, the 8 bytes page data are passed to userspace, otherwise an I/O error is returned. +"offset" +------- +This file controls the 2-byte Offset Register of the chip. +Writing a 2-byte value will change the Offset Register, which changes the +current measurement done by the chip. Changing this register to the two's complement +of the current register while forcing zero current through the load will calibrate +the chip, canceling offset errors in the current ADC. + + "temperature" ------------- Opening and reading this file initiates the CONVERT_T (temperature conversion) diff --git a/drivers/w1/slaves/w1_ds2438.c b/drivers/w1/slaves/w1_ds2438.c index 42080ae779f0..01eaa5a17fba 100644 --- a/drivers/w1/slaves/w1_ds2438.c +++ b/drivers/w1/slaves/w1_ds2438.c @@ -193,6 +193,34 @@ static int w1_ds2438_change_config_bit(struct w1_slave *sl, u8 mask, u8 value) return -1; } +static int w1_ds2438_change_offset_register(struct w1_slave *sl, u8 *value) +{ + unsigned int retries = W1_DS2438_RETRIES; + u8 w1_buf[9]; + u8 w1_page1_buf[DS2438_PAGE_SIZE + 1 /*for CRC*/]; + + if (w1_ds2438_get_page(sl, 1, w1_page1_buf) == 0) { + memcpy(&w1_buf[2], w1_page1_buf, DS2438_PAGE_SIZE - 1); /* last register reserved */ + w1_buf[7] = value[0]; /* change only offset register */ + w1_buf[8] = value[1]; + while (retries--) { + if (w1_reset_select_slave(sl)) + continue; + w1_buf[0] = W1_DS2438_WRITE_SCRATCH; + w1_buf[1] = 0x01; /* write to page 1 */ + w1_write_block(sl->master, w1_buf, 9); + + if (w1_reset_select_slave(sl)) + continue; + w1_buf[0] = W1_DS2438_COPY_SCRATCH; + w1_buf[1] = 0x01; + w1_write_block(sl->master, w1_buf, 2); + return 0; + } + } + return -1; +} + static int w1_ds2438_get_voltage(struct w1_slave *sl, int adc_input, uint16_t *voltage) { @@ -364,6 +392,25 @@ static ssize_t page1_read(struct file *filp, struct kobject *kobj, return ret; } +static ssize_t offset_write(struct file *filp, struct kobject *kobj, + struct bin_attribute *bin_attr, char *buf, + loff_t off, size_t count) +{ + struct w1_slave *sl = kobj_to_w1_slave(kobj); + int ret; + + mutex_lock(&sl->master->bus_mutex); + + if (w1_ds2438_change_offset_register(sl, buf) == 0) + ret = count; + else + ret = -EIO; + + mutex_unlock(&sl->master->bus_mutex); + + return ret; +} + static ssize_t temperature_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) @@ -430,6 +477,7 @@ static ssize_t vdd_read(struct file *filp, struct kobject *kobj, static BIN_ATTR_RW(iad, 0); static BIN_ATTR_RO(page0, DS2438_PAGE_SIZE); static BIN_ATTR_RO(page1, DS2438_PAGE_SIZE); +static BIN_ATTR_WO(offset, 2); static BIN_ATTR_RO(temperature, 0/* real length varies */); static BIN_ATTR_RO(vad, 0/* real length varies */); static BIN_ATTR_RO(vdd, 0/* real length varies */); @@ -438,6 +486,7 @@ static struct bin_attribute *w1_ds2438_bin_attrs[] = { &bin_attr_iad, &bin_attr_page0, &bin_attr_page1, + &bin_attr_offset, &bin_attr_temperature, &bin_attr_vad, &bin_attr_vdd, -- 2.30.1