Skip to content

Commit

Permalink
Intel official release 5.22.25
Browse files Browse the repository at this point in the history
  • Loading branch information
@aloktion
aloktion committed Jan 3, 2025
1 parent 318b5a1 commit 4290973
Show file tree
Hide file tree
Showing 26 changed files with 707 additions and 490 deletions.
2 changes: 1 addition & 1 deletion README
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ixgbe Linux* Base Driver for Intel(R) Ethernet Network Connections
******************************************************************

November 26, 2024
December 09, 2024


Contents
Expand Down
154 changes: 77 additions & 77 deletions SUMS
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
33793 23 ixgbe-5.21.6/src/ixgbe_dcb_nl.c
37831 33 ixgbe-5.21.6/src/ixgbe_debugfs.c
42652 44 ixgbe-5.21.6/src/ixgbe_devlink.c
36288 2 ixgbe-5.21.6/src/ixgbe_devlink.h
28947 142 ixgbe-5.21.6/src/ixgbe_ethtool.c
00631 28 ixgbe-5.21.6/src/ixgbe_fcoe.c
45032 2 ixgbe-5.21.6/src/ixgbe_fcoe.h
03103 28 ixgbe-5.21.6/src/ixgbe_fw_update.c
39127 1 ixgbe-5.21.6/src/ixgbe_fw_update.h
17771 42 ixgbe-5.21.6/src/ixgbe.h
11416 39 ixgbe-5.21.6/src/ixgbe_lib.c
11314 418 ixgbe-5.21.6/src/ixgbe_main.c
01709 3 ixgbe-5.21.6/src/ixgbe_model.h
53188 2 ixgbe-5.21.6/src/ixgbe_osdep2.h
42856 6 ixgbe-5.21.6/src/ixgbe_osdep.h
14070 32 ixgbe-5.21.6/src/ixgbe_param.c
27779 25 ixgbe-5.21.6/src/ixgbe_procfs.c
52463 53 ixgbe-5.21.6/src/ixgbe_ptp.c
17129 54 ixgbe-5.21.6/src/ixgbe_sriov.c
54417 3 ixgbe-5.21.6/src/ixgbe_sriov.h
47519 8 ixgbe-5.21.6/src/ixgbe_sysfs.c
29208 3 ixgbe-5.21.6/src/ixgbe_txrx_common.h
49395 24 ixgbe-5.21.6/src/ixgbe_xsk.c
40720 39 ixgbe-5.21.6/src/ixgbe_82598.c
30753 2 ixgbe-5.21.6/src/ixgbe_82598.h
63425 76 ixgbe-5.21.6/src/ixgbe_82599.c
40415 2 ixgbe-5.21.6/src/ixgbe_82599.h
00964 49 ixgbe-5.21.6/src/ixgbe_api.c
64342 10 ixgbe-5.21.6/src/ixgbe_api.h
01139 143 ixgbe-5.21.6/src/ixgbe_common.c
41888 7 ixgbe-5.21.6/src/ixgbe_common.h
44239 10 ixgbe-5.21.6/src/ixgbe_dcb_82598.c
26436 3 ixgbe-5.21.6/src/ixgbe_dcb_82598.h
14972 17 ixgbe-5.21.6/src/ixgbe_dcb_82599.c
15379 4 ixgbe-5.21.6/src/ixgbe_dcb_82599.h
11817 20 ixgbe-5.21.6/src/ixgbe_dcb.c
13284 5 ixgbe-5.21.6/src/ixgbe_dcb.h
29341 165 ixgbe-5.21.6/src/ixgbe_e610.c
44960 10 ixgbe-5.21.6/src/ixgbe_e610.h
50806 30 ixgbe-5.21.6/src/ixgbe_mbx.c
45831 8 ixgbe-5.21.6/src/ixgbe_mbx.h
19036 71 ixgbe-5.21.6/src/ixgbe_phy.c
65238 8 ixgbe-5.21.6/src/ixgbe_phy.h
14289 83 ixgbe-5.21.6/src/ixgbe_type_e610.h
61921 173 ixgbe-5.21.6/src/ixgbe_type.h
04310 30 ixgbe-5.21.6/src/ixgbe_x540.c
25023 2 ixgbe-5.21.6/src/ixgbe_x540.h
24467 126 ixgbe-5.21.6/src/ixgbe_x550.c
09177 5 ixgbe-5.21.6/src/ixgbe_x550.h
26303 5 ixgbe-5.21.6/src/kcompat_gcc.h
35109 214 ixgbe-5.21.6/src/kcompat.h
15554 84 ixgbe-5.21.6/src/kcompat_impl.h
40162 22 ixgbe-5.21.6/src/kcompat-generator.sh
55708 12 ixgbe-5.21.6/src/kcompat-lib.sh
31136 1 ixgbe-5.21.6/src/kcompat_defs.h
00188 7 ixgbe-5.21.6/src/kcompat_sles_defs.h
58761 6 ixgbe-5.21.6/src/kcompat_rhel_defs.h
61688 2 ixgbe-5.21.6/src/kcompat_ubuntu_defs.h
46425 9 ixgbe-5.21.6/src/kcompat_std_defs.h
64712 77 ixgbe-5.21.6/src/kcompat.c
63964 29 ixgbe-5.21.6/src/kcompat_ethtool.c
19200 16 ixgbe-5.21.6/src/kcompat_overflow.h
39427 12 ixgbe-5.21.6/src/kcompat_cleanup.h
40297 58 ixgbe-5.21.6/src/kcompat_xarray.h
06218 5 ixgbe-5.21.6/src/auxiliary_compat.h
39339 33 ixgbe-5.21.6/src/kcompat_pldmfw.c
07249 6 ixgbe-5.21.6/src/kcompat_pldmfw.h
09996 7 ixgbe-5.21.6/src/Makefile
50138 18 ixgbe-5.21.6/src/common.mk
12190 1 ixgbe-5.21.6/src/Module.supported
58887 9 ixgbe-5.21.6/scripts/set_irq_affinity
28276 8 ixgbe-5.21.6/pci.updates
27626 1 ixgbe-5.21.6/security.md
12529 18 ixgbe-5.21.6/COPYING
23824 64 ixgbe-5.21.6/README
57047 67 ixgbe-5.21.6/ixgbe.7
03676 11 ixgbe-5.21.6/ixgbe.spec
62926 23 ixgbe-5.22.25/src/ixgbe_dcb_nl.c
17629 34 ixgbe-5.22.25/src/ixgbe_debugfs.c
41706 45 ixgbe-5.22.25/src/ixgbe_devlink.c
36288 2 ixgbe-5.22.25/src/ixgbe_devlink.h
44714 143 ixgbe-5.22.25/src/ixgbe_ethtool.c
28741 28 ixgbe-5.22.25/src/ixgbe_fcoe.c
45032 2 ixgbe-5.22.25/src/ixgbe_fcoe.h
48459 28 ixgbe-5.22.25/src/ixgbe_fw_update.c
39127 1 ixgbe-5.22.25/src/ixgbe_fw_update.h
13718 42 ixgbe-5.22.25/src/ixgbe.h
24404 39 ixgbe-5.22.25/src/ixgbe_lib.c
61115 418 ixgbe-5.22.25/src/ixgbe_main.c
01709 3 ixgbe-5.22.25/src/ixgbe_model.h
53188 2 ixgbe-5.22.25/src/ixgbe_osdep2.h
42856 6 ixgbe-5.22.25/src/ixgbe_osdep.h
14070 32 ixgbe-5.22.25/src/ixgbe_param.c
28900 25 ixgbe-5.22.25/src/ixgbe_procfs.c
19775 53 ixgbe-5.22.25/src/ixgbe_ptp.c
44536 54 ixgbe-5.22.25/src/ixgbe_sriov.c
54417 3 ixgbe-5.22.25/src/ixgbe_sriov.h
47519 8 ixgbe-5.22.25/src/ixgbe_sysfs.c
29208 3 ixgbe-5.22.25/src/ixgbe_txrx_common.h
06964 26 ixgbe-5.22.25/src/ixgbe_xsk.c
40720 39 ixgbe-5.22.25/src/ixgbe_82598.c
30753 2 ixgbe-5.22.25/src/ixgbe_82598.h
63425 76 ixgbe-5.22.25/src/ixgbe_82599.c
40415 2 ixgbe-5.22.25/src/ixgbe_82599.h
15102 49 ixgbe-5.22.25/src/ixgbe_api.c
64342 10 ixgbe-5.22.25/src/ixgbe_api.h
01139 143 ixgbe-5.22.25/src/ixgbe_common.c
41888 7 ixgbe-5.22.25/src/ixgbe_common.h
44239 10 ixgbe-5.22.25/src/ixgbe_dcb_82598.c
26436 3 ixgbe-5.22.25/src/ixgbe_dcb_82598.h
14972 17 ixgbe-5.22.25/src/ixgbe_dcb_82599.c
15379 4 ixgbe-5.22.25/src/ixgbe_dcb_82599.h
11817 20 ixgbe-5.22.25/src/ixgbe_dcb.c
13284 5 ixgbe-5.22.25/src/ixgbe_dcb.h
17074 168 ixgbe-5.22.25/src/ixgbe_e610.c
25333 10 ixgbe-5.22.25/src/ixgbe_e610.h
29420 31 ixgbe-5.22.25/src/ixgbe_mbx.c
45831 8 ixgbe-5.22.25/src/ixgbe_mbx.h
19036 71 ixgbe-5.22.25/src/ixgbe_phy.c
65238 8 ixgbe-5.22.25/src/ixgbe_phy.h
56003 86 ixgbe-5.22.25/src/ixgbe_type_e610.h
61921 173 ixgbe-5.22.25/src/ixgbe_type.h
04310 30 ixgbe-5.22.25/src/ixgbe_x540.c
25023 2 ixgbe-5.22.25/src/ixgbe_x540.h
24467 126 ixgbe-5.22.25/src/ixgbe_x550.c
09177 5 ixgbe-5.22.25/src/ixgbe_x550.h
26303 5 ixgbe-5.22.25/src/kcompat_gcc.h
35001 212 ixgbe-5.22.25/src/kcompat.h
35433 88 ixgbe-5.22.25/src/kcompat_impl.h
36611 26 ixgbe-5.22.25/src/kcompat-generator.sh
59327 12 ixgbe-5.22.25/src/kcompat-lib.sh
31136 1 ixgbe-5.22.25/src/kcompat_defs.h
07717 7 ixgbe-5.22.25/src/kcompat_sles_defs.h
44191 5 ixgbe-5.22.25/src/kcompat_rhel_defs.h
61688 2 ixgbe-5.22.25/src/kcompat_ubuntu_defs.h
25625 8 ixgbe-5.22.25/src/kcompat_std_defs.h
64712 77 ixgbe-5.22.25/src/kcompat.c
63964 29 ixgbe-5.22.25/src/kcompat_ethtool.c
35974 17 ixgbe-5.22.25/src/kcompat_overflow.h
28921 12 ixgbe-5.22.25/src/kcompat_cleanup.h
40297 58 ixgbe-5.22.25/src/kcompat_xarray.h
06218 5 ixgbe-5.22.25/src/auxiliary_compat.h
22864 33 ixgbe-5.22.25/src/kcompat_pldmfw.c
07249 6 ixgbe-5.22.25/src/kcompat_pldmfw.h
09996 7 ixgbe-5.22.25/src/Makefile
50138 18 ixgbe-5.22.25/src/common.mk
12190 1 ixgbe-5.22.25/src/Module.supported
58887 9 ixgbe-5.22.25/scripts/set_irq_affinity
28276 8 ixgbe-5.22.25/pci.updates
27626 1 ixgbe-5.22.25/security.md
12529 18 ixgbe-5.22.25/COPYING
03956 64 ixgbe-5.22.25/README
31382 67 ixgbe-5.22.25/ixgbe.7
09118 11 ixgbe-5.22.25/ixgbe.spec
2 changes: 1 addition & 1 deletion ixgbe.7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "IXGBE" "7" "November 26, 2024" "" "Linux ixgbe README"
.TH "IXGBE" "7" "December 09, 2024" "" "Linux ixgbe README"
.SH NAME
ixgbe \- ixgbe Linux* Base Driver for Intel(R) Ethernet Network Connections
.SS Contents
Expand Down
2 changes: 1 addition & 1 deletion ixgbe.spec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: ixgbe
Summary: Intel(R) 10GbE PCI Express Linux Network Driver
Version: 5.21.6
Version: 5.22.25
Release: 1
Source: %{name}-%{version}.tar.gz
Vendor: Intel Corporation
Expand Down
43 changes: 21 additions & 22 deletions src/ixgbe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,23 @@ struct ixgbe_therm_proc_data {

#define IXGBE_PRIMARY_ABORT_LIMIT 5

enum ixgbe_state_t {
__IXGBE_TESTING,
__IXGBE_RESETTING,
__IXGBE_DOWN,
__IXGBE_DISABLED,
__IXGBE_REMOVING,
__IXGBE_SERVICE_SCHED,
__IXGBE_SERVICE_INITED,
__IXGBE_IN_SFP_INIT,
#ifdef HAVE_PTP_1588_CLOCK
__IXGBE_PTP_RUNNING,
__IXGBE_PTP_TX_IN_PROGRESS,
#endif
__IXGBE_RESET_REQUESTED,
__IXGBE_STATE_T_NUM /* Must be last */
};

/* board specific private data structure */
struct ixgbe_adapter {
#if defined(NETIF_F_HW_VLAN_TX) || defined(NETIF_F_HW_VLAN_CTAG_TX)
Expand All @@ -860,7 +877,7 @@ struct ixgbe_adapter {
struct bpf_prog *xdp_prog;
struct pci_dev *pdev;

unsigned long state;
DECLARE_BITMAP(state, __IXGBE_STATE_T_NUM);

/* Some features need tri-state capability,
* thus the additional *_CAPABLE flags.
Expand Down Expand Up @@ -1153,13 +1170,11 @@ struct ixgbe_adapter {
#endif
#ifdef HAVE_AF_XDP_ZC_SUPPORT
/* AF_XDP zero-copy */
#ifdef HAVE_NETDEV_BPF_XSK_POOL
struct xsk_buff_pool **xsk_pools;
#else
#ifndef HAVE_NETDEV_BPF_XSK_POOL
struct xdp_umem **xsk_pools;
#endif /* HAVE_NETDEV_BPF_XSK_POOL */
u16 num_xsk_pools_used;
u16 num_xsk_pools;
#endif /* HAVE_NETDEV_BPF_XSK_POOL */
#endif
struct devlink *devlink;
struct devlink_port devlink_port;
Expand Down Expand Up @@ -1216,22 +1231,6 @@ struct ixgbe_fdir_filter {
u64 action;
};

enum ixgbe_state_t {
__IXGBE_TESTING,
__IXGBE_RESETTING,
__IXGBE_DOWN,
__IXGBE_DISABLED,
__IXGBE_REMOVING,
__IXGBE_SERVICE_SCHED,
__IXGBE_SERVICE_INITED,
__IXGBE_IN_SFP_INIT,
#ifdef HAVE_PTP_1588_CLOCK
__IXGBE_PTP_RUNNING,
__IXGBE_PTP_TX_IN_PROGRESS,
#endif
__IXGBE_RESET_REQUESTED,
};

struct ixgbe_cb {
#ifdef CONFIG_IXGBE_DISABLE_PACKET_SPLIT
union { /* Union defining head/tail partner */
Expand Down Expand Up @@ -1371,7 +1370,6 @@ void ixgbe_dbg_adapter_init(struct ixgbe_adapter *adapter);
void ixgbe_dbg_adapter_exit(struct ixgbe_adapter *adapter);
void ixgbe_dbg_init(void);
void ixgbe_dbg_exit(void);
void ixgbe_pf_fwlog_update_module(struct ixgbe_adapter *adapter, int log_level, int module);
#endif /* HAVE_IXGBE_DEBUG_FS */

static inline struct netdev_queue *txring_txq(const struct ixgbe_ring *ring)
Expand Down Expand Up @@ -1456,5 +1454,6 @@ bool ixgbe_fwlog_ring_empty(struct ixgbe_fwlog_ring *rings);
void ixgbe_fwlog_ring_increment(u16 *item, u16 size);
void ixgbe_fwlog_realloc_rings(struct ixgbe_hw *hw, int ring_size);
s32 ixgbe_fwlog_init(struct ixgbe_hw *hw);
void ixgbe_set_fw_version_E610(struct ixgbe_adapter *adapter);

#endif /* _IXGBE_H_ */
5 changes: 3 additions & 2 deletions src/ixgbe_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,8 +1129,9 @@ s32 ixgbe_set_fw_drv_ver(struct ixgbe_hw *hw, u8 maj, u8 min, u8 build,
*/
bool ixgbe_get_fw_tsam_mode(struct ixgbe_hw *hw)
{
return ixgbe_call_func(hw, hw->mac.ops.get_fw_tsam_mode, (hw),
IXGBE_NOT_IMPLEMENTED);
if (hw->mac.ops.get_fw_tsam_mode)
return hw->mac.ops.get_fw_tsam_mode(hw);
return false;
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/ixgbe_dcb_nl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev)
{
struct ixgbe_adapter *adapter = netdev_priv(dev);

while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
while (test_and_set_bit(__IXGBE_RESETTING, adapter->state))
usleep_range(1000, 2000);

if (netif_running(dev))
Expand All @@ -323,7 +323,7 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev)
dev->open(dev);
#endif

clear_bit(__IXGBE_RESETTING, &adapter->state);
clear_bit(__IXGBE_RESETTING, adapter->state);
}

static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
Expand Down Expand Up @@ -646,7 +646,7 @@ static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
return -EINVAL;

if (!adapter->ixgbe_ieee_ets) {
adapter->ixgbe_ieee_ets = kmalloc(sizeof(struct ieee_ets),
adapter->ixgbe_ieee_ets = kzalloc(sizeof(struct ieee_ets),
GFP_KERNEL);
if (!adapter->ixgbe_ieee_ets)
return -ENOMEM;
Expand Down Expand Up @@ -724,7 +724,7 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
return -EINVAL;

if (!adapter->ixgbe_ieee_pfc) {
adapter->ixgbe_ieee_pfc = kmalloc(sizeof(struct ieee_pfc),
adapter->ixgbe_ieee_pfc = kzalloc(sizeof(struct ieee_pfc),
GFP_KERNEL);
if (!adapter->ixgbe_ieee_pfc)
return -ENOMEM;
Expand Down
18 changes: 15 additions & 3 deletions src/ixgbe_debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ static const char * const ixgbe_fwlog_module_string[] = {
"WATCHDOG",
"TASK_DISPATCH",
"MNG",
"SYNCE",
"HEALTH",
"TSDRV",
"PFREG",
Expand Down Expand Up @@ -106,6 +107,10 @@ static void ixgbe_print_fwlog_config(struct ixgbe_hw *hw, struct ixgbe_fwlog_cfg
struct ixgbe_fwlog_module_entry *entry =
&cfg->module_entries[i];

/* TODO: Remove this hack when SyncE gets turned on always */
if (i == IXGBE_ACI_FW_LOG_ID_SYNCE)
continue;

len = snprintf(tmp, used, "\tModule: %s, Log Level: %s\n",
ixgbe_fwlog_module_string[entry->module_id],
ixgbe_fwlog_level_string[entry->log_level]);
Expand Down Expand Up @@ -387,7 +392,7 @@ struct ixgbe_cluster_header {

/**
* ixgbe_get_last_table_id - get a value that should be used as End of Table
* @pf: pointer to pf struct
* @adapter: pointer to adapter struct
*
* Different versions of FW may indicate End Of Table by different value. Read
* FW capabilities and decide what value to use as End of Table.
Expand All @@ -407,6 +412,7 @@ static u16 ixgbe_get_last_table_id(struct ixgbe_adapter *adapter)
* ixgbe_debugfs_fw_dump - send request to FW to dump cluster and save to file
* @adapter: pointer to adapter struct
* @cluster_id: number or FW cluster to be dumped
* @read_all_clusters: ignore cluster_id and dump all clusters
*
* Create FW configuration binary snapshot. Repeatedly send ACI requests to dump
* FW cluster, FW responds in 4KB blocks and sets new values for table_id
Expand Down Expand Up @@ -1012,6 +1018,12 @@ static ssize_t ixgbe_debugfs_module_write(struct file *file, const char __user *
goto module_write_error;
}

/* TODO: remove this hack when SyncE gets turned on always */
if (module == IXGBE_ACI_FW_LOG_ID_SYNCE) {
ret = -EINVAL;
goto module_write_error;
}

log_level = sysfs_match_string(ixgbe_fwlog_level_string, argv[1]);
if (log_level < 0) {
dev_info(dev, "unknown log level '%s'\n", argv[1]);
Expand All @@ -1023,15 +1035,15 @@ static ssize_t ixgbe_debugfs_module_write(struct file *file, const char __user *
* sysfs_match_string()
*/
if (module != IXGBE_ACI_FW_LOG_ID_MAX) {
ixgbe_pf_fwlog_update_module(adapter, log_level, module);
ixgbe_pf_fwlog_update_modules(adapter, log_level, 1 << module);
} else {
/* the module 'ALL' is a shortcut so that we can set
* all of the modules to the same level quickly
*/
int i;

for (i = 0; i < IXGBE_ACI_FW_LOG_ID_MAX; i++)
ixgbe_pf_fwlog_update_module(adapter, log_level, i);
ixgbe_pf_fwlog_update_modules(adapter, log_level, 1 << i);
}
} else {
dev_info(dev, "unknown or invalid command '%s'\n", argv[0]);
Expand Down
Loading

0 comments on commit 4290973

Please sign in to comment.