Commit 4c39e768 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Tony Nguyen

e1000e: Use PCI_EXP_LNKSTA_NLW & FIELD_GET() instead of custom defines/code

e1000e has own copy of PCI Negotiated Link Width field defines. Use the
ones from include/uapi/linux/pci_regs.h instead of the custom ones and
remove the custom ones and convert to FIELD_GET().
Suggested-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4f601167
...@@ -681,8 +681,6 @@ ...@@ -681,8 +681,6 @@
#define PCIE_LINK_STATUS 0x12 #define PCIE_LINK_STATUS 0x12
#define PCI_HEADER_TYPE_MULTIFUNC 0x80 #define PCI_HEADER_TYPE_MULTIFUNC 0x80
#define PCIE_LINK_WIDTH_MASK 0x3F0
#define PCIE_LINK_WIDTH_SHIFT 4
#define PHY_REVISION_MASK 0xFFFFFFF0 #define PHY_REVISION_MASK 0xFFFFFFF0
#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ #define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2018 Intel Corporation. */
#include <linux/bitfield.h>
#include "e1000.h" #include "e1000.h"
/** /**
...@@ -25,9 +27,8 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw) ...@@ -25,9 +27,8 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
pci_read_config_word(adapter->pdev, pci_read_config_word(adapter->pdev,
cap_offset + PCIE_LINK_STATUS, cap_offset + PCIE_LINK_STATUS,
&pcie_link_status); &pcie_link_status);
bus->width = (enum e1000_bus_width)((pcie_link_status & bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW,
PCIE_LINK_WIDTH_MASK) >> pcie_link_status);
PCIE_LINK_WIDTH_SHIFT);
} }
mac->ops.set_lan_id(hw); mac->ops.set_lan_id(hw);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment