From: Jacob Keller <jacob.e.keller@intel.com>
To: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Cc: Richard Cochran <richardcochran@gmail.com>,
Jacob Keller <jacob.e.keller@intel.com>,
Michael Chan <michael.chan@broadcom.com>
Subject: [PATCH net-next 7/9] ptp: bnxt: convert .adjfreq to .adjfine
Date: Wed, 9 Nov 2022 15:09:43 -0800 [thread overview]
Message-ID: <20221109230945.545440-8-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20221109230945.545440-1-jacob.e.keller@intel.com>
When the BNXT_FW_CAP_PTP_RTC flag is not set, the bnxt driver implements
.adjfreq on a cyclecounter in terms of the straightforward "base * ppb / 1
billion" calculation. When BNXT_FW_CAP_PTP_RTC is set, the driver forwards
the ppb value to firmware for configuration.
Convert the driver to the newer .adjfine interface, updating the
cyclecounter calculation to use adjust_by_scaled_ppm to perform the
calculation. Use scaled_ppm_to_ppb when forwarding the correction to
firmware.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: Michael Chan <michael.chan@broadcom.com>
Cc: Richard Cochran <richardcochran@gmail.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 22 +++++--------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
index 460cb20599f6..4ec8bba18cdd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
@@ -205,7 +205,7 @@ static int bnxt_ptp_adjtime(struct ptp_clock_info *ptp_info, s64 delta)
return 0;
}
-static int bnxt_ptp_adjfreq(struct ptp_clock_info *ptp_info, s32 ppb)
+static int bnxt_ptp_adjfine(struct ptp_clock_info *ptp_info, long scaled_ppm)
{
struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,
ptp_info);
@@ -214,23 +214,13 @@ static int bnxt_ptp_adjfreq(struct ptp_clock_info *ptp_info, s32 ppb)
int rc = 0;
if (!(ptp->bp->fw_cap & BNXT_FW_CAP_PTP_RTC)) {
- int neg_adj = 0;
- u32 diff;
- u64 adj;
-
- if (ppb < 0) {
- neg_adj = 1;
- ppb = -ppb;
- }
- adj = ptp->cmult;
- adj *= ppb;
- diff = div_u64(adj, 1000000000ULL);
-
spin_lock_bh(&ptp->ptp_lock);
timecounter_read(&ptp->tc);
- ptp->cc.mult = neg_adj ? ptp->cmult - diff : ptp->cmult + diff;
+ ptp->cc.mult = adjust_by_scaled_ppm(ptp->cmult, scaled_ppm);
spin_unlock_bh(&ptp->ptp_lock);
} else {
+ s32 ppb = scaled_ppm_to_ppb(scaled_ppm);
+
rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_CFG);
if (rc)
return rc;
@@ -240,7 +230,7 @@ static int bnxt_ptp_adjfreq(struct ptp_clock_info *ptp_info, s32 ppb)
rc = hwrm_req_send(ptp->bp, req);
if (rc)
netdev_err(ptp->bp->dev,
- "ptp adjfreq failed. rc = %d\n", rc);
+ "ptp adjfine failed. rc = %d\n", rc);
}
return rc;
}
@@ -769,7 +759,7 @@ static const struct ptp_clock_info bnxt_ptp_caps = {
.n_per_out = 0,
.n_pins = 0,
.pps = 0,
- .adjfreq = bnxt_ptp_adjfreq,
+ .adjfine = bnxt_ptp_adjfine,
.adjtime = bnxt_ptp_adjtime,
.do_aux_work = bnxt_ptp_ts_aux_work,
.gettimex64 = bnxt_ptp_gettimex,
--
2.38.0.83.gd420dda05763
next prev parent reply other threads:[~2022-11-09 23:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 23:09 [PATCH net-next 0/9] ptp: convert remaining users of .adjfreq Jacob Keller
2022-11-09 23:09 ` [PATCH net-next 1/9] ptp_phc: convert .adjfreq to .adjfine Jacob Keller
2022-11-09 23:09 ` [PATCH net-next 2/9] ptp_ixp46x: " Jacob Keller
2022-11-10 8:14 ` Linus Walleij
2022-11-09 23:09 ` [PATCH net-next 3/9] ptp: tg3: " Jacob Keller
2022-11-10 5:23 ` Pavan Chebbi
2022-11-09 23:09 ` [PATCH net-next 4/9] ptp: hclge: " Jacob Keller
2022-11-09 23:09 ` [PATCH net-next 5/9] ptp: stmac: " Jacob Keller
2022-11-09 23:09 ` [PATCH net-next 6/9] ptp: cpts: " Jacob Keller
2022-11-09 23:09 ` Jacob Keller [this message]
2022-11-10 5:24 ` [PATCH net-next 7/9] ptp: bnxt: " Pavan Chebbi
2022-11-09 23:09 ` [PATCH net-next 8/9] ptp: convert remaining drivers to adjfine interface Jacob Keller
2022-11-09 23:09 ` [PATCH net-next 9/9] ptp: remove the .adjfreq interface function Jacob Keller
2022-11-11 12:00 ` [PATCH net-next 0/9] ptp: convert remaining users of .adjfreq patchwork-bot+netdevbpf
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=20221109230945.545440-8-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=michael.chan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.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).