mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-02 17:49:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ixgbe: Enable link management in E610 device

Browse source 
Add high level link management support for E610 device. Enable the
following features:
- driver load
- bring up network interface
- IP address assignment
- pass traffic
- show statistics (e.g. via ethtool)
- disable network interface
- driver unload

Co-developed-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Co-developed-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Reviewed-by: Jan Glaza <jan.glaza@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Bharath R <bharath.r@intel.com>
Signed-off-by: Piotr Kwapulinski <piotr.kwapulinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Piotr Kwapulinski 2024-12-05 09:44:50 +01:00 committed by Tony Nguyen
parent 34b4157707
commit 4600cdf9f5
14 changed files with 659 additions and 30 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/net/ethernet/intel/ixgbe/ixgbe.h
View file

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#ifndef _IXGBE_H_ #ifndef _IXGBE_H_
#define _IXGBE_H_ #define _IXGBE_H_
@ -20,6 +20,7 @@
#include "ixgbe_type.h" #include "ixgbe_type.h"
#include "ixgbe_common.h" #include "ixgbe_common.h"
#include "ixgbe_dcb.h" #include "ixgbe_dcb.h"
#include "ixgbe_e610.h"
#if IS_ENABLED(CONFIG_FCOE) #if IS_ENABLED(CONFIG_FCOE)
#define IXGBE_FCOE #define IXGBE_FCOE
#include "ixgbe_fcoe.h" #include "ixgbe_fcoe.h"
@ -173,6 +174,7 @@ enum ixgbe_tx_flags {
#define VMDQ_P(p) ((p) + adapter->ring_feature[RING_F_VMDQ].offset) #define VMDQ_P(p) ((p) + adapter->ring_feature[RING_F_VMDQ].offset)
#define IXGBE_82599_VF_DEVICE_ID 0x10ED #define IXGBE_82599_VF_DEVICE_ID 0x10ED
#define IXGBE_X540_VF_DEVICE_ID 0x1515 #define IXGBE_X540_VF_DEVICE_ID 0x1515
#define IXGBE_E610_VF_DEVICE_ID 0x57AD
#define UPDATE_VF_COUNTER_32bit(reg, last_counter, counter) \ #define UPDATE_VF_COUNTER_32bit(reg, last_counter, counter) \
{ \ { \
@ -654,6 +656,7 @@ struct ixgbe_adapter {
#define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP BIT(9) #define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP BIT(9)
#define IXGBE_FLAG2_PTP_PPS_ENABLED BIT(10) #define IXGBE_FLAG2_PTP_PPS_ENABLED BIT(10)
#define IXGBE_FLAG2_PHY_INTERRUPT BIT(11) #define IXGBE_FLAG2_PHY_INTERRUPT BIT(11)
#define IXGBE_FLAG2_FW_ASYNC_EVENT BIT(12)
#define IXGBE_FLAG2_VLAN_PROMISC BIT(13) #define IXGBE_FLAG2_VLAN_PROMISC BIT(13)
#define IXGBE_FLAG2_EEE_CAPABLE BIT(14) #define IXGBE_FLAG2_EEE_CAPABLE BIT(14)
#define IXGBE_FLAG2_EEE_ENABLED BIT(15) #define IXGBE_FLAG2_EEE_ENABLED BIT(15)
@ -661,6 +664,9 @@ struct ixgbe_adapter {
#define IXGBE_FLAG2_IPSEC_ENABLED BIT(17) #define IXGBE_FLAG2_IPSEC_ENABLED BIT(17)
#define IXGBE_FLAG2_VF_IPSEC_ENABLED BIT(18) #define IXGBE_FLAG2_VF_IPSEC_ENABLED BIT(18)
#define IXGBE_FLAG2_AUTO_DISABLE_VF BIT(19) #define IXGBE_FLAG2_AUTO_DISABLE_VF BIT(19)
#define IXGBE_FLAG2_PHY_FW_LOAD_FAILED BIT(20)
#define IXGBE_FLAG2_NO_MEDIA BIT(21)
#define IXGBE_FLAG2_MOD_POWER_UNSUPPORTED BIT(22)
/* Tx fast path data */ /* Tx fast path data */
int num_tx_queues; int num_tx_queues;
@ -793,6 +799,7 @@ struct ixgbe_adapter {
u32 vferr_refcount; u32 vferr_refcount;
struct ixgbe_mac_addr *mac_table; struct ixgbe_mac_addr *mac_table;
struct kobject *info_kobj; struct kobject *info_kobj;
u16 lse_mask;
#ifdef CONFIG_IXGBE_HWMON #ifdef CONFIG_IXGBE_HWMON
struct hwmon_buff *ixgbe_hwmon_buff; struct hwmon_buff *ixgbe_hwmon_buff;
#endif /* CONFIG_IXGBE_HWMON */ #endif /* CONFIG_IXGBE_HWMON */
@ -849,6 +856,7 @@ static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
return IXGBE_MAX_RSS_INDICES_X550; return IXGBE_MAX_RSS_INDICES_X550;
default: default:
return 0; return 0;
@ -874,6 +882,7 @@ enum ixgbe_state_t {
__IXGBE_PTP_RUNNING, __IXGBE_PTP_RUNNING,
__IXGBE_PTP_TX_IN_PROGRESS, __IXGBE_PTP_TX_IN_PROGRESS,
__IXGBE_RESET_REQUESTED, __IXGBE_RESET_REQUESTED,
__IXGBE_PHY_INIT_COMPLETE,
}; };
struct ixgbe_cb { struct ixgbe_cb {
@ -896,6 +905,7 @@ enum ixgbe_boards {
board_x550em_x_fw, board_x550em_x_fw,
board_x550em_a, board_x550em_a,
board_x550em_a_fw, board_x550em_a_fw,
board_e610,
}; };
extern const struct ixgbe_info ixgbe_82598_info; extern const struct ixgbe_info ixgbe_82598_info;
@ -906,6 +916,7 @@ extern const struct ixgbe_info ixgbe_X550EM_x_info;
extern const struct ixgbe_info ixgbe_x550em_x_fw_info; extern const struct ixgbe_info ixgbe_x550em_x_fw_info;
extern const struct ixgbe_info ixgbe_x550em_a_info; extern const struct ixgbe_info ixgbe_x550em_a_info;
extern const struct ixgbe_info ixgbe_x550em_a_fw_info; extern const struct ixgbe_info ixgbe_x550em_a_fw_info;
extern const struct ixgbe_info ixgbe_e610_info;
#ifdef CONFIG_IXGBE_DCB #ifdef CONFIG_IXGBE_DCB
extern const struct dcbnl_rtnl_ops ixgbe_dcbnl_ops; extern const struct dcbnl_rtnl_ops ixgbe_dcbnl_ops;
#endif #endif

3
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -1615,6 +1615,7 @@ int ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
IXGBE_WRITE_REG(hw, IXGBE_FDIRSCTPM, ~fdirtcpm); IXGBE_WRITE_REG(hw, IXGBE_FDIRSCTPM, ~fdirtcpm);
break; break;
default: default:

19
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -58,6 +58,7 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
switch (hw->device_id) { switch (hw->device_id) {
case IXGBE_DEV_ID_X550EM_A_SFP: case IXGBE_DEV_ID_X550EM_A_SFP:
case IXGBE_DEV_ID_X550EM_A_SFP_N: case IXGBE_DEV_ID_X550EM_A_SFP_N:
case IXGBE_DEV_ID_E610_SFP:
supported = false; supported = false;
break; break;
default: default:
@ -88,6 +89,8 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
case IXGBE_DEV_ID_X550EM_A_10G_T: case IXGBE_DEV_ID_X550EM_A_10G_T:
case IXGBE_DEV_ID_X550EM_A_1G_T: case IXGBE_DEV_ID_X550EM_A_1G_T:
case IXGBE_DEV_ID_X550EM_A_1G_T_L: case IXGBE_DEV_ID_X550EM_A_1G_T_L:
case IXGBE_DEV_ID_E610_10G_T:
case IXGBE_DEV_ID_E610_2_5G_T:
supported = true; supported = true;
break; break;
default: default:
@ -469,9 +472,14 @@ int ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)
} }
} }
if (hw->mac.type == ixgbe_mac_X550 || hw->mac.type == ixgbe_mac_X540) { if (hw->mac.type == ixgbe_mac_X550 ||
hw->mac.type == ixgbe_mac_X540 ||
hw->mac.type == ixgbe_mac_e610) {
if (hw->phy.id == 0) if (hw->phy.id == 0)
hw->phy.ops.identify(hw); hw->phy.ops.identify(hw);
}
if (hw->mac.type == ixgbe_mac_X550 || hw->mac.type == ixgbe_mac_X540) {
hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECL, MDIO_MMD_PCS, &i); hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECL, MDIO_MMD_PCS, &i);
hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECH, MDIO_MMD_PCS, &i); hw->phy.ops.read_reg(hw, IXGBE_PCRC8ECH, MDIO_MMD_PCS, &i);
hw->phy.ops.read_reg(hw, IXGBE_LDPCECL, MDIO_MMD_PCS, &i); hw->phy.ops.read_reg(hw, IXGBE_LDPCECL, MDIO_MMD_PCS, &i);
@ -2922,6 +2930,10 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw)
pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS; pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS;
max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599; max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;
break; break;
case ixgbe_mac_e610:
pcie_offset = IXGBE_PCIE_MSIX_E610_CAPS;
max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;
break;
default: default:
return 1; return 1;
} }
@ -3370,7 +3382,8 @@ int ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
*speed = IXGBE_LINK_SPEED_1GB_FULL; *speed = IXGBE_LINK_SPEED_1GB_FULL;
break; break;
case IXGBE_LINKS_SPEED_100_82599: case IXGBE_LINKS_SPEED_100_82599:
if ((hw->mac.type >= ixgbe_mac_X550) && if ((hw->mac.type >= ixgbe_mac_X550 ||
hw->mac.type == ixgbe_mac_e610) &&
(links_reg & IXGBE_LINKS_SPEED_NON_STD)) (links_reg & IXGBE_LINKS_SPEED_NON_STD))
*speed = IXGBE_LINK_SPEED_5GB_FULL; *speed = IXGBE_LINK_SPEED_5GB_FULL;
else else

