Skip to contentSkip to conversation

media: ov5640: Fix check for PLL1 exceeding max allowed rate

PATCH Superseded Adam Ford 2 participants 4 messages Oct 29, 2019 – Nov 28, 2019

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 media: ov5640: Fix check for PLL1 exceeding max allowed rate

The variable _rate is by ov5640_compute_sys_clk() which returns zero if the PLL exceeds 1GHz. Unfortunately, the check to see if the max PLL1 output is checking 'rate' and not '_rate' and 'rate' does not ever appear to be 0.

This patch changes the check against the returned value of '_rate' to determine if the PLL1 output exceeds 1GHz.

Fixes aa2882481cad ("media: ov5640: Adjust the clock based on the expected rate")
drivers/media/i2c/ov5640.c +1 -1
index 5e495c833d32..bb968e764f31 100644
@@ -874,7 +874,7 @@ static unsigned long ov5640_calc_sys_clk(struct ov5640_dev *sensor,
 			 * We have reached the maximum allowed PLL1 output,
 			 * increase sysdiv.
 			 */
-			if (!rate)
+			if (!_rate)
 				break;
 
 			/*
Signature · 1 line
2.17.1
author
#1 lore raw
Quoted 11 lines · Adam Ford

The variable _rate is by ov5640_compute_sys_clk() which returns zero if the PLL exceeds 1GHz. Unfortunately, the check to see if the max PLL1 output is checking 'rate' and not '_rate' and 'rate' does not ever appear to be 0.

This patch changes the check against the returned value of '_rate' to determine if the PLL1 output exceeds 1GHz.

Fixes aa2882481cad ("media: ov5640: Adjust the clock based on the expected rate")

I haven't seen any responses to this patch. Has anyone had a chance to review this? It's been nearly a month.
I think it would be appropriate to backport to stable if deemed acceptable.

adam

Quoted 18 lines
drivers/media/i2c/ov5640.c +1 -2
index 5e495c833d32..bb968e764f31 100644
@@ -874,7 +874,7 @@ static unsigned long ov5640_calc_sys_clk(struct ov5640_dev *sensor,
                         * We have reached the maximum allowed PLL1 output,
                         * increase sysdiv.
                         */
-                       if (!rate)
+                       if (!_rate)
                                break;
 
                        /*
--

2.17.1

Acked-by
#2 lore raw

Hi Adam,

Quoted 6 lines · Adam Ford
Quoted 5 lines · Adam Ford

The variable _rate is by ov5640_compute_sys_clk() which returns zero if the PLL exceeds 1GHz. Unfortunately, the check to see if the max PLL1 output is checking 'rate' and not '_rate' and 'rate' does not ever appear to be 0.

This seems a bit convoluted. What about:

"The PLL calculation routine checks the wrong variable 'rate' to verify that the calculated PLL1 output frequency does not exceed 1GHz. Fix this by using the correct '_rate' one."

Or something against these lines

Quoted 9 lines
Quoted 6 lines

This patch changes the check against the returned value of '_rate' to determine if the PLL1 output exceeds 1GHz.

Fixes aa2882481cad ("media: ov5640: Adjust the clock based on the expected rate")

I haven't seen any responses to this patch. Has anyone had a chance to review this? It's been nearly a month.

You're totally right! Sorry about this

Quoted 2 lines

I think it would be appropriate to backport to stable if deemed acceptable.

Indeed! This fixes a real issue

Thanks
j

Quoted 20 lines

adam

Quoted 18 lines
drivers/media/i2c/ov5640.c +1 -2
index 5e495c833d32..bb968e764f31 100644
@@ -874,7 +874,7 @@ static unsigned long ov5640_calc_sys_clk(struct ov5640_dev *sensor,
                         * We have reached the maximum allowed PLL1 output,
                         * increase sysdiv.
                         */
-                       if (!rate)
+                       if (!_rate)
                                break;
 
                        /*
--

2.17.1

author
#3 lore raw
Quoted 11 lines · Jacopo Mondi

Hi Adam,

Quoted 6 lines · Adam Ford
Quoted 5 lines · Adam Ford

The variable _rate is by ov5640_compute_sys_clk() which returns zero if the PLL exceeds 1GHz. Unfortunately, the check to see if the max PLL1 output is checking 'rate' and not '_rate' and 'rate' does not ever appear to be 0.

Quoted 7 lines

This seems a bit convoluted. What about:

"The PLL calculation routine checks the wrong variable 'rate' to verify that the calculated PLL1 output frequency does not exceed 1GHz. Fix this by using the correct '_rate' one."

Or something against these lines

That makes sense.

I'll do a V2 for this patch and change the description and add your 'acked-by' note to it.

I probably won't get to it until this weekend, since today is a holiday in the US, and I am traveling.

adam

Quoted 43 lines
Quoted 10 lines
Quoted 7 lines

This patch changes the check against the returned value of '_rate' to determine if the PLL1 output exceeds 1GHz.

Fixes aa2882481cad ("media: ov5640: Adjust the clock based on the expected rate")

I haven't seen any responses to this patch. Has anyone had a chance to review this? It's been nearly a month.

You're totally right! Sorry about this

Quoted 2 lines

I think it would be appropriate to backport to stable if deemed acceptable.

Indeed! This fixes a real issue

Thanks
j

Quoted 20 lines

adam

Quoted 18 lines
drivers/media/i2c/ov5640.c +1 -2
index 5e495c833d32..bb968e764f31 100644
@@ -874,7 +874,7 @@ static unsigned long ov5640_calc_sys_clk(struct ov5640_dev *sensor,
                         * We have reached the maximum allowed PLL1 output,
                         * increase sysdiv.
                         */
-                       if (!rate)
+                       if (!_rate)
                                break;
 
                        /*
--

2.17.1