From: Karol Kolacinski <karol.kolacinski@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: Karol Kolacinski <karol.kolacinski@intel.com>
Subject: [Intel-wired-lan] [PATCH 1/9] ice: use ice_pf_src_tmr_owned where available
Date: Mon, 7 Aug 2023 12:36:16 +0200 [thread overview]
Message-ID: <20230807103624.468230-2-karol.kolacinski@intel.com> (raw)
In-Reply-To: <20230807103624.468230-1-karol.kolacinski@intel.com>
The ice_pf_src_tmr_owned() macro exists to check the function capability
bit indicating if the current function owns the PTP hardware clock.
This is slightly shorter than the more verbose access via
hw.func_caps.ts_func_info.src_tmr_owned. Be consistent and use this
where possible rather than open coding its equivalent.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---
drivers/net/ethernet/intel/ice/ice_main.c | 2 +-
drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index a73895483e6c..1ac37a3f8de5 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3158,7 +3158,7 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)
ena_mask &= ~PFINT_OICR_TSYN_EVNT_M;
- if (hw->func_caps.ts_func_info.src_tmr_owned) {
+ if (ice_pf_src_tmr_owned(pf)) {
/* Save EVENTs from GLTSYN register */
pf->ptp.ext_ts_irq |= gltsyn_stat &
(GLTSYN_STAT_EVENT0_M |
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 97b8581ae931..0669ca905c46 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -2447,7 +2447,7 @@ void ice_ptp_reset(struct ice_pf *pf)
if (test_bit(ICE_PFR_REQ, pf->state))
goto pfr;
- if (!hw->func_caps.ts_func_info.src_tmr_owned)
+ if (!ice_pf_src_tmr_owned(pf))
goto reset_ts;
err = ice_ptp_init_phc(hw);
--
2.39.2
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
next prev parent reply other threads:[~2023-08-07 10:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 10:36 [Intel-wired-lan] [PATCH 0/9] ice: fix timestamping in reset process Karol Kolacinski
2023-08-07 10:36 ` Karol Kolacinski [this message]
2023-08-07 10:59 ` [Intel-wired-lan] [PATCH 1/9] ice: use ice_pf_src_tmr_owned where available Przemek Kitszel
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 2/9] ice: introduce PTP state machine Karol Kolacinski
2023-08-07 11:12 ` Przemek Kitszel
2023-08-07 17:32 ` Jacob Keller
2023-08-08 8:47 ` Przemek Kitszel
2023-08-17 14:04 ` Kolacinski, Karol
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 3/9] ice: pass reset type to PTP reset functions Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 4/9] ice: rename PTP functions and fields Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 5/9] ice: factor out ice_ptp_rebuild_owner() Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 6/9] ice: remove ptp_tx ring parameter flag Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 7/9] ice: modify tstamp_config only during TS mode set Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 8/9] ice: restore timestamp configuration after reset Karol Kolacinski
2023-10-27 23:50 ` Jacob Keller
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 9/9] ice: stop destroying and reinitalizing Tx tracker during reset Karol Kolacinski
2023-08-07 12:20 ` Przemek Kitszel
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=20230807103624.468230-2-karol.kolacinski@intel.com \
--to=karol.kolacinski@intel.com \
--cc=intel-wired-lan@lists.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox