Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp631736imm; Wed, 4 Jul 2018 03:19:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfUiDl8JPG+rOVORAYRxSVz+XKlSg2SsE3Q9CzTbGbmQ6/Dnki2sRaAY+IrSQp+i2VUBtFc X-Received: by 2002:a65:44c3:: with SMTP id g3-v6mr1348290pgs.231.1530699567264; Wed, 04 Jul 2018 03:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530699567; cv=none; d=google.com; s=arc-20160816; b=dpxmk0Y40xpa80Pfu/ICluWk/Q94v0AVv1EtP8dIHHv1GCYdXOIzkKzDMrYg+ggoUE 35JK9cihOhNIow3W82jrAMG7fjGAVkjtTLVlRrYCmouqu7TZtb123qXdRefN/Tro4B+Z Nm2kaexJOu4xe/+ynllIgc1yHs8fv/JzfftdY+Nuvlbz0EClgytkg/eKF2mZ8M8dKQ+K BHLQQRgeByo512APRTEM8FaAzs2RxXy46EPrSCbpWptCkGzWFluhwQ2BIsgeNUqOj4KG iK6KzVOrbFDPhmDTuDr7rvpIzv+PAb+2B3+qOwmsEm6v/eAH6bc275XI0euoGBV8vz6N khYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=cb8kiu5iXgCnHxZjwKPDY/0SaKGjf1cQeYYdrbLPyCI=; b=sAnRQ2mEgFAD4GO4/pDs6hhuXSxY5/1o/DxkxaGtep9dzAOR6uB7MJJN0qrSlZ7bqB eXg3hvZ9ZwyiprB23FP+Blw2+DwmlCmLiWQLP465l5PFxH7cClFtRdjim6bJ83k7sLIt ceunO4ChzeOI4iL8Sm+Sbb4X0+HTmRYd6mrHS8ZBEJxXjqTxS+sogfnrhjDCv56xksOH 9moWlSDmdVMwKYDHvHvw10j/29eGq3RYTwOIiXuVTxtdZcTRwYsM5zjhX+im/O7NOuKM 4ncURnwzVnV1wYVqFbZXu8MtO+nMOnSVT+AILJQ0cSCePJkjQ0CKn3FUbW1iauchK1kI GSVg== 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 q79-v6si3465186pfk.268.2018.07.04.03.19.13; Wed, 04 Jul 2018 03:19:27 -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 S934279AbeGDKSE (ORCPT + 99 others); Wed, 4 Jul 2018 06:18:04 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:2903 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932548AbeGDKSB (ORCPT ); Wed, 4 Jul 2018 06:18:01 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1, AES128-SHA) id ; Wed, 04 Jul 2018 03:18:01 -0700 Received: from HQMAIL101.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Wed, 04 Jul 2018 03:18:01 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Wed, 04 Jul 2018 03:18:01 -0700 Received: from dhcp-10-21-25-168.Nvidia.com (10.21.25.201) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Wed, 4 Jul 2018 10:17:58 +0000 From: Aapo Vienamo To: Peter De Schrijver CC: Prashant Gaikwad , Michael Turquette , Stephen Boyd , Thierry Reding , Jonathan Hunter , , , , Aapo Vienamo Subject: [PATCH v2 1/3] clk: tegra: refactor 7.1 div calculation Date: Wed, 4 Jul 2018 13:17:33 +0300 Message-ID: <1530699455-27654-1-git-send-email-avienamo@nvidia.com> X-Mailer: git-send-email 2.7.4 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.21.25.201] X-ClientProxiedBy: UKMAIL101.nvidia.com (10.26.138.13) To HQMAIL101.nvidia.com (172.20.187.10) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter De Schrijver Move this to a separate file so it can be used to calculate the sdmmc clock dividers. Signed-off-by: Peter De-Schrijver Signed-off-by: Aapo Vienamo --- drivers/clk/tegra/Makefile | 1 + drivers/clk/tegra/clk-divider.c | 30 ++++------------------- drivers/clk/tegra/clk.h | 3 +++ drivers/clk/tegra/div71.c | 54 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 drivers/clk/tegra/div71.c diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile index b716923..6d4f563 100644 --- a/drivers/clk/tegra/Makefile +++ b/drivers/clk/tegra/Makefile @@ -24,3 +24,4 @@ obj-$(CONFIG_ARCH_TEGRA_132_SOC) += clk-tegra124.o obj-y += cvb.o obj-$(CONFIG_ARCH_TEGRA_210_SOC) += clk-tegra210.o obj-$(CONFIG_CLK_TEGRA_BPMP) += clk-bpmp.o +obj-y += div71.o diff --git a/drivers/clk/tegra/clk-divider.c b/drivers/clk/tegra/clk-divider.c index 16e0aee..ad87858 100644 --- a/drivers/clk/tegra/clk-divider.c +++ b/drivers/clk/tegra/clk-divider.c @@ -32,35 +32,15 @@ static int get_div(struct tegra_clk_frac_div *divider, unsigned long rate, unsigned long parent_rate) { - u64 divider_ux1 = parent_rate; - u8 flags = divider->flags; - int mul; - - if (!rate) - return 0; - - mul = get_mul(divider); - - if (!(flags & TEGRA_DIVIDER_INT)) - divider_ux1 *= mul; - - if (flags & TEGRA_DIVIDER_ROUND_UP) - divider_ux1 += rate - 1; - - do_div(divider_ux1, rate); - - if (flags & TEGRA_DIVIDER_INT) - divider_ux1 *= mul; + int div; - divider_ux1 -= mul; + div = div71_get(rate, parent_rate, divider->width, divider->frac_width, + divider->flags); - if ((s64)divider_ux1 < 0) + if (div < 0) return 0; - if (divider_ux1 > get_max_div(divider)) - return get_max_div(divider); - - return divider_ux1; + return div; } static unsigned long clk_frac_div_recalc_rate(struct clk_hw *hw, diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h index e1f8846..f14e136 100644 --- a/drivers/clk/tegra/clk.h +++ b/drivers/clk/tegra/clk.h @@ -811,6 +811,9 @@ extern tegra_clk_apply_init_table_func tegra_clk_apply_init_table; int tegra_pll_wait_for_lock(struct tegra_clk_pll *pll); u16 tegra_pll_get_fixed_mdiv(struct clk_hw *hw, unsigned long input_rate); int tegra_pll_p_div_to_hw(struct tegra_clk_pll *pll, u8 p_div); +int div71_get(unsigned long rate, unsigned parent_rate, u8 width, + u8 frac_width, u8 flags); + /* Combined read fence with delay */ #define fence_udelay(delay, reg) \ diff --git a/drivers/clk/tegra/div71.c b/drivers/clk/tegra/div71.c new file mode 100644 index 0000000..1a5e04c --- /dev/null +++ b/drivers/clk/tegra/div71.c @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#include "clk.h" + +#define div_mask(w) ((1 << (w)) - 1) + +int div71_get(unsigned long rate, unsigned parent_rate, u8 width, + u8 frac_width, u8 flags) +{ + u64 divider_ux1 = parent_rate; + int mul; + + if (!rate) + return 0; + + mul = 1 << frac_width; + + if (!(flags & TEGRA_DIVIDER_INT)) + divider_ux1 *= mul; + + if (flags & TEGRA_DIVIDER_ROUND_UP) + divider_ux1 += rate - 1; + + do_div(divider_ux1, rate); + + if (flags & TEGRA_DIVIDER_INT) + divider_ux1 *= mul; + + if (divider_ux1 < mul) + return 0; + + divider_ux1 -= mul; + + if (divider_ux1 > div_mask(width)) + return div_mask(width); + + return divider_ux1; +} -- 2.7.4