diff mbox series

[14/38] ccs-pll: Fix check for PLL multiplier upper bound

Message ID	20201202180641.17401-15-sakari.ailus@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Cc: mchehab@kernel.org Subject: [PATCH 14/38] ccs-pll: Fix check for PLL multiplier upper bound Date: Wed, 2 Dec 2020 20:06:17 +0200 Message-Id: <20201202180641.17401-15-sakari.ailus@linux.intel.com> In-Reply-To: <20201202180641.17401-1-sakari.ailus@linux.intel.com> References: <20201202180641.17401-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Support additional CCS PLL features, C-PHY \| expand [00/38] Support additional CCS PLL features, C-PHY [01/38] ccs-pll: Don't use div_u64 to divide a 32-bit number [02/38] ccs-pll: Split limits and PLL configuration into front and back parts [03/38] ccs-pll: Use correct VT divisor for calculating VT SYS divisor [04/38] ccs-pll: End search if there are no better values available [05/38] ccs-pll: Remove parallel bus support [06/38] ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY [07/38] ccs-pll: Move the flags field down, away from 8-bit fields [08/38] ccs-pll: Document the structs in the header as well as the function [09/38] ccs-pll: Use the BIT macro [10/38] ccs-pll: Begin calculation from OP system clock frequency [11/38] ccs-pll: Fix condition for pre-PLL divider lower bound [12/38] ccs-pll: Avoid overflow in pre-PLL divisor lower bound search [13/38] ccs-pll: Fix comment on check against maximum PLL multiplier [14/38] ccs-pll: Fix check for PLL multiplier upper bound [15/38] ccs-pll: Use explicit 32-bit unsigned type [16/38] ccs-pll: Add support for lane speed model [17/38] ccs: Add support for lane speed model [18/38] ccs-pll: Add support for decoupled OP domain calculation [19/38] ccs-pll: Add support for extended input PLL clock divider [20/38] ccs-pll: Support two cycles per pixel on OP domain [21/38] ccs-pll: Add support flexible OP PLL pixel clock divider [22/38] ccs-pll: Add sanity checks [23/38] ccs-pll: Add C-PHY support [24/38] ccs-pll: Split off VT subtree calculation [25/38] ccs-pll: Check for derating and overrating, support non-derating sensors [26/38] ccs-pll: Better separate OP and VT sub-tree calculation [27/38] ccs-pll: Print relevant information on PLL tree [28/38] ccs-pll: Rework bounds checks [29/38] ccs-pll: Make VT divisors 16-bit [30/38] ccs-pll: Fix VT post-PLL divisor calculation [31/38] ccs-pll: Separate VT divisor limit calculation from the rest [32/38] ccs-pll: Add trivial dual PLL support [33/38] ccs: Dual PLL support [34/38] ccs-pll: Add support for DDR OP system and pixel clocks [35/38] ccs: Add support for DDR OP SYS and OP PIX clocks [36/38] ccs: Print written register values [37/38] ccs-pll: Print pixel rates [38/38] ccs: Add support for obtaining C-PHY configuration from firmware

Commit Message

Sakari Ailus Dec. 2, 2020, 6:06 p.m. UTC

The additional multiplier (for higher VT timing) of the PLL multiplier was
checked against the upper limit but the result was rounded up, possibly
producing too high additional multiplier. Round down instead to keep
within hardware limits.

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

diff mbox series

Patch

diff --git a/drivers/media/i2c/ccs-pll.c b/drivers/media/i2c/ccs-pll.c
index f4c41d61e332..b23e959000a4 100644
--- a/drivers/media/i2c/ccs-pll.c
+++ b/drivers/media/i2c/ccs-pll.c
@@ -204,8 +204,7 @@  __ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,
 	dev_dbg(dev, "more_mul_max: max_op_sys_clk_div check: %u\n",
 		more_mul_max);
 	/* Ensure we won't go above max_pll_multiplier. */
-	more_mul_max = min(more_mul_max,
-			   DIV_ROUND_UP(op_lim_fr->max_pll_multiplier, mul));
+	more_mul_max = min(more_mul_max, op_lim_fr->max_pll_multiplier / mul);
 	dev_dbg(dev, "more_mul_max: min_pll_multiplier check: %u\n",
 		more_mul_max);