* [PATCH] iio: adc: stm32: add check on clock rate
@ 2017-10-18 11:40 Fabrice Gasnier
2017-10-21 16:55 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Gasnier @ 2017-10-18 11:40 UTC (permalink / raw)
To: linux-arm-kernel
Add check on STM32 ADC clock rate to report an explicit error.
This may avoid division by 0 later in stm32-adc driver.
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
drivers/iio/adc/stm32-adc-core.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c
index 804198e..6aefef9 100644
--- a/drivers/iio/adc/stm32-adc-core.c
+++ b/drivers/iio/adc/stm32-adc-core.c
@@ -139,6 +139,11 @@ static int stm32f4_adc_clk_sel(struct platform_device *pdev,
}
rate = clk_get_rate(priv->aclk);
+ if (!rate) {
+ dev_err(&pdev->dev, "Invalid clock rate: 0\n");
+ return -EINVAL;
+ }
+
for (i = 0; i < ARRAY_SIZE(stm32f4_pclk_div); i++) {
if ((rate / stm32f4_pclk_div[i]) <= STM32F4_ADC_MAX_CLK_RATE)
break;
@@ -216,6 +221,10 @@ static int stm32h7_adc_clk_sel(struct platform_device *pdev,
* From spec: PLL output musn't exceed max rate
*/
rate = clk_get_rate(priv->aclk);
+ if (!rate) {
+ dev_err(&pdev->dev, "Invalid adc clock rate: 0\n");
+ return -EINVAL;
+ }
for (i = 0; i < ARRAY_SIZE(stm32h7_adc_ckmodes_spec); i++) {
ckmode = stm32h7_adc_ckmodes_spec[i].ckmode;
@@ -232,6 +241,10 @@ static int stm32h7_adc_clk_sel(struct platform_device *pdev,
/* Synchronous clock modes (e.g. ckmode is 1, 2 or 3) */
rate = clk_get_rate(priv->bclk);
+ if (!rate) {
+ dev_err(&pdev->dev, "Invalid bus clock rate: 0\n");
+ return -EINVAL;
+ }
for (i = 0; i < ARRAY_SIZE(stm32h7_adc_ckmodes_spec); i++) {
ckmode = stm32h7_adc_ckmodes_spec[i].ckmode;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] iio: adc: stm32: add check on clock rate
2017-10-18 11:40 [PATCH] iio: adc: stm32: add check on clock rate Fabrice Gasnier
@ 2017-10-21 16:55 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2017-10-21 16:55 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 18 Oct 2017 13:40:12 +0200
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:
> Add check on STM32 ADC clock rate to report an explicit error.
> This may avoid division by 0 later in stm32-adc driver.
>
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
I've applied this via the slow path for the next merge window as you haven't
explicitly highlighted it as a fix. If you want it to go through for stable
etc then let me know...
I have no idea if this can be triggered in sensibly configured system or not!
Thanks,
Jonathan
> ---
> drivers/iio/adc/stm32-adc-core.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c
> index 804198e..6aefef9 100644
> --- a/drivers/iio/adc/stm32-adc-core.c
> +++ b/drivers/iio/adc/stm32-adc-core.c
> @@ -139,6 +139,11 @@ static int stm32f4_adc_clk_sel(struct platform_device *pdev,
> }
>
> rate = clk_get_rate(priv->aclk);
> + if (!rate) {
> + dev_err(&pdev->dev, "Invalid clock rate: 0\n");
> + return -EINVAL;
> + }
> +
> for (i = 0; i < ARRAY_SIZE(stm32f4_pclk_div); i++) {
> if ((rate / stm32f4_pclk_div[i]) <= STM32F4_ADC_MAX_CLK_RATE)
> break;
> @@ -216,6 +221,10 @@ static int stm32h7_adc_clk_sel(struct platform_device *pdev,
> * From spec: PLL output musn't exceed max rate
> */
> rate = clk_get_rate(priv->aclk);
> + if (!rate) {
> + dev_err(&pdev->dev, "Invalid adc clock rate: 0\n");
> + return -EINVAL;
> + }
>
> for (i = 0; i < ARRAY_SIZE(stm32h7_adc_ckmodes_spec); i++) {
> ckmode = stm32h7_adc_ckmodes_spec[i].ckmode;
> @@ -232,6 +241,10 @@ static int stm32h7_adc_clk_sel(struct platform_device *pdev,
>
> /* Synchronous clock modes (e.g. ckmode is 1, 2 or 3) */
> rate = clk_get_rate(priv->bclk);
> + if (!rate) {
> + dev_err(&pdev->dev, "Invalid bus clock rate: 0\n");
> + return -EINVAL;
> + }
>
> for (i = 0; i < ARRAY_SIZE(stm32h7_adc_ckmodes_spec); i++) {
> ckmode = stm32h7_adc_ckmodes_spec[i].ckmode;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-21 16:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-18 11:40 [PATCH] iio: adc: stm32: add check on clock rate Fabrice Gasnier
2017-10-21 16:55 ` 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).