All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jacob Keller <jacob.e.keller@intel.com>
To: netdev@vger.kernel.org
Cc: Jacob Keller <jacob.e.keller@intel.com>,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>,
	Stephen Hemminger <sthemmin@microsoft.com>,
	Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Shyam Sundar S K <Shyam-sundar.S-k@amd.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Siva Reddy Kallam <siva.kallam@broadcom.com>,
	Prashant Sreedharan <prashant@broadcom.com>,
	Michael Chan <mchan@broadcom.com>,
	Yisen Zhuang <yisen.zhuang@huawei.com>,
	Salil Mehta <salil.mehta@huawei.com>,
	Jesse Brandeburg <jesse.brandeburg@intel.com>,
	Tony Nguyen <anthony.l.nguyen@intel.com>,
	Tariq Toukan <tariqt@nvidia.com>,
	Saeed Mahameed <saeedm@nvidia.com>,
	Leon Romanovsky <leon@kernel.org>,
	Bryan Whitehead <bryan.whitehead@microchip.com>,
	Sergey Shtylyov <s.shtylyov@omp.ru>,
	Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	Alexandre Torgue <alexandre.torgue@foss.st.com>,
	Jose Abreu <joabreu@synopsys.com>,
	Maxime Coquelin <mcoquelin.stm32@gmail.com>,
	Richard Cochran <richardcochran@gmail.com>,
	Vivek Thampi <vithampi@vmware.com>,
	VMware PV-Drivers Reviewers <pv-drivers@vmware.com>,
	Jie Wang <wangjie125@huawei.com>,
	Guangbin Huang <huangguangbin2@huawei.com>,
	Eran Ben Elisha <eranbe@nvidia.com>, Aya Levin <ayal@nvidia.com>,
	Cai Huoqing <cai.huoqing@linux.dev>,
	Biju Das <biju.das.jz@bp.renesas.com>,
	Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
	Phil Edworthy <phil.edworthy@renesas.com>,
	Jiasheng Jiang <jiasheng@iscas.ac.cn>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Linus Walleij <linus.walleij@linaro.org>,
	Wan Jiabing <wanjiabing@vivo.com>, Lv Ruyi <lv.ruyi@zte.com.cn>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-renesas-soc@vger.kernel.org
Subject: [net-next v2 8/9] ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm
Date: Fri, 30 Sep 2022 13:48:50 -0700	[thread overview]
Message-ID: <20220930204851.1910059-9-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20220930204851.1910059-1-jacob.e.keller@intel.com>

The ravb implementation of .adjfreq is implemented in terms of a
straight forward "base * ppb / 1 billion" calculation.

Convert this driver to .adjfine and use the adjust_by_scaled_ppm helper
function to calculate the new addend.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: Sergey Shtylyov <s.shtylyov@omp.ru>
Cc: Biju Das <biju.das.jz@bp.renesas.com>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Cc: linux-renesas-soc@vger.kernel.org
---
 drivers/net/ethernet/renesas/ravb_ptp.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb_ptp.c b/drivers/net/ethernet/renesas/ravb_ptp.c
index 87c4306d66ec..6e4ef7af27bf 100644
--- a/drivers/net/ethernet/renesas/ravb_ptp.c
+++ b/drivers/net/ethernet/renesas/ravb_ptp.c
@@ -88,24 +88,17 @@ static int ravb_ptp_update_compare(struct ravb_private *priv, u32 ns)
 }
 
 /* PTP clock operations */
