From 2b21d4a86e12efab3e5a78b18fc3b2173ab0ae83 Mon Sep 17 00:00:00 2001 From: Mohan Thadikamalla Date: Fri, 9 Dec 2022 13:16:54 +0530 Subject: [PATCH] nvethernet: Remove MAC START ioctl Issue: MAC START and STOP IOCTL are deprecated, so these IOCTL calls has internally generated failure for Linux OSD. Fix: Remove MAC START IOCTL from Linux OSD. Bug 3889287 Change-Id: I19684936d22dac35df5af2393e163f51118fc8ce Signed-off-by: Mohan Thadikamalla Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2824816 Reviewed-by: Bhadram Varka Reviewed-by: Narayan Reddy Reviewed-by: Ashutosh Jha GVS: Gerrit_Virtual_Submit --- .../ethernet/nvidia/nvethernet/ether_linux.c | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 0ba29dc7..097cf3a9 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -2633,15 +2633,6 @@ static int ether_open(struct net_device *dev) /* Init EEE configuration */ ether_init_eee_params(pdata); - /* Start the MAC */ - ioctl_data.cmd = OSI_CMD_START_MAC; - ret = osi_handle_ioctl(pdata->osi_core, &ioctl_data); - if (ret < 0) { - dev_err(&dev->dev, - "%s: failed to start MAC %d\n", - __func__, ret); - goto err_r_irq; - } /* start PHY */ phy_start(pdata->phydev); @@ -6660,14 +6651,6 @@ static int ether_resume(struct ether_priv_data *pdata) /* enable NAPI */ ether_napi_enable(pdata); - /* start the mac */ - ioctl_data.cmd = OSI_CMD_START_MAC; - ret = osi_handle_ioctl(osi_core, &ioctl_data); - if (ret < 0) { - dev_err(dev, - "%s: failed to start MAC %d\n", __func__, ret); - goto err_start_mac; - } if (pdata->phydev && !(device_may_wakeup(&ndev->dev))) { /* configure phy init */ @@ -6696,9 +6679,9 @@ static int ether_resume(struct ether_priv_data *pdata) #endif /* MACSEC_SUPPORT */ return 0; -err_start_mac: - ether_napi_disable(pdata); + err_dma: + ether_napi_disable(pdata); osi_hw_core_deinit(osi_core); err_resume: free_dma_resources(pdata);