Commit 847cf3b9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
ixgbe, ixgbevf: Add support for Intel(R) E610 device

Piotr Kwapulinski says:

Add initial support for Intel(R) E610 Series of network devices. The E610
is based on X550 but adds firmware managed link, enhanced security
capabilities and support for updated server manageability.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ixgbevf: Add support for Intel(R) E610 device
  PCI: Add PCI_VDEVICE_SUB helper macro
  ixgbe: Enable link management in E610 device
  ixgbe: Clean up the E610 link management related code
  ixgbe: Add ixgbe_x540 multiple header inclusion protection
  ixgbe: Add support for EEPROM dump in E610 device
  ixgbe: Add support for NVM handling in E610 device
  ixgbe: Add link management support for E610 device
  ixgbe: Add support for E610 device capabilities detection
  ixgbe: Add support for E610 FW Admin Command Interface
====================

Link: https://patch.msgid.link/20241220201521.3363985-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4c61d809 4c44b450

drivers/net/ethernet/intel/ixgbe/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright(c) 1999 - 2018 Intel Corporation.

# Copyright(c) 1999 - 2024 Intel Corporation.

#

# Makefile for the Intel(R) 10GbE PCI Express ethernet driver

#
@@ -9,7 +9,7 @@ obj-$(CONFIG_IXGBE) += ixgbe.o 
ixgbe-y := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \

           ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \

           ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o \

           ixgbe_xsk.o

           ixgbe_xsk.o ixgbe_e610.o



ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \

                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+12 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 1999 - 2018 Intel Corporation. */

/* Copyright(c) 1999 - 2024 Intel Corporation. */



#ifndef _IXGBE_H_

#define _IXGBE_H_
@@ -20,6 +20,7 @@ 
#include "ixgbe_type.h"

#include "ixgbe_common.h"

#include "ixgbe_dcb.h"

#include "ixgbe_e610.h"

#if IS_ENABLED(CONFIG_FCOE)

#define IXGBE_FCOE

#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 IXGBE_82599_VF_DEVICE_ID        0x10ED

#define IXGBE_X540_VF_DEVICE_ID         0x1515

#define IXGBE_E610_VF_DEVICE_ID		0x57AD



#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_PTP_PPS_ENABLED		BIT(10)

#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_EEE_CAPABLE			BIT(14)

#define IXGBE_FLAG2_EEE_ENABLED			BIT(15)
@@ -661,6 +664,9 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG2_IPSEC_ENABLED		BIT(17)

#define IXGBE_FLAG2_VF_IPSEC_ENABLED		BIT(18)

#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 */

	int num_tx_queues;
@@ -793,6 +799,7 @@ struct ixgbe_adapter { 
	u32 vferr_refcount;

	struct ixgbe_mac_addr *mac_table;

	struct kobject *info_kobj;

	u16 lse_mask;

#ifdef CONFIG_IXGBE_HWMON

	struct hwmon_buff *ixgbe_hwmon_buff;

#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_X550EM_x:

	case ixgbe_mac_x550em_a:

	case ixgbe_mac_e610:

		return IXGBE_MAX_RSS_INDICES_X550;

	default:

		return 0;
@@ -874,6 +882,7 @@ enum ixgbe_state_t { 
	__IXGBE_PTP_RUNNING,

	__IXGBE_PTP_TX_IN_PROGRESS,

	__IXGBE_RESET_REQUESTED,

	__IXGBE_PHY_INIT_COMPLETE,

};



struct ixgbe_cb {
@@ -896,6 +905,7 @@ enum ixgbe_boards { 
	board_x550em_x_fw,

	board_x550em_a,

	board_x550em_a_fw,

	board_e610,

};



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_a_info;

extern const struct ixgbe_info ixgbe_x550em_a_fw_info;

extern const struct ixgbe_info ixgbe_e610_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops ixgbe_dcbnl_ops;

#endif

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 1999 - 2018 Intel Corporation. */

/* Copyright(c) 1999 - 2024 Intel Corporation. */



#include <linux/pci.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_X550EM_x:

	case ixgbe_mac_x550em_a:

	case ixgbe_mac_e610:

		IXGBE_WRITE_REG(hw, IXGBE_FDIRSCTPM, ~fdirtcpm);

		break;

	default:

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+21 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 1999 - 2018 Intel Corporation. */

/* Copyright(c) 1999 - 2024 Intel Corporation. */



#include <linux/pci.h>

#include <linux/delay.h>
@@ -58,6 +58,7 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) 
		switch (hw->device_id) {

		case IXGBE_DEV_ID_X550EM_A_SFP:

		case IXGBE_DEV_ID_X550EM_A_SFP_N:

		case IXGBE_DEV_ID_E610_SFP:

			supported = false;

			break;

		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_1G_T:

		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;

			break;

		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)

			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_PCRC8ECH, MDIO_MMD_PCS, &i);

		hw->phy.ops.read_reg(hw, IXGBE_LDPCECL, MDIO_MMD_PCS, &i);
@@ -660,7 +668,11 @@ int ixgbe_get_bus_info_generic(struct ixgbe_hw *hw) 
	hw->bus.type = ixgbe_bus_type_pci_express;



	/* Get the negotiated link width and speed from PCI config space */

	link_status = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_LINK_STATUS);

	if (hw->mac.type == ixgbe_mac_e610)

		link_status = ixgbe_read_pci_cfg_word(hw, IXGBE_PCI_LINK_STATUS_E610);

	else

		link_status = ixgbe_read_pci_cfg_word(hw,

						      IXGBE_PCI_LINK_STATUS);



	hw->bus.width = ixgbe_convert_bus_width(link_status);

	hw->bus.speed = ixgbe_convert_bus_speed(link_status);
@@ -2918,6 +2930,10 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw) 
		pcie_offset = IXGBE_PCIE_MSIX_82599_CAPS;

		max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;

		break;

	case ixgbe_mac_e610:

		pcie_offset = IXGBE_PCIE_MSIX_E610_CAPS;

		max_msix_count = IXGBE_MAX_MSIX_VECTORS_82599;

		break;

	default:

		return 1;

	}
@@ -3366,7 +3382,8 @@ int ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, 
		*speed = IXGBE_LINK_SPEED_1GB_FULL;

		break;

	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))

			*speed = IXGBE_LINK_SPEED_5GB_FULL;

		else

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 1999 - 2018 Intel Corporation. */

/* Copyright(c) 1999 - 2024 Intel Corporation. */



#include "ixgbe.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_X540:

	case ixgbe_mac_X550:

	case ixgbe_mac_e610:

		for (j = 0; j < netdev->addr_len; j++, i++)

			perm_addr[i] = adapter->hw.mac.san_addr[j];

		break;