nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: fix FMON faults

Browse Source 
Issue: BPMP FMON giving faults because of below issues -
1) rx_input rate not set before enabling the clks
2) Rx monitoring clocks not enabled after clks stable.

Fix: Followed below for enabling the FMON
1) Set rates for mgbeN_rx_input/mgbeN_rx_pcs_input
2) clk enable - mgbeN_rx_input/mgbeN_rx_pcs
3) clk enable - mgbeN_rx_input_m/mgbeN_rx_pcs_m

Bug 3412303

Change-Id: Id118b244844a61dc5267f357fe93e32f7ac20b4e
Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2659395
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Bhadram Varka
2022-01-25 20:59:21 +05:30
committed by Revanth Kumar Uppala
parent f35cce8a91
commit fb00a33686
1 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -374,12 +374,8 @@ static void ether_disable_mgbe_clks(struct ether_priv_data *pdata)
clk_disable_unprepare(pdata->rx_pcs_input_clk);
}
if (!IS_ERR_OR_NULL(pdata->rx_pcs_m_clk)) {
clk_disable_unprepare(pdata->rx_pcs_m_clk);
}
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
clk_disable_unprepare(pdata->rx_m_clk);
if (!IS_ERR_OR_NULL(pdata->rx_input_clk)) {
clk_disable_unprepare(pdata->rx_input_clk);
}
pdata->clks_enable = false;
@@ -419,10 +415,6 @@ static void ether_disable_eqos_clks(struct ether_priv_data *pdata)
clk_disable_unprepare(pdata->pllrefe_clk);
}
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
clk_disable_unprepare(pdata->rx_m_clk);
}
pdata->clks_enable = false;
}
@@ -461,24 +453,17 @@ static int ether_enable_mgbe_clks(struct ether_priv_data *pdata)
unsigned long rate = 0;
int ret;
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
ret = clk_prepare_enable(pdata->rx_m_clk);
if (!IS_ERR_OR_NULL(pdata->rx_input_clk)) {
ret = clk_prepare_enable(pdata->rx_input_clk);
if (ret < 0) {
return ret;
}
}
if (!IS_ERR_OR_NULL(pdata->rx_pcs_m_clk)) {
ret = clk_prepare_enable(pdata->rx_pcs_m_clk);
if (ret < 0) {
goto err_rx_pcs_m;
}
}
if (!IS_ERR_OR_NULL(pdata->rx_pcs_input_clk)) {
ret = clk_prepare_enable(pdata->rx_pcs_input_clk);
if (ret < 0) {
goto err_rx_pcs_input;
return ret;
}
}
@@ -597,14 +582,6 @@ err_rx_pcs:
if (!IS_ERR_OR_NULL(pdata->rx_pcs_input_clk)) {
clk_disable_unprepare(pdata->rx_pcs_input_clk);
}
err_rx_pcs_input:
if (!IS_ERR_OR_NULL(pdata->rx_pcs_m_clk)) {
clk_disable_unprepare(pdata->rx_pcs_m_clk);
}
err_rx_pcs_m:
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
clk_disable_unprepare(pdata->rx_m_clk);
}
return ret;
}
@@ -665,21 +642,10 @@ static int ether_enable_eqos_clks(struct ether_priv_data *pdata)
}
}
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
ret = clk_prepare_enable(pdata->rx_m_clk);
if (ret < 0) {
goto err_rx_m;
}
}
pdata->clks_enable = true;
return 0;
err_rx_m:
if (!IS_ERR_OR_NULL(pdata->tx_clk)) {
clk_disable_unprepare(pdata->tx_clk);
}
err_tx:
if (!IS_ERR_OR_NULL(pdata->ptp_ref_clk)) {
clk_disable_unprepare(pdata->ptp_ref_clk);
@@ -912,6 +878,34 @@ static inline void set_speed_work_func(struct work_struct *work)
netif_carrier_on(dev);
}
static void ether_en_dis_monitor_clks(struct ether_priv_data *pdata,
unsigned int en_dis)
{
if (en_dis == OSI_ENABLE) {
/* Enable Monitoring clocks */
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
if (clk_prepare_enable(pdata->rx_m_clk) < 0)
dev_err(pdata->dev,
"failed to enable rx_m_clk");
}
if (!IS_ERR_OR_NULL(pdata->rx_pcs_m_clk)) {
if (clk_prepare_enable(pdata->rx_pcs_m_clk) < 0)
dev_err(pdata->dev,
"failed to enable rx_pcs_m_clk");
}
} else {
/* Disable Monitoring clocks */
if (!IS_ERR_OR_NULL(pdata->rx_pcs_m_clk)) {
clk_disable_unprepare(pdata->rx_pcs_m_clk);
}
if (!IS_ERR_OR_NULL(pdata->rx_m_clk)) {
clk_disable_unprepare(pdata->rx_m_clk);
}
}
}
/**
* @brief Adjust link call back
*
@@ -1024,6 +1018,7 @@ static void ether_adjust_link(struct net_device *dev)
return;
}
ether_en_dis_monitor_clks(pdata, OSI_ENABLE);
pdata->speed = speed;
}
@@ -1042,6 +1037,7 @@ static void ether_adjust_link(struct net_device *dev)
val = pdata->osi_core->xstats.link_disconnect_count;
pdata->osi_core->xstats.link_disconnect_count =
osi_update_stats_counter(val, 1UL);
ether_en_dis_monitor_clks(pdata, OSI_DISABLE);
} else {
/* Nothing here */
}