-static int ravb_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
+static int ravb_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
 {
 	struct ravb_private *priv = container_of(ptp, struct ravb_private,
 						 ptp.info);
 	struct net_device *ndev = priv->ndev;
 	unsigned long flags;
-	u32 diff, addend;
-	bool neg_adj = false;
+	u32 addend;
 	u32 gccr;
 
-	if (ppb < 0) {
-		neg_adj = true;
-		ppb = -ppb;
-	}
-	addend = priv->ptp.default_addend;
-	diff = div_u64((u64)addend * ppb, NSEC_PER_SEC);
-
-	addend = neg_adj ? addend - diff : addend + diff;
+	addend = (u32)adjust_by_scaled_ppm(priv->ptp.default_addend,
+					   scaled_ppm);
 
 	spin_lock_irqsave(&priv->lock, flags);
 
@@ -295,7 +288,7 @@ static const struct ptp_clock_info ravb_ptp_info = {
 	.max_adj	= 50000000,
 	.n_ext_ts	= N_EXT_TS,
 	.n_per_out	= N_PER_OUT,
-	.adjfreq	= ravb_ptp_adjfreq,
+	.adjfine	= ravb_ptp_adjfine,
 	.adjtime	= ravb_ptp_adjtime,
 	.gettime64	= ravb_ptp_gettime64,
 	.settime64	= ravb_ptp_settime64,
-- 
2.37.1.394.gc50926e1f488


  parent reply	other threads:[~2022-09-30 20:49 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-30 20:48 [net-next v2 0/9] ptp: convert drivers to .adjfine Jacob Keller
2022-09-30 20:48 ` [net-next v2 1/9] ptp: add missing documentation for parameters Jacob Keller
2022-09-30 20:48 ` [net-next v2 2/9] ptp: introduce helpers to adjust by scaled parts per million Jacob Keller
2022-09-30 20:48 ` [net-next v2 3/9] drivers: convert unsupported .adjfreq to .adjfine Jacob Keller
2022-09-30 20:48 ` [net-next v2 4/9] ptp: mlx4: convert to .adjfine and adjust_by_scaled_ppm Jacob Keller
2022-09-30 20:48 ` [net-next v2 5/9] ptp: mlx5: " Jacob Keller
2022-10-02 11:15   ` Gal Pressman
2022-09-30 20:48 ` [net-next v2 6/9] ptp: lan743x: remove .adjfreq implementation Jacob Keller
2022-09-30 20:48 ` [net-next v2 7/9] ptp: lan743x: use diff_by_scaled_ppm in .adjfine implementation Jacob Keller
2022-09-30 20:48 ` Jacob Keller [this message]
2022-10-03 10:55   ` [net-next v2 8/9] ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm Sergey Shtylyov
2022-09-30 20:48 ` [net-next v2 9/9] ptp: xgbe: " Jacob Keller
2022-10-03 16:54 ` [net-next v2 0/9] ptp: convert drivers to .adjfine Jakub Kicinski
2022-10-03 18:04   ` Keller, Jacob E
2022-10-03 17:37 ` Richard Cochran

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220930204851.1910059-9-jacob.e.keller@intel.com \
    --to=jacob.e.keller@intel.com \
    --cc=Shyam-sundar.S-k@amd.com \
    --cc=alexandre.torgue@foss.st.com \
    --cc=anthony.l.nguyen@intel.com \
    --cc=arnd@arndb.de \
    --cc=ayal@nvidia.com \
    --cc=biju.das.jz@bp.renesas.com \
    --cc=bryan.whitehead@microchip.com \
    --cc=cai.huoqing@linux.dev \
    --cc=davem@davemloft.net \
    --cc=decui@microsoft.com \
    --cc=edumazet@google.com \
    --cc=eranbe@nvidia.com \
    --cc=gustavoars@kernel.org \
    --cc=haiyangz@microsoft.com \
    --cc=huangguangbin2@huawei.com \
    --cc=jesse.brandeburg@intel.com \
    --cc=jiasheng@iscas.ac.cn \
    --cc=joabreu@synopsys.com \
    --cc=kuba@kernel.org \
    --cc=kys@microsoft.com \
    --cc=leon@kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=lv.ruyi@zte.com.cn \
    --cc=mchan@broadcom.com \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=peppe.cavallaro@st.com \
    --cc=phil.edworthy@renesas.com \
    --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
    --cc=prashant@broadcom.com \
    --cc=pv-drivers@vmware.com \
    --cc=richardcochran@gmail.com \
    --cc=s.shtylyov@omp.ru \
    --cc=saeedm@nvidia.com \
    --cc=salil.mehta@huawei.com \
    --cc=siva.kallam@broadcom.com \
    --cc=sthemmin@microsoft.com \
    --cc=tariqt@nvidia.com \
    --cc=thomas.lendacky@amd.com \
    --cc=vithampi@vmware.com \
    --cc=wangjie125@huawei.com \
    --cc=wanjiabing@vivo.com \
    --cc=wei.liu@kernel.org \
    --cc=yisen.zhuang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.