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: Update MGBE MAC version

Browse Source 
On uFPGA MGBE MAC version is 0x31 and it got updated
to 0x40 on silicon.

Bug 200751806

Change-Id: If07f9bf338d522f5efc8823323db522dd3438daa
Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2559465
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Bhadram Varka
2021-07-15 13:16:49 +05:30
committed by Revanth Kumar Uppala
parent 56063f5983
commit 2c6aad7764
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1272,8 +1272,7 @@ static void ether_free_irqs(struct ether_priv_data *pdata)
}
if (pdata->osi_core->mac_ver > OSI_EQOS_MAC_5_00 ||
(pdata->osi_core->mac_ver == OSI_MGBE_MAC_3_00) ||
(pdata->osi_core->mac_ver == OSI_MGBE_MAC_3_10)) {
pdata->osi_core->mac == OSI_MAC_HW_MGBE) {
for (i = 0; i < pdata->osi_core->num_vm_irqs; i++) {
if (pdata->rx_irq_alloc_mask & (OSI_ENABLE << i)) {
devm_free_irq(pdata->dev, pdata->vm_irqs[i],
@@ -1464,8 +1463,7 @@ static int ether_request_irqs(struct ether_priv_data *pdata)
pdata->common_irq_alloc_mask = 1;
if (osi_core->mac_ver > OSI_EQOS_MAC_5_00 ||
(osi_core->mac_ver == OSI_MGBE_MAC_3_10) ||
(osi_core->mac_ver == OSI_MGBE_MAC_3_00)) {
osi_core->mac == OSI_MAC_HW_MGBE) {
for (i = 0; i < osi_core->num_vm_irqs; i++) {
snprintf(irq_names[j], ETHER_IRQ_NAME_SZ, "%s.vm%d",
netdev_name(pdata->ndev), i);
@@ -4262,8 +4260,7 @@ static int ether_get_irqs(struct platform_device *pdev,
return pdata->common_irq;
}
if (osi_core->mac_ver > OSI_EQOS_MAC_5_00 ||
(osi_core->mac_ver == OSI_MGBE_MAC_3_10) ||
(osi_core->mac_ver == OSI_MGBE_MAC_3_00)) {
(osi_core->mac == OSI_MAC_HW_MGBE)) {
ret = ether_get_vm_irq_data(pdev, pdata);
if (ret < 0) {
dev_err(pdata->dev, "failed to get VM IRQ info\n");
@@ -4399,7 +4396,7 @@ static int ether_get_mac_address(struct ether_priv_data *pdata)
* MAC address is at /chosen/nvidia,ether-mac8
*/
if ((pdata->osi_core->mac_ver > OSI_EQOS_MAC_5_10) ||
(pdata->osi_core->mac_ver == OSI_MGBE_MAC_3_10)) {
(pdata->osi_core->mac == OSI_MAC_HW_MGBE)) {
ret = of_property_read_u32(np,
"nvidia,mac-addr-idx",
&mac_addr_idx);