On Wed, Aug 17, 2022 at 04:16:20PM +0200, Julien Panis wrote:
> ECAP hardware on TI AM62x SoC supports capture feature. It can be used
> to timestamp events (falling/rising edges) detected on signal input pin.
>
> This commit adds capture driver support for ECAP hardware on AM62x SoC.
>
> In the ECAP hardware, capture pin can also be configured to be in
> PWM mode. Current implementation only supports capture operating mode.
> Hardware also supports timebase sync between multiple instances, but
> this driver supports simple independent capture functionality.
>
> Signed-off-by: Julien Panis <jpanis@xxxxxxxxxxxx>
> ---
> drivers/counter/Kconfig | 15 +
> drivers/counter/Makefile | 1 +
> drivers/counter/ti-ecap-capture.c | 624 ++++++++++++++++++++++++++++++
> include/uapi/linux/counter.h | 2 +
> 4 files changed, 642 insertions(+)
> create mode 100644 drivers/counter/ti-ecap-capture.c
>
> diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
> index 5edd155f1911..08235268af0b 100644
> --- a/drivers/counter/Kconfig
> +++ b/drivers/counter/Kconfig
> @@ -101,4 +101,19 @@ config INTEL_QEP
> To compile this driver as a module, choose M here: the module
> will be called intel-qep.
>
> +config TI_ECAP_CAPTURE
> + tristate "TI eCAP capture driver"
> + depends on ARCH_OMAP2PLUS || ARCH_DAVINCI_DA8XX || ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST
> + depends on HAS_IOMEM
> + select REGMAP_MMIO
> + help
> + Select this option to enable the Texas Instruments Enhanced Capture
> + (eCAP) driver in input mode.
> +
> + It can be used to timestamp events (falling/rising edges) detected
> + on signal input pin.
The phrase "signal input pin" sounds ambiguous; perhaps "ECAP input
signal" or similar works better here.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called ti-ecap-capture.
> +
> endif # COUNTER
> diff --git a/drivers/counter/Makefile b/drivers/counter/Makefile
> index 8fde6c100ebc..b9a369e0d4fc 100644
> --- a/drivers/counter/Makefile
> +++ b/drivers/counter/Makefile
> @@ -14,3 +14,4 @@ obj-$(CONFIG_TI_EQEP) += ti-eqep.o
> obj-$(CONFIG_FTM_QUADDEC) += ftm-quaddec.o
> obj-$(CONFIG_MICROCHIP_TCB_CAPTURE) += microchip-tcb-capture.o
> obj-$(CONFIG_INTEL_QEP) += intel-qep.o
> +obj-$(CONFIG_TI_ECAP_CAPTURE) += ti-ecap-capture.o
> diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
> new file mode 100644
> index 000000000000..b00ddf122bbd
> --- /dev/null
> +++ b/drivers/counter/ti-ecap-capture.c
> @@ -0,0 +1,624 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * ECAP Capture driver
> + *
> + * Copyright (C) 2022 Julien Panis <jpanis@xxxxxxxxxxxx>
> + */
> +
> +#include <linux/atomic.h>
> +#include <linux/clk.h>
> +#include <linux/counter.h>
> +#include <linux/err.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/regmap.h>
> +
> +#define ECAP_DRV_NAME "ecap"
> +
> +/* ECAP event IDs */
> +enum ecap_event_id {
> + /* Capture events */
> + ECAP_CEVT1,
> + ECAP_CEVT2,
> + ECAP_CEVT3,
> + ECAP_CEVT4,
> + /* Counter overflow event */
> + ECAP_CNTOVF,
> + /* Helpers for capture events */
> + ECAP_CEVT_LAST = ECAP_CEVT4,
> + ECAP_NB_CEVT = ECAP_CEVT_LAST + 1,
> + /* Helpers for all events */
> + ECAP_EVT_LAST = ECAP_CNTOVF,
> + ECAP_NB_EVT = ECAP_EVT_LAST + 1,
> +};
You're relying on a side-effect of enum structures to define your ECAP_*
constants in sequence; this obscures the intention of your code and
makes it more difficult to understand the purpose of the constants.
The enum structure is unnecessary; these are register flags so C defines
are sufficent and clear enough to represent these values.
> +static void ecap_cnt_capture_enable(struct counter_device *counter, bool rearm)
> +{
> + struct ecap_cnt_dev *ecap_dev = counter_priv(counter);
> + unsigned int regval;
> +
> + pm_runtime_get_sync(counter->parent);
> +
> + /* Enable interrupts on events */
> + regmap_update_bits(ecap_dev->regmap, ECAP_ECINT_EN_FLG_REG,
> + ECAP_EVT_EN_MASK, ECAP_EVT_EN_MASK);
> +
> + /* Run counter */
> + regval = ECAP_SYNCO_DIS_MASK | ECAP_STOPVALUE_MASK | ECAP_ECCTL_EN_MASK;
> + if (rearm) {
> + atomic_set(&ecap_dev->nb_ovf, 0);
> + regmap_write(ecap_dev->regmap, ECAP_TSCNT_REG, 0);
Looks like you're resetting both nb_ovf and TSCNT here. This combines
too many operations in one extension, whereas extensions are intended to
serve a restricted and well-defined scope of behavior. The "enable"
extension is intended to serve as a pause/unpause mechanism for the
respective Count, so don't reset the Count data here. Instead break
these operations into their own extensions: implement a count_write()
callback to reset TSCNT, and similarly for nb_ovf.
> +static int ecap_cnt_action_read(struct counter_device *counter,
> + struct counter_count *count,
> + struct counter_synapse *synapse,
> + enum counter_synapse_action *action)
> +{
> + *action = COUNTER_SYNAPSE_ACTION_NONE;
> +
> + return 0;
> +}
This action_read() callback serves both "ECAP Input Signal" and "ECAP
Clock Signal" so you need to check the struct counter_synapse to see
which Signal is being handled. Return COUNTER_SYNAPSE_ACTION_NONE for
ECAP_INPUT_SIG, and COUNTER_SYNAPSE_ACTION_BOTH_EDGES for ECAP_CLOCK_SIG
(assuming TSCNT increments on both edges of the clock).
> +
> +static int ecap_cnt_watch_validate(struct counter_device *counter,
> + const struct counter_watch *watch)
> +{
> + return (watch->channel == ECAP_CHAN &&
> + (watch->event == COUNTER_EVENT_CAPTURE ||
> + watch->event == COUNTER_EVENT_OVERFLOW)) ? 0 : -EINVAL;
One-liners are typically nice, but it is difficult to parse the meaning
of expressions with multiple layers. The logic of this conditional check
is clearer if you separate the channel validation from the event type
validation with their own if-statement blocks.
> +static int ecap_cnt_cap_set_pol(struct counter_device *counter,
> + struct counter_signal *signal,
> + u8 inst, u32 pol)
> +{
> + struct ecap_cnt_dev *ecap_dev = counter_priv(counter);
> +
> + if (ecap_dev->enabled)
> + return -EBUSY;
> + if (pol > 1)
> + return -EINVAL;
The boundary check for "pol" can be removed; COUNTER_COMP_SIGNAL_ENUM
already ensures that "pol" will be within the boundaries of your Counter
enum array.
> +static int ecap_cnt_count_cumul_read(struct counter_device *counter,
> + struct counter_count *count, u64 *val)
> +{
> + struct ecap_cnt_dev *ecap_dev = counter_priv(counter);
> +
> + *val = ((u64)U32_MAX + 1) * atomic_read(&ecap_dev->nb_ovf);
> +
> + return 0;
> +}
Reimplement this as "ceiling" and "num_overflows"; simply return U32_MAX
and nb_ovf respectively.
> +static int ecap_cnt_clk_get_freq(struct counter_device *counter,
> + struct counter_signal *signal, u64 *freq)
> +{
> + struct ecap_cnt_dev *ecap_dev = counter_priv(counter);
> +
> + *freq = ecap_dev->clk_rate;
Looks like this is the only place you ever use clk_rate. Just perform
the clk_get_rate() call here and you won't need clk_rate in ecap_dev
anymore.
> +static const struct counter_ops ecap_cnt_ops = {
> + .count_read = ecap_cnt_count_read,
> + .function_read = ecap_cnt_function_read,
> + .action_read = ecap_cnt_action_read,
> + .watch_validate = ecap_cnt_watch_validate,
> +};
Add a count_write callback to set TSCNT. This will allow users to reset
TSCNT back to 0 when desired.
> +static const enum counter_synapse_action ecap_cnt_actions[] = {
> + COUNTER_SYNAPSE_ACTION_NONE,
> +};
Define a second array with just COUNTER_SYNAPSE_ACTION_BOTH_EDGES for
the clock Signal (assuming the count increments on both edges) and pass
it to the respective clock signal Synapse actions_list.
> +static struct counter_comp ecap_cnt_signal_ext[] = {
> + COUNTER_COMP_SIGNAL_ENUM("polarity1", ecap_cnt_cap1_get_pol,
> + ecap_cnt_cap1_set_pol, ecap_cnt_cap_avail_pol),
> + COUNTER_COMP_SIGNAL_ENUM("polarity2", ecap_cnt_cap2_get_pol,
> + ecap_cnt_cap2_set_pol, ecap_cnt_cap_avail_pol),
> + COUNTER_COMP_SIGNAL_ENUM("polarity3", ecap_cnt_cap3_get_pol,
> + ecap_cnt_cap3_set_pol, ecap_cnt_cap_avail_pol),
> + COUNTER_COMP_SIGNAL_ENUM("polarity4", ecap_cnt_cap4_get_pol,
> + ecap_cnt_cap4_set_pol, ecap_cnt_cap_avail_pol),
> +};
Zero-based indexing is typically expected so start at polarity0 instead
of polarity1.
> +static struct counter_signal ecap_cnt_signals[] = {
> + {
> + .id = ECAP_INPUT_SIG,
> + .name = "ECAP Input Signal",
> + .ext = ecap_cnt_signal_ext,
> + .num_ext = ARRAY_SIZE(ecap_cnt_signal_ext),
> + },
> + {
> + .id = ECAP_CLOCK_SIG,
> + .name = "ECAP Clock Signal",
> + .ext = ecap_cnt_clock_ext,
> + .num_ext = ARRAY_SIZE(ecap_cnt_clock_ext),
> + },
> +};
> +
> +static struct counter_synapse ecap_cnt_synapses[] = {
> + {
> + .actions_list = ecap_cnt_actions,
> + .num_actions = ARRAY_SIZE(ecap_cnt_actions),
> + .signal = &ecap_cnt_signals[ECAP_INPUT_SIG],
> + },
> + {
> + .actions_list = ecap_cnt_actions,
> + .num_actions = ARRAY_SIZE(ecap_cnt_actions),
> + .signal = &ecap_cnt_signals[ECAP_CLOCK_SIG],
> + },
> +};
I find it more natural to list the clock signal first because that's
what's incrementing the TSCNT counter. But this isn't necessarily wrong,
so I'll leave it up to you if you want to reorder your Signals and
Synapses arrays.
> +static struct counter_comp ecap_cnt_count_ext[] = {
> + COUNTER_COMP_COUNT_U64("capture1", ecap_cnt_cap1_read, NULL),
> + COUNTER_COMP_COUNT_U64("capture2", ecap_cnt_cap2_read, NULL),
> + COUNTER_COMP_COUNT_U64("capture3", ecap_cnt_cap3_read, NULL),
> + COUNTER_COMP_COUNT_U64("capture4", ecap_cnt_cap4_read, NULL),
Same comment about zero-based indexing here as with the polarity
extensions: start with capture0 instead of capture 1.
> + COUNTER_COMP_COUNT_U64("count_cumul", ecap_cnt_count_cumul_read, NULL),
> + COUNTER_COMP_ENABLE(ecap_cnt_enable_read, ecap_cnt_enable_write),
> +};
Replace "count_cumul" with "num_overflows" (COUNTER_COMP_COUNT_U64) and
"ceiling" (COUNTER_COMP_CEILING).
> +static struct counter_count ecap_cnt_counts[] = {
> + {
> + .id = 0,
> + .name = "ECAP Timestamp Counter",
You probably don't need "ECAP" in the Count name because users already
know they interacting with an ECAP device when they read the sysfs
"counterX/name" attribute.
> +static irqreturn_t ecap_cnt_isr(int irq, void *dev_id)
> +{
> + struct counter_device *counter_dev = dev_id;
> + struct ecap_cnt_dev *ecap_dev = counter_priv(counter_dev);
> + unsigned int clr = 0;
> + unsigned int flg;
> + int i;
> +
> + regmap_read(ecap_dev->regmap, ECAP_ECINT_EN_FLG_REG, &flg);
> +
> + for (i = ECAP_CEVT_LAST ; i <= ECAP_EVT_LAST ; i++) {
> + if (flg & ECAP_EVT_FLG_BIT(i)) {
Use the for_each_set_bit() macro to simplify this for-loop+if check.
> + if (i != ECAP_CNTOVF) {
Move the check for overflow outside of the for-loop because it's
conceptually unrelated to the other flags. The for-loop can then be
focused on just the capture events.
> + /* Input signal edge detected on last CAP (CAP4) */
> + counter_push_event(counter_dev, COUNTER_EVENT_CAPTURE, ECAP_CHAN);
Restricting event pushes to just CAP4 means losing three quarters of the
possible captures events this device is capable of reporting. By pushing
a Counter event on every capture, users have much finer control over the
operation of their device, allowing them to perform measurements of
instantaneous pulse widths among other such cycle analyses.
Your particular use-case requires analysing four captures at a time. If
you push every capture event on the same channel, you would have to
ignore the majority of them; checking for CAP4 on every capture event is
cumbersome for userspace in such a scenario. To reconcile the need to
report all device events with the desire to filter some of those capture
events, the solution is to push each CAPx event to respective Counter
event channels::
counter_push_event(counter_dev, COUNTER_EVENT_CAPTURE, i);
This intuitively matches an update to a capture buffer element with a
respective Counter event channel. For your use-case, this requires no
change to a userspace application reading the sysfs attributes, and a
minimal change to one interacting with the character device node:
specifying the particular Counter event channel in your Counter watches;
the rest of users are able to watch all capture events, or just some, as
they please.
> +static int ecap_cnt_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct ecap_cnt_dev *ecap_dev;
> + struct counter_device *counter_dev;
> + void __iomem *mmio_base;
> + int ret;
> +
> + counter_dev = devm_counter_alloc(dev, sizeof(*ecap_dev));
> + if (IS_ERR(counter_dev))
> + return PTR_ERR(counter_dev);
> +
> + counter_dev->name = ECAP_DRV_NAME;
> + counter_dev->parent = dev;
> + counter_dev->ops = &ecap_cnt_ops;
> + counter_dev->signals = ecap_cnt_signals;
> + counter_dev->num_signals = ARRAY_SIZE(ecap_cnt_signals);
> + counter_dev->counts = ecap_cnt_counts;
> + counter_dev->num_counts = ARRAY_SIZE(ecap_cnt_counts);
> +
> + ecap_dev = counter_priv(counter_dev);
> +
> + ecap_dev->clk = devm_clk_get_enabled(dev, "fck");
> + if (IS_ERR(ecap_dev->clk))
> + return dev_err_probe(dev, PTR_ERR(ecap_dev->clk), "failed to get clock\n");
> +
> + ecap_dev->clk_rate = clk_get_rate(ecap_dev->clk);
> + if (!ecap_dev->clk_rate) {
> + dev_err(dev, "failed to get clock rate\n");
> + return -EINVAL;
> + }
> +
> + mmio_base = devm_platform_ioremap_resource(pdev, 0);
> + if (IS_ERR(mmio_base))
> + return PTR_ERR(mmio_base);
> +
> + ecap_dev->regmap = devm_regmap_init_mmio(dev, mmio_base, &ecap_cnt_regmap_config);
> + if (IS_ERR(ecap_dev->regmap))
> + return dev_err_probe(dev, PTR_ERR(ecap_dev->regmap), "failed to init regmap\n");
> +
> + ret = platform_get_irq(pdev, 0);
> + if (ret < 0)
> + return dev_err_probe(dev, ret, "failed to get irq\n");
> +
> + ret = devm_request_irq(dev, ret, ecap_cnt_isr, 0, pdev->name, counter_dev);
> + if (ret)
> + return dev_err_probe(dev, ret, "failed to request irq\n");
> +
> + platform_set_drvdata(pdev, counter_dev);
> +
> + pm_runtime_enable(dev);
> +
> + /* Register a cleanup callback to care for disabling PM */
> + ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
> + if (ret)
> + return dev_err_probe(dev, ret, "failed to add pm disable action\n");
> +
> + ecap_dev->enabled = 0;
The devm_counter_alloc() function ensures your ecap_dev structure is
zero-initialized so you don't need to explicitly set "enabled" to 0
here. However, it's not harmful so I'll leave it up to you if you want
to remove this line.
William Breathitt Gray
Attachment:
signature.asc
Description: PGP signature
