From: William Breathitt Gray <vilhelm.gray@gmail.com>
To: jic23@kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com, kernel@pengutronix.de,
a.fatoum@pengutronix.de, 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-arm-kernel@lists.infradead.org, syednwaris@gmail.com,
patrick.havelange@essensium.com, fabrice.gasnier@st.com,
mcoquelin.stm32@gmail.com, alexandre.torgue@st.com,
o.rempel@pengutronix.de, jarkko.nikula@linux.intel.com,
William Breathitt Gray <vilhelm.gray@gmail.com>,
Pavel Machek <pavel@ucw.cz>
Subject: [PATCH v11 28/33] tools/counter: Create Counter tools
Date: Wed, 9 Jun 2021 10:31:31 +0900 [thread overview]
Message-ID: <d803ade96baa867f664ccf72e6d0302693e58edf.1623201082.git.vilhelm.gray@gmail.com> (raw)
In-Reply-To: <cover.1623201081.git.vilhelm.gray@gmail.com>
This creates an example Counter program under tools/counter/*
to exemplify the Counter character device interface.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
MAINTAINERS | 1 +
tools/Makefile | 13 ++---
tools/counter/Build | 1 +
tools/counter/Makefile | 53 ++++++++++++++++++
tools/counter/counter_example.c | 95 +++++++++++++++++++++++++++++++++
5 files changed, 157 insertions(+), 6 deletions(-)
create mode 100644 tools/counter/Build
create mode 100644 tools/counter/Makefile
create mode 100644 tools/counter/counter_example.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 7e2ddf74bd7b..9e2a0c5637ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4679,6 +4679,7 @@ F: Documentation/driver-api/generic-counter.rst
F: drivers/counter/
F: include/linux/counter.h
F: include/uapi/linux/counter.h
+F: tools/counter/
CP2615 I2C DRIVER
M: Bence Csókás <bence98@sch.bme.hu>
diff --git a/tools/Makefile b/tools/Makefile
index 7e9d34ddd74c..4c26400ffc03 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,6 +12,7 @@ help:
@echo ' acpi - ACPI tools'
@echo ' bpf - misc BPF tools'
@echo ' cgroup - cgroup tools'
+ @echo ' counter - Counter tools'
@echo ' cpupower - a tool for all things x86 CPU power'
@echo ' debugging - tools for debugging'
@echo ' firewire - the userspace part of nosy, an IEEE-1394 traffic sniffer'
@@ -65,7 +66,7 @@ acpi: FORCE
cpupower: FORCE
$(call descend,power/$@)
-cgroup firewire hv guest bootconfig spi usb virtio vm bpf iio gpio objtool leds wmi pci firmware debugging tracing: FORCE
+cgroup counter firewire hv guest bootconfig spi usb virtio vm bpf iio gpio objtool leds wmi pci firmware debugging tracing: FORCE
$(call descend,$@)
bpf/%: FORCE
@@ -100,7 +101,7 @@ freefall: FORCE
kvm_stat: FORCE
$(call descend,kvm/$@)
-all: acpi cgroup cpupower gpio hv firewire liblockdep \
+all: acpi cgroup counter cpupower gpio hv firewire liblockdep \
perf selftests bootconfig spi turbostat usb \
virtio vm bpf x86_energy_perf_policy \
tmon freefall iio objtool kvm_stat wmi \
@@ -112,7 +113,7 @@ acpi_install:
cpupower_install:
$(call descend,power/$(@:_install=),install)
-cgroup_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install vm_install bpf_install objtool_install wmi_install pci_install debugging_install tracing_install:
+cgroup_install counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install vm_install bpf_install objtool_install wmi_install pci_install debugging_install tracing_install:
$(call descend,$(@:_install=),install)
liblockdep_install:
@@ -133,7 +134,7 @@ freefall_install:
kvm_stat_install:
$(call descend,kvm/$(@:_install=),install)
-install: acpi_install cgroup_install cpupower_install gpio_install \
+install: acpi_install cgroup_install counter_install cpupower_install gpio_install \
hv_install firewire_install iio_install liblockdep_install \
perf_install selftests_install turbostat_install usb_install \
virtio_install vm_install bpf_install x86_energy_perf_policy_install \
@@ -147,7 +148,7 @@ acpi_clean:
cpupower_clean:
$(call descend,power/cpupower,clean)
-cgroup_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
+cgroup_clean counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
$(call descend,$(@:_clean=),clean)
liblockdep_clean:
@@ -181,7 +182,7 @@ freefall_clean:
build_clean:
$(call descend,build,clean)
-clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean \
+clean: acpi_clean cgroup_clean counter_clean cpupower_clean hv_clean firewire_clean \
perf_clean selftests_clean turbostat_clean bootconfig_clean spi_clean usb_clean virtio_clean \
vm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \
diff --git a/tools/counter/Build b/tools/counter/Build
new file mode 100644
index 000000000000..33f4a51d715e
--- /dev/null
+++ b/tools/counter/Build
@@ -0,0 +1 @@
+counter_example-y += counter_example.o
diff --git a/tools/counter/Makefile b/tools/counter/Makefile
new file mode 100644
index 000000000000..5ebc195fd9c0
--- /dev/null
+++ b/tools/counter/Makefile
@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: GPL-2.0
+include ../scripts/Makefile.include
+
+bindir ?= /usr/bin
+
+ifeq ($(srctree),)
+srctree := $(patsubst %/,%,$(dir $(CURDIR)))
+srctree := $(patsubst %/,%,$(dir $(srctree)))
+endif
+
+# Do not use make's built-in rules
+# (this improves performance and avoids hard-to-debug behaviour);
+MAKEFLAGS += -r
+
+override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
+
+ALL_TARGETS := counter_example
+ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
+
+all: $(ALL_PROGRAMS)
+
+export srctree OUTPUT CC LD CFLAGS
+include $(srctree)/tools/build/Makefile.include
+
+#
+# We need the following to be outside of kernel tree
+#
+$(OUTPUT)include/linux/counter.h: ../../include/uapi/linux/counter.h
+ mkdir -p $(OUTPUT)include/linux 2>&1 || true
+ ln -sf $(CURDIR)/../../include/uapi/linux/counter.h $@
+
+prepare: $(OUTPUT)include/linux/counter.h
+
+COUNTER_EXAMPLE := $(OUTPUT)counter_example.o
+$(COUNTER_EXAMPLE): prepare FORCE
+ $(Q)$(MAKE) $(build)=counter_example
+$(OUTPUT)counter_example: $(COUNTER_EXAMPLE)
+ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
+
+clean:
+ rm -f $(ALL_PROGRAMS)
+ rm -rf $(OUTPUT)include/linux/counter.h
+ find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete
+
+install: $(ALL_PROGRAMS)
+ install -d -m 755 $(DESTDIR)$(bindir); \
+ for program in $(ALL_PROGRAMS); do \
+ install $$program $(DESTDIR)$(bindir); \
+ done
+
+FORCE:
+
+.PHONY: all install clean FORCE prepare
diff --git a/tools/counter/counter_example.c b/tools/counter/counter_example.c
new file mode 100644
index 000000000000..71dfec673c11
--- /dev/null
+++ b/tools/counter/counter_example.c
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Counter - example userspace application
+ *
+ * The userspace application opens /dev/counter0, configures the
+ * COUNTER_EVENT_INDEX event channel 0 to gather Count 0 count and Count
+ * 1 count, and prints out the data as it becomes available on the
+ * character device node.
+ *
+ * Copyright (C) 2021 William Breathitt Gray
+ */
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/counter.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+struct counter_watch watches[2] = {
+ {
+ /* Component data: Count 0 count */
+ .component.type = COUNTER_COMPONENT_COUNT,
+ .component.scope = COUNTER_SCOPE_COUNT,
+ .component.parent = 0,
+ /* Event type: Index */
+ .event = COUNTER_EVENT_INDEX,
+ /* Device event channel 0 */
+ .channel = 0,
+ },
+ {
+ /* Component data: Count 1 count */
+ .component.type = COUNTER_COMPONENT_COUNT,
+ .component.scope = COUNTER_SCOPE_COUNT,
+ .component.parent = 1,
+ /* Event type: Index */
+ .event = COUNTER_EVENT_INDEX,
+ /* Device event channel 0 */
+ .channel = 0,
+ },
+};
+
+int main(void)
+{
+ int fd;
+ int ret;
+ struct counter_event event_data[2];
+
+ fd = open("/dev/counter0", O_RDWR);
+ if (fd == -1) {
+ perror("Unable to open /dev/counter0");
+ return -errno;
+ }
+
+ ret = ioctl(fd, COUNTER_ADD_WATCH_IOCTL, watches);
+ if (ret == -1) {
+ perror("Error adding watches[0]");
+ return -errno;
+ }
+ ret = ioctl(fd, COUNTER_ADD_WATCH_IOCTL, watches + 1);
+ if (ret == -1) {
+ perror("Error adding watches[1]");
+ return -errno;
+ }
+ ret = ioctl(fd, COUNTER_ENABLE_EVENTS_IOCTL);
+ if (ret == -1) {
+ perror("Error enabling events");
+ return -errno;
+ }
+
+ for (;;) {
+ ret = read(fd, event_data, sizeof(event_data));
+ if (ret == -1) {
+ perror("Failed to read event data");
+ return -errno;
+ }
+
+ if (ret != sizeof(event_data)) {
+ fprintf(stderr, "Failed to read event data\n");
+ return -EIO;
+ }
+
+ printf("Timestamp 0: %llu\tCount 0: %llu\n"
+ "Error Message 0: %s\n"
+ "Timestamp 1: %llu\tCount 1: %llu\n"
+ "Error Message 1: %s\n",
+ (unsigned long long)event_data[0].timestamp,
+ (unsigned long long)event_data[0].value,
+ strerror(event_data[0].status),
+ (unsigned long long)event_data[1].timestamp,
+ (unsigned long long)event_data[1].value,
+ strerror(event_data[1].status));
+ }
+
+ return 0;
+}
--
2.32.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-09 1:47 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 1:31 [PATCH v11 00/33] Introduce the Counter character device interface William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 01/33] docs: counter: Consolidate Counter sysfs attributes documentation William Breathitt Gray
2021-06-09 14:55 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 02/33] docs: counter: Fix spelling William Breathitt Gray
2021-06-09 15:02 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 03/33] counter: 104-quad-8: Remove pointless comment William Breathitt Gray
2021-06-09 15:02 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 04/33] counter: 104-quad-8: Return error when invalid mode during ceiling_write William Breathitt Gray
2021-06-09 15:12 ` Jonathan Cameron
2021-06-09 15:48 ` William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 05/33] counter: 104-quad-8: Annotate hardware config module parameter William Breathitt Gray
2021-06-09 15:17 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 06/33] counter: 104-quad-8: Add const qualifiers for quad8_preset_register_set William Breathitt Gray
2021-06-09 15:19 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 07/33] counter: 104-quad-8: Add const qualifier for functions_list array William Breathitt Gray
2021-06-09 15:20 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 08/33] counter: interrupt-cnt: " William Breathitt Gray
2021-06-09 15:21 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 09/33] counter: microchip-tcb-capture: " William Breathitt Gray
2021-06-09 15:22 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 10/33] counter: stm32-lptimer-cnt: " William Breathitt Gray
2021-06-09 15:25 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 11/33] counter: stm32-timer-cnt: " William Breathitt Gray
2021-06-09 15:25 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 12/33] counter: 104-quad-8: Add const qualifier for actions_list array William Breathitt Gray
2021-06-09 15:27 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 13/33] counter: ftm-quaddec: " William Breathitt Gray
2021-06-09 15:28 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 14/33] counter: interrupt-cnt: " William Breathitt Gray
2021-06-09 15:29 ` Jonathan Cameron
2021-06-09 15:36 ` William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 15/33] counter: microchip-tcb-capture: " William Breathitt Gray
2021-06-09 15:30 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 16/33] counter: stm32-lptimer-cnt: " William Breathitt Gray
2021-06-09 15:32 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 17/33] counter: stm32-timer-cnt: " William Breathitt Gray
2021-06-09 15:33 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 18/33] counter: Return error code on invalid modes William Breathitt Gray
2021-06-09 15:47 ` Jonathan Cameron
2021-07-03 10:41 ` William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 19/33] counter: Standardize to ERANGE for limit exceeded errors William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 20/33] counter: Rename counter_signal_value to counter_signal_level William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 21/33] counter: Rename counter_count_function to counter_function William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 23/33] counter: Update counter.h comments to reflect sysfs internalization William Breathitt Gray
2021-06-09 16:55 ` Jonathan Cameron
2021-06-09 1:31 ` [PATCH v11 24/33] docs: counter: Update " William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 25/33] counter: Move counter enums to uapi header William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 26/33] counter: Add character device interface William Breathitt Gray
2021-06-09 8:07 ` Dan Carpenter
2021-06-09 8:28 ` William Breathitt Gray
2021-06-09 8:59 ` Dan Carpenter
2021-06-09 14:16 ` William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 27/33] docs: counter: Document " William Breathitt Gray
2021-06-09 1:31 ` William Breathitt Gray [this message]
2021-06-09 1:31 ` [PATCH v11 29/33] counter: Implement signalZ_action_component_id sysfs attribute William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 30/33] counter: Implement *_component_id sysfs attributes William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 31/33] counter: Implement events_queue_size sysfs attribute William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 32/33] counter: 104-quad-8: Replace mutex with spinlock William Breathitt Gray
2021-06-09 1:31 ` [PATCH v11 33/33] counter: 104-quad-8: Add IRQ support for the ACCES 104-QUAD-8 William Breathitt Gray
2021-06-09 17:27 ` Jonathan Cameron
2021-06-09 13:59 ` [PATCH v11 00/33] Introduce the Counter character device interface Jonathan Cameron
2021-06-09 14:26 ` William Breathitt Gray
[not found] ` <87dec6c889e40068ed27cbb3e66a6376856e2267.1623201082.git.vilhelm.gray@gmail.com>
2021-06-09 16:51 ` [RESEND PATCH v11 22/33] counter: Internalize sysfs interface code Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d803ade96baa867f664ccf72e6d0302693e58edf.1623201082.git.vilhelm.gray@gmail.com \
--to=vilhelm.gray@gmail.com \
--cc=a.fatoum@pengutronix.de \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@st.com \
--cc=david@lechnology.com \
--cc=fabrice.gasnier@st.com \
--cc=gwendal@chromium.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=jic23@kernel.org \
--cc=kamel.bouhara@bootlin.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=o.rempel@pengutronix.de \
--cc=patrick.havelange@essensium.com \
--cc=pavel@ucw.cz \
--cc=syednwaris@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).