From: Andre Guedes <andre.guedes@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH 2/4] igc: Don't reschedule ptp_tx work
Date: Tue, 28 Jul 2020 16:37:52 -0700 [thread overview]
Message-ID: <20200728233754.65747-3-andre.guedes@intel.com> (raw)
In-Reply-To: <20200728233754.65747-1-andre.guedes@intel.com>
The ptp_tx work is scheduled only if TSICR.TXTS bit is set, therefore
TSYNCTXCTL.TXTT_0 bit is expected to be set when we check it igc_ptp_tx_
work(). If it isn't, something is really off and rescheduling the ptp_tx
work to check it later doesn't help much. This patch changes the code to
WARN_ON_ONCE() if this situation ever happens.
Signed-off-by: Andre Guedes <andre.guedes@intel.com>
---
drivers/net/ethernet/intel/igc/igc_ptp.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 79802fb4ea83..b912830ea7bb 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -410,11 +410,10 @@ static void igc_ptp_tx_work(struct work_struct *work)
}
tsynctxctl = rd32(IGC_TSYNCTXCTL);
- if (tsynctxctl & IGC_TSYNCTXCTL_TXTT_0)
- igc_ptp_tx_hwtstamp(adapter);
- else
- /* reschedule to check later */
- schedule_work(&adapter->ptp_tx_work);
+ if (WARN_ON_ONCE(!(tsynctxctl & IGC_TSYNCTXCTL_TXTT_0)))
+ return;
+
+ igc_ptp_tx_hwtstamp(adapter);
}
/**
--
2.26.2
next prev parent reply other threads:[~2020-07-28 23:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 23:37 [Intel-wired-lan] [PATCH 0/4] igc: PTP tx fixes Andre Guedes
2020-07-28 23:37 ` [Intel-wired-lan] [PATCH 1/4] igc: Rename IGC_TSYNCTXCTL_VALID macro Andre Guedes
2020-08-14 3:07 ` Brown, Aaron F
2020-07-28 23:37 ` Andre Guedes [this message]
2020-08-14 3:08 ` [Intel-wired-lan] [PATCH 2/4] igc: Don't reschedule ptp_tx work Brown, Aaron F
2020-07-28 23:37 ` [Intel-wired-lan] [PATCH 3/4] igc: Remove timeout check from " Andre Guedes
2020-08-14 3:09 ` Brown, Aaron F
2020-07-28 23:37 ` [Intel-wired-lan] [PATCH 4/4] igc: Fix race condition in PTP tx code Andre Guedes
2020-08-14 3:09 ` Brown, Aaron F
2020-08-22 1:24 ` Andre Guedes
2020-08-24 18:07 ` Nguyen, Anthony L
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=20200728233754.65747-3-andre.guedes@intel.com \
--to=andre.guedes@intel.com \
--cc=intel-wired-lan@osuosl.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.