From patchwork Thu Dec 10 22:15:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 11966873 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=-18.8 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 96B65C4167B for ; Thu, 10 Dec 2020 23:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E39023B85 for ; Thu, 10 Dec 2020 23:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387709AbgLJWbG (ORCPT ); Thu, 10 Dec 2020 17:31:06 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:45555 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405087AbgLJWV1 (ORCPT ); Thu, 10 Dec 2020 17:21:27 -0500 Received: by mail-pg1-f193.google.com with SMTP id v29so5557843pgk.12 for ; Thu, 10 Dec 2020 14:21:11 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=GLtV+gnrQeHdgfIX08JWdfTRMwPLGkXn877DyEgZ+iQ=; b=nBnOEJd16r4Qpn2Kfctl/rjlSIGtRzWbaoQlDKqNmaosQ92IXH9/q3A120+RZ1b1X0 rA5Yun+RiGTFf2aFuCiChuNe8OqfP+n4enFChaO0wBA4+EBSenOJl2idcRdJ3hhPib+j DMzL8pvSozy7iPRJWXWX8XoDSIdGrjOqLKU2k= 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=GLtV+gnrQeHdgfIX08JWdfTRMwPLGkXn877DyEgZ+iQ=; b=nUDtumhxl4G+r+3agGyNGWT/wLMgOXZdO6/UgZ8qWKClDhzp0wvxhJbypKKUfe65pn GRsbWNvizJ0kFdP2wB5VER2O8ZkQllWHlW4kAmQgO5v0h3YkSe4XOJV8yeEULwi1kyYd ggBI+TNPLFOeYUBSDBi0+7Gn89XZOyuKZAVq2Blf8wcuG9i1lq8UsyadtELQpAh+uSJv JlBdWxyjK0kBvPExGAatqTfRHpMSzMw/ozwgKHyriDan2ZkN4ewetma/hC7+w4gub6Pr 6X6HAmRca05mJHz5XSr1nHLqDx6/8Fd1n4BXi2Ijeq+ICIL/ZWKiV2gV43DIeTJckhrB ib8w== X-Gm-Message-State: AOAM5327mGvFxVTHnoiqrctcrI5OUrNTpGx1SA1G94MNuo6y9hwLErBQ bJkqSpCv2WYPfPMXKjQW+Nxk1w== X-Google-Smtp-Source: ABdhPJxgwDLzNnjXNgMjIjgsqsihOstFByksU5tA11FNC8ZM6CVDmx48/htSkKSuVWo8XYUsyZXLhw== X-Received: by 2002:a63:a902:: with SMTP id u2mr8707603pge.263.1607638546321; Thu, 10 Dec 2020 14:15:46 -0800 (PST) Received: from localhost ([2620:15c:202:201:7220:84ff:fe09:94fe]) by smtp.gmail.com with ESMTPSA id l197sm7750119pfd.97.2020.12.10.14.15.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Dec 2020 14:15:45 -0800 (PST) From: Gwendal Grignou To: gabriele.mzt@gmail.com, jic23@kernel.org, lars@metafoo.de, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, Gwendal Grignou Subject: [PATCH v3 1/2] iio: acpi_als: Add timestamp channel Date: Thu, 10 Dec 2020 14:15:40 -0800 Message-Id: <20201210221541.1180448-2-gwendal@chromium.org> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201210221541.1180448-1-gwendal@chromium.org> References: <20201210221541.1180448-1-gwendal@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add timestamp channel in list of channel, to allow retrieving timestamps when events are produced. Signed-off-by: Gwendal Grignou --- Changes in v3: none. drivers/iio/light/acpi-als.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/iio/light/acpi-als.c b/drivers/iio/light/acpi-als.c index 1eafd0b24e182..ff0ecec65fae4 100644 --- a/drivers/iio/light/acpi-als.c +++ b/drivers/iio/light/acpi-als.c @@ -45,24 +45,23 @@ static const struct iio_chan_spec acpi_als_channels[] = { .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_PROCESSED), }, + IIO_CHAN_SOFT_TIMESTAMP(1), }; /* * The event buffer contains timestamp and all the data from * the ACPI0008 block. There are multiple, but so far we only - * support _ALI (illuminance). Once someone adds new channels - * to acpi_als_channels[], the evt_buffer below will grow - * automatically. + * support _ALI (illuminance): + * One channel, paddind and timestamp. */ -#define ACPI_ALS_EVT_NR_SOURCES ARRAY_SIZE(acpi_als_channels) #define ACPI_ALS_EVT_BUFFER_SIZE \ - (sizeof(s64) + (ACPI_ALS_EVT_NR_SOURCES * sizeof(s32))) + (sizeof(s32) + sizeof(s32) + sizeof(s64)) struct acpi_als { struct acpi_device *device; struct mutex lock; - s32 evt_buffer[ACPI_ALS_EVT_BUFFER_SIZE]; + s32 evt_buffer[ACPI_ALS_EVT_BUFFER_SIZE / sizeof(s32)] __aligned(8); }; /* From patchwork Thu Dec 10 22:15:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 11966871 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=-18.8 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, URIBL_BLOCKED,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 B21F1C4361B for ; Thu, 10 Dec 2020 23:11:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 805A822287 for ; Thu, 10 Dec 2020 23:11:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388009AbgLJWbN (ORCPT ); Thu, 10 Dec 2020 17:31:13 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36841 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405093AbgLJWV3 (ORCPT ); Thu, 10 Dec 2020 17:21:29 -0500 Received: by mail-pg1-f195.google.com with SMTP id w5so4807107pgj.3 for ; Thu, 10 Dec 2020 14:21:13 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/hBjI6ZEs2CpOz6vwVEa3HT4banbkGMgvbas2fetO38=; b=JOPpsi6rqjSOsB/+Df0X6V+rC0xxX0c5bLSRRHZ/cWOaESbl1dBSjUdOpRS0Pz56bE 1anE7SYaK3YPZemfaJ8U6BcamGHcTBVhBTppbjhUK8JfAUsS2Y9+kz8LBJon6JS62ecG hT8ZxTfHR9uUhnVwiFGBam3tppOGdi9ws+Hzg= 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=/hBjI6ZEs2CpOz6vwVEa3HT4banbkGMgvbas2fetO38=; b=Kc5LQVLgpbfesuOQG3R1iIZyuIiwWe9xTKYbnSryTYKuNgBEG8bhHw3rz8crGvaReH asKSQzjXezBEwhsifFGqu6Ikn8GXyh5SlqgM+VfToV/NDL5q+fB3W9WKWTnGcX2qZ76M MOQH+gO8fGgo34jRY4etbSgVNkt2/9iU31t9pXZ4vaz84fzzaeyPMnGCYe1UcvlQDkzv p632v0jZeG9qsa7gxO1HzeqMh10au7ITxCDQg2kNv5CelfAMbVnKe+gv1dJ3lbNr6w0P ixGudK1Z9TfTAaAWuEzaVVwnTyhE89Yo7CodjKa9CrUYuaiGOgq7k8TgAXjn0hwGA6/O yElg== X-Gm-Message-State: AOAM531M3lh7my+G0bvmfoitKc/O1jTVk7bOatkVUr9ltcibSUCs0Z3v 0nl0/GYpV+ekOaUROH+GWjh2MQ== X-Google-Smtp-Source: ABdhPJyx4Zg38Msjm3AThW9wmU4Kveez+koyOm1UC/Vwz3JGSEjBsW81Au9SxmL/RgebvO8VWVRNlw== X-Received: by 2002:a17:90a:e60d:: with SMTP id j13mr9944336pjy.52.1607638548148; Thu, 10 Dec 2020 14:15:48 -0800 (PST) Received: from localhost ([2620:15c:202:201:7220:84ff:fe09:94fe]) by smtp.gmail.com with ESMTPSA id s13sm7813275pfd.99.2020.12.10.14.15.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Dec 2020 14:15:47 -0800 (PST) From: Gwendal Grignou To: gabriele.mzt@gmail.com, jic23@kernel.org, lars@metafoo.de, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, Gwendal Grignou Subject: [PATCH v3 2/2] iio: acpi_als: Add trigger support Date: Thu, 10 Dec 2020 14:15:41 -0800 Message-Id: <20201210221541.1180448-3-gwendal@chromium.org> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201210221541.1180448-1-gwendal@chromium.org> References: <20201210221541.1180448-1-gwendal@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org As some firmware does not notify on illuminance changes, add a trigger to be able to query light via software (sysfs-trigger or hrtrigger). BUG=b:172408337 TEST=Check iio_info reports the sensor as buffer capable: iio:device0: acpi-als (buffer capable) Check we can get data on demand on volteer: echo 1 > iio_sysfs_trigger/add_trigger cat trigger2/name > iio\:device0/trigger/current_trigger for i in iio\:device0/scan_elements/*_en iio\:device0/buffer/enable ; do echo 1 > $i done od -x /dev/iio\:device0& echo 1 > trigger2/trigger_now Signed-off-by: Gwendal Grignou --- Changes in v3: -- should not increase buffer pointer before call iio_push_buffer. drivers/iio/light/acpi-als.c | 92 ++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 25 deletions(-) diff --git a/drivers/iio/light/acpi-als.c b/drivers/iio/light/acpi-als.c index ff0ecec65fae4..d506242eefabe 100644 --- a/drivers/iio/light/acpi-als.c +++ b/drivers/iio/light/acpi-als.c @@ -16,11 +16,15 @@ #include #include #include +#include #include #include #include #include +#include +#include +#include #define ACPI_ALS_CLASS "als" #define ACPI_ALS_DEVICE_NAME "acpi-als" @@ -60,6 +64,7 @@ static const struct iio_chan_spec acpi_als_channels[] = { struct acpi_als { struct acpi_device *device; struct mutex lock; + struct iio_trigger *trig; s32 evt_buffer[ACPI_ALS_EVT_BUFFER_SIZE / sizeof(s32)] __aligned(8); }; @@ -103,33 +108,20 @@ static void acpi_als_notify(struct acpi_device *device, u32 event) { struct iio_dev *indio_dev = acpi_driver_data(device); struct acpi_als *als = iio_priv(indio_dev); - s32 *buffer = als->evt_buffer; - s64 time_ns = iio_get_time_ns(indio_dev); - s32 val; - int ret; - - mutex_lock(&als->lock); - memset(buffer, 0, ACPI_ALS_EVT_BUFFER_SIZE); + if (!iio_buffer_enabled(indio_dev) || + !iio_trigger_using_own(indio_dev)) + return; switch (event) { case ACPI_ALS_NOTIFY_ILLUMINANCE: - ret = acpi_als_read_value(als, ACPI_ALS_ILLUMINANCE, &val); - if (ret < 0) - goto out; - *buffer++ = val; + iio_trigger_poll_chained(als->trig); break; default: /* Unhandled event */ dev_dbg(&device->dev, "Unhandled ACPI ALS event (%08x)!\n", event); - goto out; } - - iio_push_to_buffers_with_timestamp(indio_dev, als->evt_buffer, time_ns); - -out: - mutex_unlock(&als->lock); } static int acpi_als_read_raw(struct iio_dev *indio_dev, @@ -160,13 +152,46 @@ static const struct iio_info acpi_als_info = { .read_raw = acpi_als_read_raw, }; +static irqreturn_t acpi_als_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->indio_dev; + struct acpi_als *als = iio_priv(indio_dev); + s32 *buffer = als->evt_buffer; + s32 val; + int ret; + + mutex_lock(&als->lock); + + ret = acpi_als_read_value(als, ACPI_ALS_ILLUMINANCE, &val); + if (ret < 0) + goto out; + *buffer = val; + + /* + * when coming from own trigger via polls, set timestamp here. + * Given ACPI notifier is already in a thread and call function directly, + * there is no need to set the timestamp in the notify function. + */ + if (!pf->timestamp) + pf->timestamp = iio_get_time_ns(indio_dev); + + iio_push_to_buffers_with_timestamp(indio_dev, buffer, pf->timestamp); +out: + mutex_unlock(&als->lock); + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; +} + static int acpi_als_add(struct acpi_device *device) { struct acpi_als *als; struct iio_dev *indio_dev; - struct iio_buffer *buffer; + struct device *dev = &device->dev; + int ret; - indio_dev = devm_iio_device_alloc(&device->dev, sizeof(*als)); + indio_dev = devm_iio_device_alloc(dev, sizeof(*als)); if (!indio_dev) return -ENOMEM; @@ -177,19 +202,36 @@ static int acpi_als_add(struct acpi_device *device) mutex_init(&als->lock); indio_dev->name = ACPI_ALS_DEVICE_NAME; - indio_dev->dev.parent = &device->dev; + indio_dev->dev.parent = dev; indio_dev->info = &acpi_als_info; - indio_dev->modes = INDIO_BUFFER_SOFTWARE; + indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = acpi_als_channels; indio_dev->num_channels = ARRAY_SIZE(acpi_als_channels); - buffer = devm_iio_kfifo_allocate(&device->dev); - if (!buffer) + als->trig = devm_iio_trigger_alloc(dev, "%s-dev%d", + indio_dev->name, + indio_dev->id); + if (!als->trig) return -ENOMEM; - iio_device_attach_buffer(indio_dev, buffer); + iio_trigger_set_drvdata(als->trig, indio_dev); + ret = devm_iio_trigger_register(dev, als->trig); + if (ret) + return ret; + /* + * Set hardware trigger by default to let events flow when + * BIOS support notification. + */ + indio_dev->trig = iio_trigger_get(als->trig); + + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, + iio_pollfunc_store_time, + acpi_als_trigger_handler, + NULL); + if (ret) + return ret; - return devm_iio_device_register(&device->dev, indio_dev); + return devm_iio_device_register(dev, indio_dev); } static const struct acpi_device_id acpi_als_device_ids[] = {