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: Avoid using mdiobus_c45_addr().

Browse Source 
Avoid using mdiobus_c45_addr() as it is
obsolete from K6.3.
Instead use its definition directly.

Bug 4014315

Change-Id: Ic407f407b03e465eea97bb530e86360ef81eb1e6
Signed-off-by: Revanth Kumar Uppala <ruppala@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2873724
Tested-by: Jonathan Hunter <jonathanh@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Revanth Kumar Uppala
2023-03-20 12:12:07 +00:00
committed by mobile promotions
parent a48d02a935
commit 6e2e6973cd
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/nvidia/Makefile
View File

@@ -1,13 +1,7 @@
#SPDX-License-Identifier: GPL-2.0-only #SPDX-License-Identifier: GPL-2.0-only
#Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. #Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL))
LINUX_VERSION_6_3 := $(shell expr 6 \* 256 + 3)
ifdef CONFIG_PCI ifdef CONFIG_PCI
obj-m += pcie/ obj-m += pcie/
endif endif
# nvethernet is currently broken for Linux v6.3 and so skip for Linux v6.3+
ifeq ($(shell test $(LINUX_VERSION) -lt $(LINUX_VERSION_6_3); echo $$?),0)
obj-m += nvethernet/ obj-m += nvethernet/
endif

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

@@ -3666,7 +3666,7 @@ static int ether_handle_priv_rmdio_ioctl(struct ether_priv_data *pdata,
if (mdio_phy_id_is_c45(mii_data->phy_id)) { if (mdio_phy_id_is_c45(mii_data->phy_id)) {
prtad = mdio_phy_id_prtad(mii_data->phy_id); prtad = mdio_phy_id_prtad(mii_data->phy_id);
devad = mdio_phy_id_devad(mii_data->phy_id); devad = mdio_phy_id_devad(mii_data->phy_id);
devad = mdiobus_c45_addr(devad, mii_data->reg_num); devad = MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | mii_data->reg_num;
} else { } else {
prtad = mii_data->phy_id; prtad = mii_data->phy_id;
devad = mii_data->reg_num; devad = mii_data->reg_num;
@@ -3707,7 +3707,7 @@ static int ether_handle_priv_wmdio_ioctl(struct ether_priv_data *pdata,
if (mdio_phy_id_is_c45(mii_data->phy_id)) { if (mdio_phy_id_is_c45(mii_data->phy_id)) {
prtad = mdio_phy_id_prtad(mii_data->phy_id); prtad = mdio_phy_id_prtad(mii_data->phy_id);
devad = mdio_phy_id_devad(mii_data->phy_id); devad = mdio_phy_id_devad(mii_data->phy_id);
devad = mdiobus_c45_addr(devad, mii_data->reg_num); devad = MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | mii_data->reg_num;
} else { } else {
prtad = mii_data->phy_id; prtad = mii_data->phy_id;
devad = mii_data->reg_num; devad = mii_data->reg_num;

6
drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
View File

@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ /* Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved */
#ifndef ETHER_LINUX_H #ifndef ETHER_LINUX_H
#define ETHER_LINUX_H #define ETHER_LINUX_H
@@ -287,6 +287,10 @@ static inline int ether_avail_txdesc_cnt(struct osi_dma_priv_data *osi_dma,
#define ETHER_VM_IRQ_TX_CHAN_MASK(x) BIT((x) * 2U) #define ETHER_VM_IRQ_TX_CHAN_MASK(x) BIT((x) * 2U)
#define ETHER_VM_IRQ_RX_CHAN_MASK(x) BIT(((x) * 2U) + 1U) #define ETHER_VM_IRQ_RX_CHAN_MASK(x) BIT(((x) * 2U) + 1U)
/* MDIO clause 45 bit */
#define MII_ADDR_C45 OSI_BIT(30)
#define MII_DEVADDR_C45_SHIFT 16
/** /**
* @brief DMA Transmit Channel NAPI * @brief DMA Transmit Channel NAPI
*/ */