From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD834C43387 for ; Wed, 26 Dec 2018 19:31:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F4F620882 for ; Wed, 26 Dec 2018 19:31:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XGfA1c4G" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727521AbeLZTbF (ORCPT ); Wed, 26 Dec 2018 14:31:05 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:46075 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727508AbeLZTbF (ORCPT ); Wed, 26 Dec 2018 14:31:05 -0500 Received: by mail-lj1-f195.google.com with SMTP id s5-v6so14529529ljd.12; Wed, 26 Dec 2018 11:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CojuasIwDrAB3CvS+E6S9WithTfIsPwfoAXvkLeIxUE=; b=XGfA1c4GlY3JbN1FQfQ+lvAh033diteaDHVUB7k2BIwoczs3zia4RuPq2GBn1hCt3Z M9Frf2mUDxGuPMK0jW5xJox7j+AA2+gw8eA/yuWYVMAj8cv0faHL2dFCprpjIeyx3Ijq glJI0/pcAYFzR7WvoZcpBWPL7iNKQik5u2vJ8GM0Wf8AtaZ73SbkcfYzD5KL4isEV8UK bR8qLu11qogXn4uJX21KZZ8b0Cbxz3P2R7t0PPmTpLSCXrskDiNIoZEaK1V3W0ajaaYb aNH66zp+A/FbGDgLwCyjdHtiAItaQf5mqOcwuDbM1kvMG+vMdD3t4jE6z6RPN5Nb9RFc Tuxw== 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:mime-version :content-transfer-encoding; bh=CojuasIwDrAB3CvS+E6S9WithTfIsPwfoAXvkLeIxUE=; b=jpTXMR7nrSqWgxgWuA0vt/rz4pHs6tIdMGuWStj6zcnlTSsR2n58VntOzattDCwhRe YqpSQdXptlVQoIdZ7w9eA/OQ3BT9y8m0pt4qyUSl6SdWTSbDLjHAA1HYA9WeOn4F0Ew1 D8aJC91E7m/+tc0843yH6OwaOaeNYoia3PzV8nAFXB7qW0h5lWm+fa5Mxb4MhFfNxpwl OIqB9kxJZPQS+LOMV8ppkqdhT3xGsY1BYsTxMjvyqPMJPjg3X7nlNTuBRwRomNYJ0vww Br8dv7Psu+jVHaqGacyW0Ht5yCwVXCQ/YN5bR/brTyp+Fvt19t5FM9vKeUjvhrpMKHRD 1b+g== X-Gm-Message-State: AJcUukd1mUdB3bs4uK5hD9Tewo3Xoh/LirY8sihA+9D2kIV1JDNtImP3 pUAPz3X93BQcqiT7CkbcVHta23Xr X-Google-Smtp-Source: ALg8bN7uxBQkLEsLmkOp/DfALZAhwgz8dKItBPNL6eAX9XEEUpwymuqjDhjGqwsk0GfC2HvYvE1UQw== X-Received: by 2002:a2e:93d7:: with SMTP id p23-v6mr12148784ljh.22.1545852662164; Wed, 26 Dec 2018 11:31:02 -0800 (PST) Received: from arch.domain.name (89-70-37-207.dynamic.chello.pl. [89.70.37.207]) by smtp.gmail.com with ESMTPSA id x29-v6sm7638299ljb.97.2018.12.26.11.31.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Dec 2018 11:31:01 -0800 (PST) From: Tomasz Duszynski To: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tomasz Duszynski Subject: [PATCH] iio: chemical: sps30: allow changing self cleaning period Date: Wed, 26 Dec 2018 20:30:35 +0100 Message-Id: <20181226193035.3144-1-tduszyns@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Sensor can periodically trigger self cleaning. Period can be changed by writing a new value to a dedicated attribute. Upon attribute read triplet representing respectively current, minimum and maximum period is returned. Signed-off-by: Tomasz Duszynski --- Documentation/ABI/testing/sysfs-bus-iio-sps30 | 11 ++ drivers/iio/chemical/sps30.c | 134 +++++++++++++++--- 2 files changed, 127 insertions(+), 18 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-iio-sps30 b/Documentation/ABI/testing/sysfs-bus-iio-sps30 index e7ce2c57635e..d83d9192a3e0 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio-sps30 +++ b/Documentation/ABI/testing/sysfs-bus-iio-sps30 @@ -6,3 +6,14 @@ Description: Writing 1 starts sensor self cleaning. Internal fan accelerates to its maximum speed and keeps spinning for about 10 seconds in order to blow out accumulated dust. + +What: /sys/bus/iio/devices/iio:deviceX/cleaning_interval +Date: December 2018 +KernelVersion: 4.22 +Contact: linux-iio@vger.kernel.org +Description: + Sensor is capable of triggering self cleaning periodically. + Period can be changed by writing a new value here. Upon reading + three values are returned representing respectively current, + minimum and maximum period. All values are in seconds. + Writing 0 here disables periodical self cleaning entirely. diff --git a/drivers/iio/chemical/sps30.c b/drivers/iio/chemical/sps30.c index f3b4390c8f5c..c219fda08cba 100644 --- a/drivers/iio/chemical/sps30.c +++ b/drivers/iio/chemical/sps30.c @@ -5,9 +5,6 @@ * Copyright (c) Tomasz Duszynski * * I2C slave address: 0x69 - * - * TODO: - * - support for reading/setting auto cleaning interval */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -21,6 +18,7 @@ #include #include #include +#include #include #define SPS30_CRC8_POLYNOMIAL 0x31 @@ -28,6 +26,9 @@ #define SPS30_MAX_READ_SIZE 48 /* sensor measures reliably up to 3000 ug / m3 */ #define SPS30_MAX_PM 3000 +/* minimum and maximum self cleaning intervals in seconds */ +#define SPS30_AUTO_CLEANING_INTERVAL_MIN 0 +#define SPS30_AUTO_CLEANING_INTERVAL_MAX 604800 /* SPS30 commands */ #define SPS30_START_MEAS 0x0010 @@ -37,6 +38,9 @@ #define SPS30_READ_DATA 0x0300 #define SPS30_READ_SERIAL 0xd033 #define SPS30_START_FAN_CLEANING 0x5607 +#define SPS30_AUTO_CLEANING_INTERVAL 0x8004 +/* not a sensor command per se, used only to distinguish write from read */ +#define SPS30_READ_AUTO_CLEANING_INTERVAL 0x8005 enum { PM1, @@ -45,6 +49,11 @@ enum { PM10, }; +enum { + RESET, + MEASURING, +}; + struct sps30_state { struct i2c_client *client; /* @@ -52,6 +61,7 @@ struct sps30_state { * Must be held whenever sequence of commands is to be executed. */ struct mutex lock; + int state; }; DECLARE_CRC8_TABLE(sps30_crc8_table); @@ -107,6 +117,9 @@ static int sps30_do_cmd(struct sps30_state *state, u16 cmd, u8 *data, int size) case SPS30_START_FAN_CLEANING: ret = sps30_write_then_read(state, buf, 2, NULL, 0); break; + case SPS30_READ_AUTO_CLEANING_INTERVAL: + buf[0] = SPS30_AUTO_CLEANING_INTERVAL >> 8; + buf[1] = (u8)SPS30_AUTO_CLEANING_INTERVAL; case SPS30_READ_DATA_READY_FLAG: case SPS30_READ_DATA: case SPS30_READ_SERIAL: @@ -114,6 +127,15 @@ static int sps30_do_cmd(struct sps30_state *state, u16 cmd, u8 *data, int size) size += size / 2; ret = sps30_write_then_read(state, buf, 2, buf, size); break; + case SPS30_AUTO_CLEANING_INTERVAL: + buf[2] = data[0]; + buf[3] = data[1]; + buf[4] = crc8(sps30_crc8_table, &buf[2], 2, CRC8_INIT_VALUE); + buf[5] = data[2]; + buf[6] = data[3]; + buf[7] = crc8(sps30_crc8_table, &buf[5], 2, CRC8_INIT_VALUE); + ret = sps30_write_then_read(state, buf, 8, NULL, 0); + break; } if (ret) @@ -170,6 +192,14 @@ static int sps30_do_meas(struct sps30_state *state, s32 *data, int size) int i, ret, tries = 5; u8 tmp[16]; + if (state->state == RESET) { + ret = sps30_do_cmd(state, SPS30_START_MEAS, NULL, 0); + if (ret) + return ret; + + state->state = MEASURING; + } + while (tries--) { ret = sps30_do_cmd(state, SPS30_READ_DATA_READY_FLAG, tmp, 2); if (ret) @@ -276,6 +306,24 @@ static int sps30_read_raw(struct iio_dev *indio_dev, return -EINVAL; } +static int sps30_do_cmd_reset(struct sps30_state *state) +{ + int ret; + + ret = sps30_do_cmd(state, SPS30_RESET, NULL, 0); + msleep(300); + /* + * Power-on-reset causes sensor to produce some glitch on i2c bus and + * some controllers end up in error state. Recover simply by placing + * some data on the bus, for example STOP_MEAS command, which + * is NOP in this case. + */ + sps30_do_cmd(state, SPS30_STOP_MEAS, NULL, 0); + state->state = RESET; + + return ret; +} + static ssize_t start_cleaning_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) @@ -296,10 +344,73 @@ static ssize_t start_cleaning_store(struct device *dev, return len; } +static ssize_t cleaning_interval_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct sps30_state *state = iio_priv(indio_dev); + u8 tmp[4]; + int ret; + + mutex_lock(&state->lock); + ret = sps30_do_cmd(state, SPS30_READ_AUTO_CLEANING_INTERVAL, tmp, 4); + mutex_unlock(&state->lock); + if (ret) + return ret; + + return sprintf(buf, "%d %d %d\n", get_unaligned_be32(tmp), + SPS30_AUTO_CLEANING_INTERVAL_MIN, + SPS30_AUTO_CLEANING_INTERVAL_MAX); +} + +static ssize_t cleaning_interval_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct sps30_state *state = iio_priv(indio_dev); + int val, ret; + u8 tmp[4]; + + if (kstrtoint(buf, 0, &val)) + return -EINVAL; + + if ((val < SPS30_AUTO_CLEANING_INTERVAL_MIN) && + (val > SPS30_AUTO_CLEANING_INTERVAL_MAX)) + return -EINVAL; + + put_unaligned_be32(val, tmp); + + mutex_lock(&state->lock); + ret = sps30_do_cmd(state, SPS30_AUTO_CLEANING_INTERVAL, tmp, 0); + if (ret) { + mutex_unlock(&state->lock); + return ret; + } + + msleep(20); + + /* + * sensor requires reset in order to return up to date self cleaning + * period + */ + ret = sps30_do_cmd_reset(state); + if (ret) + dev_warn(dev, + "interval changed but reads will return the old value\n"); + + mutex_unlock(&state->lock); + + return len; +} + static IIO_DEVICE_ATTR_WO(start_cleaning, 0); +static IIO_DEVICE_ATTR_RW(cleaning_interval, 0); static struct attribute *sps30_attrs[] = { &iio_dev_attr_start_cleaning.dev_attr.attr, + &iio_dev_attr_cleaning_interval.dev_attr.attr, NULL }; @@ -362,6 +473,7 @@ static int sps30_probe(struct i2c_client *client) state = iio_priv(indio_dev); i2c_set_clientdata(client, indio_dev); state->client = client; + state->state = RESET; indio_dev->dev.parent = &client->dev; indio_dev->info = &sps30_info; indio_dev->name = client->name; @@ -373,19 +485,11 @@ static int sps30_probe(struct i2c_client *client) mutex_init(&state->lock); crc8_populate_msb(sps30_crc8_table, SPS30_CRC8_POLYNOMIAL); - ret = sps30_do_cmd(state, SPS30_RESET, NULL, 0); + ret = sps30_do_cmd_reset(state); if (ret) { dev_err(&client->dev, "failed to reset device\n"); return ret; } - msleep(300); - /* - * Power-on-reset causes sensor to produce some glitch on i2c bus and - * some controllers end up in error state. Recover simply by placing - * some data on the bus, for example STOP_MEAS command, which - * is NOP in this case. - */ - sps30_do_cmd(state, SPS30_STOP_MEAS, NULL, 0); ret = sps30_do_cmd(state, SPS30_READ_SERIAL, buf, sizeof(buf)); if (ret) { @@ -395,12 +499,6 @@ static int sps30_probe(struct i2c_client *client) /* returned serial number is already NUL terminated */ dev_info(&client->dev, "serial number: %s\n", buf); - ret = sps30_do_cmd(state, SPS30_START_MEAS, NULL, 0); - if (ret) { - dev_err(&client->dev, "failed to start measurement\n"); - return ret; - } - ret = devm_add_action_or_reset(&client->dev, sps30_stop_meas, state); if (ret) return ret; -- 2.20.1