Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp2143223pxk; Sat, 26 Sep 2020 19:21:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2kfdOE9ZXvIW9IbttPaqwuSyULw8m7vPMqmTpw2VgztGCOCmeLyvoIqum3cYRD8iIu8m2 X-Received: by 2002:a17:906:3495:: with SMTP id g21mr9323877ejb.121.1601173273816; Sat, 26 Sep 2020 19:21:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601173273; cv=none; d=google.com; s=arc-20160816; b=sWuJINL6Cjaj8fkI7Yl1kgMy/q8HqOCTDQ4xvpRQoqBn/TaCZR7XjisKvRiV/XJHUs A9VppHAK7tdc3qqsgp7TwFU2cuQ/h5E7qs5ZYODhpyi3JsFV/i2E648vf9NF2hV46mDA YKp03M5QuJoe1w/iMCTFMK+UpVqybNv2XizE0O1illsBEthC/YhqJucnuh751Xd5WJDb RZGCvRTT1LmAwWsCnDeythnOzUoXpAW9eCDJl1gJZ4IijHwRrZHJO+xBvCQWbFDAkqKx V0x0s4DoCC2P4qqzhlZ//iKwj9Yd2gAO5I2tTsMV/dDUFnzFiRgVnUxdOKcxdmtHshFt RXiQ== 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=jh6B1cpV4Xtp8VA5B+hRuezmF+MxbU6cFrVm7vcy4zI=; b=ywmR4v8N6H3aiUpcSm1bZKQSMuF5vz3xVh9LEZa1n+B/CcNm3vHBnL2/5nqeNs1E5M endOlbz8EaOe+I91EwO4fjZFjaYRcM9lPnDOgIZQ+pwUBV7Y44HcJHPx/EUDS6gr9FmZ ADUkCOccPrch+WRiBOU1xjJiNY2ERkJyYVOMoJpcwQCcoTBpCF+z9dVlYhMNo+xlgA98 7Z2UshmaxDrhktLHh7I5r5yXmPPBmMc80wEJisSBzMAS0K4L4O3UWDQZBlazS3qwaOXA 3FKY/bIa+aJIPARbFbX1tbELlEGW13YPDJeZzIRCfGRyX1wODnr5pJSHtWqaVCOkF8mL u/Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="sK+x7Gh/"; 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 10si4534996ejn.250.2020.09.26.19.20.50; Sat, 26 Sep 2020 19:21:13 -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="sK+x7Gh/"; 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 S1730224AbgI0CSy (ORCPT + 99 others); Sat, 26 Sep 2020 22:18:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729921AbgI0CSk (ORCPT ); Sat, 26 Sep 2020 22:18:40 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9683BC0613CE; Sat, 26 Sep 2020 19:18:40 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id d20so7070929qka.5; Sat, 26 Sep 2020 19:18:40 -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=jh6B1cpV4Xtp8VA5B+hRuezmF+MxbU6cFrVm7vcy4zI=; b=sK+x7Gh/GSMJp1Ma5jcudkcPr1UFfz2fXtTCtyS8y3goiF520fGc7JCyrrzgmfJVpE N7ds1Hk/SqWPcyT8407iN+kpll9j8azYYihJn3vUyNOb6YjQoLpYSkQp5axbUqH3fzqv QvuI9TyBK5IvwMmf3H0VJEU9/bcDj88jl2Cd6JFNZGSQ3DWYKGIzutPxN764v6VpAEpz TVlQ1U+UizxPkNKjLqbTOwBsKSTZTdiAWvpBqROBbiJPvGZmKtaSwGjvJWCvKouWGRP8 xhlc4s6UNey8m3LIshDhuIysGa6bTSBTPT5L1M2PtuspvadU0u76rCFAiVp9ltHJnO+4 sFKA== 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=jh6B1cpV4Xtp8VA5B+hRuezmF+MxbU6cFrVm7vcy4zI=; b=OQCuClYHrliTP9FgFIkvr0Z17vOlIr3rtVZXUlgDEcaT40V5ZeovSLH+suN8Xr8w7L 7VONgaO8/mCGYBm4UaDTaY9KuaL4oN0e9J972thERQMT/VWpDr8b+E4N6FpOcDnD6tXY vIypJGHPP6C9AweE5lXkehSpNHMScNpyEY/EXnSs1kA7l4iz0Fm0W+YKLTLhBLBfFD6K KatQ7vQRJyiczGfXwF41w+taDp3sUQm77HlNmEaNMgzHlskHalGnUdeHKsi3YYPCplyR c+I2vSBduktgTEX9/uNBvkXQ2aWbkujb5KlVFTLhXax7KtWx9HhAL6DhZbDk0VWCZ1dZ IqmA== X-Gm-Message-State: AOAM532rxPEyJ4DUD+UkDisMeiN0/T7mDaWsQt/VYY+eho2k+J8iJb/T nYNIcBQGGDzs0GzFC4nEreA= X-Received: by 2002:a37:bb86:: with SMTP id l128mr1311570qkf.426.1601173119712; Sat, 26 Sep 2020 19:18:39 -0700 (PDT) Received: from localhost.localdomain (072-189-064-225.res.spectrum.com. [72.189.64.225]) by smtp.gmail.com with ESMTPSA id f12sm5276906qti.70.2020.09.26.19.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 19:18:39 -0700 (PDT) From: William Breathitt Gray To: jic23@kernel.org Cc: kamel.bouhara@bootlin.com, gwendal@chromium.org, alexandre.belloni@bootlin.com, david@lechnology.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, syednwaris@gmail.com, patrick.havelange@essensium.com, fabrice.gasnier@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, William Breathitt Gray Subject: [PATCH v5 4/5] docs: counter: Document character device interface Date: Sat, 26 Sep 2020 22:18:17 -0400 Message-Id: <54190f9875b81b6aa5483a7710b084053a44abb8.1601170670.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds high-level documentation about the Counter subsystem character device interface. Signed-off-by: William Breathitt Gray --- Documentation/ABI/testing/sysfs-bus-counter | 18 ++ Documentation/driver-api/generic-counter.rst | 228 ++++++++++++++---- .../userspace-api/ioctl/ioctl-number.rst | 1 + 3 files changed, 206 insertions(+), 41 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-counter b/Documentation/ABI/testing/sysfs-bus-counter index 566bd99fe0a5..b7fdb14ae891 100644 --- a/Documentation/ABI/testing/sysfs-bus-counter +++ b/Documentation/ABI/testing/sysfs-bus-counter @@ -99,6 +99,24 @@ Description: Read-only attribute that indicates whether excessive noise is present at the channel Y counter inputs. +What: /sys/bus/counter/devices/counterX/countY/extensionZ_name +What: /sys/bus/counter/devices/counterX/extensionZ_name +What: /sys/bus/counter/devices/counterX/signalY/extensionZ_name +KernelVersion: 5.11 +Contact: linux-iio@vger.kernel.org +Description: + Read-only attribute that indicates the component name of + Extension Z. + +What: /sys/bus/counter/devices/counterX/countY/extensionZ_width +What: /sys/bus/counter/devices/counterX/extensionZ_width +What: /sys/bus/counter/devices/counterX/signalY/extensionZ_width +KernelVersion: 5.11 +Contact: linux-iio@vger.kernel.org +Description: + Read-only attribute that indicates the data width of value of + Extension Z. + What: /sys/bus/counter/devices/counterX/countY/function KernelVersion: 5.2 Contact: linux-iio@vger.kernel.org diff --git a/Documentation/driver-api/generic-counter.rst b/Documentation/driver-api/generic-counter.rst index b842ddbbd8a0..6077bf162ac3 100644 --- a/Documentation/driver-api/generic-counter.rst +++ b/Documentation/driver-api/generic-counter.rst @@ -223,19 +223,6 @@ whether an input line is differential or single-ended) and instead focus on the core idea of what the data and process represent (e.g. position as interpreted from quadrature encoding data). -Userspace Interface -=================== - -Several sysfs attributes are generated by the Generic Counter interface, -and reside under the /sys/bus/counter/devices/counterX directory, where -counterX refers to the respective counter device. Please see -Documentation/ABI/testing/sysfs-bus-counter for detailed -information on each Generic Counter interface sysfs attribute. - -Through these sysfs attributes, programs and scripts may interact with -the Generic Counter paradigm Counts, Signals, and Synapses of respective -counter devices. - Driver API ========== @@ -387,16 +374,16 @@ userspace interface components:: / driver callbacks / ------------------- | - +---------------+ - | - V - +--------------------+ - | Counter sysfs | - +--------------------+ - | Translates to the | - | standard Counter | - | sysfs output | - +--------------------+ + +---------------+---------------+ + | | + V V + +--------------------+ +---------------------+ + | Counter sysfs | | Counter chrdev | + +--------------------+ +---------------------+ + | Translates to the | | Translates to the | + | standard Counter | | standard Counter | + | sysfs output | | character device | + +--------------------+ +---------------------+ Thereafter, data can be transferred directly between the Counter device driver and Counter userspace interface:: @@ -427,23 +414,30 @@ driver and Counter userspace interface:: / u64 / ---------- | - +---------------+ - | - V - +--------------------+ - | Counter sysfs | - +--------------------+ - | Translates to the | - | standard Counter | - | sysfs output | - |--------------------| - | Type: const char * | - | Value: "42" | - +--------------------+ - | - --------------- - / const char * / - --------------- + +---------------+---------------+ + | | + V V + +--------------------+ +---------------------+ + | Counter sysfs | | Counter chrdev | + +--------------------+ +---------------------+ + | Translates to the | | Translates to the | + | standard Counter | | standard Counter | + | sysfs output | | character device | + |--------------------| |---------------------| + | Type: const char * | | Type: u64 | + | Value: "42" | | Value: 42 | + +--------------------+ +---------------------+ + | | + --------------- ----------------------- + / const char * / / struct counter_event / + --------------- ----------------------- + | | + | V + | +-----------+ + | | read | + | +-----------+ + | \ Count: 42 / + | ----------- | V +--------------------------------------------------+ @@ -452,7 +446,7 @@ driver and Counter userspace interface:: \ Count: "42" / -------------------------------------------------- -There are three primary components involved: +There are four primary components involved: Counter device driver --------------------- @@ -472,3 +466,155 @@ and vice versa. Please refer to the `Documentation/ABI/testing/sysfs-bus-counter` file for a detailed breakdown of the available Generic Counter interface sysfs attributes. + +Counter chrdev +-------------- +Translates counter data to the standard Counter character device; data +is transferred via standard character device read calls, while Counter +events are configured via ioctl calls. + +Sysfs Interface +=============== + +Several sysfs attributes are generated by the Generic Counter interface, +and reside under the `/sys/bus/counter/devices/counterX` directory, +where `X` is to the respective counter device id. Please see +`Documentation/ABI/testing/sysfs-bus-counter` for detailed information +on each Generic Counter interface sysfs attribute. + +Through these sysfs attributes, programs and scripts may interact with +the Generic Counter paradigm Counts, Signals, and Synapses of respective +counter devices. + +Counter Character Device +======================== + +Counter character device nodes are created under the `/dev` directory as +`counterX`, where `X` is the respective counter device id. Defines for +the standard Counter data types are exposed via the userspace +`include/uapi/linux/counter.h` file. + +Counter events +-------------- +Counter device drivers can support Counter events by utilizing the +`counter_push_event` function:: + + int counter_push_event(struct counter_device *const counter, const u8 event, + const u8 channel); + +The event id is specified by the `event` parameter; the event channel id +is specified by the `channel` parameter. When this function is called, +the Counter data associated with the respective event is gathered, and a +`struct counter_event` is generated for each datum and pushed to +userspace. + +Counter events can be configured by users to report various Counter +data of interest. This can be conceptualized as a list of Counter +component read calls to perform. For example:: + + +~~~~~~~~~~~~~~~~~~~~~~~~+~~~~~~~~~~~~~~~~~~~~~~~~+ + | COUNTER_EVENT_OVERFLOW | COUNTER_EVENT_INDEX | + +~~~~~~~~~~~~~~~~~~~~~~~~+~~~~~~~~~~~~~~~~~~~~~~~~+ + | Channel 0 | Channel 0 | + +------------------------+------------------------+ + | * Count 0 | * Signal 0 | + | * Count 1 | * Signal 0 Extension 0 | + | * Signal 3 | * Extension 4 | + | * Count 4 Extension 2 +------------------------+ + | * Signal 5 Extension 0 | Channel 1 | + | +------------------------+ + | | * Signal 4 | + | | * Signal 4 Extension 0 | + | | * Count 7 | + +------------------------+------------------------+ + +When `counter_push_event(counter, COUNTER_EVENT_INDEX, 1)` is called for +example, it will go down the list for the `COUNTER_EVENT_INDEX` event +channel 1 and execute the read callbacks for Signal 4, Signal 4 +Extension 0, and Count 4 -- the data returned for each is pushed to a +kfifo as a `struct counter_event`, which userspace can retrieve via a +standard read operation on the respective character device node. + +Userspace +--------- +Userspace applications can configure Counter events via ioctl operations +on the Counter character device node. There following ioctl codes are +supported and provided by the `linux/counter.h` userspace header file: + +* COUNTER_CLEAR_WATCHES_IOCTL: + Clear all Counter watches from all events + +* COUNTER_SET_WATCH_IOCTL: + Set a Counter watch for the specified event + +* COUNTER_LOAD_WATCHES_IOCTL: + Activates the Counter watches set earlier + +To configure events to gather Counter data, users first populate a +`struct counter_watch` with the relevant event id, event channel id, and +the information for the desired Counter component from which to read, +and then pass it via the `COUNTER_SET_WATCH_IOCTL` ioctl command. + +The `COUNTER_SET_WATCH_IOCTL` command will buffer these Counter watches. +When ready, the `COUNTER_LOAD_WATCHES_IOCTL` ioctl command may be used +to activate these Counter watches. + +Userspace applications can then execute a `read` operation (optionally +calling `poll` first) on the Counter character device node to retrieve +`struct counter_event` elements with the desired data. + +For example, the following userspace code opens `/dev/counter0`, +configures the `COUNTER_EVENT_INDEX` event channel 0 to gather Count 0 +and Count 1, and prints out the data as it becomes available on the +character device node:: + + #include + #include + #include + #include + #include + #include + + struct counter_watch watches[2] = { + { + .event = COUNTER_EVENT_INDEX, + .channel = 0, + .component.scope = COUNTER_SCOPE_COUNT, + .component.parent = 0, + .component.type = COUNTER_COMPONENT_COUNT, + }, + { + .event = COUNTER_EVENT_INDEX, + .channel = 0, + .component.scope = COUNTER_SCOPE_COUNT, + .component.parent = 1, + .component.type = COUNTER_COMPONENT_COUNT, + }, + }; + + int main(void) + { + struct pollfd pfd = { .events = POLLIN }; + struct counter_event event_data[2]; + + pfd.fd = open("/dev/counter0", O_RDWR); + + ioctl(pfd.fd, COUNTER_SET_WATCH_IOCTL, watches); + ioctl(pfd.fd, COUNTER_SET_WATCH_IOCTL, watches + 1); + ioctl(pfd.fd, COUNTER_LOAD_WATCHES_IOCTL); + + for (;;) { + poll(&pfd, 1, -1); + + read(pfd.fd, event_data, sizeof(event_data)); + + printf("Timestamp 0: %llu\nCount 0: %llu\n" + "Timestamp 1: %llu\nCount 1: %llu\n", + (unsigned long long)event_data[0].timestamp, + (unsigned long long)event_data[0].value_u64, + (unsigned long long)event_data[1].timestamp, + (unsigned long long)event_data[1].value_u64); + } + + return 0; + } diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 2a198838fca9..f6e96bb780cd 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -88,6 +88,7 @@ Code Seq# Include File Comments 0x20 all drivers/cdrom/cm206.h 0x22 all scsi/sg.h +0x3E 00-0F linux/counter.h '!' 00-1F uapi/linux/seccomp.h '#' 00-3F IEEE 1394 Subsystem Block for the entire subsystem -- 2.28.0