nv-tegra-mirror/nvethernetrm
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/kernel/nvethernetrm.git synced 2025-12-22 09:12:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

osi: Removal of global variables related to HSI

Browse Source 
Removed Report ID and error codes from global and moved them to local.

Bug 3857897

Change-Id: Ib1a5d70782e8c8e26ca3f04316f7f2bb2b03735f
Signed-off-by: Sanath Kumar Gampa <sgampa@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/kernel/nvethernetrm/+/2806355
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Mohan Thadikamalla <mohant@nvidia.com>
Reviewed-by: Krishna Thota <kthota@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Sanath Kumar Gampa
2022-11-10 07:43:19 +05:30
committed by mobile promotions
parent 2fb7d1d324
commit 70e0744729
5 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osi_common.h
View File

@@ -160,7 +160,7 @@
/* Logging defines */
/* log levels */
#define OSI_LOG_INFO 1U
#define OSI_LOG_INFO 1U
#ifndef OSI_STRIPPED_LIB
#define OSI_LOG_WARN 2U
#endif /* OSI_STRIPPED_LIB */

7
include/osi_core.h
View File

@@ -300,8 +300,8 @@ typedef my_lint_64 nvel64_t;
*/
#define OSI_CORE_INFO(priv, type, err, loga) \
{ \
osi_core->osd_ops.ops_log((priv), __func__, __LINE__, \
OSI_LOG_INFO, (type), (err), (loga)); \
osi_core->osd_ops.ops_log(priv, __func__, __LINE__, \
OSI_LOG_INFO, type, err, loga); \
}
#define VLAN_NUM_VID 4096U
@@ -379,9 +379,6 @@ typedef my_lint_64 nvel64_t;
#define MACSEC_REG_VIOL_ERR_IDX 3U
/** @} */
extern nveu32_t osi_hsi_err_code[][2];
extern nveu16_t osi_hsi_reporter_id[];
/**
* @addtogroup HSI_TIME_THRESHOLD
*

8
osi/core/eqos_core.c
View File

@@ -811,7 +811,7 @@ static nve32_t eqos_hsi_configure(struct osi_core_priv_data *const osi_core,
if (enable == OSI_ENABLE) {
osi_core->hsi.enabled = OSI_ENABLE;
osi_core->hsi.reporter_id = osi_hsi_reporter_id[osi_core->instance_id];
osi_core->hsi.reporter_id = OSI_HSI_EQOS0_REPORTER_ID;
/* T23X-EQOS_HSIv2-19: Enabling of Consistency Monitor for TX Frame Errors */
value = osi_readla(osi_core,
@@ -1756,8 +1756,7 @@ static void eqos_handle_hsi_intr(struct osi_core_priv_data *const osi_core)
EQOS_WRAP_COMMON_INTR_STATUS);
if (((val & EQOS_REGISTER_PARITY_ERR) == EQOS_REGISTER_PARITY_ERR) ||
((val & EQOS_CORE_UNCORRECTABLE_ERR) == EQOS_CORE_UNCORRECTABLE_ERR)) {
osi_core->hsi.err_code[UE_IDX] =
osi_hsi_err_code[osi_core->instance_id][UE_IDX];
osi_core->hsi.err_code[UE_IDX] = OSI_HSI_EQOS0_UE_CODE;
osi_core->hsi.report_err = OSI_ENABLE;
osi_core->hsi.report_count_err[UE_IDX] = OSI_ENABLE;
/* Disable the interrupt */
@@ -1769,8 +1768,7 @@ static void eqos_handle_hsi_intr(struct osi_core_priv_data *const osi_core)
EQOS_WRAP_COMMON_INTR_ENABLE);
}
if ((val & EQOS_CORE_CORRECTABLE_ERR) == EQOS_CORE_CORRECTABLE_ERR) {
osi_core->hsi.err_code[CE_IDX] =
osi_hsi_err_code[osi_core->instance_id][CE_IDX];
osi_core->hsi.err_code[CE_IDX] = OSI_HSI_EQOS0_CE_CODE;
osi_core->hsi.report_err = OSI_ENABLE;
osi_core->hsi.ce_count =
osi_update_stats_counter(osi_core->hsi.ce_count, 1UL);

12
osi/core/mgbe_core.c
View File

@@ -2077,6 +2077,12 @@ static nve32_t mgbe_hsi_configure(struct osi_core_priv_data *const osi_core,
{
nveu32_t value = 0U;
nve32_t ret = 0;
const nveu16_t osi_hsi_reporter_id[] = {
OSI_HSI_MGBE0_REPORTER_ID,
OSI_HSI_MGBE1_REPORTER_ID,
OSI_HSI_MGBE2_REPORTER_ID,
OSI_HSI_MGBE3_REPORTER_ID,
};
if (enable == OSI_ENABLE) {
osi_core->hsi.enabled = OSI_ENABLE;
@@ -3434,6 +3440,12 @@ static void mgbe_handle_hsi_intr(struct osi_core_priv_data *osi_core)
nveu32_t val2 = 0;
void *xpcs_base = osi_core->xpcs_base;
nveu64_t ce_count_threshold;
const nveu32_t osi_hsi_err_code[][2] = {
{OSI_HSI_MGBE0_UE_CODE, OSI_HSI_MGBE0_CE_CODE},
{OSI_HSI_MGBE1_UE_CODE, OSI_HSI_MGBE1_CE_CODE},
{OSI_HSI_MGBE2_UE_CODE, OSI_HSI_MGBE2_CE_CODE},
{OSI_HSI_MGBE3_UE_CODE, OSI_HSI_MGBE3_CE_CODE},
};
val = osi_readla(osi_core, (nveu8_t *)osi_core->base +
MGBE_WRAP_COMMON_INTR_STATUS);

24
osi/core/osi_core.c
View File

@@ -25,30 +25,6 @@
#include "core_local.h"
#include "../osi/common/common.h"
#ifdef HSI_SUPPORT
/**
* @brief osi_hsi_err_code - Array of error code
*/
nveu32_t osi_hsi_err_code[][2] = {
{OSI_HSI_MGBE0_UE_CODE, OSI_HSI_MGBE0_CE_CODE},
{OSI_HSI_MGBE1_UE_CODE, OSI_HSI_MGBE1_CE_CODE},
{OSI_HSI_MGBE2_UE_CODE, OSI_HSI_MGBE2_CE_CODE},
{OSI_HSI_MGBE3_UE_CODE, OSI_HSI_MGBE3_CE_CODE},
{OSI_HSI_EQOS0_UE_CODE, OSI_HSI_EQOS0_CE_CODE},
};
/**
* @brief osi_hsi_reporter_id - Array of reporter_id
*/
nveu16_t osi_hsi_reporter_id[] = {
OSI_HSI_MGBE0_REPORTER_ID,
OSI_HSI_MGBE1_REPORTER_ID,
OSI_HSI_MGBE2_REPORTER_ID,
OSI_HSI_MGBE3_REPORTER_ID,
OSI_HSI_EQOS0_REPORTER_ID,
};
#endif
/**
* @brief Function to validate function pointers.
*