Skip to content

Commit bd279e1

Browse files
pavanchebbikuba-moo
authored andcommitted
bnxt_en: Use absolute target ns from ptp_clock_request
There is no need to calculate the target PHC cycles required to make phase adjustment on the PPS OUT signal. This is because the application supplies absolute n_sec value in the future and is already the actual desired target value. Remove the unnecessary code. Fixes: 9e518f2 ("bnxt_en: 1PPS functions to configure TSIO pins") Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Cc: Richard Cochran <richardcochran@gmail.com> Signed-off-by: Pavan Chebbi <pavan.chebbi@broadcom.com> Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> Tested-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> Link: https://patch.msgid.link/20260504083611.1383776-5-pavan.chebbi@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 16517bc commit bd279e1

1 file changed

Lines changed: 5 additions & 24 deletions

File tree

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -419,42 +419,20 @@ void bnxt_ptp_reapply_pps(struct bnxt *bp)
419419
}
420420
}
421421

422-
static int bnxt_get_target_cycles(struct bnxt_ptp_cfg *ptp, u64 target_ns,
423-
u64 *cycles_delta)
424-
{
425-
u64 cycles_now;
426-
u64 nsec_now, nsec_delta;
427-
int rc;
428-
429-
rc = bnxt_refclk_read(ptp->bp, NULL, &cycles_now);
430-
if (rc)
431-
return rc;
432-
433-
nsec_now = bnxt_timecounter_cyc2time(ptp, cycles_now);
434-
435-
nsec_delta = target_ns - nsec_now;
436-
*cycles_delta = div64_u64(nsec_delta << ptp->cc.shift, ptp->cc.mult);
437-
return 0;
438-
}
439-
440422
static int bnxt_ptp_perout_cfg(struct bnxt_ptp_cfg *ptp,
441423
struct ptp_clock_request *rq)
442424
{
443425
struct hwrm_func_ptp_cfg_input *req;
444426
struct bnxt *bp = ptp->bp;
445427
struct timespec64 ts;
446-
u64 target_ns, delta;
428+
u64 target_ns;
447429
u16 enables;
448430
int rc;
449431

450432
ts.tv_sec = rq->perout.start.sec;
451433
ts.tv_nsec = rq->perout.start.nsec;
452434
target_ns = timespec64_to_ns(&ts);
453435

454-
rc = bnxt_get_target_cycles(ptp, target_ns, &delta);
455-
if (rc)
456-
return rc;
457-
458436
rc = hwrm_req_init(bp, req, HWRM_FUNC_PTP_CFG);
459437
if (rc)
460438
return rc;
@@ -468,7 +446,10 @@ static int bnxt_ptp_perout_cfg(struct bnxt_ptp_cfg *ptp,
468446
req->ptp_freq_adj_dll_phase = 0;
469447
req->ptp_freq_adj_ext_period = cpu_to_le32(NSEC_PER_SEC);
470448
req->ptp_freq_adj_ext_up = 0;
471-
req->ptp_freq_adj_ext_phase_lower = cpu_to_le32(delta);
449+
req->ptp_freq_adj_ext_phase_lower =
450+
cpu_to_le32(lower_32_bits(target_ns));
451+
req->ptp_freq_adj_ext_phase_upper =
452+
cpu_to_le32(upper_32_bits(target_ns));
472453

473454
return hwrm_req_send(bp, req);
474455
}

0 commit comments

Comments
 (0)