Skip to content

Commit 22bf4bd

Browse files
Luo Jiekuba-moo
authored andcommitted
net: phy: qcom: Add PHY counter support
Add PHY counter functionality to the shared library. The implementation is identical for the current QCA807X and QCA808X PHYs. The PHY counter can be configured to perform CRC checking for both received and transmitted packets. Additionally, the packet counter can be set to automatically clear after it is read. The PHY counter includes 32-bit packet counters for both RX (received) and TX (transmitted) packets, as well as 16-bit counters for recording CRC error packets for both RX and TX. Signed-off-by: Luo Jie <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent a93f38e commit 22bf4bd

File tree

2 files changed

+98
-0
lines changed

2 files changed

+98
-0
lines changed

drivers/net/phy/qcom/qcom-phy-lib.c

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,3 +699,78 @@ int qca808x_led_reg_blink_set(struct phy_device *phydev, u16 reg,
699699
return 0;
700700
}
701701
EXPORT_SYMBOL_GPL(qca808x_led_reg_blink_set);
702+
703+
/* Enable CRC checking for both received and transmitted frames to ensure
704+
* accurate counter recording. The hardware supports a 32-bit counter,
705+
* configure the counter to clear after it is read to facilitate the
706+
* implementation of a 64-bit software counter
707+
*/
708+
int qcom_phy_counter_config(struct phy_device *phydev)
709+
{
710+
return phy_set_bits_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_CTRL,
711+
QCA808X_MMD7_CNT_CTRL_CRC_CHECK_EN |
712+
QCA808X_MMD7_CNT_CTRL_READ_CLEAR_EN);
713+
}
714+
EXPORT_SYMBOL_GPL(qcom_phy_counter_config);
715+
716+
int qcom_phy_update_stats(struct phy_device *phydev,
717+
struct qcom_phy_hw_stats *hw_stats)
718+
{
719+
int ret;
720+
u32 cnt;
721+
722+
/* PHY 32-bit counter for RX packets. */
723+
ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_RX_PKT_15_0);
724+
if (ret < 0)
725+
return ret;
726+
727+
cnt = ret;
728+
729+
ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_RX_PKT_31_16);
730+
if (ret < 0)
731+
return ret;
732+
733+
cnt |= ret << 16;
734+
hw_stats->rx_pkts += cnt;
735+
736+
/* PHY 16-bit counter for RX CRC error packets. */
737+
ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_RX_ERR_PKT);
738+
if (ret < 0)
739+
return ret;
740+
741+
hw_stats->rx_err_pkts += ret;
742+
743+
/* PHY 32-bit counter for TX packets. */
744+
ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_TX_PKT_15_0);
745+
if (ret < 0)
746+
return ret;
747+
748+
cnt = ret;
749+
750+
ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_TX_PKT_31_16);
751+
if (ret < 0)
752+
return ret;
753+
754+
cnt |= ret << 16;
755+
hw_stats->tx_pkts += cnt;
756+
757+
/* PHY 16-bit counter for TX CRC error packets. */
758+
ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_CNT_TX_ERR_PKT);
759+
if (ret < 0)
760+
return ret;
761+
762+
hw_stats->tx_err_pkts += ret;
763+
764+
return 0;
765+
}
766+
EXPORT_SYMBOL_GPL(qcom_phy_update_stats);
767+
768+
void qcom_phy_get_stats(struct ethtool_phy_stats *stats,
769+
struct qcom_phy_hw_stats hw_stats)
770+
{
771+
stats->tx_packets = hw_stats.tx_pkts;
772+
stats->tx_errors = hw_stats.tx_err_pkts;
773+
stats->rx_packets = hw_stats.rx_pkts;
774+
stats->rx_errors = hw_stats.rx_err_pkts;
775+
}
776+
EXPORT_SYMBOL_GPL(qcom_phy_get_stats);

drivers/net/phy/qcom/qcom.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,17 @@
195195
#define AT803X_MIN_DOWNSHIFT 2
196196
#define AT803X_MAX_DOWNSHIFT 9
197197

198+
#define QCA808X_MMD7_CNT_CTRL 0x8029
199+
#define QCA808X_MMD7_CNT_CTRL_READ_CLEAR_EN BIT(1)
200+
#define QCA808X_MMD7_CNT_CTRL_CRC_CHECK_EN BIT(0)
201+
202+
#define QCA808X_MMD7_CNT_RX_PKT_31_16 0x802a
203+
#define QCA808X_MMD7_CNT_RX_PKT_15_0 0x802b
204+
#define QCA808X_MMD7_CNT_RX_ERR_PKT 0x802c
205+
#define QCA808X_MMD7_CNT_TX_PKT_31_16 0x802d
206+
#define QCA808X_MMD7_CNT_TX_PKT_15_0 0x802e
207+
#define QCA808X_MMD7_CNT_TX_ERR_PKT 0x802f
208+
198209
enum stat_access_type {
199210
PHY,
200211
MMD
@@ -212,6 +223,13 @@ struct at803x_ss_mask {
212223
u8 speed_shift;
213224
};
214225

226+
struct qcom_phy_hw_stats {
227+
u64 rx_pkts;
228+
u64 rx_err_pkts;
229+
u64 tx_pkts;
230+
u64 tx_err_pkts;
231+
};
232+
215233
int at803x_debug_reg_read(struct phy_device *phydev, u16 reg);
216234
int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
217235
u16 clear, u16 set);
@@ -246,3 +264,8 @@ int qca808x_led_reg_brightness_set(struct phy_device *phydev,
246264
int qca808x_led_reg_blink_set(struct phy_device *phydev, u16 reg,
247265
unsigned long *delay_on,
248266
unsigned long *delay_off);
267+
int qcom_phy_counter_config(struct phy_device *phydev);
268+
int qcom_phy_update_stats(struct phy_device *phydev,
269+
struct qcom_phy_hw_stats *hw_stats);
270+
void qcom_phy_get_stats(struct ethtool_phy_stats *stats,
271+
struct qcom_phy_hw_stats hw_stats);

0 commit comments

Comments
 (0)