Skip to content

L
linux
Commit ee112c12 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files
Options

stmmac: fix PTP type ethtool stats 

This patch fixes the ethtool stats for PTP frames; previous
version does not take care about some message types: i.e.
announce, management and signaling. It also provided a
broken statistic in case of "No PTP message received".
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Acked-by: default avatarRayagond Kokatanur <rayagond@vayavyalabs.com>
Acked-by: default avatarAlexandre TORGUE <alexandre.torgue@st.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba1ffd74
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 44 deletions
drivers/net/ethernet/stmicro/stmmac/common.h
View file @ ee112c12
...@@ -120,14 +120,17 @@ struct stmmac_extra_stats { ...@@ -120,14 +120,17 @@ struct stmmac_extra_stats {
unsigned long ip_csum_bypassed; unsigned long ip_csum_bypassed;
unsigned long ipv4_pkt_rcvd; unsigned long ipv4_pkt_rcvd;
unsigned long ipv6_pkt_rcvd; unsigned long ipv6_pkt_rcvd;
unsigned long rx_msg_type_ext_no_ptp; unsigned long no_ptp_rx_msg_type_ext;
unsigned long rx_msg_type_sync; unsigned long ptp_rx_msg_type_sync;
unsigned long rx_msg_type_follow_up; unsigned long ptp_rx_msg_type_follow_up;
unsigned long rx_msg_type_delay_req; unsigned long ptp_rx_msg_type_delay_req;
unsigned long rx_msg_type_delay_resp; unsigned long ptp_rx_msg_type_delay_resp;
unsigned long rx_msg_type_pdelay_req; unsigned long ptp_rx_msg_type_pdelay_req;
unsigned long rx_msg_type_pdelay_resp; unsigned long ptp_rx_msg_type_pdelay_resp;
unsigned long rx_msg_type_pdelay_follow_up; unsigned long ptp_rx_msg_type_pdelay_follow_up;
unsigned long ptp_rx_msg_type_announce;
unsigned long ptp_rx_msg_type_management;
unsigned long ptp_rx_msg_pkt_reserved_type;
unsigned long ptp_frame_type; unsigned long ptp_frame_type;
unsigned long ptp_ver; unsigned long ptp_ver;
unsigned long timestamp_dropped; unsigned long timestamp_dropped;
......
drivers/net/ethernet/stmicro/stmmac/descs.h
View file @ ee112c12
...@@ -155,14 +155,18 @@ ...@@ -155,14 +155,18 @@
#define ERDES4_L3_L4_FILT_NO_MATCH_MASK GENMASK(27, 26) #define ERDES4_L3_L4_FILT_NO_MATCH_MASK GENMASK(27, 26)
/* Extended RDES4 message type definitions */ /* Extended RDES4 message type definitions */
#define RDES_EXT_NO_PTP 0 #define RDES_EXT_NO_PTP 0x0
#define RDES_EXT_SYNC 1 #define RDES_EXT_SYNC 0x1
#define RDES_EXT_FOLLOW_UP 2 #define RDES_EXT_FOLLOW_UP 0x2
#define RDES_EXT_DELAY_REQ 3 #define RDES_EXT_DELAY_REQ 0x3
#define RDES_EXT_DELAY_RESP 4 #define RDES_EXT_DELAY_RESP 0x4
#define RDES_EXT_PDELAY_REQ 5 #define RDES_EXT_PDELAY_REQ 0x5
#define RDES_EXT_PDELAY_RESP 6 #define RDES_EXT_PDELAY_RESP 0x6
#define RDES_EXT_PDELAY_FOLLOW_UP 7 #define RDES_EXT_PDELAY_FOLLOW_UP 0x7
#define RDES_PTP_ANNOUNCE 0x8
#define RDES_PTP_MANAGEMENT 0x9
#define RDES_PTP_SIGNALING 0xa
#define RDES_PTP_PKT_RESERVED_TYPE 0xf
/* Basic descriptor structure for normal and alternate descriptors */ /* Basic descriptor structure for normal and alternate descriptors */
struct dma_desc { struct dma_desc {
......
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
View file @ ee112c12
...@@ -123,22 +123,29 @@ static int dwmac4_wrback_get_rx_status(void *data, struct stmmac_extra_stats *x, ...@@ -123,22 +123,29 @@ static int dwmac4_wrback_get_rx_status(void *data, struct stmmac_extra_stats *x,
x->ipv4_pkt_rcvd++; x->ipv4_pkt_rcvd++;
if (rdes1 & RDES1_IPV6_HEADER) if (rdes1 & RDES1_IPV6_HEADER)
x->ipv6_pkt_rcvd++; x->ipv6_pkt_rcvd++;
if (message_type == RDES_EXT_SYNC)
x->rx_msg_type_sync++; if (message_type == RDES_EXT_NO_PTP)
x->no_ptp_rx_msg_type_ext++;
else if (message_type == RDES_EXT_SYNC)
x->ptp_rx_msg_type_sync++;
else if (message_type == RDES_EXT_FOLLOW_UP) else if (message_type == RDES_EXT_FOLLOW_UP)
x->rx_msg_type_follow_up++; x->ptp_rx_msg_type_follow_up++;
else if (message_type == RDES_EXT_DELAY_REQ) else if (message_type == RDES_EXT_DELAY_REQ)
x->rx_msg_type_delay_req++; x->ptp_rx_msg_type_delay_req++;
else if (message_type == RDES_EXT_DELAY_RESP) else if (message_type == RDES_EXT_DELAY_RESP)
x->rx_msg_type_delay_resp++; x->ptp_rx_msg_type_delay_resp++;
else if (message_type == RDES_EXT_PDELAY_REQ) else if (message_type == RDES_EXT_PDELAY_REQ)
x->rx_msg_type_pdelay_req++; x->ptp_rx_msg_type_pdelay_req++;
else if (message_type == RDES_EXT_PDELAY_RESP) else if (message_type == RDES_EXT_PDELAY_RESP)
x->rx_msg_type_pdelay_resp++; x->ptp_rx_msg_type_pdelay_resp++;
else if (message_type == RDES_EXT_PDELAY_FOLLOW_UP) else if (message_type == RDES_EXT_PDELAY_FOLLOW_UP)
x->rx_msg_type_pdelay_follow_up++; x->ptp_rx_msg_type_pdelay_follow_up++;
else else if (message_type == RDES_PTP_ANNOUNCE)
x->rx_msg_type_ext_no_ptp++; x->ptp_rx_msg_type_announce++;
else if (message_type == RDES_PTP_MANAGEMENT)
x->ptp_rx_msg_type_management++;
else if (message_type == RDES_PTP_PKT_RESERVED_TYPE)
x->ptp_rx_msg_pkt_reserved_type++;
if (rdes1 & RDES1_PTP_PACKET_TYPE) if (rdes1 & RDES1_PTP_PACKET_TYPE)
x->ptp_frame_type++; x->ptp_frame_type++;
......
drivers/net/ethernet/stmicro/stmmac/enh_desc.c
View file @ ee112c12
...@@ -150,22 +150,30 @@ static void enh_desc_get_ext_status(void *data, struct stmmac_extra_stats *x, ...@@ -150,22 +150,30 @@ static void enh_desc_get_ext_status(void *data, struct stmmac_extra_stats *x,
x->ipv4_pkt_rcvd++; x->ipv4_pkt_rcvd++;
if (rdes4 & ERDES4_IPV6_PKT_RCVD) if (rdes4 & ERDES4_IPV6_PKT_RCVD)
x->ipv6_pkt_rcvd++; x->ipv6_pkt_rcvd++;
if (message_type == RDES_EXT_SYNC)
x->rx_msg_type_sync++; if (message_type == RDES_EXT_NO_PTP)
x->no_ptp_rx_msg_type_ext++;
else if (message_type == RDES_EXT_SYNC)
x->ptp_rx_msg_type_sync++;
else if (message_type == RDES_EXT_FOLLOW_UP) else if (message_type == RDES_EXT_FOLLOW_UP)
x->rx_msg_type_follow_up++; x->ptp_rx_msg_type_follow_up++;
else if (message_type == RDES_EXT_DELAY_REQ) else if (message_type == RDES_EXT_DELAY_REQ)
x->rx_msg_type_delay_req++; x->ptp_rx_msg_type_delay_req++;
else if (message_type == RDES_EXT_DELAY_RESP) else if (message_type == RDES_EXT_DELAY_RESP)
x->rx_msg_type_delay_resp++; x->ptp_rx_msg_type_delay_resp++;
else if (message_type == RDES_EXT_PDELAY_REQ) else if (message_type == RDES_EXT_PDELAY_REQ)
x->rx_msg_type_pdelay_req++; x->ptp_rx_msg_type_pdelay_req++;
else if (message_type == RDES_EXT_PDELAY_RESP) else if (message_type == RDES_EXT_PDELAY_RESP)
x->rx_msg_type_pdelay_resp++; x->ptp_rx_msg_type_pdelay_resp++;
else if (message_type == RDES_EXT_PDELAY_FOLLOW_UP) else if (message_type == RDES_EXT_PDELAY_FOLLOW_UP)
x->rx_msg_type_pdelay_follow_up++; x->ptp_rx_msg_type_pdelay_follow_up++;
else else if (message_type == RDES_PTP_ANNOUNCE)
x->rx_msg_type_ext_no_ptp++; x->ptp_rx_msg_type_announce++;
else if (message_type == RDES_PTP_MANAGEMENT)
x->ptp_rx_msg_type_management++;
else if (message_type == RDES_PTP_PKT_RESERVED_TYPE)
x->ptp_rx_msg_pkt_reserved_type++;
if (rdes4 & ERDES4_PTP_FRAME_TYPE) if (rdes4 & ERDES4_PTP_FRAME_TYPE)
x->ptp_frame_type++; x->ptp_frame_type++;
if (rdes4 & ERDES4_PTP_VER) if (rdes4 & ERDES4_PTP_VER)
......
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
View file @ ee112c12
...@@ -115,14 +115,17 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = { ...@@ -115,14 +115,17 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
STMMAC_STAT(ip_csum_bypassed), STMMAC_STAT(ip_csum_bypassed),
STMMAC_STAT(ipv4_pkt_rcvd), STMMAC_STAT(ipv4_pkt_rcvd),
STMMAC_STAT(ipv6_pkt_rcvd), STMMAC_STAT(ipv6_pkt_rcvd),
STMMAC_STAT(rx_msg_type_ext_no_ptp), STMMAC_STAT(no_ptp_rx_msg_type_ext),
STMMAC_STAT(rx_msg_type_sync), STMMAC_STAT(ptp_rx_msg_type_sync),
STMMAC_STAT(rx_msg_type_follow_up), STMMAC_STAT(ptp_rx_msg_type_follow_up),
STMMAC_STAT(rx_msg_type_delay_req), STMMAC_STAT(ptp_rx_msg_type_delay_req),
STMMAC_STAT(rx_msg_type_delay_resp), STMMAC_STAT(ptp_rx_msg_type_delay_resp),
STMMAC_STAT(rx_msg_type_pdelay_req), STMMAC_STAT(ptp_rx_msg_type_pdelay_req),
STMMAC_STAT(rx_msg_type_pdelay_resp), STMMAC_STAT(ptp_rx_msg_type_pdelay_resp),
STMMAC_STAT(rx_msg_type_pdelay_follow_up), STMMAC_STAT(ptp_rx_msg_type_pdelay_follow_up),
STMMAC_STAT(ptp_rx_msg_type_announce),
STMMAC_STAT(ptp_rx_msg_type_management),
STMMAC_STAT(ptp_rx_msg_pkt_reserved_type),
STMMAC_STAT(ptp_frame_type), STMMAC_STAT(ptp_frame_type),
STMMAC_STAT(ptp_ver), STMMAC_STAT(ptp_ver),
STMMAC_STAT(timestamp_dropped), STMMAC_STAT(timestamp_dropped),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7