* [net-next v2 8/9] ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm
[not found] <20220930204851.1910059-1-jacob.e.keller@intel.com>
@ 2022-09-30 20:48 ` Jacob Keller
2022-10-03 10:55 ` Sergey Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Jacob Keller @ 2022-09-30 20:48 UTC (permalink / raw)
To: netdev
Cc: Jacob Keller, K. Y. Srinivasan, Haiyang Zhang, Stephen Hemminger,
Wei Liu, Dexuan Cui, Tom Lendacky, Shyam Sundar S K,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Siva Reddy Kallam, Prashant Sreedharan, Michael Chan,
Yisen Zhuang, Salil Mehta, Jesse Brandeburg, Tony Nguyen,
Tariq Toukan, Saeed Mahameed, Leon Romanovsky, Bryan Whitehead,
Sergey Shtylyov, Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
Maxime Coquelin, Richard Cochran, Vivek Thampi,
VMware PV-Drivers Reviewers, Jie Wang, Guangbin Huang,
Eran Ben Elisha, Aya Levin, Cai Huoqing, Biju Das, Lad Prabhakar,
Phil Edworthy, Jiasheng Jiang, Gustavo A. R. Silva, Linus Walleij,
Wan Jiabing, Lv Ruyi, Arnd Bergmann, linux-renesas-soc
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
^ permalink raw reply related [flat|nested] 2+ messages in thread