nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: pass MDC CR from DT

Browse Source 
o Add nvidia,mdc-cr property reading
o Set the default values if property is not present
   EQOS = 6
   MGBE = 5
o Remove CMD MDC CONFIG which is not required.

Bug 5147775

Change-Id: I84c382745b862f73ffecb3a4ea15fe56b79d63e4
Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3336145
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Mahesh Patil <maheshp@nvidia.com>
Reviewed-by: Srinivas Ramachandran <srinivasra@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Bhadram Varka
2025-04-08 11:46:03 +00:00
committed by Jon Hunter
parent 63597e114a
commit ebee392608
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6075,10 +6075,6 @@ static int ether_configure_car(struct platform_device *pdev,
struct device *dev = pdata->dev; struct device *dev = pdata->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct osi_core_priv_data *osi_core = pdata->osi_core; struct osi_core_priv_data *osi_core = pdata->osi_core;
#ifndef OSI_STRIPPED_LIB
unsigned long csr_clk_rate = 0;
struct osi_ioctl ioctl_data = {};
#endif /* !OSI_STRIPPED_LIB */
int ret = 0; int ret = 0;
@@ -6161,24 +6157,7 @@ static int ether_configure_car(struct platform_device *pdev,
} }
} }
#ifndef OSI_STRIPPED_LIB
csr_clk_rate = clk_get_rate(pdata->axi_cbb_clk);
ioctl_data.cmd = OSI_CMD_MDC_CONFIG;
ioctl_data.arg5_u64 = csr_clk_rate;
ret = osi_handle_ioctl(osi_core, &ioctl_data);
if (ret < 0) {
dev_err(&pdev->dev, "failed to configure MDC\n");
goto err_mdc;
}
#endif /* !OSI_STRIPPED_LIB */
return ret; return ret;
#ifndef OSI_STRIPPED_LIB
err_mdc:
if (pdata->mac_rst) {
reset_control_assert(pdata->mac_rst);
}
#endif /* !OSI_STRIPPED_LIB */
err_rst: err_rst:
ether_disable_clks(pdata); ether_disable_clks(pdata);
err_enable_clks: err_enable_clks:
@@ -6501,6 +6480,11 @@ static int ether_parse_dt(struct ether_priv_data *pdata)
unsigned int dt_pad_calibration_enable; unsigned int dt_pad_calibration_enable;
unsigned int dt_pad_auto_cal_pu_offset; unsigned int dt_pad_auto_cal_pu_offset;
unsigned int dt_pad_auto_cal_pd_offset; unsigned int dt_pad_auto_cal_pd_offset;
const uint32_t def_mdc_cr[OSI_MAX_MAC_IP_TYPES] = {
OSI_EQOS_DEFAULT_MDC_CR,
OSI_MGBE_DEFAULT_MDC_CR,
OSI_MGBE_DEFAULT_MDC_CR
};
/* This variable is for DT entry which should not fail bootup */ /* This variable is for DT entry which should not fail bootup */
int ret_val = 0; int ret_val = 0;
@@ -7091,6 +7075,12 @@ static int ether_parse_dt(struct ether_priv_data *pdata)
} }
} }
ret_val = of_property_read_u32(np, "nvidia,mdc-cr", &osi_core->mdc_cr);
if ((ret_val < 0) || (osi_core->mdc_cr > OSI_MAX_MDC_CR)) {
dev_info(dev, "failed to read or invalid MDC CR - default to %d\n", def_mdc_cr[osi_core->mac]);
osi_core->mdc_cr = def_mdc_cr[osi_core->mac];
}
exit: exit:
return ret; return ret;
} }