From: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
To: William Breathitt Gray <vilhelm.gray@gmail.com>, <jic23@kernel.org>
Cc: <kamel.bouhara@bootlin.com>, <gwendal@chromium.org>,
<david@lechnology.com>, <linux-iio@vger.kernel.org>,
<patrick.havelange@essensium.com>,
<alexandre.belloni@bootlin.com>, <mcoquelin.stm32@gmail.com>,
<linux-kernel@vger.kernel.org>, <o.rempel@pengutronix.de>,
<kernel@pengutronix.de>, <fabrice.gasnier@st.com>,
<syednwaris@gmail.com>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>, <alexandre.torgue@st.com>
Subject: Re: [Linux-stm32] [PATCH v10 18/33] counter: Return error code on invalid modes
Date: Mon, 22 Mar 2021 17:26:15 +0100 [thread overview]
Message-ID: <91f41020-d042-e69a-e1e8-ef4a0ebe4bf8@foss.st.com> (raw)
In-Reply-To: <e1dd9e43f713ccaa29e1c05d7b21d86bff02ab34.1616150619.git.vilhelm.gray@gmail.com>
On 3/19/21 12:00 PM, William Breathitt Gray wrote:
> Only a select set of modes (function, action, etc.) are valid for a
> given device configuration. This patch ensures that invalid modes result
> in a return -EINVAL. Such a situation should never occur in reality, but
> it's good to define a default switch cases for the sake of making the
> intent of the code clear.
>
> Cc: Syed Nayyar Waris <syednwaris@gmail.com>
> Cc: Kamel Bouhara <kamel.bouhara@bootlin.com>
> Cc: Fabrice Gasnier <fabrice.gasnier@st.com>
> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> Cc: Alexandre Torgue <alexandre.torgue@st.com>
> Cc: David Lechner <david@lechnology.com>
> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
> ---
> drivers/counter/104-quad-8.c | 20 +++++++----
> drivers/counter/microchip-tcb-capture.c | 6 ++++
> drivers/counter/stm32-lptimer-cnt.c | 10 +++---
Hi William,
Fro the STM32 driver, You can add my:
Reviewed-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Thanks,
Fabrice
> drivers/counter/ti-eqep.c | 45 +++++++++++--------------
> 4 files changed, 46 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
> index 09d779544969..b7d6c1c43655 100644
> --- a/drivers/counter/104-quad-8.c
> +++ b/drivers/counter/104-quad-8.c
> @@ -273,6 +273,10 @@ static int quad8_function_set(struct counter_device *counter,
> *scale = 2;
> mode_cfg |= QUAD8_CMR_QUADRATURE_X4;
> break;
> + default:
> + /* should never reach this path */
> + mutex_unlock(&priv->lock);
> + return -EINVAL;
> }
> }
>
> @@ -349,7 +353,7 @@ static int quad8_action_get(struct counter_device *counter,
> case QUAD8_COUNT_FUNCTION_PULSE_DIRECTION:
> if (synapse->signal->id == signal_a_id)
> *action = QUAD8_SYNAPSE_ACTION_RISING_EDGE;
> - break;
> + return 0;
> case QUAD8_COUNT_FUNCTION_QUADRATURE_X1:
> if (synapse->signal->id == signal_a_id) {
> quad8_direction_get(counter, count, &direction);
> @@ -359,17 +363,18 @@ static int quad8_action_get(struct counter_device *counter,
> else
> *action = QUAD8_SYNAPSE_ACTION_FALLING_EDGE;
> }
> - break;
> + return 0;
> case QUAD8_COUNT_FUNCTION_QUADRATURE_X2:
> if (synapse->signal->id == signal_a_id)
> *action = QUAD8_SYNAPSE_ACTION_BOTH_EDGES;
> - break;
> + return 0;
> case QUAD8_COUNT_FUNCTION_QUADRATURE_X4:
> *action = QUAD8_SYNAPSE_ACTION_BOTH_EDGES;
> - break;
> + return 0;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> }
> -
> - return 0;
> }
>
> static const struct counter_ops quad8_ops = {
> @@ -529,6 +534,9 @@ static int quad8_count_mode_set(struct counter_device *counter,
> case COUNTER_COUNT_MODE_MODULO_N:
> cnt_mode = 3;
> break;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> }
>
> mutex_lock(&priv->lock);
> diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
> index 51b8af80f98b..0c9a61962911 100644
> --- a/drivers/counter/microchip-tcb-capture.c
> +++ b/drivers/counter/microchip-tcb-capture.c
> @@ -133,6 +133,9 @@ static int mchp_tc_count_function_set(struct counter_device *counter,
> bmr |= ATMEL_TC_QDEN | ATMEL_TC_POSEN;
> cmr |= ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_ABETRG | ATMEL_TC_XC0;
> break;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> }
>
> regmap_write(priv->regmap, ATMEL_TC_BMR, bmr);
> @@ -226,6 +229,9 @@ static int mchp_tc_count_action_set(struct counter_device *counter,
> case MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE:
> edge = ATMEL_TC_ETRGEDG_BOTH;
> break;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> }
>
> return regmap_write_bits(priv->regmap,
> diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c
> index c19d998df5ba..78f383b77bd2 100644
> --- a/drivers/counter/stm32-lptimer-cnt.c
> +++ b/drivers/counter/stm32-lptimer-cnt.c
> @@ -206,9 +206,10 @@ static int stm32_lptim_cnt_function_set(struct counter_device *counter,
> priv->quadrature_mode = 1;
> priv->polarity = STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES;
> return 0;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> }
> -
> - return -EINVAL;
> }
>
> static ssize_t stm32_lptim_cnt_enable_read(struct counter_device *counter,
> @@ -326,9 +327,10 @@ static int stm32_lptim_cnt_action_get(struct counter_device *counter,
> case STM32_LPTIM_ENCODER_BOTH_EDGE:
> *action = priv->polarity;
> return 0;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> }
> -
> - return -EINVAL;
> }
>
> static int stm32_lptim_cnt_action_set(struct counter_device *counter,
> diff --git a/drivers/counter/ti-eqep.c b/drivers/counter/ti-eqep.c
> index 65df9ef5b5bc..878725c2f010 100644
> --- a/drivers/counter/ti-eqep.c
> +++ b/drivers/counter/ti-eqep.c
> @@ -157,44 +157,39 @@ static int ti_eqep_action_get(struct counter_device *counter,
> * QEPA and QEPB trigger QCLK.
> */
> *action = TI_EQEP_SYNAPSE_ACTION_BOTH_EDGES;
> - break;
> + return 0;
> case TI_EQEP_COUNT_FUNC_DIR_COUNT:
> /* In direction-count mode only rising edge of QEPA is counted
> * and QEPB gives direction.
> */
> - switch (synapse->signal->id) {
> - case TI_EQEP_SIGNAL_QEPA:
> - *action = TI_EQEP_SYNAPSE_ACTION_RISING_EDGE;
> - break;
> - default:
> + if (synapse->signal->id == TI_EQEP_SIGNAL_QEPB)
> *action = TI_EQEP_SYNAPSE_ACTION_NONE;
> - break;
> - }
> - break;
> + else
> + *action = TI_EQEP_SYNAPSE_ACTION_RISING_EDGE;
> + return 0;
> case TI_EQEP_COUNT_FUNC_UP_COUNT:
> case TI_EQEP_COUNT_FUNC_DOWN_COUNT:
> /* In up/down-count modes only QEPA is counted and QEPB is not
> * used.
> */
> - switch (synapse->signal->id) {
> - case TI_EQEP_SIGNAL_QEPA:
> - err = regmap_read(priv->regmap16, QDECCTL, &qdecctl);
> - if (err)
> - return err;
> -
> - if (qdecctl & QDECCTL_XCR)
> - *action = TI_EQEP_SYNAPSE_ACTION_BOTH_EDGES;
> - else
> - *action = TI_EQEP_SYNAPSE_ACTION_RISING_EDGE;
> - break;
> - default:
> + if (synapse->signal->id == TI_EQEP_SIGNAL_QEPB) {
> *action = TI_EQEP_SYNAPSE_ACTION_NONE;
> - break;
> + return 0;
> }
> - break;
> - }
>
> - return 0;
> + err = regmap_read(priv->regmap16, QDECCTL, &qdecctl);
> + if (err)
> + return err;
> +
> + if (qdecctl & QDECCTL_XCR)
> + *action = TI_EQEP_SYNAPSE_ACTION_BOTH_EDGES;
> + else
> + *action = TI_EQEP_SYNAPSE_ACTION_RISING_EDGE;
> + return 0;
> + default:
> + /* should never reach this path */
> + return -EINVAL;
> + }
> }
>
> static const struct counter_ops ti_eqep_counter_ops = {
>
next prev parent reply other threads:[~2021-03-22 16:28 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 11:00 [PATCH v10 00/33] Introduce the Counter character device interface William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 01/33] docs: counter: Consolidate Counter sysfs attributes documentation William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 02/33] docs: counter: Fix spelling William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 03/33] counter: 104-quad-8: Remove pointless comment William Breathitt Gray
2021-04-15 15:13 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 04/33] counter: 104-quad-8: Return error when invalid mode during ceiling_write William Breathitt Gray
2021-04-15 15:14 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 05/33] counter: 104-quad-8: Annotate hardware config module parameter William Breathitt Gray
2021-04-15 15:15 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 06/33] counter: 104-quad-8: Add const qualifiers for quad8_preset_register_set William Breathitt Gray
2021-04-15 15:16 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 07/33] counter: 104-quad-8: Add const qualifier for functions_list array William Breathitt Gray
2021-04-15 15:17 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 08/33] counter: interrupt-cnt: " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 09/33] counter: microchip-tcb-capture: " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 10/33] counter: stm32-lptimer-cnt: " William Breathitt Gray
2021-03-22 16:22 ` [Linux-stm32] " Fabrice Gasnier
2021-03-19 11:00 ` [PATCH v10 11/33] counter: stm32-timer-cnt: " William Breathitt Gray
2021-03-22 16:22 ` [Linux-stm32] " Fabrice Gasnier
2021-03-19 11:00 ` [PATCH v10 12/33] counter: 104-quad-8: Add const qualifier for actions_list array William Breathitt Gray
2021-04-15 15:18 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 13/33] counter: ftm-quaddec: " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 14/33] counter: interrupt-cnt: " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 15/33] counter: microchip-tcb-capture: " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 16/33] counter: stm32-lptimer-cnt: " William Breathitt Gray
2021-03-22 16:23 ` [Linux-stm32] " Fabrice Gasnier
2021-03-19 11:00 ` [PATCH v10 17/33] counter: stm32-timer-cnt: " William Breathitt Gray
2021-03-22 16:24 ` [Linux-stm32] " Fabrice Gasnier
2021-03-19 11:00 ` [PATCH v10 18/33] counter: Return error code on invalid modes William Breathitt Gray
2021-03-22 16:26 ` Fabrice Gasnier [this message]
2021-04-15 15:19 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 19/33] counter: Standardize to ERANGE for limit exceeded errors William Breathitt Gray
2021-03-22 16:29 ` [Linux-stm32] " Fabrice Gasnier
2021-04-15 15:20 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 20/33] counter: Rename counter_signal_value to counter_signal_level William Breathitt Gray
2021-04-15 15:21 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 21/33] counter: Rename counter_count_function to counter_function William Breathitt Gray
2021-03-22 16:31 ` [Linux-stm32] " Fabrice Gasnier
2021-04-15 15:22 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 22/33] counter: Internalize sysfs interface code William Breathitt Gray
2021-03-22 16:44 ` [Linux-stm32] " Fabrice Gasnier
2021-03-23 9:17 ` William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 23/33] counter: Update counter.h comments to reflect sysfs internalization William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 24/33] docs: counter: Update " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 25/33] counter: Move counter enums to uapi header William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 26/33] counter: Add character device interface William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 27/33] docs: counter: Document " William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 28/33] tools/counter: Create Counter tools William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 29/33] counter: Implement signalZ_action_component_id sysfs attribute William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 30/33] counter: Implement *_component_id sysfs attributes William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 31/33] counter: Implement events_queue_size sysfs attribute William Breathitt Gray
2021-03-19 11:00 ` [PATCH v10 32/33] counter: 104-quad-8: Replace mutex with spinlock William Breathitt Gray
2021-04-15 15:24 ` Syed Nayyar Waris
2021-03-19 11:00 ` [PATCH v10 33/33] counter: 104-quad-8: Add IRQ support for the ACCES 104-QUAD-8 William Breathitt Gray
2021-04-15 15:25 ` Syed Nayyar Waris
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=91f41020-d042-e69a-e1e8-ef4a0ebe4bf8@foss.st.com \
--to=fabrice.gasnier@foss.st.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@st.com \
--cc=david@lechnology.com \
--cc=fabrice.gasnier@st.com \
--cc=gwendal@chromium.org \
--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=syednwaris@gmail.com \
--cc=vilhelm.gray@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).