From patchwork Thu Feb 11 12:24:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 12083005 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=-11.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,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 18322C433E9 for ; Thu, 11 Feb 2021 12:26:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CBFC564E23 for ; Thu, 11 Feb 2021 12:25:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230405AbhBKMZp (ORCPT ); Thu, 11 Feb 2021 07:25:45 -0500 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:11292 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231934AbhBKMXg (ORCPT ); Thu, 11 Feb 2021 07:23:36 -0500 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11BCMfr5016212; Thu, 11 Feb 2021 07:22:41 -0500 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com with ESMTP id 36hr7qg8v7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Feb 2021 07:22:38 -0500 Received: from ASHBMBX9.ad.analog.com (ASHBMBX9.ad.analog.com [10.64.17.10]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 11BCMb1T004514 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Thu, 11 Feb 2021 07:22:37 -0500 Received: from ASHBCASHYB4.ad.analog.com (10.64.17.132) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Thu, 11 Feb 2021 07:22:36 -0500 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBCASHYB4.ad.analog.com (10.64.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.721.2; Thu, 11 Feb 2021 07:22:36 -0500 Received: from zeus.spd.analog.com (10.66.68.11) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.1.1779.2 via Frontend Transport; Thu, 11 Feb 2021 07:22:36 -0500 Received: from localhost.localdomain ([10.48.65.12]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 11BCMYWY011557; Thu, 11 Feb 2021 07:22:34 -0500 From: Alexandru Ardelean To: , CC: , , , , , , , Alexandru Ardelean Subject: [PATCH v5 00/17] iio: core,buffer: add support for multiple IIO buffers per IIO device Date: Thu, 11 Feb 2021 14:24:35 +0200 Message-ID: <20210211122452.78106-1-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.737 definitions=2021-02-11_05:2021-02-10,2021-02-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 lowpriorityscore=0 malwarescore=0 clxscore=1015 spamscore=0 phishscore=0 suspectscore=0 mlxscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102110110 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Some tweaks in v5, and this time I merged all the changelog histories into this final one. Changelog v4 -> v5: * https://lore.kernel.org/linux-iio/20210210100823.46780-1-alexandru.ardelean@analog.com/T/#t * patch 'iio: buffer: add ioctl() to support opening extra buffers for IIO device' don't return -EBUSY in iio_buffer_poll_wrapper(); return 0 __poll_t is unsigned, so returning 0 is the best we can do Reported-by: kernel test robot * patch 'iio: buffer: dmaengine: obtain buffer object from attribute' removed unused 'indio_dev' variable; seems i missed this initially * patch 'iio: buffer: add ioctl() to support opening extra buffers for IIO device' call 'wake_up(buffer->pollq)' in iio_buffer_chrdev_release() Changelog v3 -> v4: * https://lore.kernel.org/linux-iio/20210201145105.20459-1-alexandru.ardelean@analog.com/ * patch 'docs: ioctl-number.rst: reserve IIO subsystem ioctl() space' remove 'uapi/' from `uapi/linux/iio/*.h` * patch 'iio: core: register chardev only if needed' add commit comment about potentially breaking userspace ABI with chardev removal * patch 'iio: core: rework iio device group creation' remove NULL re-init in iio_device_unregister_sysfs() ; memory is being free'd * patch 'iio: buffer: group attr count and attr alloc' extend commit comment about the 2 or 1 buffer directores * patch 'iio: core: merge buffer/ & scan_elements/ attributes' fixed static checker complaints - removed unused global - initialize omitted 'ret = -ENOMEM' on error path - made iio_buffer_unregister_legacy_sysfs_groups() static * patch 'iio: buffer: wrap all buffer attributes into iio_dev_attr' - update some omitted unwindings; seems i forgot a few originally this was showing up when trying to read from buffer1 * add patch 'iio: buffer: move __iio_buffer_free_sysfs_and_mask() before alloc func' * patch 'iio: buffer: introduce support for attaching more IIO buffers' - removed 'iio_dev_opaque->attached_buffers = NULL' after kfree() - using 'iio_dev_opaque->attached_buffers_cnt' to check that we have buffers instead of checking 'indio_dev->buffer' * patch 'iio: buffer: add ioctl() to support opening extra buffers for IIO device' - replaced -ENOENT with -ENODEV when buffer index is out of range * add 'iio: core: rename 'dev' -> 'indio_dev' in iio_device_alloc()' * add 'iio: buffer: dmaengine: obtain buffer object from attribute' * add tools/iio patches for new multibuffer logic tools: iio: make iioutils_get_type() private in iio_utils tools: iio: privatize globals and functions in iio_generic_buffer.c file tools: iio: convert iio_generic_buffer to use new IIO buffer API Changelog v2 -> v3: * https://lore.kernel.org/linux-iio/20210122155805.83012-1-alexandru.ardelean@analog.com/ * added commit 'docs: ioctl-number.rst: reserve IIO subsystem ioctl() space' reserving 'i' 0x90-0x9F ioctls for IIO I did not see any conflicts with others (in the doc) - related to this, the new IIO_BUFFER_GET_FD_IOCTL is now at 'i' 0x91 * changed approach for creating sysfs buffer directories; - they are now created as groups on the IIO device; that also means that the groups array needs to be krealloc-ed and assign later in the registration - merged bufferX/ and scan_elementsX/ directories into a single bufferX/ directory - for legacy the buffer/ & scan_elements/ directories are kept; but they're groups objects have been moved on the iio_dev_opaque object - internally, the iio_dev_attr type is being extended to hold a reference for an IIO buffer; = this is great for scan_elements attributes = and for the rest of the iio_buffer attributes, it means we need to wrap them into iio_dev_attr Changelog v1 -> v2: * https://lore.kernel.org/linux-iio/20201117162340.43924-1-alexandru.ardelean@analog.com/ * 'iio: buffer: rework buffer & scan_elements dir creation' add more doc-strings detailing the reasoning for this change * 'iio: buffer: re-route scan_elements via it's kobj_type' move list_del() before the kfree()'s in the list destruction * 'iio: buffer: introduce support for attaching more IIO buffers' - changed to 'cnt' variable vs re-using the 'i' for unwinding in iio_buffer_alloc_sysfs_and_mask() - removed kfree(old) in iio_device_attach_buffer() - made iio_device_attach_buffer() an int return; this means that some follow up patches are needed to make this return value be used; * 'iio: buffer: add ioctl() to support opening extra buffers for IIO device' - tested ioctl() with a simple C program; attached to comment; - changed 'i' variable usage to 'sz' for alloc - changed logic for buffer0; returning FD 0; userspace should know that the IIO_BUFFER_GET_FD_IOCTL call returns 0 for buffer0; this is because I can't find a way to determine the FD of the ioctl() in the kernel; duplicating an ioctl() for buffer0 is also bad; Alexandru Ardelean (17): docs: ioctl-number.rst: reserve IIO subsystem ioctl() space iio: core: register chardev only if needed iio: core-trigger: make iio_device_register_trigger_consumer() an int return iio: core: rework iio device group creation iio: buffer: group attr count and attr alloc iio: core: merge buffer/ & scan_elements/ attributes iio: add reference to iio buffer on iio_dev_attr iio: buffer: wrap all buffer attributes into iio_dev_attr iio: buffer: dmaengine: obtain buffer object from attribute iio: core: wrap iio device & buffer into struct for character devices iio: buffer: move __iio_buffer_free_sysfs_and_mask() before alloc iio: buffer: introduce support for attaching more IIO buffers iio: buffer: add ioctl() to support opening extra buffers for IIO device iio: core: rename 'dev' -> 'indio_dev' in iio_device_alloc() tools: iio: make iioutils_get_type() private in iio_utils tools: iio: privatize globals and functions in iio_generic_buffer.c file tools: iio: convert iio_generic_buffer to use new IIO buffer API .../userspace-api/ioctl/ioctl-number.rst | 1 + .../buffer/industrialio-buffer-dmaengine.c | 4 +- drivers/iio/iio_core.h | 24 +- drivers/iio/iio_core_trigger.h | 4 +- drivers/iio/industrialio-buffer.c | 484 ++++++++++++++---- drivers/iio/industrialio-core.c | 108 +++- drivers/iio/industrialio-event.c | 6 +- drivers/iio/industrialio-trigger.c | 6 +- include/linux/iio/buffer.h | 4 +- include/linux/iio/buffer_impl.h | 21 +- include/linux/iio/iio-opaque.h | 14 + include/linux/iio/iio.h | 5 - include/linux/iio/sysfs.h | 3 + include/uapi/linux/iio/buffer.h | 10 + tools/iio/Makefile | 1 + tools/iio/iio_generic_buffer.c | 151 ++++-- tools/iio/iio_utils.c | 18 +- tools/iio/iio_utils.h | 8 +- 18 files changed, 668 insertions(+), 204 deletions(-) create mode 100644 include/uapi/linux/iio/buffer.h