osi: core: clean-up MGBE MMC counters

Issue:
MGBE OSI_CMD_READ_MMC command
execution time is more than MAX_PROC_TIME.

Fix:
Clean up unwanted MMC register reads.

Bug 4101129

Change-Id: I01e0d74f263947beab21b21fe3782ef465c898ed
Signed-off-by: Mohan Thadikamalla <mohant@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/kernel/nvethernetrm/+/2913392
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Mohan Thadikamalla
2023-05-31 20:53:18 +05:30
committed by mobile promotions
parent 163e9cf67c
commit 1150fc9b29

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -101,12 +101,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
{ {
struct osi_mmc_counters *mmc = &osi_core->mmc; struct osi_mmc_counters *mmc = &osi_core->mmc;
mmc->mmc_tx_octetcount_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_gb,
MMC_TXOCTETCOUNT_GB_L);
mmc->mmc_tx_octetcount_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_gb_h,
MMC_TXOCTETCOUNT_GB_H);
mmc->mmc_tx_framecount_gb = mmc->mmc_tx_framecount_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_gb, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_gb,
MMC_TXPACKETCOUNT_GB_L); MMC_TXPACKETCOUNT_GB_L);
@@ -125,42 +119,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_tx_multicastframe_g_h = mmc->mmc_tx_multicastframe_g_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_multicastframe_g_h, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_multicastframe_g_h,
MMC_TXMULTICASTPACKETS_G_H); MMC_TXMULTICASTPACKETS_G_H);
mmc->mmc_tx_64_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_64_octets_gb,
MMC_TX64OCTETS_GB_L);
mmc->mmc_tx_64_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_64_octets_gb_h,
MMC_TX64OCTETS_GB_H);
mmc->mmc_tx_65_to_127_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_65_to_127_octets_gb,
MMC_TX65TO127OCTETS_GB_L);
mmc->mmc_tx_65_to_127_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_65_to_127_octets_gb_h,
MMC_TX65TO127OCTETS_GB_H);
mmc->mmc_tx_128_to_255_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_128_to_255_octets_gb,
MMC_TX128TO255OCTETS_GB_L);
mmc->mmc_tx_128_to_255_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_128_to_255_octets_gb_h,
MMC_TX128TO255OCTETS_GB_H);
mmc->mmc_tx_256_to_511_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_256_to_511_octets_gb,
MMC_TX256TO511OCTETS_GB_L);
mmc->mmc_tx_256_to_511_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_256_to_511_octets_gb_h,
MMC_TX256TO511OCTETS_GB_H);
mmc->mmc_tx_512_to_1023_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_512_to_1023_octets_gb,
MMC_TX512TO1023OCTETS_GB_L);
mmc->mmc_tx_512_to_1023_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_512_to_1023_octets_gb_h,
MMC_TX512TO1023OCTETS_GB_H);
mmc->mmc_tx_1024_to_max_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_1024_to_max_octets_gb,
MMC_TX1024TOMAXOCTETS_GB_L);
mmc->mmc_tx_1024_to_max_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_1024_to_max_octets_gb_h,
MMC_TX1024TOMAXOCTETS_GB_H);
mmc->mmc_tx_unicast_gb = mmc->mmc_tx_unicast_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_unicast_gb, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_unicast_gb,
MMC_TXUNICASTPACKETS_GB_L); MMC_TXUNICASTPACKETS_GB_L);
@@ -185,39 +143,12 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_tx_underflow_error_h = mmc->mmc_tx_underflow_error_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_underflow_error_h, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_underflow_error_h,
MMC_TXUNDERFLOWERROR_H); MMC_TXUNDERFLOWERROR_H);
mmc->mmc_tx_singlecol_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_singlecol_g,
MMC_TXSINGLECOL_G);
mmc->mmc_tx_multicol_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_multicol_g,
MMC_TXMULTICOL_G);
mmc->mmc_tx_deferred =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_deferred,
MMC_TXDEFERRED);
mmc->mmc_tx_latecol =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_latecol,
MMC_TXLATECOL);
mmc->mmc_tx_exesscol =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_exesscol,
MMC_TXEXESSCOL);
mmc->mmc_tx_carrier_error =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_carrier_error,
MMC_TXCARRIERERROR);
mmc->mmc_tx_octetcount_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_g,
MMC_TXOCTETCOUNT_G_L);
mmc->mmc_tx_octetcount_g_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_octetcount_g_h,
MMC_TXOCTETCOUNT_G_H);
mmc->mmc_tx_framecount_g = mmc->mmc_tx_framecount_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_g, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_g,
MMC_TXPACKETSCOUNT_G_L); MMC_TXPACKETSCOUNT_G_L);
mmc->mmc_tx_framecount_g_h = mmc->mmc_tx_framecount_g_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_g_h, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_framecount_g_h,
MMC_TXPACKETSCOUNT_G_H); MMC_TXPACKETSCOUNT_G_H);
mmc->mmc_tx_excessdef =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_excessdef,
MMC_TXEXECESS_DEFERRED);
mmc->mmc_tx_pause_frame = mmc->mmc_tx_pause_frame =
mgbe_update_mmc_val(osi_core, mmc->mmc_tx_pause_frame, mgbe_update_mmc_val(osi_core, mmc->mmc_tx_pause_frame,
MMC_TXPAUSEPACKETS_L); MMC_TXPAUSEPACKETS_L);
@@ -236,18 +167,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_rx_framecount_gb_h = mmc->mmc_rx_framecount_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_framecount_gb_h, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_framecount_gb_h,
MMC_RXPACKETCOUNT_GB_H); MMC_RXPACKETCOUNT_GB_H);
mmc->mmc_rx_octetcount_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_gb,
MMC_RXOCTETCOUNT_GB_L);
mmc->mmc_rx_octetcount_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_gb_h,
MMC_RXOCTETCOUNT_GB_H);
mmc->mmc_rx_octetcount_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_g,
MMC_RXOCTETCOUNT_G_L);
mmc->mmc_rx_octetcount_g_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_octetcount_g_h,
MMC_RXOCTETCOUNT_G_H);
mmc->mmc_rx_broadcastframe_g = mmc->mmc_rx_broadcastframe_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_broadcastframe_g, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_broadcastframe_g,
MMC_RXBROADCASTPACKETS_G_L); MMC_RXBROADCASTPACKETS_G_L);
@@ -281,42 +200,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_rx_oversize_g = mmc->mmc_rx_oversize_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_oversize_g, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_oversize_g,
MMC_RXOVERSIZE_G); MMC_RXOVERSIZE_G);
mmc->mmc_rx_64_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_64_octets_gb,
MMC_RX64OCTETS_GB_L);
mmc->mmc_rx_64_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_64_octets_gb_h,
MMC_RX64OCTETS_GB_H);
mmc->mmc_rx_65_to_127_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_65_to_127_octets_gb,
MMC_RX65TO127OCTETS_GB_L);
mmc->mmc_rx_65_to_127_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_65_to_127_octets_gb_h,
MMC_RX65TO127OCTETS_GB_H);
mmc->mmc_rx_128_to_255_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_128_to_255_octets_gb,
MMC_RX128TO255OCTETS_GB_L);
mmc->mmc_rx_128_to_255_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_128_to_255_octets_gb_h,
MMC_RX128TO255OCTETS_GB_H);
mmc->mmc_rx_256_to_511_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_256_to_511_octets_gb,
MMC_RX256TO511OCTETS_GB_L);
mmc->mmc_rx_256_to_511_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_256_to_511_octets_gb_h,
MMC_RX256TO511OCTETS_GB_H);
mmc->mmc_rx_512_to_1023_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_512_to_1023_octets_gb,
MMC_RX512TO1023OCTETS_GB_L);
mmc->mmc_rx_512_to_1023_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_512_to_1023_octets_gb_h,
MMC_RX512TO1023OCTETS_GB_H);
mmc->mmc_rx_1024_to_max_octets_gb =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_1024_to_max_octets_gb,
MMC_RX1024TOMAXOCTETS_GB_L);
mmc->mmc_rx_1024_to_max_octets_gb_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_1024_to_max_octets_gb_h,
MMC_RX1024TOMAXOCTETS_GB_H);
mmc->mmc_rx_unicast_g = mmc->mmc_rx_unicast_g =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_unicast_g, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_unicast_g,
MMC_RXUNICASTPACKETS_G_L); MMC_RXUNICASTPACKETS_G_L);
@@ -452,12 +335,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_rx_icmp_err_h = mmc->mmc_rx_icmp_err_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_err_h, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_err_h,
MMC_RXICMP_ERR_PKTS_H); MMC_RXICMP_ERR_PKTS_H);
mmc->mmc_rx_ipv4_gd_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_gd_octets,
MMC_RXIPV4_GD_OCTETS_L);
mmc->mmc_rx_ipv4_gd_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_gd_octets_h,
MMC_RXIPV4_GD_OCTETS_H);
mmc->mmc_rx_ipv4_hderr_octets = mmc->mmc_rx_ipv4_hderr_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_hderr_octets, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_hderr_octets,
MMC_RXIPV4_HDRERR_OCTETS_L); MMC_RXIPV4_HDRERR_OCTETS_L);
@@ -482,18 +359,6 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_rx_ipv4_udsbl_octets_h = mmc->mmc_rx_ipv4_udsbl_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_udsbl_octets_h, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv4_udsbl_octets_h,
MMC_RXIPV4_UDP_CHKSM_DIS_OCT_H); MMC_RXIPV4_UDP_CHKSM_DIS_OCT_H);
mmc->mmc_rx_udp_gd_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_gd_octets,
MMC_RXUDP_GD_OCTETS_L);
mmc->mmc_rx_udp_gd_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_gd_octets_h,
MMC_RXUDP_GD_OCTETS_H);
mmc->mmc_rx_ipv6_gd_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_gd_octets,
MMC_RXIPV6_GD_OCTETS_L);
mmc->mmc_rx_ipv6_gd_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_gd_octets_h,
MMC_RXIPV6_GD_OCTETS_H);
mmc->mmc_rx_ipv6_hderr_octets = mmc->mmc_rx_ipv6_hderr_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_hderr_octets, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_ipv6_hderr_octets,
MMC_RXIPV6_HDRERR_OCTETS_L); MMC_RXIPV6_HDRERR_OCTETS_L);
@@ -512,24 +377,12 @@ void mgbe_read_mmc(struct osi_core_priv_data *const osi_core)
mmc->mmc_rx_udp_err_octets_h = mmc->mmc_rx_udp_err_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_err_octets_h, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_udp_err_octets_h,
MMC_RXUDP_ERR_OCTETS_H); MMC_RXUDP_ERR_OCTETS_H);
mmc->mmc_rx_tcp_gd_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_gd_octets,
MMC_RXTCP_GD_OCTETS_L);
mmc->mmc_rx_tcp_gd_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_gd_octets_h,
MMC_RXTCP_GD_OCTETS_H);
mmc->mmc_rx_tcp_err_octets = mmc->mmc_rx_tcp_err_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_err_octets, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_err_octets,
MMC_RXTCP_ERR_OCTETS_L); MMC_RXTCP_ERR_OCTETS_L);
mmc->mmc_rx_tcp_err_octets_h = mmc->mmc_rx_tcp_err_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_err_octets_h, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_tcp_err_octets_h,
MMC_RXTCP_ERR_OCTETS_H); MMC_RXTCP_ERR_OCTETS_H);
mmc->mmc_rx_icmp_gd_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_gd_octets,
MMC_RXICMP_GD_OCTETS_L);
mmc->mmc_rx_icmp_gd_octets_h =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_gd_octets_h,
MMC_RXICMP_GD_OCTETS_H);
mmc->mmc_rx_icmp_err_octets = mmc->mmc_rx_icmp_err_octets =
mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_err_octets, mgbe_update_mmc_val(osi_core, mmc->mmc_rx_icmp_err_octets,
MMC_RXICMP_ERR_OCTETS_L); MMC_RXICMP_ERR_OCTETS_L);