3
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include "ixgbe.h" #include "ixgbe.h"
#include <linux/dcbnl.h> #include <linux/dcbnl.h>
@ -154,6 +154,7 @@ static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,
case ixgbe_mac_82599EB: case ixgbe_mac_82599EB:
case ixgbe_mac_X540: case ixgbe_mac_X540:
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_e610:
for (j = 0; j < netdev->addr_len; j++, i++) for (j = 0; j < netdev->addr_len; j++, i++)
perm_addr[i] = adapter->hw.mac.san_addr[j]; perm_addr[i] = adapter->hw.mac.san_addr[j];
break; break;

165
drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
View file

@ -3,8 +3,10 @@
#include "ixgbe_common.h" #include "ixgbe_common.h"
#include "ixgbe_e610.h" #include "ixgbe_e610.h"
#include "ixgbe_x550.h"
#include "ixgbe_type.h" #include "ixgbe_type.h"
#include "ixgbe_x540.h" #include "ixgbe_x540.h"
#include "ixgbe_mbx.h"
#include "ixgbe_phy.h" #include "ixgbe_phy.h"
/** /**
@ -2491,3 +2493,166 @@ int ixgbe_validate_eeprom_checksum_e610(struct ixgbe_hw *hw, u16 *checksum_val)
return err; return err;
} }
/**
* ixgbe_reset_hw_e610 - Perform hardware reset
* @hw: pointer to hardware structure
*
* Resets the hardware by resetting the transmit and receive units, masks
* and clears all interrupts, and performs a reset.
*
* Return: the exit code of the operation.
*/
int ixgbe_reset_hw_e610(struct ixgbe_hw *hw)
{
u32 swfw_mask = hw->phy.phy_semaphore_mask;
u32 ctrl, i;
int err;
/* Call adapter stop to disable tx/rx and clear interrupts */
err = hw->mac.ops.stop_adapter(hw);
if (err)
goto reset_hw_out;
/* Flush pending Tx transactions. */
ixgbe_clear_tx_pending(hw);
hw->phy.ops.init(hw);
mac_reset_top:
err = hw->mac.ops.acquire_swfw_sync(hw, swfw_mask);
if (err)
return -EBUSY;
ctrl = IXGBE_CTRL_RST;
ctrl |= IXGBE_READ_REG(hw, IXGBE_CTRL);
IXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);
IXGBE_WRITE_FLUSH(hw);
hw->mac.ops.release_swfw_sync(hw, swfw_mask);
/* Poll for reset bit to self-clear indicating reset is complete */
for (i = 0; i < 10; i++) {
udelay(1);
ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
if (!(ctrl & IXGBE_CTRL_RST_MASK))
break;
}
if (ctrl & IXGBE_CTRL_RST_MASK) {
struct ixgbe_adapter *adapter = container_of(hw, struct ixgbe_adapter,
hw);
err = -EIO;
netdev_err(adapter->netdev, "Reset polling failed to complete.");
}
/* Double resets are required for recovery from certain error
* conditions. Between resets, it is necessary to stall to allow time
* for any pending HW events to complete.
*/
msleep(100);
if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
goto mac_reset_top;
}
/* Set the Rx packet buffer size. */
IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0), GENMASK(18, 17));
/* Store the permanent mac address */
hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
/* Maximum number of Receive Address Registers. */
#define IXGBE_MAX_NUM_RAR 128
/* Store MAC address from RAR0, clear receive address registers, and
* clear the multicast table. Also reset num_rar_entries to the
* maximum number of Receive Address Registers, since we modify this
* value when programming the SAN MAC address.
*/
hw->mac.num_rar_entries = IXGBE_MAX_NUM_RAR;
hw->mac.ops.init_rx_addrs(hw);
/* Initialize bus function number */
hw->mac.ops.set_lan_id(hw);
reset_hw_out:
return err;
}
static const struct ixgbe_mac_operations mac_ops_e610 = {
.init_hw = ixgbe_init_hw_generic,
.start_hw = ixgbe_start_hw_X540,
.clear_hw_cntrs = ixgbe_clear_hw_cntrs_generic,
.enable_rx_dma = ixgbe_enable_rx_dma_generic,
.get_mac_addr = ixgbe_get_mac_addr_generic,
.get_device_caps = ixgbe_get_device_caps_generic,
.stop_adapter = ixgbe_stop_adapter_generic,
.set_lan_id = ixgbe_set_lan_id_multi_port_pcie,
.set_rxpba = ixgbe_set_rxpba_generic,
.check_link = ixgbe_check_link_e610,
.blink_led_start = ixgbe_blink_led_start_X540,
.blink_led_stop = ixgbe_blink_led_stop_X540,
.set_rar = ixgbe_set_rar_generic,
.clear_rar = ixgbe_clear_rar_generic,
.set_vmdq = ixgbe_set_vmdq_generic,
.set_vmdq_san_mac = ixgbe_set_vmdq_san_mac_generic,
.clear_vmdq = ixgbe_clear_vmdq_generic,
.init_rx_addrs = ixgbe_init_rx_addrs_generic,
.update_mc_addr_list = ixgbe_update_mc_addr_list_generic,
.enable_mc = ixgbe_enable_mc_generic,
.disable_mc = ixgbe_disable_mc_generic,
.clear_vfta = ixgbe_clear_vfta_generic,
.set_vfta = ixgbe_set_vfta_generic,
.fc_enable = ixgbe_fc_enable_generic,
.set_fw_drv_ver = ixgbe_set_fw_drv_ver_x550,
.init_uta_tables = ixgbe_init_uta_tables_generic,
.set_mac_anti_spoofing = ixgbe_set_mac_anti_spoofing,
.set_vlan_anti_spoofing = ixgbe_set_vlan_anti_spoofing,
.set_source_address_pruning =
ixgbe_set_source_address_pruning_x550,
.set_ethertype_anti_spoofing =
ixgbe_set_ethertype_anti_spoofing_x550,
.disable_rx_buff = ixgbe_disable_rx_buff_generic,
.enable_rx_buff = ixgbe_enable_rx_buff_generic,
.enable_rx = ixgbe_enable_rx_generic,
.disable_rx = ixgbe_disable_rx_e610,
.led_on = ixgbe_led_on_generic,
.led_off = ixgbe_led_off_generic,
.init_led_link_act = ixgbe_init_led_link_act_generic,
.reset_hw = ixgbe_reset_hw_e610,
.get_media_type = ixgbe_get_media_type_e610,
.setup_link = ixgbe_setup_link_e610,
.get_link_capabilities = ixgbe_get_link_capabilities_e610,
.get_bus_info = ixgbe_get_bus_info_generic,
.acquire_swfw_sync = ixgbe_acquire_swfw_sync_X540,
.release_swfw_sync = ixgbe_release_swfw_sync_X540,
.init_swfw_sync = ixgbe_init_swfw_sync_X540,
.prot_autoc_read = prot_autoc_read_generic,
.prot_autoc_write = prot_autoc_write_generic,
.setup_fc = ixgbe_setup_fc_e610,
.fc_autoneg = ixgbe_fc_autoneg_e610,
};
static const struct ixgbe_phy_operations phy_ops_e610 = {
.init = ixgbe_init_phy_ops_e610,
.identify = ixgbe_identify_phy_e610,
.identify_sfp = ixgbe_identify_module_e610,
.setup_link_speed = ixgbe_setup_phy_link_speed_generic,
.setup_link = ixgbe_setup_phy_link_e610,
.enter_lplu = ixgbe_enter_lplu_e610,
};
static const struct ixgbe_eeprom_operations eeprom_ops_e610 = {
.read = ixgbe_read_ee_aci_e610,
.read_buffer = ixgbe_read_ee_aci_buffer_e610,
.validate_checksum = ixgbe_validate_eeprom_checksum_e610,
};
const struct ixgbe_info ixgbe_e610_info = {
.mac = ixgbe_mac_e610,
.get_invariants = ixgbe_get_invariants_X540,
.mac_ops = &mac_ops_e610,
.eeprom_ops = &eeprom_ops_e610,
.phy_ops = &phy_ops_e610,
.mbx_ops = &mbx_ops_generic,
.mvals = ixgbe_mvals_x550em_a,
};

