Intel-Wired-Lan Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Christopher S M Hall <christopher.s.hall@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: david.zage@intel.com, vinicius.gomes@intel.com,
	netdev@vger.kernel.org, rodrigo.cadore@l-acoustics.com,
	vinschen@redhat.com,
	Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,
	Mor Bar-Gabay <morx.bar.gabay@intel.com>,
	Avigail Dahan <avigailx.dahan@intel.com>
Subject: [Intel-wired-lan] [PATCH iwl-net v3 3/6] igc: Move ktime snapshot into PTM retry loop
Date: Wed,  6 Nov 2024 18:47:19 +0000	[thread overview]
Message-ID: <20241106184722.17230-4-christopher.s.hall@intel.com> (raw)
In-Reply-To: <20241106184722.17230-1-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()")
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Mor Bar-Gabay <morx.bar.gabay@intel.com>
Tested-by: Avigail Dahan <avigailx.dahan@intel.com>
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 c640e346342b..516abe7405de 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


  parent reply	other threads:[~2024-11-06 18:58 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-06 18:47 [Intel-wired-lan] [PATCH iwl-net v3 0/6] igc: Fix PTM timeout Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 1/6] igc: Ensure the PTM cycle is reliably triggered Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 2/6] igc: Lengthen the hardware retry time to prevent timeouts Christopher S M Hall
2024-11-06 23:13   ` Paul Menzel
2024-11-06 23:53     ` Hall, Christopher S
2024-11-07  5:48       ` Paul Menzel
2024-11-07  5:56         ` Paul Menzel
2024-11-06 18:47 ` Christopher S M Hall [this message]
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 4/6] igc: Handle the IGC_PTP_ENABLED flag correctly Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 5/6] igc: Cleanup PTP module if probe fails Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 6/6] igc: Add lock preventing multiple simultaneous PTM transactions Christopher S M Hall
2024-11-12 15:39 ` [Intel-wired-lan] [PATCH iwl-net v3 0/6] igc: Fix PTM timeout Corinna Vinschen
2025-01-08 11:10 ` 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=20241106184722.17230-4-christopher.s.hall@intel.com \
    --to=christopher.s.hall@intel.com \
    --cc=avigailx.dahan@intel.com \
    --cc=david.zage@intel.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=michal.swiatkowski@linux.intel.com \
    --cc=morx.bar.gabay@intel.com \
    --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