From: christopher.s.hall@intel.com
To: intel-wired-lan@lists.osuosl.org
Cc: Christopher S M Hall <christopher.s.hall@intel.com>,
david.zage@intel.com, vinschen@redhat.com,
vinicius.gomes@intel.com, netdev@vger.kernel.org,
rodrigo.cadore@l-acoustics.com
Subject: [Intel-wired-lan] [PATCH iwl-net v1 3/5] igc: Move ktime snapshot into PTM retry loop
Date: Tue, 6 Aug 2024 17:30:30 -0700 [thread overview]
Message-ID: <20240807003032.10300-4-christopher.s.hall@intel.com> (raw)
In-Reply-To: <20240807003032.10300-1-christopher.s.hall@intel.com>
From: Christopher S M Hall <christopher.s.hall@intel.com>
Move ktime_get_snapshot() into the loop. If a retry does occur, a more
recent snapshot will result in a more accurate cross-timestamp.
Fixes: a90ec8483732 ("igc: Add support for PTP getcrosststamp()")
Signed-off-by: Christopher S M Hall <christopher.s.hall@intel.com>
---
drivers/net/ethernet/intel/igc/igc_ptp.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 00cc80d8d164..fb885fcaa97c 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -1011,16 +1011,16 @@ static int igc_phc_get_syncdevicetime(ktime_t *device,
int err, count = 100;
ktime_t t1, t2_curr;
- /* Get a snapshot of system clocks to use as historic value. */
- ktime_get_snapshot(&adapter->snapshot);
-
+ /* Doing this in a loop because in the event of a
+ * badly timed (ha!) system clock adjustment, we may
+ * get PTM errors from the PCI root, but these errors
+ * are transitory. Repeating the process returns valid
+ * data eventually.
+ */
do {
- /* Doing this in a loop because in the event of a
- * badly timed (ha!) system clock adjustment, we may
- * get PTM errors from the PCI root, but these errors
- * are transitory. Repeating the process returns valid
- * data eventually.
- */
+ /* Get a snapshot of system clocks to use as historic value. */
+ ktime_get_snapshot(&adapter->snapshot);
+
igc_ptm_trigger(hw);
err = readx_poll_timeout(rd32, IGC_PTM_STAT, stat,
--
2.34.1
next prev parent reply other threads:[~2024-08-07 0:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-07 0:30 [Intel-wired-lan] [PATCH iwl-net v1 0/5] igc: PTM timeout fix christopher.s.hall
2024-08-07 0:30 ` [Intel-wired-lan] [PATCH iwl-net v1 1/5] igc: Ensure the PTM cycle is reliably triggered christopher.s.hall
2024-08-07 5:05 ` Paul Menzel
2024-08-07 16:15 ` Corinna Vinschen
2024-08-07 20:27 ` Hall, Christopher S
2024-08-08 14:50 ` Corinna Vinschen
2024-08-07 0:30 ` [Intel-wired-lan] [PATCH iwl-net v1 2/5] igc: Lengthen the hardware retry time to prevent timeouts christopher.s.hall
2024-08-08 14:54 ` Corinna Vinschen
2024-08-07 0:30 ` christopher.s.hall [this message]
2024-08-08 14:54 ` [Intel-wired-lan] [PATCH iwl-net v1 3/5] igc: Move ktime snapshot into PTM retry loop Corinna Vinschen
2024-08-07 0:30 ` [Intel-wired-lan] [PATCH iwl-net v1 4/5] igc: Reduce retry count to a more reasonable number christopher.s.hall
2024-08-07 5:28 ` Paul Menzel
2024-08-07 0:30 ` [Intel-wired-lan] [PATCH iwl-net v1 5/5] igc: Add lock preventing multiple simultaneous PTM transactions christopher.s.hall
2024-08-08 15:17 ` Corinna Vinschen
2024-10-11 9:25 ` [Intel-wired-lan] [PATCH iwl-net v1 0/5] igc: PTM timeout fix Corinna Vinschen
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=20240807003032.10300-4-christopher.s.hall@intel.com \
--to=christopher.s.hall@intel.com \
--cc=david.zage@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=netdev@vger.kernel.org \
--cc=rodrigo.cadore@l-acoustics.com \
--cc=vinicius.gomes@intel.com \
--cc=vinschen@redhat.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