netdev.vger.kernel.org archive mirror
 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>,
	UNGLinuxDriver@microchip.com
Subject: [net-next v2 7/9] ptp: lan743x: use diff_by_scaled_ppm in .adjfine implementation
Date: Fri, 30 Sep 2022 13:48:49 -0700	[thread overview]
Message-ID: <20220930204851.1910059-8-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20220930204851.1910059-1-jacob.e.keller@intel.com>

Update the lan743x driver to use the recently added diff_by_scaled_ppm
helper function. This reduces the amount of code required in lan743x_ptp.c
driver file.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: Bryan Whitehead <bryan.whitehead@microchip.com>
Cc: UNGLinuxDriver@microchip.com
---
 drivers/net/ethernet/microchip/lan743x_ptp.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c
index 130f88b77cfe..c232af22ff02 100644
--- a/drivers/net/ethernet/microchip/lan743x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan743x_ptp.c
@@ -339,25 +339,18 @@ static int lan743x_ptpci_adjfine(struct ptp_clock_info *ptpci, long scaled_ppm)
 	struct lan743x_adapter *adapter =
 		container_of(ptp, struct lan743x_adapter, ptp);
 	u32 lan743x_rate_adj = 0;
-	bool positive = true;
-	u64 u64_delta = 0;
+	u64 u64_delta;
 
 	if ((scaled_ppm < (-LAN743X_PTP_MAX_FINE_ADJ_IN_SCALED_PPM)) ||
 	    scaled_ppm > LAN743X_PTP_MAX_FINE_ADJ_IN_SCALED_PPM) {
 		return -EINVAL;
 	}
-	if (scaled_ppm > 0) {
-		u64_delta = (u64)scaled_ppm;
-		positive = true;
-	} else {
-		u64_delta = (u64)(-scaled_ppm);
-		positive = false;
-	}
-	u64_delta = (u64_delta << 19);
-	lan743x_rate_adj = div_u64(u64_delta, 1000000);
 
-	if (positive)
-		lan743x_rate_adj |= PTP_CLOCK_RATE_ADJ_DIR_;
+	/* diff_by_scaled_ppm returns true if the difference is negative */
+	if (diff_by_scaled_ppm(1ULL << 35, scaled_ppm, &u64_delta))
+		lan743x_rate_adj = (u32)u64_delta;
+	else
+		lan743x_rate_adj = (u32)u64_delta | PTP_CLOCK_RATE_ADJ_DIR_;
 
 	lan743x_csr_write(adapter, PTP_CLOCK_RATE_ADJ,
 			  lan743x_rate_adj);
-- 
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 ` Jacob Keller [this message]
2022-09-30 20:48 ` [net-next v2 8/9] ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm Jacob Keller
2022-10-03 10:55   ` 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-8-jacob.e.keller@intel.com \
    --to=jacob.e.keller@intel.com \
    --cc=Shyam-sundar.S-k@amd.com \
    --cc=UNGLinuxDriver@microchip.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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).