Skip to content

Commit d5b595d

Browse files
committed
Merge branch 'net-cadence-macb-modernize-statistics-reporting'
Sean Anderson says: ==================== net: cadence: macb: Modernize statistics reporting Implement the modern interfaces for statistics reporting. ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents c900e49 + f6af690 commit d5b595d

File tree

2 files changed

+235
-85
lines changed

2 files changed

+235
-85
lines changed

drivers/net/ethernet/cadence/macb.h

Lines changed: 64 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -951,75 +951,73 @@ struct macb_tx_skb {
951951
* device stats by a periodic timer.
952952
*/
953953
struct macb_stats {
954-
u32 rx_pause_frames;
955-
u32 tx_ok;
956-
u32 tx_single_cols;
957-
u32 tx_multiple_cols;
958-
u32 rx_ok;
959-
u32 rx_fcs_errors;
960-
u32 rx_align_errors;
961-
u32 tx_deferred;
962-
u32 tx_late_cols;
963-
u32 tx_excessive_cols;
964-
u32 tx_underruns;
965-
u32 tx_carrier_errors;
966-
u32 rx_resource_errors;
967-
u32 rx_overruns;
968-
u32 rx_symbol_errors;
969-
u32 rx_oversize_pkts;
970-
u32 rx_jabbers;
971-
u32 rx_undersize_pkts;
972-
u32 sqe_test_errors;
973-
u32 rx_length_mismatch;
974-
u32 tx_pause_frames;
954+
u64 rx_pause_frames;
955+
u64 tx_ok;
956+
u64 tx_single_cols;
957+
u64 tx_multiple_cols;
958+
u64 rx_ok;
959+
u64 rx_fcs_errors;
960+
u64 rx_align_errors;
961+
u64 tx_deferred;
962+
u64 tx_late_cols;
963+
u64 tx_excessive_cols;
964+
u64 tx_underruns;
965+
u64 tx_carrier_errors;
966+
u64 rx_resource_errors;
967+
u64 rx_overruns;
968+
u64 rx_symbol_errors;
969+
u64 rx_oversize_pkts;
970+
u64 rx_jabbers;
971+
u64 rx_undersize_pkts;
972+
u64 sqe_test_errors;
973+
u64 rx_length_mismatch;
974+
u64 tx_pause_frames;
975975
};
976976

977977
struct gem_stats {
978-
u32 tx_octets_31_0;
979-
u32 tx_octets_47_32;
980-
u32 tx_frames;
981-
u32 tx_broadcast_frames;
982-
u32 tx_multicast_frames;
983-
u32 tx_pause_frames;
984-
u32 tx_64_byte_frames;
985-
u32 tx_65_127_byte_frames;
986-
u32 tx_128_255_byte_frames;
987-
u32 tx_256_511_byte_frames;
988-
u32 tx_512_1023_byte_frames;
989-
u32 tx_1024_1518_byte_frames;
990-
u32 tx_greater_than_1518_byte_frames;
991-
u32 tx_underrun;
992-
u32 tx_single_collision_frames;
993-
u32 tx_multiple_collision_frames;
994-
u32 tx_excessive_collisions;
995-
u32 tx_late_collisions;
996-
u32 tx_deferred_frames;
997-
u32 tx_carrier_sense_errors;
998-
u32 rx_octets_31_0;
999-
u32 rx_octets_47_32;
1000-
u32 rx_frames;
1001-
u32 rx_broadcast_frames;
1002-
u32 rx_multicast_frames;
1003-
u32 rx_pause_frames;
1004-
u32 rx_64_byte_frames;
1005-
u32 rx_65_127_byte_frames;
1006-
u32 rx_128_255_byte_frames;
1007-
u32 rx_256_511_byte_frames;
1008-
u32 rx_512_1023_byte_frames;
1009-
u32 rx_1024_1518_byte_frames;
1010-
u32 rx_greater_than_1518_byte_frames;
1011-
u32 rx_undersized_frames;
1012-
u32 rx_oversize_frames;
1013-
u32 rx_jabbers;
1014-
u32 rx_frame_check_sequence_errors;
1015-
u32 rx_length_field_frame_errors;
1016-
u32 rx_symbol_errors;
1017-
u32 rx_alignment_errors;
1018-
u32 rx_resource_errors;
1019-
u32 rx_overruns;
1020-
u32 rx_ip_header_checksum_errors;
1021-
u32 rx_tcp_checksum_errors;
1022-
u32 rx_udp_checksum_errors;
978+
u64 tx_octets;
979+
u64 tx_frames;
980+
u64 tx_broadcast_frames;
981+
u64 tx_multicast_frames;
982+
u64 tx_pause_frames;
983+
u64 tx_64_byte_frames;
984+
u64 tx_65_127_byte_frames;
985+
u64 tx_128_255_byte_frames;
986+
u64 tx_256_511_byte_frames;
987+
u64 tx_512_1023_byte_frames;
988+
u64 tx_1024_1518_byte_frames;
989+
u64 tx_greater_than_1518_byte_frames;
990+
u64 tx_underrun;
991+
u64 tx_single_collision_frames;
992+
u64 tx_multiple_collision_frames;
993+
u64 tx_excessive_collisions;
994+
u64 tx_late_collisions;
995+
u64 tx_deferred_frames;
996+
u64 tx_carrier_sense_errors;
997+
u64 rx_octets;
998+
u64 rx_frames;
999+
u64 rx_broadcast_frames;
1000+
u64 rx_multicast_frames;
1001+
u64 rx_pause_frames;
1002+
u64 rx_64_byte_frames;
1003+
u64 rx_65_127_byte_frames;
1004+
u64 rx_128_255_byte_frames;
1005+
u64 rx_256_511_byte_frames;
1006+
u64 rx_512_1023_byte_frames;
1007+
u64 rx_1024_1518_byte_frames;
1008+
u64 rx_greater_than_1518_byte_frames;
1009+
u64 rx_undersized_frames;
1010+
u64 rx_oversize_frames;
1011+
u64 rx_jabbers;
1012+
u64 rx_frame_check_sequence_errors;
1013+
u64 rx_length_field_frame_errors;
1014+
u64 rx_symbol_errors;
1015+
u64 rx_alignment_errors;
1016+
u64 rx_resource_errors;
1017+
u64 rx_overruns;
1018+
u64 rx_ip_header_checksum_errors;
1019+
u64 rx_tcp_checksum_errors;
1020+
u64 rx_udp_checksum_errors;
10231021
};
10241022

10251023
/* Describes the name and offset of an individual statistic register, as

0 commit comments

Comments
 (0)