From patchwork Tue Nov 22 13:07:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13052331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B658FC4332F for ; Tue, 22 Nov 2022 13:07:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233121AbiKVNHN (ORCPT ); Tue, 22 Nov 2022 08:07:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbiKVNHL (ORCPT ); Tue, 22 Nov 2022 08:07:11 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B8DF62072; Tue, 22 Nov 2022 05:07:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669122430; x=1700658430; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=13YUW771QBcON+nmTqGzaH6KQD1PytOjrL6vf8Gczwk=; b=dkbSM5QkM7sH8M+BvN90iLnDE/D+ElsbpyLfQwMkdnbvL7HlbfWJIHZ/ d/+E+IgZbCXkGVbA+6cXp79Stfl2W3A7Lo2yWZdwz/tiv/a3x2xT2n47n hm+WWCSLaVImYyt4nZWfF/qcLyNUagNombtsPdwSbIjrGvnAQZ0Z969fS mFtF5LtkAQhuLnDfLtH3lJpSyP57iGgASg2AJH44nWLiu7FHPYor5avU6 n7N4ZjxCxEgsi7JlIJd+nh5//BR/wh/CXvsxMxTNA089vn11wZ7nwRNih YICb9wsoMhga1Hn0A+sI4dbu6UcSzDYbOwJlTVT6TLdg5uwjVIqhkoyBr w==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="301358043" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="301358043" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 05:07:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="619206109" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="619206109" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 22 Nov 2022 05:07:08 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D206B128; Tue, 22 Nov 2022 15:07:33 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Turquette , Stephen Boyd Subject: [PATCH v2 1/3] clk: fractional-divider: Split out clk_fd_get_div() helper Date: Tue, 22 Nov 2022 15:07:30 +0200 Message-Id: <20221122130732.48537-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Split out clk_fd_get_div() helper for the future use elsewhere. Signed-off-by: Andy Shevchenko --- v2: no changes drivers/clk/clk-fractional-divider.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c index 8efa5142ff8c..5c6f1d0f8fb4 100644 --- a/drivers/clk/clk-fractional-divider.c +++ b/drivers/clk/clk-fractional-divider.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -63,14 +64,12 @@ static inline void clk_fd_writel(struct clk_fractional_divider *fd, u32 val) writel(val, fd->reg); } -static unsigned long clk_fd_recalc_rate(struct clk_hw *hw, - unsigned long parent_rate) +static void clk_fd_get_div(struct clk_hw *hw, struct u32_fract *fract) { struct clk_fractional_divider *fd = to_clk_fd(hw); unsigned long flags = 0; unsigned long m, n; u32 val; - u64 ret; if (fd->lock) spin_lock_irqsave(fd->lock, flags); @@ -92,11 +91,22 @@ static unsigned long clk_fd_recalc_rate(struct clk_hw *hw, n++; } - if (!n || !m) + fract->numerator = m; + fract->denominator = n; +} + +static unsigned long clk_fd_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) +{ + struct u32_fract fract; + u64 ret; + + clk_fd_get_div(hw, &fract); + + if (!fract.numerator || !fract.denominator) return parent_rate; - ret = (u64)parent_rate * m; - do_div(ret, n); + ret = (u64)parent_rate * fract.numerator; + do_div(ret, fract.denominator); return ret; } From patchwork Tue Nov 22 13:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13052332 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1924BC43217 for ; Tue, 22 Nov 2022 13:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232828AbiKVNHO (ORCPT ); Tue, 22 Nov 2022 08:07:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232849AbiKVNHM (ORCPT ); Tue, 22 Nov 2022 08:07:12 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D3826238B; Tue, 22 Nov 2022 05:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669122431; x=1700658431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JvcE92gKvOcwLrDEGyRbhKXu2OVvTqGr3iFpwDsrMbM=; b=OMwSFDaN6gHOiW3OUAE00JJo8Netpm20PKeHLmIl7HrbW6RJ7sZZ+aQD I9T9gvxxYlHcORdZMir9nbGirXjB19UwRjJIcR/R7WCyqoL7iM6SPC01w mEqDu769XoYNMwmVyUu8+CqK/s8E9qphZCpP9gbDKFYkf0z1g0Jxc6Qfx EEfgGfBca+8MAJyEBBfezzXbXV11waaWmBdrBBI1bh3oEivVlxZRuXCik RVxUXYIbZ1wPtsYY6jrSXwlKyF6oXrH4kNI/BJP/wQKFcJP7ajrOdOzK/ 0nlfsDbz7K/jxyITJfhZvmGMJCdfQ+rAve68R5MjYSSMFQYYcEF2TD01N A==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="301358045" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="301358045" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 05:07:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="619206110" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="619206110" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 22 Nov 2022 05:07:08 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E0B95F7; Tue, 22 Nov 2022 15:07:33 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Turquette , Stephen Boyd Subject: [PATCH v2 2/3] clk: fractional-divider: Show numerator and denominator in debugfs Date: Tue, 22 Nov 2022 15:07:31 +0200 Message-Id: <20221122130732.48537-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221122130732.48537-1-andriy.shevchenko@linux.intel.com> References: <20221122130732.48537-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org It's very useful to see what are the values of the fractional divider. For that, add respective debugfs files. Signed-off-by: Andy Shevchenko --- v2: no changes drivers/clk/clk-fractional-divider.c | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c index 5c6f1d0f8fb4..b6b52b79d671 100644 --- a/drivers/clk/clk-fractional-divider.c +++ b/drivers/clk/clk-fractional-divider.c @@ -39,6 +39,7 @@ */ #include +#include #include #include #include @@ -193,10 +194,45 @@ static int clk_fd_set_rate(struct clk_hw *hw, unsigned long rate, return 0; } +#ifdef CONFIG_DEBUG_FS +static int clk_fd_numerator_get(void *hw, u64 *val) +{ + struct u32_fract fract; + + clk_fd_get_div(hw, &fract); + + *val = fract.numerator; + + return 0; +} +DEFINE_DEBUGFS_ATTRIBUTE(clk_fd_numerator_fops, clk_fd_numerator_get, NULL, "%llu\n"); + +static int clk_fd_denominator_get(void *hw, u64 *val) +{ + struct u32_fract fract; + + clk_fd_get_div(hw, &fract); + + *val = fract.denominator; + + return 0; +} +DEFINE_DEBUGFS_ATTRIBUTE(clk_fd_denominator_fops, clk_fd_denominator_get, NULL, "%llu\n"); + +static void clk_fd_debug_init(struct clk_hw *hw, struct dentry *dentry) +{ + debugfs_create_file("numerator", 0444, dentry, hw, &clk_fd_numerator_fops); + debugfs_create_file("denominator", 0444, dentry, hw, &clk_fd_denominator_fops); +} +#endif + const struct clk_ops clk_fractional_divider_ops = { .recalc_rate = clk_fd_recalc_rate, .round_rate = clk_fd_round_rate, .set_rate = clk_fd_set_rate, +#ifdef CONFIG_DEBUG_FS + .debug_init = clk_fd_debug_init, +#endif }; EXPORT_SYMBOL_GPL(clk_fractional_divider_ops); From patchwork Tue Nov 22 13:07:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13052333 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DF4AC433FE for ; Tue, 22 Nov 2022 13:07:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233286AbiKVNHQ (ORCPT ); Tue, 22 Nov 2022 08:07:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233069AbiKVNHM (ORCPT ); Tue, 22 Nov 2022 08:07:12 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78A645915A; Tue, 22 Nov 2022 05:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669122431; x=1700658431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cT2P7D+KHsVNsHeh/fdjbnG586bb89r6zo96DDjOifg=; b=kmrIhTxhLCQI5HK5Hi+vOSiUrhG+JI/nNkpkLOROULuXc75F0D/BBvZD xhIsbzuxdP0juDwObU9ybGOWWkhxwYbXX5hzy/BhBNKsVfmxGDnQKfttV 6CCSuS+Zewu/C3exPpY/D8CICjPetl2FTpoZtZNZHg5vKUkS8vzUA5xhq DKVYjH1fIEGDMJdjpMo3GuWcrnq46rT21t7MKJiIE5cZDfpzV1CQaklI6 2mJmon9leRCgfRhGyChn0XT+6D6evYslzafw6p68GHC0GNf2pTipLACsK mrVYoqIfab8Xp+MpRWbOzMktbrt8u5S+Ed8t05S/ul84KNzXKyfX3jHXG Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="301358047" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="301358047" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2022 05:07:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10538"; a="619206111" X-IronPort-AV: E=Sophos;i="5.96,184,1665471600"; d="scan'208";a="619206111" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 22 Nov 2022 05:07:08 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E5E3212B; Tue, 22 Nov 2022 15:07:33 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Turquette , Stephen Boyd Subject: [PATCH v2 3/3] clk: fractional-divider: Regroup inclusions Date: Tue, 22 Nov 2022 15:07:32 +0200 Message-Id: <20221122130732.48537-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221122130732.48537-1-andriy.shevchenko@linux.intel.com> References: <20221122130732.48537-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org For the better maintenance regroup inclusions as follows: - split CCF related headers in its own group - order groups from generic to particular - sort each group alphabetically Signed-off-by: Andy Shevchenko --- v2: dropped duplicate of linux/clk-provider.h drivers/clk/clk-fractional-divider.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c index b6b52b79d671..6affe3565025 100644 --- a/drivers/clk/clk-fractional-divider.c +++ b/drivers/clk/clk-fractional-divider.c @@ -38,14 +38,15 @@ * saturated values. */ -#include #include +#include #include #include #include -#include -#include #include +#include + +#include #include "clk-fractional-divider.h"