Received: by 10.213.65.16 with SMTP id m16csp246570imf; Mon, 12 Mar 2018 02:15:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELuy9vq1jLTwdvPhJmG7skWKUa2CT/+Ne7giEIfCcqqOa37BmpUetPcbuEeS3l/tdv/w/kto X-Received: by 2002:a17:902:9a4a:: with SMTP id x10-v6mr7696319plv.256.1520846122886; Mon, 12 Mar 2018 02:15:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520846122; cv=none; d=google.com; s=arc-20160816; b=q94D9TfGoDp8beNIFqCtLEIQgmxdgAy1QJ3Zo90YbLSkuY1A3kgw4H+oB3wWT2ls69 uZKc1lOOKL29El+WtWvgHPngCj54zHP1TNP3DSb5zER2aiFiHXu1zoLXXpw8AVnwNDGN trUxzbomYBE0VBQRVd81fa7kRNjsPvhofGlPrtC2FVv0vrFzXctiSQqyGDSFfsdnSbg9 R1AOqEOLkoyhxf9XuFQL+LXbAPR99557pVm7nZ/dk1oMJVHtxJcsQ5tcVjQxQbbYvzu+ NDVyiW+rwMtb/eYPZNZ1DksrpmLpPjjWohiNcenHa0T/DYnnaOeB+2qew7B4bh0NBiTY gXoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:arc-authentication-results; bh=ELzDXwS0JxNRO90m0qHgPVnrPor0V1bhUftCwVhs0Kc=; b=qsdbf7UQV5GwT+3LIdG0PwurRa/9tgOmMFIFpOwsPNVhIfjk/0tqYvjvBMGGpZa/fl I0wV96oXdgWC9ktyAkVM5bNu+Vr7FJnu9GqPKQNJJaw7vSrnSTzk5KXlUWYgXvFQi2sK LLV3aWqM1cp9P0/qComh3m6sEt2mKJE7hHNY2zBGtNiVRwZKqiaXO/Wct1MfG+voNZ0N 0HeK1yDZtAyQ2JLsGoyBuhJlwxM+XxCMdC5cJVYIFPdtJwp3vtxNrvBJoOTe6+NSU4Af aeWg7XPia+HlSQzol/gXSw3wTQ4B5FrzcegOsWWBrvLhNU5+gPJH3nwOJWuOfnb+RDzM Jgqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p10si4748350pgn.756.2018.03.12.02.15.08; Mon, 12 Mar 2018 02:15:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752087AbeCLJOP (ORCPT + 99 others); Mon, 12 Mar 2018 05:14:15 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:7787 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751180AbeCLJOM (ORCPT ); Mon, 12 Mar 2018 05:14:12 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com id ; Mon, 12 Mar 2018 02:13:42 -0700 Received: from HQMAIL103.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 12 Mar 2018 02:14:11 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 12 Mar 2018 02:14:11 -0700 Received: from UKMAIL101.nvidia.com (10.26.138.13) by HQMAIL103.nvidia.com (172.20.187.11) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Mon, 12 Mar 2018 09:14:10 +0000 Received: from tbergstrom-lnx.Nvidia.com (10.21.24.170) by UKMAIL101.nvidia.com (10.26.138.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Mon, 12 Mar 2018 09:14:07 +0000 Received: by tbergstrom-lnx.Nvidia.com (Postfix, from userid 1002) id 408F0F80612; Mon, 12 Mar 2018 11:14:07 +0200 (EET) Date: Mon, 12 Mar 2018 11:14:07 +0200 From: Peter De Schrijver To: Jon Hunter CC: , , , , , , , , , Subject: Re: [PATCH v3 05/11] clk: tegra: prepare dfll driver for PWM regulator Message-ID: <20180312091407.GS6190@tbergstrom-lnx.Nvidia.com> References: <1517934852-23255-1-git-send-email-pdeschrijver@nvidia.com> <1517934852-23255-6-git-send-email-pdeschrijver@nvidia.com> <011f626d-8bd5-3cae-bfbf-f49a1b2833fb@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <011f626d-8bd5-3cae-bfbf-f49a1b2833fb@nvidia.com> X-NVConfidentiality: public User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [10.21.24.170] X-ClientProxiedBy: UKMAIL101.nvidia.com (10.26.138.13) To UKMAIL101.nvidia.com (10.26.138.13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 08, 2018 at 10:50:06PM +0000, Jon Hunter wrote: > > On 06/02/18 16:34, Peter De Schrijver wrote: > > This patch prepares the dfll driver to work with PWM regulators. > > To do this we introduce a new array lut_uv which gives the voltage for > > a given index generated by the dfll logic. This index will then be > > translated to a PMIC voltage ID in case of I2C using the i2c_lut. In case > > of a PWM regulator, it will be used to determine the PWM duty cycle. > > We also introduce lut_bottom which holds the lowest voltage we will ever > > need. In case of I2C this can be set to zero because the i2c_lut will be > > initialized such that entry 0 will be the lowest voltage we will ever > > need. In case of PWM, the lowest voltage is determined by the regulator > > hardware so we need this software limit. Note that this is different > > from lut_min which gives the lowest voltage we allow taking temperature > > into account. In a future patchset we will update lut_vmin dynamically. > > Similarly lut_max will be the highest voltage allowed taking temperature > > into accouint. Also this will be updated dynamically once temperature > > dependence will be introduced. > > > > Signed-off-by: Peter De Schrijver > > --- > > drivers/clk/tegra/clk-dfll.c | 62 ++++++++++++++++++++++++++------------------ > > 1 file changed, 37 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/clk/tegra/clk-dfll.c b/drivers/clk/tegra/clk-dfll.c > > index 0a7deee..fa97763 100644 > > --- a/drivers/clk/tegra/clk-dfll.c > > +++ b/drivers/clk/tegra/clk-dfll.c > > @@ -301,9 +301,10 @@ struct tegra_dfll { > > u32 i2c_slave_addr; > > > > /* i2c_lut array entries are regulator framework selectors */ > > - unsigned i2c_lut[MAX_DFLL_VOLTAGES]; > > - int i2c_lut_size; > > - u8 lut_min, lut_max, lut_safe; > > + unsigned int i2c_lut[MAX_DFLL_VOLTAGES]; > > + unsigned int lut_uv[MAX_DFLL_VOLTAGES]; > > + int lut_size; > > + u8 lut_bottom, lut_min, lut_max, lut_safe; > > }; > > > > #define clk_hw_to_dfll(_hw) container_of(_hw, struct tegra_dfll, dfll_clk_hw) > > @@ -531,10 +532,10 @@ static void dfll_load_i2c_lut(struct tegra_dfll *td) > > u32 val; > > > > for (i = 0; i < MAX_DFLL_VOLTAGES; i++) { > > - if (i < td->lut_min) > > - lut_index = td->lut_min; > > - else if (i > td->lut_max) > > - lut_index = td->lut_max; > > + if (i < td->lut_bottom) > > + lut_index = td->lut_bottom; > > + else if (i > td->lut_size - 1) > > + lut_index = td->lut_size - 1; > > else > > lut_index = i; > > > > @@ -594,9 +595,9 @@ static void dfll_init_out_if(struct tegra_dfll *td) > > { > > u32 val; > > > > - td->lut_min = 0; > > - td->lut_max = td->i2c_lut_size - 1; > > - td->lut_safe = td->lut_min + 1; > > + td->lut_min = td->lut_bottom; > > + td->lut_max = td->lut_size - 1; > > + td->lut_safe = td->lut_min + (td->lut_min < td->lut_max ? 1 : 0); > > > > dfll_i2c_writel(td, 0, DFLL_OUTPUT_CFG); > > val = (td->lut_safe << DFLL_OUTPUT_CFG_SAFE_SHIFT) | > > @@ -619,11 +620,11 @@ static void dfll_init_out_if(struct tegra_dfll *td) > > */ > > > > /** > > - * find_lut_index_for_rate - determine I2C LUT index for given DFLL rate > > + * find_lut_index_for_rate - determine LUT index for given DFLL rate > > * @td: DFLL instance > > * @rate: clock rate > > * > > - * Determines the index of a I2C LUT entry for a voltage that approximately > > + * Determines the index of a LUT entry for a voltage that approximately > > * produces the given DFLL clock rate. This is used when forcing a value > > * to the integrator during rate changes. Returns -ENOENT if a suitable > > * LUT index is not found. > > @@ -637,11 +638,11 @@ static int find_lut_index_for_rate(struct tegra_dfll *td, unsigned long rate) > > if (IS_ERR(opp)) > > return PTR_ERR(opp); > > > > - uv = dev_pm_opp_get_voltage(opp); > > + uv = dev_pm_opp_get_voltage(opp) / td->soc->alignment.step_uv; > > dev_pm_opp_put(opp); > > > > - for (i = 0; i < td->i2c_lut_size; i++) { > > - if (regulator_list_voltage(td->vdd_reg, td->i2c_lut[i]) == uv) > > + for (i = td->lut_bottom; i < td->lut_size; i++) { > > + if ((td->lut_uv[i] / td->soc->alignment.step_uv) >= uv) > > return i; > > } > > > > @@ -1377,15 +1378,17 @@ static int dfll_init(struct tegra_dfll *td) > > */ > > static int find_vdd_map_entry_exact(struct tegra_dfll *td, int uV) > > { > > - int i, n_voltages, reg_uV; > > + int i, n_voltages, reg_mult, align_mult; > > > > + align_mult = uV / td->soc->alignment.step_uv; > > n_voltages = regulator_count_voltages(td->vdd_reg); > > for (i = 0; i < n_voltages; i++) { > > - reg_uV = regulator_list_voltage(td->vdd_reg, i); > > - if (reg_uV < 0) > > + reg_mult = regulator_list_voltage(td->vdd_reg, i) / > > + td->soc->alignment.step_uv; > > + if (reg_mult < 0) > > break; > > > > - if (uV == reg_uV) > > + if (align_mult == reg_mult) > > return i; > > } > > > > @@ -1399,15 +1402,17 @@ static int find_vdd_map_entry_exact(struct tegra_dfll *td, int uV) > > * */ > > static int find_vdd_map_entry_min(struct tegra_dfll *td, int uV) > > { > > - int i, n_voltages, reg_uV; > > + int i, n_voltages, reg_mult, align_mult; > > > > + align_mult = uV / td->soc->alignment.step_uv; > > n_voltages = regulator_count_voltages(td->vdd_reg); > > for (i = 0; i < n_voltages; i++) { > > - reg_uV = regulator_list_voltage(td->vdd_reg, i); > > - if (reg_uV < 0) > > + reg_mult = regulator_list_voltage(td->vdd_reg, i) / > > + td->soc->alignment.step_uv; > > + if (reg_mult < 0) > > break; > > > > - if (uV <= reg_uV) > > + if (align_mult <= reg_mult) > > return i; > > } > > > > @@ -1450,8 +1455,10 @@ static int dfll_build_i2c_lut(struct tegra_dfll *td) > > if (lut < 0) > > goto out; > > td->i2c_lut[0] = lut; > > + td->lut_bottom = 0; > > > > for (j = 1, rate = 0; ; rate++) { > > + > > opp = dev_pm_opp_find_freq_ceil(td->soc->dev, &rate); > > if (IS_ERR(opp)) > > break; > > @@ -1484,13 +1491,18 @@ static int dfll_build_i2c_lut(struct tegra_dfll *td) > > if (v >= v_max) > > break; > > } > > - td->i2c_lut_size = j; > > + td->lut_size = j; > > > > if (!td->dvco_rate_min) > > dev_err(td->dev, "no opp above DFLL minimum voltage %d mV\n", > > td->soc->cvb->min_millivolts); > > - else > > + else { > > ret = 0; > > + for (j = 0; j < td->lut_size; j++) > > + td->lut_uv[j] = > > + regulator_list_voltage(td->vdd_reg, > > + td->i2c_lut[j]); > > + } > > > > out: > > return ret; > > > > I am a bit confused by this patch as I don't fully understand from the > description what is being changed. For example, there are a few places > where you are dividing by td->soc->alignment.step_uv, which seems to be > changing the calculations/behaviour for I2C unless I am missing something? > The goal is to use td->lut_uv for all voltage related lookups so we can unify the code for i2c and PWM regulators. Peter. > I would also consider renaming lut_bottom and lut_min as something like > lut_abs_min and lut_cur_min, to indicate that one is the absolute min > and the other is the current min depending on operating conditions. > > Cheers > Jon > > -- > nvpublic