ice: PTP: cleanups for ice_ptp_hw.c
Subsystems (2)
v2 cover ice: PTP: cleanups for ice_ptp_hw.c
This series from Karol refactors a few minor issues in ice_ptp_hw.c around timestamp register access and macro names.
Changes since v1:
* Fixed some typos
* Dropped patch 4 as an equivalent or better fix will go through net
Karol Kolacinski (3):
ice: PTP: Clean up timestamp registers correctly
ice: PTP: Rename macros used for PHY/QUAD port definitions
ice: PTP: move quad value check inside ice_fill_phy_msg_e822
drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 97 +++++++++++++-------- drivers/net/ethernet/intel/ice/ice_type.h | 14 +-- 2 files changed, 68 insertions(+), 43 deletions(-)
base-commit: adfc2495f825bd31c514db14fd5b05bd2985fff7
Signature · 6 lines
2.41.0.1.g9857a21e0017.dirty _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH v2 1/3 ice: PTP: Clean up timestamp registers correctly
From: Karol Kolacinski <[email protected]>
E822 PHY TS registers should not be written and the only way to clean up them is to reset QUAD memory.
To ensure that the status bit for the timestamp index is cleared, ensure that ice_clear_phy_tstamp implementations first read the timestamp out. Implementations which can write the register continue to do so.
Add a note to indicate this function should only be called on timestamps which have their valid bit set. Update the dynamic debug messages to reflect the actual action taken.
--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 70 +++++++++++++-------- 1 file changed, 45 insertions(+), 25 deletions(-)
drivers/net/ethernet/intel/ice/ice_ptp_hw.c +45 -25
@@ -628,29 +628,32 @@ ice_read_phy_tstamp_e822(struct ice_hw *hw, u8 quad, u8 idx, u64 *tstamp)* @quad: the quad to read from * @idx: the timestamp index to reset * -* Clear a timestamp, resetting its valid bit, from the PHY quad block that is -* shared between the internal PHYs on the E822 devices. +* Read the timestamp out of the quad to clear its timestamp status bit from +* the PHY quad block that is shared between the internal PHYs of the E822 +* devices. +* +* Note that unlike E810, software cannot directly write to the quad memory +* bank registers. E822 relies on the ice_get_phy_tx_tstamp_ready() function +* to determine which timestamps are valid. Reading a timestamp auto-clears +* the valid bit. +* +* To directly clear the contents of the timestamp block entirely, discarding +* all timestamp data at once, software should instead use +* ice_ptp_reset_ts_memory_quad_e822(). +* +* This function should only be called on an idx whose bit is set according to +* ice_get_phy_tx_tstamp_ready(). */ static int ice_clear_phy_tstamp_e822 (struct ice_hw *hw,u8 quad,u8 idx) { -u16 lo_addr, hi_addr; +u64 unused_tstamp;int err; - lo_addr = (u16 )TS_L (Q_REG_TX_MEMORY_BANK_START , idx); - hi_addr = (u16 )TS_H (Q_REG_TX_MEMORY_BANK_START , idx); - - err =ice_write_quad_reg_e822 (hw, quad, lo_addr,0 ); + err =ice_read_phy_tstamp_e822 (hw, quad, idx, &unused_tstamp);if (err) { -ice_debug (hw,ICE_DBG_PTP ,"Failed to clear low PTP timestamp register, err %d\n" , - err); -return err; - } - - err =ice_write_quad_reg_e822 (hw, quad, hi_addr,0 ); -if (err) { -ice_debug (hw,ICE_DBG_PTP ,"Failed to clear high PTP timestamp register, err %d\n" , - err); +ice_debug (hw,ICE_DBG_PTP ,"Failed to read the timestamp register for quad %u, idx %u, err %d\n" , + quad, idx, err);return err; }
@@ -2685,28 +2688,39 @@ ice_read_phy_tstamp_e810(struct ice_hw *hw, u8 lport, u8 idx, u64 *tstamp)* @lport: the lport to read from * @idx: the timestamp index to reset * -* Clear a timestamp, resetting its valid bit, from the timestamp block of the -* external PHY on the E810 device. +* Read the timestamp and then forcibly overwrite its value to clear the valid +* bit from the timestamp block of the external PHY on the E810 device. +* +* This function should only be called on an idx whose bit is set according to +* ice_get_phy_tx_tstamp_ready(). */ static int ice_clear_phy_tstamp_e810 (struct ice_hw *hw,u8 lport,u8 idx) {u32 lo_addr, hi_addr; +u64 unused_tstamp;int err; + err =ice_read_phy_tstamp_e810 (hw, lport, idx, &unused_tstamp); +if (err) { +ice_debug (hw,ICE_DBG_PTP ,"Failed to read the timestamp register for lport %u, idx %u, err %d\n" , + lport, idx, err); +return err; + } + lo_addr =TS_EXT (LOW_TX_MEMORY_BANK_START , lport, idx); hi_addr =TS_EXT (HIGH_TX_MEMORY_BANK_START , lport, idx); err =ice_write_phy_reg_e810 (hw, lo_addr,0 );if (err) { -ice_debug (hw,ICE_DBG_PTP ,"Failed to clear low PTP timestamp register, err %d\n" , - err); +ice_debug (hw,ICE_DBG_PTP ,"Failed to clear low PTP timestamp register for lport %u, idx %u, err %d\n" , + lport, idx, err);return err; } err =ice_write_phy_reg_e810 (hw, hi_addr,0 );if (err) { -ice_debug (hw,ICE_DBG_PTP ,"Failed to clear high PTP timestamp register, err %d\n" , - err); +ice_debug (hw,ICE_DBG_PTP ,"Failed to clear high PTP timestamp register for lport %u, idx %u, err %d\n" , + lport, idx, err);return err; }
@@ -3407,9 +3421,15 @@ int ice_read_phy_tstamp(struct ice_hw *hw, u8 block, u8 idx, u64 *tstamp)* @block: the block to read from * @idx: the timestamp index to reset * -* Clear a timestamp, resetting its valid bit, from the timestamp block. For -* E822 devices, the block is the quad to clear from. For E810 devices, the -* block is the logical port to clear from. +* Clear a timestamp from the timestamp block, discarding its value without +* returning it. This resets the memory status bit for the timestamp index +* allowing it to be reused for another timestamp in the future. +* +* For E822 devices, the block number is the PHY quad to clear from. For E810 +* devices, the block number is the logical port to clear from. +* +* This function must only be called on a timestamp index whose valid bit is +* set according to ice_get_phy_tx_tstamp_ready(). */ int ice_clear_phy_tstamp (struct ice_hw *hw,u8 block,u8 idx) {
Signature · 6 lines
2.41.0.1.g9857a21e0017.dirty _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Re: [Intel-wired-lan] [PATCH iwl-next v2 1/3] ice: PTP: Clean up timestamp registers correctly
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Jacob Keller
Sent: Wednesday, July 26, 2023 11:58 PM
To: Intel Wired LAN <[email protected]>
Cc: Paul Menzel <[email protected]>; Kolacinski, Karol <[email protected]>; Nguyen, Anthony L <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-next v2 1/3] ice: PTP: Clean up timestamp registers correctlyFrom: Karol Kolacinski <[email protected]>
E822 PHY TS registers should not be written and the only way to clean up them is to reset QUAD memory.
To ensure that the status bit for the timestamp index is cleared, ensure that
ice_clear_phy_tstampimplementations first read the timestamp out. Implementations which can write the register continue to do so.Add a note to indicate this function should only be called on timestamps which have their valid bit set. Update the dynamic debug messages to reflect the actual action taken.
Quoted 6 lines
Signed-off-by Karol Kolacinski <[email protected]>Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 70 +++++++++++++-------- 1 file changed, 45 insertions(+), 25 deletions(-)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH v2 2/3 ice: PTP: Rename macros used for PHY/QUAD port definitions
In reply to Jacob KellerFrom: Karol Kolacinski <[email protected]>
The ice_fill_phy_msg_e822 function uses several macros to specify the correct address when sending a sideband message to the PHY block in hardware.
The names of these macros are fairly generic and confusing. Future development is going to extend the driver to support new hardware families which have different relationships between PHY and QUAD. Rename the macros for clarity and to indicate that they are E822 specific. This also matches closer to the hardware specification in the data sheet.
--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 8 ++++---- drivers/net/ethernet/intel/ice/ice_type.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/ice/ice_ptp_hw.c +4 -4
@@ -168,9 +168,9 @@ ice_fill_phy_msg_e822(struct ice_sbq_msg_input *msg, u8 port, u16 offset) {int phy_port, phy, quadtype; - phy_port = port %ICE_PORTS_PER_PHY ; - phy = port /ICE_PORTS_PER_PHY ; - quadtype = (port /ICE_PORTS_PER_QUAD ) %ICE_NUM_QUAD_TYPE ; + phy_port = port %ICE_PORTS_PER_PHY_E822 ; + phy = port /ICE_PORTS_PER_PHY_E822 ; + quadtype = (port /ICE_PORTS_PER_QUAD ) %ICE_QUADS_PER_PHY_E822 ;if (quadtype ==0 ) { msg->msg_addr_low =P_Q0_L (P_0_BASE + offset, phy_port);
@@ -502,7 +502,7 @@ ice_fill_quad_msg_e822(struct ice_sbq_msg_input *msg, u8 quad, u16 offset) msg->dest_dev = rmn_0; -if ((quad %ICE_NUM_QUAD_TYPE ) ==0 ) +if ((quad %ICE_QUADS_PER_PHY_E822 ) ==0 ) addr =Q_0_BASE + offset;else addr =Q_1_BASE + offset;
drivers/net/ethernet/intel/ice/ice_type.h +7 -7
@@ -909,13 +909,13 @@ struct ice_hw {/* INTRL granularity in 1 us */ u8 intrl_gran; -#define ICE_PHY_PER_NAC 1 -#define ICE_MAX_QUAD 2 -#define ICE_NUM_QUAD_TYPE 2 -#define ICE_PORTS_PER_QUAD 4 -#define ICE_PHY_0_LAST_QUAD 1 -#define ICE_PORTS_PER_PHY 8 -#define ICE_NUM_EXTERNAL_PORTS ICE_PORTS_PER_PHY +#define ICE_PHY_PER_NAC_E822 1 +#define ICE_MAX_QUAD 2 +#define ICE_QUADS_PER_PHY_E822 2 +#define ICE_PORTS_PER_PHY_E822 8 +#define ICE_PORTS_PER_QUAD 4 +#define ICE_PORTS_PER_PHY_E810 4 +#define ICE_NUM_EXTERNAL_PORTS (ICE_MAX_QUAD * ICE_PORTS_PER_QUAD)/* Active package version (currently active) */ struct ice_pkg_ver active_pkg_ver;
Signature · 6 lines
2.41.0.1.g9857a21e0017.dirty _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Re: [Intel-wired-lan] [PATCH iwl-next v2 2/3] ice: PTP: Rename macros used for PHY/QUAD port definitions
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Jacob Keller
Sent: Wednesday, July 26, 2023 11:58 PM
To: Intel Wired LAN <[email protected]>
Cc: Paul Menzel <[email protected]>; Kolacinski, Karol <[email protected]>; Nguyen, Anthony L <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-next v2 2/3] ice: PTP: Rename macros used for PHY/QUAD port definitionsFrom: Karol Kolacinski <[email protected]>
The
ice_fill_phy_msg_e822function uses several macros to specify the correct address when sending a sideband message to the PHY block in hardware.The names of these macros are fairly generic and confusing. Future development is going to extend the driver to support new hardware families which have different relationships between PHY and QUAD. Rename the macros for clarity and to indicate that they are E822 specific. This also matches closer to the hardware specification in the data sheet.
Quoted 6 lines
Signed-off-by Karol Kolacinski <[email protected]>Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 8 ++++---- drivers/net/ethernet/intel/ice/ice_type.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH v2 3/3 ice: PTP: move quad value check inside ice_fill_phy_msg_e822
In reply to Jacob KellerFrom: Karol Kolacinski <[email protected]>
The callers of ice_fill_phy_msg_e822 check for whether the quad number is within the expected range. Move this check inside the ice_fill_phy_msg_e822 function instead of duplicating it twice.
--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ice/ice_ptp_hw.c +12 -7
@@ -495,11 +495,14 @@ ice_write_64b_phy_reg_e822(struct ice_hw *hw, u8 port, u16 low_addr, u64 val)* Fill a message buffer for accessing a register in a quad shared between * multiple PHYs. */ -static void +static int ice_fill_quad_msg_e822 (struct ice_sbq_msg_input *msg,u8 quad,u16 offset) {u32 addr; +if (quad >=ICE_MAX_QUAD ) +return -EINVAL ; + msg->dest_dev = rmn_0;if ((quad %ICE_QUADS_PER_PHY_E822 ) ==0 )
@@ -509,6 +512,8 @@ ice_fill_quad_msg_e822(struct ice_sbq_msg_input *msg, u8 quad, u16 offset) msg->msg_addr_low =lower_16_bits (addr); msg->msg_addr_high =upper_16_bits (addr); + +return 0 ; }/**
@@ -527,10 +532,10 @@ ice_read_quad_reg_e822(struct ice_hw *hw, u8 quad, u16 offset, u32 *val)struct ice_sbq_msg_input msg = {0 };int err; -if (quad >=ICE_MAX_QUAD ) -return -EINVAL ; + err =ice_fill_quad_msg_e822 (&msg, quad, offset); +if (err) +return err; -ice_fill_quad_msg_e822 (&msg, quad, offset); msg.opcode = ice_sbq_msg_rd; err =ice_sbq_rw_reg (hw, &msg);
@@ -561,10 +566,10 @@ ice_write_quad_reg_e822(struct ice_hw *hw, u8 quad, u16 offset, u32 val)struct ice_sbq_msg_input msg = {0 };int err; -if (quad >=ICE_MAX_QUAD ) -return -EINVAL ; + err =ice_fill_quad_msg_e822 (&msg, quad, offset); +if (err) +return err; -ice_fill_quad_msg_e822 (&msg, quad, offset); msg.opcode = ice_sbq_msg_wr; msg.data = val;
Signature · 6 lines
2.41.0.1.g9857a21e0017.dirty _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Re: [Intel-wired-lan] [PATCH iwl-next v2 3/3] ice: PTP: move quad value check inside ice_fill_phy_msg_e822
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Jacob Keller
Sent: Wednesday, July 26, 2023 11:58 PM
To: Intel Wired LAN <[email protected]>
Cc: Paul Menzel <[email protected]>; Kolacinski, Karol <[email protected]>; Nguyen, Anthony L <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-next v2 3/3] ice: PTP: move quad value check insideice_fill_phy_msg_e822From: Karol Kolacinski <[email protected]>
The callers of
ice_fill_phy_msg_e822check for whether the quad number is within the expected range. Move this check inside theice_fill_phy_msg_e822function instead of duplicating it twice.
Quoted 6 lines
Signed-off-by Karol Kolacinski <[email protected]>Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan