From 484c7812b3e53011a1bfde36ab9af7caa89a48c8 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Tue, 14 Feb 2023 01:28:13 -0800 Subject: [PATCH] Intel official release 5.18.11 --- SUMS | 126 +++++++++++++++++++------------------- ixgbe.spec | 58 +++--------------- pci.updates | 4 +- src/Makefile | 4 +- src/common.mk | 4 +- src/ixgbe.h | 4 +- src/ixgbe_82598.c | 4 +- src/ixgbe_82598.h | 4 +- src/ixgbe_82599.c | 4 +- src/ixgbe_82599.h | 4 +- src/ixgbe_api.c | 4 +- src/ixgbe_api.h | 4 +- src/ixgbe_common.c | 4 +- src/ixgbe_common.h | 4 +- src/ixgbe_dcb.c | 4 +- src/ixgbe_dcb.h | 4 +- src/ixgbe_dcb_82598.c | 4 +- src/ixgbe_dcb_82598.h | 4 +- src/ixgbe_dcb_82599.c | 4 +- src/ixgbe_dcb_82599.h | 4 +- src/ixgbe_dcb_nl.c | 4 +- src/ixgbe_debugfs.c | 4 +- src/ixgbe_ethtool.c | 4 +- src/ixgbe_fcoe.c | 4 +- src/ixgbe_fcoe.h | 4 +- src/ixgbe_lib.c | 4 +- src/ixgbe_main.c | 16 +++-- src/ixgbe_mbx.c | 4 +- src/ixgbe_mbx.h | 6 +- src/ixgbe_model.h | 4 +- src/ixgbe_osdep.h | 4 +- src/ixgbe_osdep2.h | 4 +- src/ixgbe_param.c | 4 +- src/ixgbe_phy.c | 4 +- src/ixgbe_phy.h | 4 +- src/ixgbe_procfs.c | 4 +- src/ixgbe_ptp.c | 4 +- src/ixgbe_sriov.c | 4 +- src/ixgbe_sriov.h | 4 +- src/ixgbe_sysfs.c | 4 +- src/ixgbe_txrx_common.h | 4 +- src/ixgbe_type.h | 9 ++- src/ixgbe_x540.c | 4 +- src/ixgbe_x540.h | 4 +- src/ixgbe_x550.c | 4 +- src/ixgbe_x550.h | 4 +- src/ixgbe_xsk.c | 4 +- src/kcompat.c | 4 +- src/kcompat.h | 7 ++- src/kcompat_defs.h | 4 +- src/kcompat_ethtool.c | 4 +- src/kcompat_gcc.h | 4 +- src/kcompat_impl.h | 19 +++++- src/kcompat_oracle_defs.h | 4 +- src/kcompat_overflow.h | 4 +- src/kcompat_rhel_defs.h | 14 ++++- src/kcompat_sles_defs.h | 6 +- src/kcompat_std_defs.h | 18 +++++- src/kcompat_ubuntu_defs.h | 4 +- 59 files changed, 243 insertions(+), 232 deletions(-) diff --git a/SUMS b/SUMS index 3cdfc50..529a422 100644 --- a/SUMS +++ b/SUMS @@ -1,63 +1,63 @@ -47745 25 ixgbe-5.18.6/src/ixgbe_xsk.c -01197 3 ixgbe-5.18.6/src/ixgbe_txrx_common.h -52716 8 ixgbe-5.18.6/src/ixgbe_sysfs.c -61530 3 ixgbe-5.18.6/src/ixgbe_sriov.h -46495 54 ixgbe-5.18.6/src/ixgbe_sriov.c -33940 51 ixgbe-5.18.6/src/ixgbe_ptp.c -55412 25 ixgbe-5.18.6/src/ixgbe_procfs.c -00245 32 ixgbe-5.18.6/src/ixgbe_param.c -05019 2 ixgbe-5.18.6/src/ixgbe_osdep2.h -04527 6 ixgbe-5.18.6/src/ixgbe_osdep.h -09539 3 ixgbe-5.18.6/src/ixgbe_model.h -50315 375 ixgbe-5.18.6/src/ixgbe_main.c -64723 39 ixgbe-5.18.6/src/ixgbe_lib.c -51835 2 ixgbe-5.18.6/src/ixgbe_fcoe.h -28051 28 ixgbe-5.18.6/src/ixgbe_fcoe.c -41704 137 ixgbe-5.18.6/src/ixgbe_ethtool.c -62975 7 ixgbe-5.18.6/src/ixgbe_debugfs.c -55592 23 ixgbe-5.18.6/src/ixgbe_dcb_nl.c -03809 40 ixgbe-5.18.6/src/ixgbe.h -37769 5 ixgbe-5.18.6/src/ixgbe_x550.h -41773 126 ixgbe-5.18.6/src/ixgbe_x550.c -48938 2 ixgbe-5.18.6/src/ixgbe_x540.h -29738 30 ixgbe-5.18.6/src/ixgbe_x540.c -13672 171 ixgbe-5.18.6/src/ixgbe_type.h -34956 8 ixgbe-5.18.6/src/ixgbe_phy.h -55396 71 ixgbe-5.18.6/src/ixgbe_phy.c -07223 8 ixgbe-5.18.6/src/ixgbe_mbx.h -29027 30 ixgbe-5.18.6/src/ixgbe_mbx.c -29968 4 ixgbe-5.18.6/src/ixgbe_dcb_82599.h -04826 17 ixgbe-5.18.6/src/ixgbe_dcb_82599.c -53142 3 ixgbe-5.18.6/src/ixgbe_dcb_82598.h -40372 10 ixgbe-5.18.6/src/ixgbe_dcb_82598.c -18110 5 ixgbe-5.18.6/src/ixgbe_dcb.h -20464 20 ixgbe-5.18.6/src/ixgbe_dcb.c -11416 7 ixgbe-5.18.6/src/ixgbe_common.h -00689 143 ixgbe-5.18.6/src/ixgbe_common.c -63969 10 ixgbe-5.18.6/src/ixgbe_api.h -10919 47 ixgbe-5.18.6/src/ixgbe_api.c -25858 2 ixgbe-5.18.6/src/ixgbe_82599.h -35540 76 ixgbe-5.18.6/src/ixgbe_82599.c -09326 2 ixgbe-5.18.6/src/ixgbe_82598.h -13782 39 ixgbe-5.18.6/src/ixgbe_82598.c -17957 1 ixgbe-5.18.6/src/kcompat_gcc.h -16737 220 ixgbe-5.18.6/src/kcompat.h -35040 43 ixgbe-5.18.6/src/kcompat_impl.h -02164 1 ixgbe-5.18.6/src/kcompat_defs.h -21434 9 ixgbe-5.18.6/src/kcompat_sles_defs.h -14116 8 ixgbe-5.18.6/src/kcompat_rhel_defs.h -18482 2 ixgbe-5.18.6/src/kcompat_oracle_defs.h -44001 2 ixgbe-5.18.6/src/kcompat_ubuntu_defs.h -53036 13 ixgbe-5.18.6/src/kcompat_std_defs.h -58437 76 ixgbe-5.18.6/src/kcompat.c -14487 29 ixgbe-5.18.6/src/kcompat_ethtool.c -47955 10 ixgbe-5.18.6/src/kcompat_overflow.h -39849 7 ixgbe-5.18.6/src/Makefile -34081 19 ixgbe-5.18.6/src/common.mk -12190 1 ixgbe-5.18.6/src/Module.supported -57879 9 ixgbe-5.18.6/scripts/set_irq_affinity -07471 7 ixgbe-5.18.6/pci.updates -12529 18 ixgbe-5.18.6/COPYING -52569 60 ixgbe-5.18.6/README -45537 9 ixgbe-5.18.6/ixgbe.7 -44504 13 ixgbe-5.18.6/ixgbe.spec +45960 25 ixgbe-5.18.11/src/ixgbe_xsk.c +31115 3 ixgbe-5.18.11/src/ixgbe_txrx_common.h +55902 8 ixgbe-5.18.11/src/ixgbe_sysfs.c +11126 3 ixgbe-5.18.11/src/ixgbe_sriov.h +49143 54 ixgbe-5.18.11/src/ixgbe_sriov.c +58195 51 ixgbe-5.18.11/src/ixgbe_ptp.c +26511 25 ixgbe-5.18.11/src/ixgbe_procfs.c +39780 32 ixgbe-5.18.11/src/ixgbe_param.c +51140 2 ixgbe-5.18.11/src/ixgbe_osdep2.h +58481 6 ixgbe-5.18.11/src/ixgbe_osdep.h +42706 3 ixgbe-5.18.11/src/ixgbe_model.h +08807 376 ixgbe-5.18.11/src/ixgbe_main.c +09335 39 ixgbe-5.18.11/src/ixgbe_lib.c +28582 2 ixgbe-5.18.11/src/ixgbe_fcoe.h +23936 28 ixgbe-5.18.11/src/ixgbe_fcoe.c +29538 137 ixgbe-5.18.11/src/ixgbe_ethtool.c +38237 7 ixgbe-5.18.11/src/ixgbe_debugfs.c +20364 23 ixgbe-5.18.11/src/ixgbe_dcb_nl.c +00983 40 ixgbe-5.18.11/src/ixgbe.h +63173 5 ixgbe-5.18.11/src/ixgbe_x550.h +34247 126 ixgbe-5.18.11/src/ixgbe_x550.c +43418 2 ixgbe-5.18.11/src/ixgbe_x540.h +18419 30 ixgbe-5.18.11/src/ixgbe_x540.c +24719 171 ixgbe-5.18.11/src/ixgbe_type.h +12534 8 ixgbe-5.18.11/src/ixgbe_phy.h +59994 71 ixgbe-5.18.11/src/ixgbe_phy.c +41342 8 ixgbe-5.18.11/src/ixgbe_mbx.h +33639 30 ixgbe-5.18.11/src/ixgbe_mbx.c +59946 4 ixgbe-5.18.11/src/ixgbe_dcb_82599.h +48256 17 ixgbe-5.18.11/src/ixgbe_dcb_82599.c +20802 3 ixgbe-5.18.11/src/ixgbe_dcb_82598.h +45396 10 ixgbe-5.18.11/src/ixgbe_dcb_82598.c +08954 5 ixgbe-5.18.11/src/ixgbe_dcb.h +51476 20 ixgbe-5.18.11/src/ixgbe_dcb.c +44570 7 ixgbe-5.18.11/src/ixgbe_common.h +56175 143 ixgbe-5.18.11/src/ixgbe_common.c +40570 10 ixgbe-5.18.11/src/ixgbe_api.h +50850 47 ixgbe-5.18.11/src/ixgbe_api.c +03508 2 ixgbe-5.18.11/src/ixgbe_82599.h +25852 76 ixgbe-5.18.11/src/ixgbe_82599.c +30113 2 ixgbe-5.18.11/src/ixgbe_82598.h +61827 39 ixgbe-5.18.11/src/ixgbe_82598.c +51953 1 ixgbe-5.18.11/src/kcompat_gcc.h +26689 220 ixgbe-5.18.11/src/kcompat.h +32270 44 ixgbe-5.18.11/src/kcompat_impl.h +21069 1 ixgbe-5.18.11/src/kcompat_defs.h +45283 9 ixgbe-5.18.11/src/kcompat_sles_defs.h +06658 8 ixgbe-5.18.11/src/kcompat_rhel_defs.h +60511 2 ixgbe-5.18.11/src/kcompat_oracle_defs.h +03336 2 ixgbe-5.18.11/src/kcompat_ubuntu_defs.h +20284 13 ixgbe-5.18.11/src/kcompat_std_defs.h +28630 76 ixgbe-5.18.11/src/kcompat.c +53656 29 ixgbe-5.18.11/src/kcompat_ethtool.c +26285 10 ixgbe-5.18.11/src/kcompat_overflow.h +11313 7 ixgbe-5.18.11/src/Makefile +26265 19 ixgbe-5.18.11/src/common.mk +12190 1 ixgbe-5.18.11/src/Module.supported +57879 9 ixgbe-5.18.11/scripts/set_irq_affinity +17107 7 ixgbe-5.18.11/pci.updates +12529 18 ixgbe-5.18.11/COPYING +52569 60 ixgbe-5.18.11/README +45537 9 ixgbe-5.18.11/ixgbe.7 +24363 11 ixgbe-5.18.11/ixgbe.spec diff --git a/ixgbe.spec b/ixgbe.spec index 669573a..c616384 100644 --- a/ixgbe.spec +++ b/ixgbe.spec @@ -1,6 +1,6 @@ Name: ixgbe Summary: Intel(R) 10GbE PCI Express Linux Network Driver -Version: 5.18.6 +Version: 5.18.11 Release: 1 Source: %{name}-%{version}.tar.gz Vendor: Intel Corporation @@ -19,6 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %define pcitable %find %{_pcitable} Requires: kernel, findutils, gawk, bash +%global __strip /bin/true + %if 0%{?BUILD_KERNEL:1} %define kernel_ver %{BUILD_KERNEL} %define check_aux_args_kernel -b %{BUILD_KERNEL} @@ -32,14 +34,6 @@ Requires: kernel, findutils, gawk, bash %define check_aux_args %check_aux_args_kernel %check_aux_args_ksrc -%define need_aux_rpm %( [ -L /lib/modules/%kernel_ver/source ] && \ - (rpm -q --whatprovides /lib/modules/%kernel_ver/source/include/linux/auxiliary_bus.h > /dev/null 2>&1 && echo 0 || echo 2) || \ - (rpm -q --whatprovides /lib/modules/%kernel_ver/build/include/linux/auxiliary_bus.h > /dev/null 2>&1 && echo 0 || echo 2) ) - -%if (%need_aux_rpm == 2) -Requires: intel_auxiliary -%endif - # Check for existence of variable kernel_module_package_buildreqs ... %if 0%{?!kernel_module_package_buildreqs:1} # ... and provide a suitable definition if it is not defined @@ -62,49 +56,25 @@ make -C src clean make -C src %install -%define req_aux %( [[ "%name" =~ ^(ice|ice_sw|ice_swx|iavf|i40e)$ ]] && echo 0 || echo 1 ) - -# install drivers that have auxiliary driver dependency -%if (%req_aux == 0) -make -C src INSTALL_MOD_PATH=%{buildroot} MANDIR=%{_mandir} modules_install_no_aux mandocs_install +make -C src INSTALL_MOD_PATH=%{buildroot} MANDIR=%{_mandir} modules_install mandocs_install # Remove modules files that we do not want to include find %{buildroot}/lib/modules/ -name 'modules.*' -exec rm -f {} \; cd %{buildroot} find lib -name "ixgbe.ko" -printf "/%p\n" \ >%{_builddir}/%{name}-%{version}/file.list -%if (%need_aux_rpm == 2) -make -C %{_builddir}/%{name}-%{version}/src INSTALL_MOD_PATH=%{buildroot} auxiliary_install -find lib -path "*extern-symvers/intel_auxiliary.symvers" -printf "/%p\n" \ - >%{_builddir}/%{name}-%{version}/aux.list -find * -name "auxiliary_bus.h" -printf "/%p\n" \ - >>%{_builddir}/%{name}-%{version}/aux.list -%endif -if [ "$(%{_builddir}/%{name}-%{version}/scripts/./check_aux_bus %check_aux_args; echo $?)" == "2" ] ; then - find lib -name "intel_auxiliary.ko" -printf "/%p\n" \ - >>%{_builddir}/%{name}-%{version}/file.list -fi - -# install drivers that do not have auxiliary driver dependency -%else -make -C src INSTALL_MOD_PATH=%{buildroot} MANDIR=%{_mandir} modules_install mandocs_install -# Remove modules files that we do not want to include -find %{buildroot}/lib/modules/ -name 'modules.*' -exec rm -f {} \; +export _ksrc=%{_usrsrc}/kernels/%{kernel_ver} cd %{buildroot} -find lib -name "ixgbe.ko" \ - -fprintf %{_builddir}/%{name}-%{version}/file.list "/%p\n" -%endif - # Sign the modules(s) %if %{?_with_modsign:1}%{!?_with_modsign:0} %define __strip /bin/true %{!?privkey: %define privkey %{_sysconfdir}/pki/SECURE-BOOT-KEY.priv} %{!?pubkey: %define pubkey %{_sysconfdir}/pki/SECURE-BOOT-KEY.der} -%{!?_signfile: %define _signfile %{_usrsrc}/kernels/%{kernel_ver}/scripts/sign-file} +%{!?_signfile: %define _signfile ${_ksrc}/scripts/sign-file} for module in `find . -type f -name *.ko`; do strip --strip-debug ${module} -$(KSRC=%{_usrsrc}/kernels/%{kernel_ver} %{_signfile} sha512 %{privkey} %{pubkey} ${module} > /dev/null 2>&1) +$(KSRC=${_ksrc} %{_signfile} sha512 %{privkey} %{pubkey} ${module} > /dev/null 2>&1) done %endif @@ -469,17 +439,3 @@ else exit -1 fi -%if (%need_aux_rpm == 2) && (%req_aux == 0) -%package -n intel_auxiliary -Summary: Auxiliary bus driver (backport) -Version: 1.0.0 - -%description -n intel_auxiliary -The Auxiliary bus driver (intel_auxiliary.ko), backported from upstream, for use by kernels that don't have auxiliary bus. - -# The if is used to hide this whole section. This causes RPM to skip the build -# of the auxiliary subproject entirely. -%files -n intel_auxiliary -f aux.list -%doc aux.list -%endif - diff --git a/pci.updates b/pci.updates index 4fff488..b8dbc9d 100644 --- a/pci.updates +++ b/pci.updates @@ -1,5 +1,5 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright(c) 1999 - 2022 Intel Corporation. +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 1999 - 2023 Intel Corporation # updates for the system pci.ids file # diff --git a/src/Makefile b/src/Makefile index 2a2ffe2..884cbf7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright(c) 1999 - 2022 Intel Corporation. +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 1999 - 2023 Intel Corporation ifneq ($(KERNELRELEASE),) # kbuild part of makefile diff --git a/src/common.mk b/src/common.mk index e51f24f..d0d9e87 100644 --- a/src/common.mk +++ b/src/common.mk @@ -1,5 +1,5 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright(c) 1999 - 2022 Intel Corporation. +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 1999 - 2023 Intel Corporation # # common Makefile rules useful for out-of-tree Linux driver builds diff --git a/src/ixgbe.h b/src/ixgbe.h index cfe7987..9a81682 100644 --- a/src/ixgbe.h +++ b/src/ixgbe.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_H_ #define _IXGBE_H_ diff --git a/src/ixgbe_82598.c b/src/ixgbe_82598.c index be3abdb..f03056e 100644 --- a/src/ixgbe_82598.c +++ b/src/ixgbe_82598.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_type.h" #include "ixgbe_82598.h" diff --git a/src/ixgbe_82598.h b/src/ixgbe_82598.h index 652b378..3781760 100644 --- a/src/ixgbe_82598.h +++ b/src/ixgbe_82598.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_82598_H_ #define _IXGBE_82598_H_ diff --git a/src/ixgbe_82599.c b/src/ixgbe_82599.c index ebc71a9..d5a134e 100644 --- a/src/ixgbe_82599.c +++ b/src/ixgbe_82599.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_type.h" #include "ixgbe_82599.h" diff --git a/src/ixgbe_82599.h b/src/ixgbe_82599.h index c41a84c..80534c6 100644 --- a/src/ixgbe_82599.h +++ b/src/ixgbe_82599.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_82599_H_ #define _IXGBE_82599_H_ diff --git a/src/ixgbe_api.c b/src/ixgbe_api.c index 8c30ba9..10b61ec 100644 --- a/src/ixgbe_api.c +++ b/src/ixgbe_api.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_api.h" #include "ixgbe_common.h" diff --git a/src/ixgbe_api.h b/src/ixgbe_api.h index dca49b0..a59fe28 100644 --- a/src/ixgbe_api.h +++ b/src/ixgbe_api.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_API_H_ #define _IXGBE_API_H_ diff --git a/src/ixgbe_common.c b/src/ixgbe_common.c index b203d9c..901eadf 100644 --- a/src/ixgbe_common.c +++ b/src/ixgbe_common.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_common.h" #include "ixgbe_phy.h" diff --git a/src/ixgbe_common.h b/src/ixgbe_common.h index 4ee5d6d..266cd93 100644 --- a/src/ixgbe_common.h +++ b/src/ixgbe_common.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_COMMON_H_ #define _IXGBE_COMMON_H_ diff --git a/src/ixgbe_dcb.c b/src/ixgbe_dcb.c index c5efc0d..b0e4b27 100644 --- a/src/ixgbe_dcb.c +++ b/src/ixgbe_dcb.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_type.h" diff --git a/src/ixgbe_dcb.h b/src/ixgbe_dcb.h index b41fd87..8b3acab 100644 --- a/src/ixgbe_dcb.h +++ b/src/ixgbe_dcb.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_DCB_H_ #define _IXGBE_DCB_H_ diff --git a/src/ixgbe_dcb_82598.c b/src/ixgbe_dcb_82598.c index 3838186..9a54c2a 100644 --- a/src/ixgbe_dcb_82598.c +++ b/src/ixgbe_dcb_82598.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_type.h" diff --git a/src/ixgbe_dcb_82598.h b/src/ixgbe_dcb_82598.h index 746739f..8ad1fb9 100644 --- a/src/ixgbe_dcb_82598.h +++ b/src/ixgbe_dcb_82598.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_DCB_82598_H_ #define _IXGBE_DCB_82598_H_ diff --git a/src/ixgbe_dcb_82599.c b/src/ixgbe_dcb_82599.c index df23f6a..d44ffe6 100644 --- a/src/ixgbe_dcb_82599.c +++ b/src/ixgbe_dcb_82599.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_type.h" diff --git a/src/ixgbe_dcb_82599.h b/src/ixgbe_dcb_82599.h index 32627c4..2a4619d 100644 --- a/src/ixgbe_dcb_82599.h +++ b/src/ixgbe_dcb_82599.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_DCB_82599_H_ #define _IXGBE_DCB_82599_H_ diff --git a/src/ixgbe_dcb_nl.c b/src/ixgbe_dcb_nl.c index ca53d32..1a16eee 100644 --- a/src/ixgbe_dcb_nl.c +++ b/src/ixgbe_dcb_nl.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" diff --git a/src/ixgbe_debugfs.c b/src/ixgbe_debugfs.c index 566b807..22e424c 100644 --- a/src/ixgbe_debugfs.c +++ b/src/ixgbe_debugfs.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" diff --git a/src/ixgbe_ethtool.c b/src/ixgbe_ethtool.c index fd539f2..260fe2b 100644 --- a/src/ixgbe_ethtool.c +++ b/src/ixgbe_ethtool.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ /* ethtool support for ixgbe */ diff --git a/src/ixgbe_fcoe.c b/src/ixgbe_fcoe.c index da4884d..5a6e098 100644 --- a/src/ixgbe_fcoe.c +++ b/src/ixgbe_fcoe.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" diff --git a/src/ixgbe_fcoe.h b/src/ixgbe_fcoe.h index 10df319..f185b58 100644 --- a/src/ixgbe_fcoe.h +++ b/src/ixgbe_fcoe.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_FCOE_H_ #define _IXGBE_FCOE_H_ diff --git a/src/ixgbe_lib.c b/src/ixgbe_lib.c index 5786424..f76ae87 100644 --- a/src/ixgbe_lib.c +++ b/src/ixgbe_lib.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" #include "ixgbe_sriov.h" diff --git a/src/ixgbe_main.c b/src/ixgbe_main.c index effcc4c..9fa2109 100644 --- a/src/ixgbe_main.c +++ b/src/ixgbe_main.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ /****************************************************************************** Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code @@ -72,7 +72,7 @@ #define RELEASE_TAG -#define DRV_VERSION "5.18.6" \ +#define DRV_VERSION "5.18.11" \ DRIVERIOV DRV_HW_PERF FPGA \ BYPASS_TAG RELEASE_TAG #define DRV_SUMMARY "Intel(R) 10GbE PCI Express Linux Network Driver" @@ -83,7 +83,7 @@ char ixgbe_driver_name[] = "ixgbe"; const char ixgbe_driver_name[] = "ixgbe"; #endif static const char ixgbe_driver_string[] = DRV_SUMMARY; -static const char ixgbe_copyright[] = "Copyright(c) 1999 - 2022 Intel Corporation."; +static const char ixgbe_copyright[] = "Copyright (C) 1999 - 2023 Intel Corporation"; static const char ixgbe_overheat_msg[] = "Network adapter has been stopped because it has over heated. " "Restart the computer. If the problem persists, " @@ -5826,6 +5826,9 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) */ if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED)) { if (hw->mac.type == ixgbe_mac_82598EB) { +#ifdef HAVE_NETIF_SET_TSO_MAX + netif_set_tso_max_size(netdev, 65536); +#else #ifdef NETDEV_CAN_SET_GSO_MAX_SIZE netif_set_gso_max_size(netdev, 65536); #else @@ -5837,11 +5840,15 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) IXGBE_GSO_PARTIAL_FEATURES; #endif #endif /* NETDEV_CAN_SET_GSO_MAX_SIZE */ +#endif /* HAVE_NETIF_SET_TSO_MAX */ } return; } if (hw->mac.type == ixgbe_mac_82598EB) { +#ifdef HAVE_NETIF_SET_TSO_MAX + netif_set_tso_max_size(netdev, 32768); +#else #ifdef NETDEV_CAN_SET_GSO_MAX_SIZE netif_set_gso_max_size(netdev, 32768); #else @@ -5852,6 +5859,7 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) netdev->gso_partial_features = 0; #endif #endif /* NETDEV_CAN_SET_GSO_MAX_SIZE */ +#endif /* HAVE_NETIF_SET_TSO_MAX */ } #if IS_ENABLED(CONFIG_FCOE) diff --git a/src/ixgbe_mbx.c b/src/ixgbe_mbx.c index 92f2d4a..c4a6810 100644 --- a/src/ixgbe_mbx.c +++ b/src/ixgbe_mbx.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_type.h" #include "ixgbe_mbx.h" diff --git a/src/ixgbe_mbx.h b/src/ixgbe_mbx.h index 7953949..219e420 100644 --- a/src/ixgbe_mbx.h +++ b/src/ixgbe_mbx.h @@ -1,10 +1,10 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_MBX_H_ #define _IXGBE_MBX_H_ -#include "ixgbe_type.h" +struct ixgbe_hw; struct ixgbe_mbx_operations { void (*init_params)(struct ixgbe_hw *hw); diff --git a/src/ixgbe_model.h b/src/ixgbe_model.h index 4c8b5e6..67f658b 100644 --- a/src/ixgbe_model.h +++ b/src/ixgbe_model.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_MODEL_H_ #define _IXGBE_MODEL_H_ diff --git a/src/ixgbe_osdep.h b/src/ixgbe_osdep.h index 31029c7..4c64001 100644 --- a/src/ixgbe_osdep.h +++ b/src/ixgbe_osdep.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ /* glue for the OS independent part of ixgbe diff --git a/src/ixgbe_osdep2.h b/src/ixgbe_osdep2.h index 7ff1723..bb3f8b4 100644 --- a/src/ixgbe_osdep2.h +++ b/src/ixgbe_osdep2.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_OSDEP2_H_ #define _IXGBE_OSDEP2_H_ diff --git a/src/ixgbe_param.c b/src/ixgbe_param.c index 70f4e1e..e8c8dd6 100644 --- a/src/ixgbe_param.c +++ b/src/ixgbe_param.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include #include diff --git a/src/ixgbe_phy.c b/src/ixgbe_phy.c index dbc98ee..e4a1364 100644 --- a/src/ixgbe_phy.c +++ b/src/ixgbe_phy.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_api.h" #include "ixgbe_common.h" diff --git a/src/ixgbe_phy.h b/src/ixgbe_phy.h index 343d647..3ece00f 100644 --- a/src/ixgbe_phy.h +++ b/src/ixgbe_phy.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_PHY_H_ #define _IXGBE_PHY_H_ diff --git a/src/ixgbe_procfs.c b/src/ixgbe_procfs.c index b65c775..2330360 100644 --- a/src/ixgbe_procfs.c +++ b/src/ixgbe_procfs.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" #include "ixgbe_common.h" diff --git a/src/ixgbe_ptp.c b/src/ixgbe_ptp.c index e1ad409..75354d0 100644 --- a/src/ixgbe_ptp.c +++ b/src/ixgbe_ptp.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" #include diff --git a/src/ixgbe_sriov.c b/src/ixgbe_sriov.c index 92371cb..2ac2092 100644 --- a/src/ixgbe_sriov.c +++ b/src/ixgbe_sriov.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include diff --git a/src/ixgbe_sriov.h b/src/ixgbe_sriov.h index 413fec8..d11a93f 100644 --- a/src/ixgbe_sriov.h +++ b/src/ixgbe_sriov.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_SRIOV_H_ diff --git a/src/ixgbe_sysfs.c b/src/ixgbe_sysfs.c index 0c2e264..4e3bde5 100644 --- a/src/ixgbe_sysfs.c +++ b/src/ixgbe_sysfs.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" #include "ixgbe_common.h" diff --git a/src/ixgbe_txrx_common.h b/src/ixgbe_txrx_common.h index 4ac6589..0b3a3de 100644 --- a/src/ixgbe_txrx_common.h +++ b/src/ixgbe_txrx_common.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_TXRX_COMMON_H_ #define _IXGBE_TXRX_COMMON_H_ diff --git a/src/ixgbe_type.h b/src/ixgbe_type.h index e018d16..d0b18e0 100644 --- a/src/ixgbe_type.h +++ b/src/ixgbe_type.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_TYPE_H_ #define _IXGBE_TYPE_H_ @@ -3060,6 +3060,7 @@ enum ixgbe_fdir_pballoc_type { #define FW_SHADOW_RAM_DUMP_LEN 0 #define FW_DEFAULT_CHECKSUM 0xFF /* checksum always 0xFF */ #define FW_NVM_DATA_OFFSET 3 +#define FW_ANVM_DATA_OFFSET 3 #define FW_MAX_READ_BUFFER_SIZE 1024 #define FW_DISABLE_RXEN_CMD 0xDE #define FW_DISABLE_RXEN_LEN 0x1 @@ -3131,6 +3132,8 @@ enum ixgbe_fdir_pballoc_type { #define FW_PHY_INFO_ID_HI_MASK 0xFFFF0000u #define FW_PHY_INFO_ID_LO_MASK 0x0000FFFFu +#define IXGBE_SR_IMMEDIATE_VALUES_PTR 0x4E + /* Host Interface Command Structures */ #pragma pack(push, 1) @@ -3434,6 +3437,8 @@ typedef u64 ixgbe_physical_layer; #define IXGBE_PHYSICAL_LAYER_1000BASE_SX 0x04000 #define IXGBE_PHYSICAL_LAYER_10BASE_T 0x08000 #define IXGBE_PHYSICAL_LAYER_2500BASE_KX 0x10000 +#define IXGBE_PHYSICAL_LAYER_2500BASE_T 0x20000 +#define IXGBE_PHYSICAL_LAYER_5000BASE_T 0x40000 /* Flow Control Data Sheet defined values * Calculation and defines taken from 802.1bb Annex O diff --git a/src/ixgbe_x540.c b/src/ixgbe_x540.c index 6d784e2..8359dbe 100644 --- a/src/ixgbe_x540.c +++ b/src/ixgbe_x540.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_x540.h" #include "ixgbe_type.h" diff --git a/src/ixgbe_x540.h b/src/ixgbe_x540.h index 7b7e9ef..4fd14c9 100644 --- a/src/ixgbe_x540.h +++ b/src/ixgbe_x540.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_X540_H_ #define _IXGBE_X540_H_ diff --git a/src/ixgbe_x550.c b/src/ixgbe_x550.c index 87f0ff4..af6c2c9 100644 --- a/src/ixgbe_x550.c +++ b/src/ixgbe_x550.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe_x550.h" #include "ixgbe_x540.h" diff --git a/src/ixgbe_x550.h b/src/ixgbe_x550.h index e8b8913..e2f38a4 100644 --- a/src/ixgbe_x550.h +++ b/src/ixgbe_x550.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _IXGBE_X550_H_ #define _IXGBE_X550_H_ diff --git a/src/ixgbe_xsk.c b/src/ixgbe_xsk.c index a288b01..15cb6b8 100644 --- a/src/ixgbe_xsk.c +++ b/src/ixgbe_xsk.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" diff --git a/src/kcompat.c b/src/kcompat.c index 1e5980d..126405a 100644 --- a/src/kcompat.c +++ b/src/kcompat.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ #include "ixgbe.h" #include "kcompat.h" diff --git a/src/kcompat.h b/src/kcompat.h index f92acd6..bac60b5 100644 --- a/src/kcompat.h +++ b/src/kcompat.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_H_ #define _KCOMPAT_H_ @@ -6894,7 +6894,6 @@ ptp_read_system_postts(struct ptp_system_timestamp __always_unused *sts) #define HAVE_PTP_CLOCK_INFO_GETTIMEX64 #define HAVE_NDO_BRIDGE_SETLINK_EXTACK #define HAVE_DMA_ALLOC_COHERENT_ZEROES_MEM -#define HAVE_GENEVE_TYPE #define HAVE_TC_INDIR_BLOCK #endif /* 5.0.0 */ @@ -6952,7 +6951,9 @@ __kc_eth_get_headlen(const struct net_device __always_unused *dev, void *data, #else /* >= 5.2.0 */ #define HAVE_NDO_SELECT_QUEUE_FALLBACK_REMOVED #define SPIN_UNLOCK_IMPLIES_MMIOWB +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)) #define HAVE_NDO_GET_DEVLINK_PORT +#endif /* < 6.2.0 */ #endif /* 5.2.0 */ /*****************************************************************************/ diff --git a/src/kcompat_defs.h b/src/kcompat_defs.h index 9ed297c..6fcbd72 100644 --- a/src/kcompat_defs.h +++ b/src/kcompat_defs.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_DEFS_H_ #define _KCOMPAT_DEFS_H_ diff --git a/src/kcompat_ethtool.c b/src/kcompat_ethtool.c index 91b5571..024cb9e 100644 --- a/src/kcompat_ethtool.c +++ b/src/kcompat_ethtool.c @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (C) 1999 - 2023 Intel Corporation */ /* * net/core/ethtool.c - Ethtool ioctl handler diff --git a/src/kcompat_gcc.h b/src/kcompat_gcc.h index 4d6b011..61e3cb4 100644 --- a/src/kcompat_gcc.h +++ b/src/kcompat_gcc.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_GCC_H_ #define _KCOMPAT_GCC_H_ diff --git a/src/kcompat_impl.h b/src/kcompat_impl.h index d3a0db0..5767b83 100644 --- a/src/kcompat_impl.h +++ b/src/kcompat_impl.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_IMPL_H_ #define _KCOMPAT_IMPL_H_ @@ -1387,6 +1387,7 @@ flow_rule_match_enc_keyid(const struct flow_rule *rule, * * Define NEED_NETIF_NAPI_ADD_NO_WEIGHT on kernels 3.10+ to use old * implementation. Undef for 6.1+ where new function was introduced. + * RedHat 9.2 required using no weight parameter option. */ #ifdef NEED_NETIF_NAPI_ADD_NO_WEIGHT static inline void @@ -1403,4 +1404,18 @@ _kc_netif_napi_add(struct net_device *dev, struct napi_struct *napi, #define netif_napi_add _kc_netif_napi_add #endif /* NEED_NETIF_NAPI_ADD_NO_WEIGHT */ +#ifdef NEED_ETHTOOL_SPRINTF +static inline +__printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vsnprintf(*data, ETH_GSTRING_LEN, fmt, args); + va_end(args); + + *data += ETH_GSTRING_LEN; +} +#endif /* NEED_ETHTOOL_SPRINTF */ + #endif /* _KCOMPAT_IMPL_H_ */ diff --git a/src/kcompat_oracle_defs.h b/src/kcompat_oracle_defs.h index d01693b..d6e412d 100644 --- a/src/kcompat_oracle_defs.h +++ b/src/kcompat_oracle_defs.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_ORACLE_DEFS_H_ #define _KCOMPAT_ORACLE_DEFS_H_ diff --git a/src/kcompat_overflow.h b/src/kcompat_overflow.h index d60cbdd..dc89d33 100644 --- a/src/kcompat_overflow.h +++ b/src/kcompat_overflow.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ /* SPDX-License-Identifier: GPL-2.0 OR MIT */ #ifndef __LINUX_OVERFLOW_H diff --git a/src/kcompat_rhel_defs.h b/src/kcompat_rhel_defs.h index fedee8a..0d981f0 100644 --- a/src/kcompat_rhel_defs.h +++ b/src/kcompat_rhel_defs.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_RHEL_DEFS_H_ #define _KCOMPAT_RHEL_DEFS_H_ @@ -112,6 +112,7 @@ #undef NEED_INDIRECT_CALL_WRAPPER_MACROS #define HAVE_INDIRECT_CALL_WRAPPER_HEADER #define HAVE_GRETAP_TYPE +#define HAVE_GENEVE_TYPE #define HAVE_VXLAN_TYPE #define HAVE_LINKMODE #define HAVE_FLOW_DISSECTOR_KEY_CVLAN @@ -175,6 +176,7 @@ #define HAVE_NETDEV_BPF_XSK_POOL #define HAVE_AF_XDP_NETDEV_UMEM #define HAVE_DEVLINK_OPS_CREATE_DEL +#undef NEED_ETHTOOL_SPRINTF #endif /* 8.5 */ /*****************************************************************************/ @@ -182,6 +184,7 @@ #else /* >= 8.6 */ #if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9,0)) #define HAVE_ETHTOOL_COALESCE_EXTACK +#define HAVE_DEVL_PORT_REGISTER #endif /* < 9.0 */ #undef NEED_ETH_HW_ADDR_SET #endif /* 8.6 */ @@ -198,6 +201,7 @@ #define HAVE_DEVLINK_NOTIFY_REGISTER #define HAVE_DEVLINK_SET_FEATURES #define HAVE_DEVLINK_PORT_SPLIT_PORT_STRUCT +#define HAVE_DEVLINK_SET_STATE_3_PARAM #endif /* 8.7 */ /*****************************************************************************/ @@ -220,4 +224,10 @@ #define HAVE_XDP_DO_FLUSH #endif /* 9.1 */ +/*****************************************************************************/ +#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9,2)) +#else /* >= 9.2 */ +#undef NEED_NETIF_NAPI_ADD_NO_WEIGHT +#endif /* 9.2 */ + #endif /* _KCOMPAT_RHEL_DEFS_H_ */ diff --git a/src/kcompat_sles_defs.h b/src/kcompat_sles_defs.h index 96537ae..f7de700 100644 --- a/src/kcompat_sles_defs.h +++ b/src/kcompat_sles_defs.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_SLES_DEFS_H_ #define _KCOMPAT_SLES_DEFS_H_ @@ -220,6 +220,7 @@ #undef HAVE_DEVLINK_PARAMS_PUBLISH #undef HAVE_DEVLINK_REGISTER_SETS_DEV #define HAVE_DEVLINK_SET_FEATURES + #undef NEED_ETHTOOL_SPRINTF #endif /* 5.14.17-150400.1 */ /*****************************************************************************/ @@ -229,6 +230,7 @@ #undef HAVE_DEVLINK_RELOAD_ENABLE_DISABLE #define HAVE_ETHTOOL_COALESCE_EXTACK #define HAVE_DEVLINK_OPS_CREATE_DEL +#define HAVE_DEVLINK_SET_STATE_3_PARAM #endif /* 5.14.21-150400.9 */ #endif /* _KCOMPAT_SLES_DEFS_H_ */ diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h index f7abd19..9a41d98 100644 --- a/src/kcompat_std_defs.h +++ b/src/kcompat_std_defs.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_STD_DEFS_H_ #define _KCOMPAT_STD_DEFS_H_ @@ -35,6 +35,7 @@ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) #else /* >= 3,10,0 */ #define NEED_NETIF_NAPI_ADD_NO_WEIGHT +#define NEED_ETHTOOL_SPRINTF #endif /* 3,10,0 */ /*****************************************************************************/ @@ -163,6 +164,7 @@ #define NEED_INDIRECT_CALL_WRAPPER_MACROS #else /* >= 5.0.0 */ #define HAVE_GRETAP_TYPE +#define HAVE_GENEVE_TYPE #define HAVE_INDIRECT_CALL_WRAPPER_HEADER #endif /* 5.0.0 */ @@ -291,6 +293,7 @@ #define HAVE_DEV_IN_MDEV_API #else /* >= 5.13.0 */ #define HAVE_XPS_MAP_TYPE +#undef NEED_ETHTOOL_SPRINTF #endif /* 5.13.0 */ /*****************************************************************************/ @@ -310,6 +313,7 @@ #define HAVE_DEVICE_IN_MDEV_PARENT_OPS #define HAVE_LMV1_SUPPORT #define NEED_PCI_IOV_VF_ID +#define HAVE_DEVLINK_SET_STATE_3_PARAM #endif /* 5.15.0 */ /*****************************************************************************/ @@ -320,6 +324,7 @@ #define HAVE_DEVLINK_NOTIFY_REGISTER #undef HAVE_DEVLINK_RELOAD_ENABLE_DISABLE #undef HAVE_DEVLINK_PARAMS_PUBLISH +#define HAVE_XSK_BATCHED_RX_ALLOC #endif /* 5.16.0 */ /*****************************************************************************/ @@ -338,12 +343,14 @@ #define HAVE_GTP_SUPPORT #undef HAVE_XSK_TX_PEEK_RELEASE_DESC_BATCH_3_PARAMS #define HAVE_DEVLINK_PORT_SPLIT_PORT_STRUCT +#define HAVE_DEVL_PORT_REGISTER #endif /* 5.18.0 */ /*****************************************************************************/ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)) #else /* >=5.19.0 */ #define HAVE_NDO_FDB_DEL_EXTACK +#define HAVE_NETIF_SET_TSO_MAX #endif /* 5.19.0 */ /*****************************************************************************/ @@ -357,6 +364,13 @@ #else /* >=6.1.0 */ #define HAVE_FLOW_DISSECTOR_KEY_L2TPV3 #undef NEED_NETIF_NAPI_ADD_NO_WEIGHT +#define HAVE_TTY_TERMIOS_CONST_STRUCT #endif /* 6.1.0 */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)) +#else /* >=6.2.0 */ +#define HAVE_SET_NETDEV_DEVLINK_PORT +#undef HAVE_NDO_GET_DEVLINK_PORT +#endif /* 6.2.0 */ + #endif /* _KCOMPAT_STD_DEFS_H_ */ diff --git a/src/kcompat_ubuntu_defs.h b/src/kcompat_ubuntu_defs.h index 5446108..9b84e9d 100644 --- a/src/kcompat_ubuntu_defs.h +++ b/src/kcompat_ubuntu_defs.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright(c) 1999 - 2022 Intel Corporation. */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 1999 - 2023 Intel Corporation */ #ifndef _KCOMPAT_UBUNTU_DEFS_H_ #define _KCOMPAT_UBUNTU_DEFS_H_