From: Karol Kolacinski <karol.kolacinski@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org,
Karol Kolacinski <karol.kolacinski@intel.com>,
anthony.l.nguyen@intel.com, jesse.brandeburg@intel.com
Subject: [Intel-wired-lan] [PATCH v4 iwl-next 06/11] ice: rename ice_ptp_tx_cfg_intr
Date: Tue, 29 Aug 2023 12:40:36 +0200 [thread overview]
Message-ID: <20230829104041.64131-7-karol.kolacinski@intel.com> (raw)
In-Reply-To: <20230829104041.64131-1-karol.kolacinski@intel.com>
From: Jacob Keller <jacob.e.keller@intel.com>
The ice_ptp_tx_cfg_intr() function sends a control queue message to
configure the PHY timestamp interrupt block. This is a very similar name
to a function which is used to configure the MAC Other Interrupt Cause
Enable register.
Rename this function to ice_ptp_cfg_phy_interrupt in order to make it
more obvious to the reader what action it performs, and distinguish it
from other similarly named functions.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
---
drivers/net/ethernet/intel/ice/ice_ptp.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 2899fc7f8deb..16491c2d036f 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -1341,14 +1341,14 @@ void ice_ptp_link_change(struct ice_pf *pf, u8 port, bool linkup)
}
/**
- * ice_ptp_tx_ena_intr - Enable or disable the Tx timestamp interrupt
+ * ice_ptp_cfg_phy_interrupt - Configure PHY interrupt settings
* @pf: PF private structure
* @ena: bool value to enable or disable interrupt
* @threshold: Minimum number of packets at which intr is triggered
*
* Utility function to enable or disable Tx timestamp interrupt and threshold
*/
-static int ice_ptp_tx_ena_intr(struct ice_pf *pf, bool ena, u32 threshold)
+static int ice_ptp_cfg_phy_interrupt(struct ice_pf *pf, bool ena, u32 threshold)
{
struct ice_hw *hw = &pf->hw;
int err = 0;
@@ -2510,8 +2510,8 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
struct ice_ptp *ptp = &pf->ptp;
struct ice_hw *hw = &pf->hw;
struct timespec64 ts;
- int err, itr = 1;
u64 time_diff;
+ int err;
if (ptp->state != ICE_PTP_RESETTING) {
if (ptp->state == ICE_PTP_READY) {
@@ -2564,7 +2564,7 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
if (!ice_is_e810(hw)) {
/* Enable quad interrupts */
- err = ice_ptp_tx_ena_intr(pf, true, itr);
+ err = ice_ptp_cfg_phy_interrupt(pf, true, 1);
if (err)
goto err;
}
@@ -2813,7 +2813,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
{
struct ice_hw *hw = &pf->hw;
struct timespec64 ts;
- int err, itr = 1;
+ int err;
err = ice_ptp_init_phc(hw);
if (err) {
@@ -2856,7 +2856,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
wr32(hw, PFINT_TSYN_MSK + (0x4 * hw->pf_id), (u32)0x1f);
/* Enable quad interrupts */
- err = ice_ptp_tx_ena_intr(pf, true, itr);
+ err = ice_ptp_cfg_phy_interrupt(pf, true, 1);
if (err)
goto err_exit;
}
--
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-29 10:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 10:40 [Intel-wired-lan] [PATCH v4 iwl-next 00/11] ice: fix timestamping in reset process Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 01/11] ice: use ice_pf_src_tmr_owned where available Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 02/11] ice: introduce PTP state machine Karol Kolacinski
2023-08-29 12:54 ` kernel test robot
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 03/11] ice: pass reset type to PTP reset functions Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 04/11] ice: rename verify_cached to has_ready_bitmap Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 05/11] ice: rename ice_ptp_configure_tx_tstamp Karol Kolacinski
2023-08-29 10:40 ` Karol Kolacinski [this message]
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 07/11] ice: factor out ice_ptp_rebuild_owner() Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 08/11] ice: remove ptp_tx ring parameter flag Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 09/11] ice: modify tstamp_config only during TS mode set Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 10/11] ice: restore timestamp configuration after reset Karol Kolacinski
2023-08-29 10:40 ` [Intel-wired-lan] [PATCH v4 iwl-next 11/11] ice: stop destroying and reinitalizing Tx tracker during reset Karol Kolacinski
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=20230829104041.64131-7-karol.kolacinski@intel.com \
--to=karol.kolacinski@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.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