1
drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
View file

@ -76,5 +76,6 @@ int ixgbe_read_ee_aci_e610(struct ixgbe_hw *hw, u16 offset, u16 *data);
int ixgbe_read_ee_aci_buffer_e610(struct ixgbe_hw *hw, u16 offset, int ixgbe_read_ee_aci_buffer_e610(struct ixgbe_hw *hw, u16 offset,
u16 words, u16 *data); u16 words, u16 *data);
int ixgbe_validate_eeprom_checksum_e610(struct ixgbe_hw *hw, u16 *checksum_val); int ixgbe_validate_eeprom_checksum_e610(struct ixgbe_hw *hw, u16 *checksum_val);
int ixgbe_reset_hw_e610(struct ixgbe_hw *hw);
#endif /* _IXGBE_E610_H_ */ #endif /* _IXGBE_E610_H_ */

6
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
/* ethtool support for ixgbe */ /* ethtool support for ixgbe */
@ -690,6 +690,7 @@ static void ixgbe_get_regs(struct net_device *netdev,
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL_82599(i)); regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL_82599(i));
regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH_82599(i)); regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH_82599(i));
break; break;
@ -1613,6 +1614,7 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
toggle = 0x7FFFF30F; toggle = 0x7FFFF30F;
test = reg_test_82599; test = reg_test_82599;
break; break;
@ -1874,6 +1876,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_DMATXCTL); reg_data = IXGBE_READ_REG(&adapter->hw, IXGBE_DMATXCTL);
reg_data |= IXGBE_DMATXCTL_TE; reg_data |= IXGBE_DMATXCTL_TE;
IXGBE_WRITE_REG(&adapter->hw, IXGBE_DMATXCTL, reg_data); IXGBE_WRITE_REG(&adapter->hw, IXGBE_DMATXCTL, reg_data);
@ -1935,6 +1938,7 @@ static int ixgbe_setup_loopback_test(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
reg_data = IXGBE_READ_REG(hw, IXGBE_MACC); reg_data = IXGBE_READ_REG(hw, IXGBE_MACC);
reg_data |= IXGBE_MACC_FLU; reg_data |= IXGBE_MACC_FLU;
IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data); IXGBE_WRITE_REG(hw, IXGBE_MACC, reg_data);

