* [PATCH v2] counter: microchip-tcb-capture: Fix CMR value check
@ 2020-11-14 23:28 William Breathitt Gray
2020-11-15 15:26 ` Kamel Bouhara
0 siblings, 1 reply; 3+ messages in thread
From: William Breathitt Gray @ 2020-11-14 23:28 UTC (permalink / raw)
To: jic23
Cc: robh+dt, alexandre.belloni, linux-arm-kernel, linux-iio,
linux-kernel, William Breathitt Gray, Kamel Bouhara
The ATMEL_TC_ETRGEDG_* defines are not masks but rather possible values
for CMR. This patch fixes the action_get() callback to properly check
for these values rather than mask them.
Fixes: 106b104137fd ("counter: Add microchip TCB capture counter")
Cc: Kamel Bouhara <kamel.bouhara@bootlin.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/counter/microchip-tcb-capture.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
index 039c54a78aa5..710acc0a3704 100644
--- a/drivers/counter/microchip-tcb-capture.c
+++ b/drivers/counter/microchip-tcb-capture.c
@@ -183,16 +183,20 @@ static int mchp_tc_count_action_get(struct counter_device *counter,
regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr);
- *action = MCHP_TC_SYNAPSE_ACTION_NONE;
-
- if (cmr & ATMEL_TC_ETRGEDG_NONE)
+ switch (cmr & ATMEL_TC_ETRGEDG) {
+ default:
*action = MCHP_TC_SYNAPSE_ACTION_NONE;
- else if (cmr & ATMEL_TC_ETRGEDG_RISING)
+ break;
+ case ATMEL_TC_ETRGEDG_RISING:
*action = MCHP_TC_SYNAPSE_ACTION_RISING_EDGE;
- else if (cmr & ATMEL_TC_ETRGEDG_FALLING)
+ break;
+ case ATMEL_TC_ETRGEDG_FALLING:
*action = MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE;
- else if (cmr & ATMEL_TC_ETRGEDG_BOTH)
+ break;
+ case ATMEL_TC_ETRGEDG_BOTH:
*action = MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE;
+ break;
+ }
return 0;
}
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] counter: microchip-tcb-capture: Fix CMR value check
2020-11-14 23:28 [PATCH v2] counter: microchip-tcb-capture: Fix CMR value check William Breathitt Gray
@ 2020-11-15 15:26 ` Kamel Bouhara
2020-11-21 16:31 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: Kamel Bouhara @ 2020-11-15 15:26 UTC (permalink / raw)
To: William Breathitt Gray
Cc: jic23, robh+dt, alexandre.belloni, linux-arm-kernel, linux-iio,
linux-kernel
On Sat, Nov 14, 2020 at 06:28:05PM -0500, William Breathitt Gray wrote:
> The ATMEL_TC_ETRGEDG_* defines are not masks but rather possible values
> for CMR. This patch fixes the action_get() callback to properly check
> for these values rather than mask them.
>
> Fixes: 106b104137fd ("counter: Add microchip TCB capture counter")
> Cc: Kamel Bouhara <kamel.bouhara@bootlin.com>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
> ---
Acked-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
> drivers/counter/microchip-tcb-capture.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
> index 039c54a78aa5..710acc0a3704 100644
> --- a/drivers/counter/microchip-tcb-capture.c
> +++ b/drivers/counter/microchip-tcb-capture.c
> @@ -183,16 +183,20 @@ static int mchp_tc_count_action_get(struct counter_device *counter,
>
> regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr);
>
> - *action = MCHP_TC_SYNAPSE_ACTION_NONE;
> -
> - if (cmr & ATMEL_TC_ETRGEDG_NONE)
> + switch (cmr & ATMEL_TC_ETRGEDG) {
> + default:
> *action = MCHP_TC_SYNAPSE_ACTION_NONE;
> - else if (cmr & ATMEL_TC_ETRGEDG_RISING)
> + break;
> + case ATMEL_TC_ETRGEDG_RISING:
> *action = MCHP_TC_SYNAPSE_ACTION_RISING_EDGE;
> - else if (cmr & ATMEL_TC_ETRGEDG_FALLING)
> + break;
> + case ATMEL_TC_ETRGEDG_FALLING:
> *action = MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE;
> - else if (cmr & ATMEL_TC_ETRGEDG_BOTH)
> + break;
> + case ATMEL_TC_ETRGEDG_BOTH:
> *action = MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE;
> + break;
> + }
>
> return 0;
> }
> --
> 2.29.2
>
--
Kamel Bouhara, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] counter: microchip-tcb-capture: Fix CMR value check
2020-11-15 15:26 ` Kamel Bouhara
@ 2020-11-21 16:31 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2020-11-21 16:31 UTC (permalink / raw)
To: Kamel Bouhara
Cc: William Breathitt Gray, robh+dt, alexandre.belloni,
linux-arm-kernel, linux-iio, linux-kernel
On Sun, 15 Nov 2020 16:26:17 +0100
Kamel Bouhara <kamel.bouhara@bootlin.com> wrote:
> On Sat, Nov 14, 2020 at 06:28:05PM -0500, William Breathitt Gray wrote:
> > The ATMEL_TC_ETRGEDG_* defines are not masks but rather possible values
> > for CMR. This patch fixes the action_get() callback to properly check
> > for these values rather than mask them.
> >
> > Fixes: 106b104137fd ("counter: Add microchip TCB capture counter")
> > Cc: Kamel Bouhara <kamel.bouhara@bootlin.com>
> > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
> > ---
>
> Acked-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
> > drivers/counter/microchip-tcb-capture.c | 16 ++++++++++------
> > 1 file changed, 10 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
> > index 039c54a78aa5..710acc0a3704 100644
> > --- a/drivers/counter/microchip-tcb-capture.c
> > +++ b/drivers/counter/microchip-tcb-capture.c
> > @@ -183,16 +183,20 @@ static int mchp_tc_count_action_get(struct counter_device *counter,
> >
> > regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr);
> >
> > - *action = MCHP_TC_SYNAPSE_ACTION_NONE;
> > -
> > - if (cmr & ATMEL_TC_ETRGEDG_NONE)
> > + switch (cmr & ATMEL_TC_ETRGEDG) {
> > + default:
> > *action = MCHP_TC_SYNAPSE_ACTION_NONE;
> > - else if (cmr & ATMEL_TC_ETRGEDG_RISING)
> > + break;
> > + case ATMEL_TC_ETRGEDG_RISING:
> > *action = MCHP_TC_SYNAPSE_ACTION_RISING_EDGE;
> > - else if (cmr & ATMEL_TC_ETRGEDG_FALLING)
> > + break;
> > + case ATMEL_TC_ETRGEDG_FALLING:
> > *action = MCHP_TC_SYNAPSE_ACTION_FALLING_EDGE;
> > - else if (cmr & ATMEL_TC_ETRGEDG_BOTH)
> > + break;
> > + case ATMEL_TC_ETRGEDG_BOTH:
> > *action = MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE;
> > + break;
> > + }
> >
> > return 0;
> > }
> > --
> > 2.29.2
> >
>
> --
> Kamel Bouhara, Bootlin
> Embedded Linux and kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-21 16:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-14 23:28 [PATCH v2] counter: microchip-tcb-capture: Fix CMR value check William Breathitt Gray
2020-11-15 15:26 ` Kamel Bouhara
2020-11-21 16:31 ` Jonathan Cameron
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).