From patchwork Thu Mar 11 01:41:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 12130065 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 E5FCAC433E6 for ; Thu, 11 Mar 2021 01:42:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3D2464FC6 for ; Thu, 11 Mar 2021 01:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229544AbhCKBle (ORCPT ); Wed, 10 Mar 2021 20:41:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbhCKBlS (ORCPT ); Wed, 10 Mar 2021 20:41:18 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E5BDC061574 for ; Wed, 10 Mar 2021 17:41:18 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id a8so2917096plp.13 for ; Wed, 10 Mar 2021 17:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rAeqIViL2QGs0ClIaIeiCbE8XiY6ys2aSvkYru6WUjU=; b=h63RPTeHUznosF1abZ0xzzFlYGhI7vsUU3/EEoI3ymoqkyWdC5G+xmn7bu9iBP59He s04hY037MIA/7we/DkEPJ4k/pmyhvz/13UVzsAih7rPrrjpxQNdA/7NaLVb1ItHJ9gX5 2IOgHukq9a5F2lqPBu8UlwF41AX1CmX0X71XY= 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=rAeqIViL2QGs0ClIaIeiCbE8XiY6ys2aSvkYru6WUjU=; b=j3wHAY7NAyc5E/WNYQ/jnlucirt1nAXo+WPX1eyU72WAmkjTE8tOyKjZ3r+GN61o6Q JXurC9WQh9ILVQ/1pP4vnqKBoPSYGlwWtQOrezIsx2musyd2sWBE/Qj4yLZCf7g4/sec WurryuppWQSnmzm/8+x82eOXXMX9ro1NSuyagI1Gh8zH2LI0OhrZKIVZXaK4uA6o6Pp0 ih6u7UOr449i9s8yv1Zgyd6mvU7go7JZSepQ6U3ZUB625Q6R+/YbyDvTWvzTnzo1geKr 3MJA8oGMmmD8DYc1l0cJNNaEQQShS5M4dnnGQ+E/3Ofi3GWAo5TlgK3cSnrXUYMjjorL vCwQ== X-Gm-Message-State: AOAM532p0QR9I9eF/7E5BSddPlBIIO7BTjIf/XEgxLN24mzqpBnis5Ea T1sDCP3jPle1uDs+YNcCL/fFiw== X-Google-Smtp-Source: ABdhPJyw39yIaP7SWUHOOz1PbMD2WJlaSlxZsQOhhAeytWVDqBXHLo2PeKyV/iCE7JJtlx1yQgGYYQ== X-Received: by 2002:a17:90b:515:: with SMTP id r21mr6330706pjz.42.1615426878018; Wed, 10 Mar 2021 17:41:18 -0800 (PST) Received: from localhost ([2620:15c:202:201:78f3:5b8f:34c5:43c6]) by smtp.gmail.com with UTF8SMTPSA id q34sm619994pgl.92.2021.03.10.17.41.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Mar 2021 17:41:17 -0800 (PST) From: Gwendal Grignou To: Jonathan.Cameron@huawei.com, alexandru.ardelean@analog.com, groeck@chromium.org Cc: linux-iio@vger.kernel.org, Gwendal Grignou Subject: [PATCH v4] iio: cros: unify hw fifo attributes without API changes Date: Wed, 10 Mar 2021 17:41:14 -0800 Message-Id: <20210311014114.3917453-1-gwendal@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org fixes commit 2e2366c2d141 ("iio: cros_ec: unify hw fifo attributes into the core file") fixes commit 165aea80e2e2 ("iio: cros_ec: use devm_iio_triggered_buffer_setup_ext()") 1. Instead of adding has_fw_fifo, deduct it from the configuration: - EC must support FIFO (EC_FEATURE_MOTION_SENSE_FIFO) set. - sensors send data a regular interval (accelerometer, gyro, magnetomer, barometer, light sensor). - "Legacy accelerometer" is only present on EC without FIFO, so we don't need to set buffer attributes. 2. devm_iio_triggered_buffer_setup_ext() does not need to be called when EC does not support FIFO, as there is no FIFO to manage. 3. Create a triggered buffer with devm_iio_triggered_buffer_setup_ext() when the EC support FIFO as it is the only clean way to set the buffer extended attributes. Add a slim trigger to be sure the samples can flow via callback from the EC FIFO to the IIO buffer. Signed-off-by: Gwendal Grignou --- Changes since v3: Remove Change-Id. Changes since v2: Remove include of buffer_impl. Rebase on top of kernel/git/jic23/iio.git testing branch. Changes since v1: Use a slim trigger when EC supports FIFO, to use devm_iio_triggered_buffer_setup_ext(). drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- .../cros_ec_sensors/cros_ec_lid_angle.c | 3 +- .../common/cros_ec_sensors/cros_ec_sensors.c | 3 +- .../cros_ec_sensors/cros_ec_sensors_core.c | 56 ++++++++++++------- drivers/iio/light/cros_ec_light_prox.c | 3 +- drivers/iio/pressure/cros_ec_baro.c | 3 +- .../linux/iio/common/cros_ec_sensors_core.h | 3 +- 7 files changed, 41 insertions(+), 32 deletions(-) diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c index 8f1232c38e0d7..b6f3471b62dcf 100644 --- a/drivers/iio/accel/cros_ec_accel_legacy.c +++ b/drivers/iio/accel/cros_ec_accel_legacy.c @@ -215,7 +215,7 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev) return -ENOMEM; ret = cros_ec_sensors_core_init(pdev, indio_dev, true, - cros_ec_sensors_capture, NULL, false); + cros_ec_sensors_capture, NULL); if (ret) return ret; diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c b/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c index 752f59037715b..af801e203623e 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c @@ -97,8 +97,7 @@ static int cros_ec_lid_angle_probe(struct platform_device *pdev) if (!indio_dev) return -ENOMEM; - ret = cros_ec_sensors_core_init(pdev, indio_dev, false, NULL, - NULL, false); + ret = cros_ec_sensors_core_init(pdev, indio_dev, false, NULL, NULL); if (ret) return ret; diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c index dee1191de7528..376a5b30010ae 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c @@ -236,8 +236,7 @@ static int cros_ec_sensors_probe(struct platform_device *pdev) ret = cros_ec_sensors_core_init(pdev, indio_dev, true, cros_ec_sensors_capture, - cros_ec_sensors_push_data, - true); + cros_ec_sensors_push_data); if (ret) return ret; diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c index f8824afe595e4..7b7a98922892d 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -240,7 +241,6 @@ static void cros_ec_sensors_core_clean(void *arg) * for backward compatibility. * @push_data: function to call when cros_ec_sensorhub receives * a sample for that sensor. - * @has_hw_fifo: Set true if this device has/uses a HW FIFO * * Return: 0 on success, -errno on failure. */ @@ -248,8 +248,7 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, struct iio_dev *indio_dev, bool physical_device, cros_ec_sensors_capture_t trigger_capture, - cros_ec_sensorhub_push_data_cb_t push_data, - bool has_hw_fifo) + cros_ec_sensorhub_push_data_cb_t push_data) { struct device *dev = &pdev->dev; struct cros_ec_sensors_core_state *state = iio_priv(indio_dev); @@ -329,19 +328,41 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, } if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE_FIFO)) { + struct iio_trigger *trig; + /* - * Create a software buffer, feed by the EC FIFO. - * We can not use trigger here, as events are generated - * as soon as sample_frequency is set. + * Create a triggered buffer to be able to trigger data + * gathering manually, but by default, samples come from + * the EC FIFO. */ - ret = devm_iio_kfifo_buffer_setup(dev, indio_dev, - INDIO_BUFFER_SOFTWARE, - NULL); + ret = devm_iio_triggered_buffer_setup_ext(dev, indio_dev, + NULL, trigger_capture, NULL, + cros_ec_sensor_fifo_attributes); if (ret) return ret; - ret = cros_ec_sensorhub_register_push_data( - sensor_hub, sensor_platform->sensor_num, + /* + * Register a trigger as plug to allow samples from the + * FIFO to flow. + * When cros-ec-sensor-ring is present, samples produced + * by the EC FIFO are directed to that ring only. + */ + trig = devm_iio_trigger_alloc(dev, "cros_ec%d-dev%d", + sensor_platform->sensor_num, indio_dev->id); + if (!trig) + return -ENOMEM; + + ret = devm_iio_trigger_register(dev, trig); + if (ret < 0) + return ret; + indio_dev->trig = iio_trigger_get(trig); + + /* + * Register the callback to use when a sensor sample is + * coming from the EC FIFO. + */ + ret = cros_ec_sensorhub_register_push_data(sensor_hub, + sensor_platform->sensor_num, indio_dev, push_data); if (ret) return ret; @@ -355,21 +376,14 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, ret = iio_device_set_clock(indio_dev, CLOCK_BOOTTIME); if (ret) return ret; - } else { - const struct attribute **fifo_attrs; - - if (has_hw_fifo) - fifo_attrs = cros_ec_sensor_fifo_attributes; - else - fifo_attrs = NULL; + } else { /* * The only way to get samples in buffer is to set a * software trigger (systrig, hrtimer). */ - ret = devm_iio_triggered_buffer_setup_ext( - dev, indio_dev, NULL, trigger_capture, - NULL, fifo_attrs); + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, + NULL, trigger_capture, NULL); if (ret) return ret; } diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c index 75d6b5fcf2cc4..de472f23d1cba 100644 --- a/drivers/iio/light/cros_ec_light_prox.c +++ b/drivers/iio/light/cros_ec_light_prox.c @@ -182,8 +182,7 @@ static int cros_ec_light_prox_probe(struct platform_device *pdev) ret = cros_ec_sensors_core_init(pdev, indio_dev, true, cros_ec_sensors_capture, - cros_ec_sensors_push_data, - true); + cros_ec_sensors_push_data); if (ret) return ret; diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c index aa043cb9ac426..2f882e1094232 100644 --- a/drivers/iio/pressure/cros_ec_baro.c +++ b/drivers/iio/pressure/cros_ec_baro.c @@ -139,8 +139,7 @@ static int cros_ec_baro_probe(struct platform_device *pdev) ret = cros_ec_sensors_core_init(pdev, indio_dev, true, cros_ec_sensors_capture, - cros_ec_sensors_push_data, - true); + cros_ec_sensors_push_data); if (ret) return ret; diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h index c9b80be82440f..7ce8a8adad587 100644 --- a/include/linux/iio/common/cros_ec_sensors_core.h +++ b/include/linux/iio/common/cros_ec_sensors_core.h @@ -96,8 +96,7 @@ struct platform_device; int cros_ec_sensors_core_init(struct platform_device *pdev, struct iio_dev *indio_dev, bool physical_device, cros_ec_sensors_capture_t trigger_capture, - cros_ec_sensorhub_push_data_cb_t push_data, - bool has_hw_fifo); + cros_ec_sensorhub_push_data_cb_t push_data); irqreturn_t cros_ec_sensors_capture(int irq, void *p); int cros_ec_sensors_push_data(struct iio_dev *indio_dev,