3
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include "ixgbe.h" #include "ixgbe.h"
#include "ixgbe_sriov.h" #include "ixgbe_sriov.h"
@ -107,6 +107,7 @@ static void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc,
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
if (num_tcs > 4) { if (num_tcs > 4) {
/* /*
* TCs : TC0/1 TC2/3 TC4-7 * TCs : TC0/1 TC2/3 TC4-7

414
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include <linux/types.h> #include <linux/types.h>
#include <linux/module.h> #include <linux/module.h>
@ -74,6 +74,7 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = {
[board_x550em_x_fw] = &ixgbe_x550em_x_fw_info, [board_x550em_x_fw] = &ixgbe_x550em_x_fw_info,
[board_x550em_a] = &ixgbe_x550em_a_info, [board_x550em_a] = &ixgbe_x550em_a_info,
[board_x550em_a_fw] = &ixgbe_x550em_a_fw_info, [board_x550em_a_fw] = &ixgbe_x550em_a_fw_info,
[board_e610] = &ixgbe_e610_info,
}; };
/* ixgbe_pci_tbl - PCI Device ID Table /* ixgbe_pci_tbl - PCI Device ID Table
@ -132,6 +133,11 @@ static const struct pci_device_id ixgbe_pci_tbl[] = {
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), board_x550em_a }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), board_x550em_a },
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T), board_x550em_a_fw }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T), board_x550em_a_fw },
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T_L), board_x550em_a_fw }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_1G_T_L), board_x550em_a_fw },
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_BACKPLANE), board_e610},
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_SFP), board_e610},
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_10G_T), board_e610},
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_2_5G_T), board_e610},
{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_E610_SGMII), board_e610},
/* required last entry */ /* required last entry */
{0, } {0, }
}; };
@ -174,6 +180,8 @@ static struct workqueue_struct *ixgbe_wq;
static bool ixgbe_check_cfg_remove(struct ixgbe_hw *hw, struct pci_dev *pdev); static bool ixgbe_check_cfg_remove(struct ixgbe_hw *hw, struct pci_dev *pdev);
static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *); static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *);
static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *);
static void ixgbe_watchdog_update_link(struct ixgbe_adapter *);
static const struct net_device_ops ixgbe_netdev_ops; static const struct net_device_ops ixgbe_netdev_ops;
@ -241,7 +249,7 @@ static int ixgbe_get_parent_bus_info(struct ixgbe_adapter *adapter)
* Return: true if information should be collected from the parent bus, false * Return: true if information should be collected from the parent bus, false
* otherwise * otherwise
*/ */
static inline bool ixgbe_pcie_from_parent(struct ixgbe_hw *hw) static bool ixgbe_pcie_from_parent(struct ixgbe_hw *hw)
{ {
switch (hw->device_id) { switch (hw->device_id) {
case IXGBE_DEV_ID_82599_SFP_SF_QP: case IXGBE_DEV_ID_82599_SFP_SF_QP:
@ -880,6 +888,7 @@ static void ixgbe_set_ivar(struct ixgbe_adapter *adapter, s8 direction,
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
if (direction == -1) { if (direction == -1) {
/* other causes */ /* other causes */
msix_vector |= IXGBE_IVAR_ALLOC_VAL; msix_vector |= IXGBE_IVAR_ALLOC_VAL;
@ -919,6 +928,7 @@ void ixgbe_irq_rearm_queues(struct ixgbe_adapter *adapter,
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
mask = (qmask & 0xFFFFFFFF); mask = (qmask & 0xFFFFFFFF);
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(0), mask); IXGBE_WRITE_REG(&adapter->hw, IXGBE_EICS_EX(0), mask);
mask = (qmask >> 32); mask = (qmask >> 32);
@ -1029,7 +1039,7 @@ static u64 ixgbe_get_tx_pending(struct ixgbe_ring *ring)
return ((head <= tail) ? tail : tail + ring->count) - head; return ((head <= tail) ? tail : tail + ring->count) - head;
} }
static inline bool ixgbe_check_tx_hang(struct ixgbe_ring *tx_ring) static bool ixgbe_check_tx_hang(struct ixgbe_ring *tx_ring)
{ {
u32 tx_done = ixgbe_get_tx_completed(tx_ring); u32 tx_done = ixgbe_get_tx_completed(tx_ring);
u32 tx_done_old = tx_ring->tx_stats.tx_done_old; u32 tx_done_old = tx_ring->tx_stats.tx_done_old;
@ -2519,6 +2529,7 @@ static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
ixgbe_set_ivar(adapter, -1, 1, v_idx); ixgbe_set_ivar(adapter, -1, 1, v_idx);
break; break;
default: default:
@ -2532,6 +2543,9 @@ static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
IXGBE_EIMS_MAILBOX | IXGBE_EIMS_MAILBOX |
IXGBE_EIMS_LSC); IXGBE_EIMS_LSC);
if (adapter->hw.mac.type == ixgbe_mac_e610)
mask &= ~IXGBE_EIMS_FW_EVENT;
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC, mask); IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIAC, mask);
} }
@ -2748,6 +2762,7 @@ void ixgbe_write_eitr(struct ixgbe_q_vector *q_vector)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
/* /*
* set the WDIS bit to not clear the timer bits and cause an * set the WDIS bit to not clear the timer bits and cause an
* immediate assertion of the interrupt * immediate assertion of the interrupt
@ -2970,6 +2985,218 @@ static void ixgbe_check_lsc(struct ixgbe_adapter *adapter)
} }
} }
/**
* ixgbe_check_phy_fw_load - check if PHY FW load failed
* @adapter: pointer to adapter structure
* @link_cfg_err: bitmap from the link info structure
*
* Check if external PHY FW load failed and print an error message if it did.
*/
static void ixgbe_check_phy_fw_load(struct ixgbe_adapter *adapter,
u8 link_cfg_err)
{
if (!(link_cfg_err & IXGBE_ACI_LINK_EXTERNAL_PHY_LOAD_FAILURE)) {
adapter->flags2 &= ~IXGBE_FLAG2_PHY_FW_LOAD_FAILED;
return;
}
if (adapter->flags2 & IXGBE_FLAG2_PHY_FW_LOAD_FAILED)
return;
if (link_cfg_err & IXGBE_ACI_LINK_EXTERNAL_PHY_LOAD_FAILURE) {
netdev_err(adapter->netdev, "Device failed to load the FW for the external PHY. Please download and install the latest NVM for your device and try again\n");
adapter->flags2 |= IXGBE_FLAG2_PHY_FW_LOAD_FAILED;
}
}
/**
* ixgbe_check_module_power - check module power level
* @adapter: pointer to adapter structure
* @link_cfg_err: bitmap from the link info structure
*
* Check module power level returned by a previous call to aci_get_link_info
* and print error messages if module power level is not supported.
*/
static void ixgbe_check_module_power(struct ixgbe_adapter *adapter,
u8 link_cfg_err)
{
/* If module power level is supported, clear the flag. */
if (!(link_cfg_err & (IXGBE_ACI_LINK_INVAL_MAX_POWER_LIMIT |
IXGBE_ACI_LINK_MODULE_POWER_UNSUPPORTED))) {
adapter->flags2 &= ~IXGBE_FLAG2_MOD_POWER_UNSUPPORTED;
return;
}
/* If IXGBE_FLAG2_MOD_POWER_UNSUPPORTED was previously set and the
* above block didn't clear this bit, there's nothing to do.
*/
if (adapter->flags2 & IXGBE_FLAG2_MOD_POWER_UNSUPPORTED)
return;
if (link_cfg_err & IXGBE_ACI_LINK_INVAL_MAX_POWER_LIMIT) {
netdev_err(adapter->netdev, "The installed module is incompatible with the device's NVM image. Cannot start link.\n");
adapter->flags2 |= IXGBE_FLAG2_MOD_POWER_UNSUPPORTED;
} else if (link_cfg_err & IXGBE_ACI_LINK_MODULE_POWER_UNSUPPORTED) {
netdev_err(adapter->netdev, "The module's power requirements exceed the device's power supply. Cannot start link.\n");
adapter->flags2 |= IXGBE_FLAG2_MOD_POWER_UNSUPPORTED;
}
}
/**
* ixgbe_check_link_cfg_err - check if link configuration failed
* @adapter: pointer to adapter structure
* @link_cfg_err: bitmap from the link info structure
*
* Print if any link configuration failure happens due to the value in the
* link_cfg_err parameter in the link info structure.
*/
static void ixgbe_check_link_cfg_err(struct ixgbe_adapter *adapter,
u8 link_cfg_err)
{
ixgbe_check_module_power(adapter, link_cfg_err);
ixgbe_check_phy_fw_load(adapter, link_cfg_err);
}
/**
* ixgbe_process_link_status_event - process the link event
* @adapter: pointer to adapter structure
* @link_up: true if the physical link is up and false if it is down
* @link_speed: current link speed received from the link event
*
* Return: 0 on success or negative value on failure.
*/
static int
ixgbe_process_link_status_event(struct ixgbe_adapter *adapter, bool link_up,
u16 link_speed)
{
struct ixgbe_hw *hw = &adapter->hw;
int status;
/* Update the link info structures and re-enable link events,
* don't bail on failure due to other book keeping needed.
*/
status = ixgbe_update_link_info(hw);
if (status)
e_dev_err("Failed to update link status, err %d aq_err %d\n",
status, hw->aci.last_status);
ixgbe_check_link_cfg_err(adapter, hw->link.link_info.link_cfg_err);
/* Check if the link state is up after updating link info, and treat
* this event as an UP event since the link is actually UP now.
*/
if (hw->link.link_info.link_info & IXGBE_ACI_LINK_UP)
link_up = true;
/* Turn off PHY if media was removed. */
if (!(adapter->flags2 & IXGBE_FLAG2_NO_MEDIA) &&
!(hw->link.link_info.link_info & IXGBE_ACI_MEDIA_AVAILABLE))
adapter->flags2 |= IXGBE_FLAG2_NO_MEDIA;
if (link_up == adapter->link_up &&
link_up == netif_carrier_ok(adapter->netdev) &&
link_speed == adapter->link_speed)
return 0;
adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
adapter->link_check_timeout = jiffies;
ixgbe_watchdog_update_link(adapter);
if (link_up)
ixgbe_watchdog_link_is_up(adapter);
else
ixgbe_watchdog_link_is_down(adapter);
return 0;
}
/**
* ixgbe_handle_link_status_event - handle link status event via ACI
* @adapter: pointer to adapter structure
* @e: event structure containing link status info
*/
static void
ixgbe_handle_link_status_event(struct ixgbe_adapter *adapter,
struct ixgbe_aci_event *e)
{
struct ixgbe_aci_cmd_get_link_status_data *link_data;
u16 link_speed;
bool link_up;
link_data = (struct ixgbe_aci_cmd_get_link_status_data *)e->msg_buf;
link_up = !!(link_data->link_info & IXGBE_ACI_LINK_UP);
link_speed = le16_to_cpu(link_data->link_speed);
if (ixgbe_process_link_status_event(adapter, link_up, link_speed))
e_dev_warn("Could not process link status event");
}
/**
* ixgbe_schedule_fw_event - schedule Firmware event
* @adapter: pointer to the adapter structure
*
* If the adapter is not in down, removing or resetting state,
* an event is scheduled.
*/
static void ixgbe_schedule_fw_event(struct ixgbe_adapter *adapter)
{
if (!test_bit(__IXGBE_DOWN, &adapter->state) &&
!test_bit(__IXGBE_REMOVING, &adapter->state) &&
!test_bit(__IXGBE_RESETTING, &adapter->state)) {
adapter->flags2 |= IXGBE_FLAG2_FW_ASYNC_EVENT;
ixgbe_service_event_schedule(adapter);
}
}
/**
* ixgbe_aci_event_cleanup - release msg_buf memory
* @event: pointer to the event holding msg_buf to be released
*
* Clean memory allocated for event's msg_buf. Implements auto memory cleanup.
*/
static void ixgbe_aci_event_cleanup(struct ixgbe_aci_event *event)
{
kfree(event->msg_buf);
}
/**
* ixgbe_handle_fw_event - handle Firmware event
* @adapter: pointer to the adapter structure
*
* Obtain an event from the ACI and then and then process it according to the
* type of the event and the opcode.
*/
static void ixgbe_handle_fw_event(struct ixgbe_adapter *adapter)
{
struct ixgbe_aci_event event __cleanup(ixgbe_aci_event_cleanup);
struct ixgbe_hw *hw = &adapter->hw;
bool pending = false;
int err;
if (adapter->flags2 & IXGBE_FLAG2_FW_ASYNC_EVENT)
adapter->flags2 &= ~IXGBE_FLAG2_FW_ASYNC_EVENT;
event.buf_len = IXGBE_ACI_MAX_BUFFER_SIZE;
event.msg_buf = kzalloc(event.buf_len, GFP_KERNEL);
if (!event.msg_buf)
return;
do {
err = ixgbe_aci_get_event(hw, &event, &pending);
if (err)
break;
switch (le16_to_cpu(event.desc.opcode)) {
case ixgbe_aci_opc_get_link_status:
ixgbe_handle_link_status_event(adapter, &event);
break;
default:
e_warn(hw, "unknown FW async event captured\n");
break;
}
} while (pending);
}
static inline void ixgbe_irq_enable_queues(struct ixgbe_adapter *adapter, static inline void ixgbe_irq_enable_queues(struct ixgbe_adapter *adapter,
u64 qmask) u64 qmask)
{ {
@ -2986,6 +3213,7 @@ static inline void ixgbe_irq_enable_queues(struct ixgbe_adapter *adapter,
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
mask = (qmask & 0xFFFFFFFF); mask = (qmask & 0xFFFFFFFF);
if (mask) if (mask)
IXGBE_WRITE_REG(hw, IXGBE_EIMS_EX(0), mask); IXGBE_WRITE_REG(hw, IXGBE_EIMS_EX(0), mask);
@ -3039,6 +3267,9 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,
case ixgbe_mac_X540: case ixgbe_mac_X540:
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_e610:
mask |= IXGBE_EIMS_FW_EVENT;
fallthrough;
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
if (adapter->hw.device_id == IXGBE_DEV_ID_X550EM_X_SFP || if (adapter->hw.device_id == IXGBE_DEV_ID_X550EM_X_SFP ||
adapter->hw.device_id == IXGBE_DEV_ID_X550EM_A_SFP || adapter->hw.device_id == IXGBE_DEV_ID_X550EM_A_SFP ||
@ -3095,12 +3326,16 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data)
if (eicr & IXGBE_EICR_MAILBOX) if (eicr & IXGBE_EICR_MAILBOX)
ixgbe_msg_task(adapter); ixgbe_msg_task(adapter);
if (eicr & IXGBE_EICR_FW_EVENT)
ixgbe_schedule_fw_event(adapter);
switch (hw->mac.type) { switch (hw->mac.type) {
case ixgbe_mac_82599EB: case ixgbe_mac_82599EB:
case ixgbe_mac_X540: case ixgbe_mac_X540:
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
if (hw->phy.type == ixgbe_phy_x550em_ext_t && if (hw->phy.type == ixgbe_phy_x550em_ext_t &&
(eicr & IXGBE_EICR_GPI_SDP0_X540)) { (eicr & IXGBE_EICR_GPI_SDP0_X540)) {
adapter->flags2 |= IXGBE_FLAG2_PHY_INTERRUPT; adapter->flags2 |= IXGBE_FLAG2_PHY_INTERRUPT;
@ -3338,6 +3573,9 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
if (eicr & IXGBE_EICR_LSC) if (eicr & IXGBE_EICR_LSC)
ixgbe_check_lsc(adapter); ixgbe_check_lsc(adapter);
if (eicr & IXGBE_EICR_FW_EVENT)
ixgbe_schedule_fw_event(adapter);
switch (hw->mac.type) { switch (hw->mac.type) {
case ixgbe_mac_82599EB: case ixgbe_mac_82599EB:
ixgbe_check_sfp_event(adapter, eicr); ixgbe_check_sfp_event(adapter, eicr);
@ -3346,6 +3584,7 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
if (eicr & IXGBE_EICR_ECC) { if (eicr & IXGBE_EICR_ECC) {
e_info(link, "Received ECC Err, initiating reset\n"); e_info(link, "Received ECC Err, initiating reset\n");
set_bit(__IXGBE_RESET_REQUESTED, &adapter->state); set_bit(__IXGBE_RESET_REQUESTED, &adapter->state);
@ -3446,6 +3685,7 @@ static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFF0000); IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFF0000);
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(0), ~0); IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(0), ~0);
IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(1), ~0); IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC_EX(1), ~0);
@ -4363,6 +4603,7 @@ static void ixgbe_setup_rdrxctl(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
if (adapter->num_vfs) if (adapter->num_vfs)
rdrxctl |= IXGBE_RDRXCTL_PSP; rdrxctl |= IXGBE_RDRXCTL_PSP;
fallthrough; fallthrough;
@ -4530,6 +4771,7 @@ static void ixgbe_vlan_strip_disable(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
for (i = 0; i < adapter->num_rx_queues; i++) { for (i = 0; i < adapter->num_rx_queues; i++) {
struct ixgbe_ring *ring = adapter->rx_ring[i]; struct ixgbe_ring *ring = adapter->rx_ring[i];
@ -4568,6 +4810,7 @@ static void ixgbe_vlan_strip_enable(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
for (i = 0; i < adapter->num_rx_queues; i++) { for (i = 0; i < adapter->num_rx_queues; i++) {
struct ixgbe_ring *ring = adapter->rx_ring[i]; struct ixgbe_ring *ring = adapter->rx_ring[i];
@ -5152,6 +5395,7 @@ static int ixgbe_hpbthresh(struct ixgbe_adapter *adapter, int pb)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
dv_id = IXGBE_DV_X540(link, tc); dv_id = IXGBE_DV_X540(link, tc);
break; break;
default: default:
@ -5212,6 +5456,7 @@ static int ixgbe_lpbthresh(struct ixgbe_adapter *adapter, int pb)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
dv_id = IXGBE_LOW_DV_X540(tc); dv_id = IXGBE_LOW_DV_X540(tc);
break; break;
default: default:
@ -5513,6 +5758,48 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)
ixgbe_configure_dfwd(adapter); ixgbe_configure_dfwd(adapter);
} }
/**
* ixgbe_enable_link_status_events - enable link status events
* @adapter: pointer to the adapter structure
* @mask: event mask to be set
*
* Enables link status events by invoking ixgbe_configure_lse()
*
* Return: the exit code of the operation.
*/
static int ixgbe_enable_link_status_events(struct ixgbe_adapter *adapter,
u16 mask)
{
int err;
err = ixgbe_configure_lse(&adapter->hw, true, mask);
if (err)
return err;
adapter->lse_mask = mask;
return 0;
}
/**
* ixgbe_disable_link_status_events - disable link status events
* @adapter: pointer to the adapter structure
*
* Disables link status events by invoking ixgbe_configure_lse()
*
* Return: the exit code of the operation.
*/
static int ixgbe_disable_link_status_events(struct ixgbe_adapter *adapter)
{
int err;
err = ixgbe_configure_lse(&adapter->hw, false, adapter->lse_mask);
if (err)
return err;
adapter->lse_mask = 0;
return 0;
}
/** /**
* ixgbe_sfp_link_config - set up SFP+ link * ixgbe_sfp_link_config - set up SFP+ link
* @adapter: pointer to private adapter struct * @adapter: pointer to private adapter struct
@ -5542,9 +5829,15 @@ static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)
**/ **/
static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw) static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
{ {
u32 speed; struct ixgbe_adapter *adapter = container_of(hw, struct ixgbe_adapter,
hw);
u16 mask = ~((u16)(IXGBE_ACI_LINK_EVENT_UPDOWN |
IXGBE_ACI_LINK_EVENT_MEDIA_NA |
IXGBE_ACI_LINK_EVENT_MODULE_QUAL_FAIL |
IXGBE_ACI_LINK_EVENT_PHY_FW_LOAD_FAIL));
bool autoneg, link_up = false; bool autoneg, link_up = false;
int ret = -EIO; int ret = -EIO;
u32 speed;
if (hw->mac.ops.check_link) if (hw->mac.ops.check_link)
ret = hw->mac.ops.check_link(hw, &speed, &link_up, false); ret = hw->mac.ops.check_link(hw, &speed, &link_up, false);
@ -5567,12 +5860,52 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
if (ret) if (ret)
return ret; return ret;
if (hw->mac.ops.setup_link) if (hw->mac.ops.setup_link) {
if (adapter->hw.mac.type == ixgbe_mac_e610) {
ret = ixgbe_enable_link_status_events(adapter, mask);
if (ret)
return ret;
}
ret = hw->mac.ops.setup_link(hw, speed, link_up); ret = hw->mac.ops.setup_link(hw, speed, link_up);
}
return ret; return ret;
} }
/**
* ixgbe_check_media_subtask - check for media
* @adapter: pointer to adapter structure
*
* If media is available then initialize PHY user configuration. Configure the
* PHY if the interface is up.
*/
static void ixgbe_check_media_subtask(struct ixgbe_adapter *adapter)
{
struct ixgbe_hw *hw = &adapter->hw;
/* No need to check for media if it's already present */
if (!(adapter->flags2 & IXGBE_FLAG2_NO_MEDIA))
return;
/* Refresh link info and check if media is present */
if (ixgbe_update_link_info(hw))
return;
ixgbe_check_link_cfg_err(adapter, hw->link.link_info.link_cfg_err);
if (hw->link.link_info.link_info & IXGBE_ACI_MEDIA_AVAILABLE) {
/* PHY settings are reset on media insertion, reconfigure
* PHY to preserve settings.
*/
if (!(ixgbe_non_sfp_link_config(&adapter->hw)))
adapter->flags2 &= ~IXGBE_FLAG2_NO_MEDIA;
/* A Link Status Event will be generated; the event handler
* will complete bringing the interface up
*/
}
}
/** /**
* ixgbe_clear_vf_stats_counters - Clear out VF stats after reset * ixgbe_clear_vf_stats_counters - Clear out VF stats after reset
* @adapter: board private structure * @adapter: board private structure
@ -5636,6 +5969,7 @@ static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
default: default:
IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(0), 0xFFFFFFFF); IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(0), 0xFFFFFFFF);
IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(1), 0xFFFFFFFF); IXGBE_WRITE_REG(hw, IXGBE_EIAM_EX(1), 0xFFFFFFFF);
@ -5986,6 +6320,7 @@ void ixgbe_disable_tx(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL,
(IXGBE_READ_REG(hw, IXGBE_DMATXCTL) & (IXGBE_READ_REG(hw, IXGBE_DMATXCTL) &
~IXGBE_DMATXCTL_TE)); ~IXGBE_DMATXCTL_TE));
@ -6230,6 +6565,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
ixgbe_clean_all_tx_rings(adapter); ixgbe_clean_all_tx_rings(adapter);
ixgbe_clean_all_rx_rings(adapter); ixgbe_clean_all_rx_rings(adapter);
if (adapter->hw.mac.type == ixgbe_mac_e610)
ixgbe_disable_link_status_events(adapter);
} }
/** /**
@ -6285,6 +6622,7 @@ static void ixgbe_init_dcb(struct ixgbe_adapter *adapter)
break; break;
case ixgbe_mac_X540: case ixgbe_mac_X540:
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_e610:
adapter->dcb_cfg.num_tcs.pg_tcs = X540_TRAFFIC_CLASS; adapter->dcb_cfg.num_tcs.pg_tcs = X540_TRAFFIC_CLASS;
adapter->dcb_cfg.num_tcs.pfc_tcs = X540_TRAFFIC_CLASS; adapter->dcb_cfg.num_tcs.pfc_tcs = X540_TRAFFIC_CLASS;
break; break;
@ -6348,6 +6686,8 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,
hw->subsystem_vendor_id = pdev->subsystem_vendor; hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_device_id = pdev->subsystem_device; hw->subsystem_device_id = pdev->subsystem_device;
hw->mac.max_link_up_time = IXGBE_LINK_UP_TIME;
/* get_invariants needs the device IDs */ /* get_invariants needs the device IDs */
ii->get_invariants(hw); ii->get_invariants(hw);
@ -6915,6 +7255,19 @@ int ixgbe_open(struct net_device *netdev)
ixgbe_up_complete(adapter); ixgbe_up_complete(adapter);
udp_tunnel_nic_reset_ntf(netdev); udp_tunnel_nic_reset_ntf(netdev);
if (adapter->hw.mac.type == ixgbe_mac_e610) {
int err = ixgbe_update_link_info(&adapter->hw);
if (err)
e_dev_err("Failed to update link info, err %d.\n", err);
ixgbe_check_link_cfg_err(adapter,
adapter->hw.link.link_info.link_cfg_err);
err = ixgbe_non_sfp_link_config(&adapter->hw);
if (ixgbe_non_sfp_link_config(&adapter->hw))
e_dev_err("Link setup failed, err %d.\n", err);
}
return 0; return 0;
@ -7068,6 +7421,7 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
pci_wake_from_d3(pdev, !!wufc); pci_wake_from_d3(pdev, !!wufc);
break; break;
default: default:
@ -7215,6 +7569,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
hwstats->pxonrxc[i] += hwstats->pxonrxc[i] +=
IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i)); IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i));
break; break;
@ -7231,7 +7586,8 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
hw->mac.type == ixgbe_mac_X540 || hw->mac.type == ixgbe_mac_X540 ||
hw->mac.type == ixgbe_mac_X550 || hw->mac.type == ixgbe_mac_X550 ||
hw->mac.type == ixgbe_mac_X550EM_x || hw->mac.type == ixgbe_mac_X550EM_x ||
hw->mac.type == ixgbe_mac_x550em_a) { hw->mac.type == ixgbe_mac_x550em_a ||
hw->mac.type == ixgbe_mac_e610) {
hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC_L(i)); hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
IXGBE_READ_REG(hw, IXGBE_QBTC_H(i)); /* to clear */ IXGBE_READ_REG(hw, IXGBE_QBTC_H(i)); /* to clear */
hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC_L(i)); hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC_L(i));
@ -7257,6 +7613,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
/* OS2BMC stats are X540 and later */ /* OS2BMC stats are X540 and later */
hwstats->o2bgptc += IXGBE_READ_REG(hw, IXGBE_O2BGPTC); hwstats->o2bgptc += IXGBE_READ_REG(hw, IXGBE_O2BGPTC);
hwstats->o2bspc += IXGBE_READ_REG(hw, IXGBE_O2BSPC); hwstats->o2bspc += IXGBE_READ_REG(hw, IXGBE_O2BSPC);
@ -7557,6 +7914,7 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
case ixgbe_mac_82599EB: { case ixgbe_mac_82599EB: {
u32 mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN); u32 mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN);
u32 fccfg = IXGBE_READ_REG(hw, IXGBE_FCCFG); u32 fccfg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
@ -8058,6 +8416,11 @@ static void ixgbe_service_task(struct work_struct *work)
ixgbe_service_event_complete(adapter); ixgbe_service_event_complete(adapter);
return; return;
} }
if (adapter->hw.mac.type == ixgbe_mac_e610) {
if (adapter->flags2 & IXGBE_FLAG2_FW_ASYNC_EVENT)
ixgbe_handle_fw_event(adapter);
ixgbe_check_media_subtask(adapter);
}
ixgbe_reset_subtask(adapter); ixgbe_reset_subtask(adapter);
ixgbe_phy_interrupt_subtask(adapter); ixgbe_phy_interrupt_subtask(adapter);
ixgbe_sfp_detection_subtask(adapter); ixgbe_sfp_detection_subtask(adapter);
@ -10776,6 +11139,24 @@ bool ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
return false; return false;
} }
/**
* ixgbe_set_fw_version_e610 - Set FW version specifically on E610 adapters
* @adapter: the adapter private structure
*
* This function is used by probe and ethtool to determine the FW version to
* format to display. The FW version is taken from the EEPROM/NVM.
*
*/
static void ixgbe_set_fw_version_e610(struct ixgbe_adapter *adapter)
{
struct ixgbe_orom_info *orom = &adapter->hw.flash.orom;
struct ixgbe_nvm_info *nvm = &adapter->hw.flash.nvm;
snprintf(adapter->eeprom_id, sizeof(adapter->eeprom_id),
"%x.%02x 0x%x %d.%d.%d", nvm->major, nvm->minor,
nvm->eetrack, orom->major, orom->build, orom->patch);
}
/** /**
* ixgbe_set_fw_version - Set FW version * ixgbe_set_fw_version - Set FW version
* @adapter: the adapter private structure * @adapter: the adapter private structure
@ -10788,6 +11169,11 @@ static void ixgbe_set_fw_version(struct ixgbe_adapter *adapter)
struct ixgbe_hw *hw = &adapter->hw; struct ixgbe_hw *hw = &adapter->hw;
struct ixgbe_nvm_version nvm_ver; struct ixgbe_nvm_version nvm_ver;
if (adapter->hw.mac.type == ixgbe_mac_e610) {
ixgbe_set_fw_version_e610(adapter);
return;
}
ixgbe_get_oem_prod_version(hw, &nvm_ver); ixgbe_get_oem_prod_version(hw, &nvm_ver);
if (nvm_ver.oem_valid) { if (nvm_ver.oem_valid) {
snprintf(adapter->eeprom_id, sizeof(adapter->eeprom_id), snprintf(adapter->eeprom_id, sizeof(adapter->eeprom_id),
@ -10874,6 +11260,8 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
#else #else
indices = IXGBE_MAX_RSS_INDICES; indices = IXGBE_MAX_RSS_INDICES;
#endif #endif
} else if (ii->mac == ixgbe_mac_e610) {
indices = IXGBE_MAX_RSS_INDICES_X550;
} }
netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), indices); netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), indices);
@ -10951,6 +11339,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
switch (adapter->hw.mac.type) { switch (adapter->hw.mac.type) {
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_e610:
netdev->udp_tunnel_nic_info = &ixgbe_udp_tunnels_x550; netdev->udp_tunnel_nic_info = &ixgbe_udp_tunnels_x550;
break; break;
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
@ -10971,6 +11360,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0); IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
break; break;
default: default:
@ -11142,6 +11532,8 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ether_addr_copy(hw->mac.addr, hw->mac.perm_addr); ether_addr_copy(hw->mac.addr, hw->mac.perm_addr);
ixgbe_mac_set_default_filter(adapter); ixgbe_mac_set_default_filter(adapter);
if (hw->mac.type == ixgbe_mac_e610)
mutex_init(&hw->aci.lock);
timer_setup(&adapter->service_timer, ixgbe_service_timer, 0); timer_setup(&adapter->service_timer, ixgbe_service_timer, 0);
if (ixgbe_removed(hw->hw_addr)) { if (ixgbe_removed(hw->hw_addr)) {
@ -11287,6 +11679,8 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_register: err_register:
ixgbe_release_hw_control(adapter); ixgbe_release_hw_control(adapter);
ixgbe_clear_interrupt_scheme(adapter); ixgbe_clear_interrupt_scheme(adapter);
if (hw->mac.type == ixgbe_mac_e610)
mutex_destroy(&adapter->hw.aci.lock);
err_sw_init: err_sw_init:
ixgbe_disable_sriov(adapter); ixgbe_disable_sriov(adapter);
adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP; adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;
@ -11333,6 +11727,11 @@ static void ixgbe_remove(struct pci_dev *pdev)
set_bit(__IXGBE_REMOVING, &adapter->state); set_bit(__IXGBE_REMOVING, &adapter->state);
cancel_work_sync(&adapter->service_task); cancel_work_sync(&adapter->service_task);
if (adapter->hw.mac.type == ixgbe_mac_e610) {
ixgbe_disable_link_status_events(adapter);
mutex_destroy(&adapter->hw.aci.lock);
}
if (adapter->mii_bus) if (adapter->mii_bus)
mdiobus_unregister(adapter->mii_bus); mdiobus_unregister(adapter->mii_bus);
@ -11464,6 +11863,9 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
device_id = IXGBE_DEV_ID_X550EM_A_VF; device_id = IXGBE_DEV_ID_X550EM_A_VF;
break; break;
case ixgbe_mac_e610:
device_id = IXGBE_DEV_ID_E610_VF;
break;
default: default:
device_id = 0; device_id = 0;
break; break;

4
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -283,6 +283,7 @@ static int ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_x:
case ixgbe_mac_x550em_a: case ixgbe_mac_x550em_a:
case ixgbe_mac_e610:
vflre = IXGBE_READ_REG(hw, IXGBE_VFLREC(reg_offset)); vflre = IXGBE_READ_REG(hw, IXGBE_VFLREC(reg_offset));
break; break;
default: default:
@ -407,6 +408,7 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw)
hw->mac.type != ixgbe_mac_X550 && hw->mac.type != ixgbe_mac_X550 &&
hw->mac.type != ixgbe_mac_X550EM_x && hw->mac.type != ixgbe_mac_X550EM_x &&
hw->mac.type != ixgbe_mac_x550em_a && hw->mac.type != ixgbe_mac_x550em_a &&
hw->mac.type != ixgbe_mac_e610 &&
hw->mac.type != ixgbe_mac_X540) hw->mac.type != ixgbe_mac_X540)
return; return;

5
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -1117,7 +1117,7 @@ int ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
hw->phy.ops.read_reg(hw, IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG, hw->phy.ops.read_reg(hw, IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
MDIO_MMD_AN, &autoneg_reg); MDIO_MMD_AN, &autoneg_reg);
if (hw->mac.type == ixgbe_mac_X550) { if (hw->mac.type == ixgbe_mac_X550 || hw->mac.type == ixgbe_mac_e610) {
/* Set or unset auto-negotiation 5G advertisement */ /* Set or unset auto-negotiation 5G advertisement */
autoneg_reg &= ~IXGBE_MII_5GBASE_T_ADVERTISE; autoneg_reg &= ~IXGBE_MII_5GBASE_T_ADVERTISE;
if ((hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_5GB_FULL) && if ((hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_5GB_FULL) &&
@ -1233,6 +1233,7 @@ static int ixgbe_get_copper_speeds_supported(struct ixgbe_hw *hw)
switch (hw->mac.type) { switch (hw->mac.type) {
case ixgbe_mac_X550: case ixgbe_mac_X550:
case ixgbe_mac_e610:
hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL;
hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL;
break; break;

12
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
View file

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -66,7 +66,9 @@ int ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw, ixgbe_link_speed speed,
* Resets the hardware by resetting the transmit and receive units, masks * Resets the hardware by resetting the transmit and receive units, masks
* and clears all interrupts, perform a PHY reset, and perform a link (MAC) * and clears all interrupts, perform a PHY reset, and perform a link (MAC)
* reset. * reset.
**/ *
* Return: 0 on success or negative value on failure
*/
int ixgbe_reset_hw_X540(struct ixgbe_hw *hw) int ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
{ {
u32 swfw_mask = hw->phy.phy_semaphore_mask; u32 swfw_mask = hw->phy.phy_semaphore_mask;
@ -133,10 +135,14 @@ int ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
hw->mac.num_rar_entries = IXGBE_X540_MAX_TX_QUEUES; hw->mac.num_rar_entries = IXGBE_X540_MAX_TX_QUEUES;
hw->mac.ops.init_rx_addrs(hw); hw->mac.ops.init_rx_addrs(hw);
/* The following is not supported by E610. */
if (hw->mac.type == ixgbe_mac_e610)
return status;
/* Store the permanent SAN mac address */ /* Store the permanent SAN mac address */
hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr); hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
/* Add the SAN MAC address to the RAR only if it's a valid address */ /* Add the SAN MAC address to RAR if it's a valid address */
if (is_valid_ether_addr(hw->mac.san_addr)) { if (is_valid_ether_addr(hw->mac.san_addr)) {
/* Save the SAN MAC RAR index */ /* Save the SAN MAC RAR index */
hw->mac.san_mac_rar_index = hw->mac.num_rar_entries - 1; hw->mac.san_mac_rar_index = hw->mac.num_rar_entries - 1;

21
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
View file

@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 1999 - 2018 Intel Corporation. */ /* Copyright(c) 1999 - 2024 Intel Corporation. */
#include "ixgbe_x540.h" #include "ixgbe_x540.h"
#include "ixgbe_x550.h"
#include "ixgbe_type.h" #include "ixgbe_type.h"
#include "ixgbe_common.h" #include "ixgbe_common.h"
#include "ixgbe_mbx.h" #include "ixgbe_mbx.h"
@ -2770,9 +2771,9 @@ static int ixgbe_led_off_t_x550em(struct ixgbe_hw *hw, u32 led_idx)
* semaphore, -EIO when command fails or -ENIVAL when incorrect * semaphore, -EIO when command fails or -ENIVAL when incorrect
* params passed. * params passed.
**/ **/
static int ixgbe_set_fw_drv_ver_x550(struct ixgbe_hw *hw, u8 maj, u8 min, int ixgbe_set_fw_drv_ver_x550(struct ixgbe_hw *hw, u8 maj, u8 min,
u8 build, u8 sub, u16 len, u8 build, u8 sub, u16 len,
const char *driver_ver) const char *driver_ver)
{ {
struct ixgbe_hic_drv_info2 fw_cmd; struct ixgbe_hic_drv_info2 fw_cmd;
int ret_val; int ret_val;
@ -3511,8 +3512,8 @@ static int ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)
* @enable: enable or disable switch for Ethertype anti-spoofing * @enable: enable or disable switch for Ethertype anti-spoofing
* @vf: Virtual Function pool - VF Pool to set for Ethertype anti-spoofing * @vf: Virtual Function pool - VF Pool to set for Ethertype anti-spoofing
**/ **/
static void ixgbe_set_ethertype_anti_spoofing_x550(struct ixgbe_hw *hw, void ixgbe_set_ethertype_anti_spoofing_x550(struct ixgbe_hw *hw,
bool enable, int vf) bool enable, int vf)
{ {
int vf_target_reg = vf >> 3; int vf_target_reg = vf >> 3;
int vf_target_shift = vf % 8 + IXGBE_SPOOF_ETHERTYPEAS_SHIFT; int vf_target_shift = vf % 8 + IXGBE_SPOOF_ETHERTYPEAS_SHIFT;
@ -3532,9 +3533,9 @@ static void ixgbe_set_ethertype_anti_spoofing_x550(struct ixgbe_hw *hw,
* @enable: enable or disable source address pruning * @enable: enable or disable source address pruning
* @pool: Rx pool to set source address pruning for * @pool: Rx pool to set source address pruning for
**/ **/
static void ixgbe_set_source_address_pruning_x550(struct ixgbe_hw *hw, void ixgbe_set_source_address_pruning_x550(struct ixgbe_hw *hw,
bool enable, bool enable,
unsigned int pool) unsigned int pool)
{ {
u64 pfflp; u64 pfflp;
@ -4047,7 +4048,7 @@ static const u32 ixgbe_mvals_X550EM_x[IXGBE_MVALS_IDX_LIMIT] = {
IXGBE_MVALS_INIT(X550EM_x) IXGBE_MVALS_INIT(X550EM_x)
}; };
static const u32 ixgbe_mvals_x550em_a[IXGBE_MVALS_IDX_LIMIT] = { const u32 ixgbe_mvals_x550em_a[IXGBE_MVALS_IDX_LIMIT] = {
IXGBE_MVALS_INIT(X550EM_a) IXGBE_MVALS_INIT(X550EM_a)
}; };

20
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.h Normal file
View file

@ -0,0 +1,20 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 2024 Intel Corporation. */
#ifndef _IXGBE_X550_H_
#define _IXGBE_X550_H_
#include "ixgbe_type.h"
extern const u32 ixgbe_mvals_x550em_a[IXGBE_MVALS_IDX_LIMIT];
int ixgbe_set_fw_drv_ver_x550(struct ixgbe_hw *hw, u8 maj, u8 min,
u8 build, u8 sub, u16 len,
const char *driver_ver);
void ixgbe_set_source_address_pruning_x550(struct ixgbe_hw *hw,
bool enable,
unsigned int pool);
void ixgbe_set_ethertype_anti_spoofing_x550(struct ixgbe_hw *hw,
bool enable, int vf);
#endif /* _IXGBE_X550_H_ */