diff mbox series

[079/100] ccs-pll: Fix VT post-PLL divisor calculation

Message ID	20200930152858.8471-80-sakari.ailus@linux.intel.com
State	Superseded
Headers	show Return-Path: <SRS0=fdi2=DH=vger.kernel.org=linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Subject: [PATCH 079/100] ccs-pll: Fix VT post-PLL divisor calculation Date: Wed, 30 Sep 2020 18:28:37 +0300 Message-Id: <20200930152858.8471-80-sakari.ailus@linux.intel.com> In-Reply-To: <20200930152858.8471-1-sakari.ailus@linux.intel.com> References: <20200930152858.8471-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	CCS driver \| expand [000/100] CCS driver [004/100] smiapp: Remove macros for defining registers, merge definitions [005/100] smiapp: Add macros for accessing CCS registers [006/100] smiapp: Use MIPI CCS version and manufacturer ID information [010/100] smiapp: Use CCS limits in reading data format descriptors [011/100] smiapp: Use CCS limits in reading binning capabilities [013/100] smiapp: Remove quirk function for writing a single 8-bit register [014/100] smiapp: Rename register access functions [018/100] ccs: Remove profile concept [021/100] dt-bindings: nokia,smia: Fix link-frequencies documentation [022/100] dt-bindings: nokia,smia: Make vana-supply optional [023/100] dt-bindings: nokia,smia: Convert to YAML [027/100] ccs: Request for "reset" GPIO [029/100] ccs: Remove the I²C ID table [030/100] ccs: Remove remaining support for platform data [032/100] ccs: Add CCS static data parser library [034/100] ccs: Read CCS static data from firmware binaries [036/100] ccs: The functions to get compose or crop rectangle never return NULL [038/100] ccs: Refactor register reading a little [040/100] ccs: Move limit value real to integer conversion from read to access time [042/100] smiapp-pll: Rename as ccs-pll [044/100] ccs: Add support for manufacturer regs from sensor and module files [045/100] ccs: Use static data read-only registers [046/100] ccs: Clean up runtime PM usage [047/100] ccs: Wrap long lines, unwrap short ones [050/100] ccs-pll: Don't use div_u64 to divide a 32-bit number [051/100] ccs-pll: Split limits and PLL configuration into front and back parts [055/100] ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY [057/100] ccs-pll: Document the structs in the header as well as the function [061/100] ccs-pll: Avoid overflow in pre-PLL divisor lower bound search [063/100] ccs-pll: Fix check for PLL multiplier upper bound [064/100] ccs-pll: Use explicit 32-bit unsigned type [067/100] ccs-pll: Add support for decoupled OP domain calculation [068/100] ccs-pll: Add support for extended input PLL clock divider [071/100] ccs-pll: Add sanity checks [072/100] ccs-pll: Add C-PHY support [076/100] ccs-pll: Print relevant information on PLL tree [077/100] ccs-pll: Rework bounds checks [078/100] ccs-pll: Make VT divisors 16-bit [079/100] ccs-pll: Fix VT post-PLL divisor calculation [080/100] ccs-pll: Separate VT divisor limit calculation from the rest [082/100] ccs: Dual PLL support [083/100] ccs-pll: Add support for DDR OP system and pixel clocks [088/100] ccs: Add digital gain support [091/100] ccs: Only add analogue gain control if the device supports it [094/100] ccs: Add support for analogue gain coefficient controls [095/100] v4l: uapi: Add controls for CCS alternative analogue gain [096/100] ccs: Add support for alternate analogue global gain [097/100] ccs: Add debug prints for MSR registers [100/100] smiapp: Add CCS ACPI device ID

Commit Message

Sakari Ailus Sept. 30, 2020, 3:28 p.m. UTC

The PLL calculator only searched even total divisor values apart from one,
but this is wrong: the total divisor is odd in cases where system divisor
is one. Fix this by including odd total PLL values where system divisor is
one to the search.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/ccs-pll.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/drivers/media/i2c/ccs-pll.c b/drivers/media/i2c/ccs-pll.c
index c0f3f68e55d8..52dea3894229 100644
--- a/drivers/media/i2c/ccs-pll.c
+++ b/drivers/media/i2c/ccs-pll.c
@@ -347,14 +347,16 @@  ccs_pll_calculate_vt(struct device *dev, const struct ccs_pll_limits *lim,
 	 * into a value which is not smaller than div, the desired
 	 * divisor.
 	 */
-	for (vt_div = min_vt_div; vt_div <= max_vt_div;
-	     vt_div += 2 - (vt_div & 1)) {
-		for (sys_div = min_sys_div;
-		     sys_div <= max_sys_div;
+	for (vt_div = min_vt_div; vt_div <= max_vt_div; vt_div++) {
+		uint16_t __max_sys_div = vt_div & 1 ? 1 : max_sys_div;
+
+		for (sys_div = min_sys_div; sys_div <= __max_sys_div;
 		     sys_div += 2 - (sys_div & 1)) {
-			uint16_t pix_div = DIV_ROUND_UP(vt_div, sys_div);
+			uint16_t pix_div;
 			uint16_t rounded_div;
 
+			pix_div = DIV_ROUND_UP(vt_div, sys_div);
+
 			if (pix_div < lim->vt_bk.min_pix_clk_div
 			    || pix_div > lim->vt_bk.max_pix_clk_div) {
 				dev_dbg(dev,