From: Richard Cochran <richardcochran@gmail.com>
To: Ido Schimmel <idosch@idosch.org>
Cc: netdev@vger.kernel.org, davem@davemloft.net, jiri@mellanox.com,
shalomt@mellanox.com, petrm@mellanox.com, mlxsw@mellanox.com,
Ido Schimmel <idosch@mellanox.com>
Subject: Re: [PATCH net-next 7/9] mlxsw: spectrum_ptp: Add implementation for physical hardware clock operations
Date: Tue, 4 Jun 2019 07:28:19 -0700 [thread overview]
Message-ID: <20190604142819.cml2tbkmcj2mvkpl@localhost> (raw)
In-Reply-To: <20190603121244.3398-8-idosch@idosch.org>
On Mon, Jun 03, 2019 at 03:12:42PM +0300, Ido Schimmel wrote:
> +static int
> +mlxsw_sp1_ptp_update_phc_settime(struct mlxsw_sp_ptp_clock *clock, u64 nsec)
Six words ^^^
What is wrong with "mlxsw_phc_settime" ?
> +{
> + struct mlxsw_core *mlxsw_core = clock->core;
> + char mtutc_pl[MLXSW_REG_MTUTC_LEN];
> + char mtpps_pl[MLXSW_REG_MTPPS_LEN];
> + u64 next_sec_in_nsec, cycles;
> + u32 next_sec;
> + int err;
> +
> + next_sec = nsec / NSEC_PER_SEC + 1;
> + next_sec_in_nsec = next_sec * NSEC_PER_SEC;
> +
> + spin_lock(&clock->lock);
> + cycles = mlxsw_sp1_ptp_ns2cycles(&clock->tc, next_sec_in_nsec);
> + spin_unlock(&clock->lock);
> +
> + mlxsw_reg_mtpps_vpin_pack(mtpps_pl, cycles);
> + err = mlxsw_reg_write(mlxsw_core, MLXSW_REG(mtpps), mtpps_pl);
> + if (err)
> + return err;
> +
> + mlxsw_reg_mtutc_pack(mtutc_pl,
> + MLXSW_REG_MTUTC_OPERATION_SET_TIME_AT_NEXT_SEC,
> + 0, next_sec);
> + return mlxsw_reg_write(mlxsw_core, MLXSW_REG(mtutc), mtutc_pl);
> +}
> +
> +static int mlxsw_sp1_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
> +{
> + struct mlxsw_sp_ptp_clock *clock =
> + container_of(ptp, struct mlxsw_sp_ptp_clock, ptp_info);
> + int neg_adj = 0;
> + u32 diff;
> + u64 adj;
> + s32 ppb;
> +
> + ppb = ptp_clock_scaled_ppm_to_ppb(scaled_ppm);
Now I see why you did this. Nice try.
The 'scaled_ppm' has a finer resolution than ppb. Please make use of
the finer resolution in your calculation. It does make a difference.
> +
> + if (ppb < 0) {
> + neg_adj = 1;
> + ppb = -ppb;
> + }
> +
> + adj = clock->nominal_c_mult;
> + adj *= ppb;
> + diff = div_u64(adj, NSEC_PER_SEC);
> +
> + spin_lock(&clock->lock);
> + timecounter_read(&clock->tc);
> + clock->cycles.mult = neg_adj ? clock->nominal_c_mult - diff :
> + clock->nominal_c_mult + diff;
> + spin_unlock(&clock->lock);
> +
> + return mlxsw_sp1_ptp_update_phc_adjfreq(clock, neg_adj ? -ppb : ppb);
> +}
Thanks,
Richard
next prev parent reply other threads:[~2019-06-04 14:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 12:12 [PATCH net-next 0/9] mlxsw: Add support for physical hardware clock Ido Schimmel
2019-06-03 12:12 ` [PATCH net-next 1/9] mlxsw: cmd: Free running clock PCI BAR and offsets via query firmware Ido Schimmel
2019-06-03 12:12 ` [PATCH net-next 2/9] mlxsw: core: Add a new interface for reading the hardware free running clock Ido Schimmel
2019-06-03 12:12 ` [PATCH net-next 3/9] mlxsw: pci: Query free running clock PCI BAR and offsets Ido Schimmel
2019-06-03 12:12 ` [PATCH net-next 4/9] mlxsw: reg: Add Management UTC Register Ido Schimmel
2019-06-04 14:17 ` Richard Cochran
2019-06-05 11:30 ` Shalom Toledo
2019-06-05 17:23 ` Richard Cochran
2019-06-05 18:55 ` Shalom Toledo
2019-06-06 2:37 ` Richard Cochran
2019-06-06 9:11 ` Shalom Toledo
2019-06-06 10:12 ` Petr Machata
2019-06-03 12:12 ` [PATCH net-next 5/9] mlxsw: reg: Add Management Pulse Per Second Register Ido Schimmel
2019-06-03 12:12 ` [PATCH net-next 6/9] ptp: ptp_clock: Publish scaled_ppm_to_ppb Ido Schimmel
2019-06-04 14:21 ` Richard Cochran
2019-06-05 11:46 ` Shalom Toledo
2019-06-03 12:12 ` [PATCH net-next 7/9] mlxsw: spectrum_ptp: Add implementation for physical hardware clock operations Ido Schimmel
2019-06-04 14:28 ` Richard Cochran [this message]
2019-06-05 6:30 ` Jiri Pirko
2019-06-05 17:24 ` Richard Cochran
2019-06-05 11:44 ` Shalom Toledo
2019-06-05 17:40 ` Richard Cochran
2019-06-05 19:28 ` Shalom Toledo
2019-06-06 2:43 ` Richard Cochran
2019-06-06 8:50 ` Shalom Toledo
2019-06-06 8:57 ` Shalom Toledo
2019-06-04 17:03 ` Richard Cochran
2019-06-05 9:00 ` Petr Machata
2019-06-05 17:31 ` Richard Cochran
2019-06-06 10:21 ` Petr Machata
2019-06-03 12:12 ` [PATCH net-next 8/9] mlxsw: spectrum: PTP physical hardware clock initialization Ido Schimmel
2019-06-03 12:12 ` [PATCH net-next 9/9] selftests: ptp: Add Physical Hardware Clock test Ido Schimmel
2019-06-04 17:05 ` Richard Cochran
2019-06-07 11:15 ` Vladimir Oltean
2019-06-08 10:44 ` Vladimir Oltean
2019-06-11 13:54 ` Shalom Toledo
2019-06-03 17:35 ` [PATCH net-next 0/9] mlxsw: Add support for physical hardware clock David Miller
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=20190604142819.cml2tbkmcj2mvkpl@localhost \
--to=richardcochran@gmail.com \
--cc=davem@davemloft.net \
--cc=idosch@idosch.org \
--cc=idosch@mellanox.com \
--cc=jiri@mellanox.com \
--cc=mlxsw@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=petrm@mellanox.com \
--cc=shalomt@mellanox.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).