Skip to content

Commit

Permalink
Intel official release 5.17.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbrandeb
jbrandeb committed Mar 23, 2024
1 parent 34dcab2 commit 067fc67
Show file tree
Hide file tree
Showing 14 changed files with 879 additions and 346 deletions.
2 changes: 1 addition & 1 deletion README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ Note: RPM functionality has only been tested in Red Hat distributions.
NOTES:
- To compile the driver on some kernel/arch combinations, you may need to
install a package with the development version of libelf (e.g. libelf-dev,
libelf-devel, elfutilsl-libelf-devel).
libelf-devel, elfutils-libelf-devel).
- When compiling an out-of-tree driver, details will vary by distribution.
However, you will usually need a kernel-devel RPM or some RPM that provides the
kernel headers at a minimum. The RPM kernel-devel will usually fill in the link
Expand Down
125 changes: 63 additions & 62 deletions SUMS
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,63 @@
57879 9 ixgbe-5.16.5/scripts/set_irq_affinity
28051 28 ixgbe-5.16.5/src/ixgbe_fcoe.c
00245 32 ixgbe-5.16.5/src/ixgbe_param.c
34956 8 ixgbe-5.16.5/src/ixgbe_phy.h
50229 8 ixgbe-5.16.5/src/kcompat_sles_defs.h
00247 7 ixgbe-5.16.5/src/Makefile
41773 126 ixgbe-5.16.5/src/ixgbe_x550.c
61530 3 ixgbe-5.16.5/src/ixgbe_sriov.h
48938 2 ixgbe-5.16.5/src/ixgbe_x540.h
20148 29 ixgbe-5.16.5/src/kcompat_impl.h
51698 18 ixgbe-5.16.5/src/common.mk
15524 143 ixgbe-5.16.5/src/ixgbe_common.c
55396 71 ixgbe-5.16.5/src/ixgbe_phy.c
29027 30 ixgbe-5.16.5/src/ixgbe_mbx.c
14476 6 ixgbe-5.16.5/src/kcompat_rhel_defs.h
42384 374 ixgbe-5.16.5/src/ixgbe_main.c
46495 54 ixgbe-5.16.5/src/ixgbe_sriov.c
37769 5 ixgbe-5.16.5/src/ixgbe_x550.h
35540 76 ixgbe-5.16.5/src/ixgbe_82599.c
29968 4 ixgbe-5.16.5/src/ixgbe_dcb_82599.h
41704 137 ixgbe-5.16.5/src/ixgbe_ethtool.c
04826 17 ixgbe-5.16.5/src/ixgbe_dcb_82599.c
25858 2 ixgbe-5.16.5/src/ixgbe_82599.h
62975 7 ixgbe-5.16.5/src/ixgbe_debugfs.c
25264 39 ixgbe-5.16.5/src/ixgbe_lib.c
29738 30 ixgbe-5.16.5/src/ixgbe_x540.c
27557 3 ixgbe-5.16.5/src/ixgbe_txrx_common.h
40372 10 ixgbe-5.16.5/src/ixgbe_dcb_82598.c
17957 1 ixgbe-5.16.5/src/kcompat_gcc.h
33940 51 ixgbe-5.16.5/src/ixgbe_ptp.c
10919 47 ixgbe-5.16.5/src/ixgbe_api.c
13672 171 ixgbe-5.16.5/src/ixgbe_type.h
63969 10 ixgbe-5.16.5/src/ixgbe_api.h
20464 20 ixgbe-5.16.5/src/ixgbe_dcb.c
11416 7 ixgbe-5.16.5/src/ixgbe_common.h
53142 3 ixgbe-5.16.5/src/ixgbe_dcb_82598.h
09326 2 ixgbe-5.16.5/src/ixgbe_82598.h
48833 75 ixgbe-5.16.5/src/kcompat.c
05019 2 ixgbe-5.16.5/src/ixgbe_osdep2.h
14487 29 ixgbe-5.16.5/src/kcompat_ethtool.c
55592 23 ixgbe-5.16.5/src/ixgbe_dcb_nl.c
44001 2 ixgbe-5.16.5/src/kcompat_ubuntu_defs.h
18110 5 ixgbe-5.16.5/src/ixgbe_dcb.h
47955 10 ixgbe-5.16.5/src/kcompat_overflow.h
07223 8 ixgbe-5.16.5/src/ixgbe_mbx.h
09539 3 ixgbe-5.16.5/src/ixgbe_model.h
04527 6 ixgbe-5.16.5/src/ixgbe_osdep.h
47745 25 ixgbe-5.16.5/src/ixgbe_xsk.c
13782 39 ixgbe-5.16.5/src/ixgbe_82598.c
55412 25 ixgbe-5.16.5/src/ixgbe_procfs.c
03764 10 ixgbe-5.16.5/src/kcompat_std_defs.h
12190 1 ixgbe-5.16.5/src/Module.supported
51835 2 ixgbe-5.16.5/src/ixgbe_fcoe.h
52716 8 ixgbe-5.16.5/src/ixgbe_sysfs.c
18174 1 ixgbe-5.16.5/src/kcompat_defs.h
06322 40 ixgbe-5.16.5/src/ixgbe.h
38177 224 ixgbe-5.16.5/src/kcompat.h
61939 11 ixgbe-5.16.5/ixgbe.spec
45537 9 ixgbe-5.16.5/ixgbe.7
20636 60 ixgbe-5.16.5/README
12529 18 ixgbe-5.16.5/COPYING
07471 7 ixgbe-5.16.5/pci.updates
52569 60 ixgbe-5.17.1/README
07471 7 ixgbe-5.17.1/pci.updates
29738 30 ixgbe-5.17.1/src/ixgbe_x540.c
55396 71 ixgbe-5.17.1/src/ixgbe_phy.c
28051 28 ixgbe-5.17.1/src/ixgbe_fcoe.c
46495 54 ixgbe-5.17.1/src/ixgbe_sriov.c
00247 7 ixgbe-5.17.1/src/Makefile
55412 25 ixgbe-5.17.1/src/ixgbe_procfs.c
48938 2 ixgbe-5.17.1/src/ixgbe_x540.h
14487 29 ixgbe-5.17.1/src/kcompat_ethtool.c
41704 137 ixgbe-5.17.1/src/ixgbe_ethtool.c
05019 2 ixgbe-5.17.1/src/ixgbe_osdep2.h
44001 2 ixgbe-5.17.1/src/kcompat_ubuntu_defs.h
12190 1 ixgbe-5.17.1/src/Module.supported
37769 5 ixgbe-5.17.1/src/ixgbe_x550.h
15524 143 ixgbe-5.17.1/src/ixgbe_common.c
47745 25 ixgbe-5.17.1/src/ixgbe_xsk.c
15415 12 ixgbe-5.17.1/src/kcompat_std_defs.h
53142 3 ixgbe-5.17.1/src/ixgbe_dcb_82598.h
03809 40 ixgbe-5.17.1/src/ixgbe.h
09326 2 ixgbe-5.17.1/src/ixgbe_82598.h
17957 1 ixgbe-5.17.1/src/kcompat_gcc.h
61530 3 ixgbe-5.17.1/src/ixgbe_sriov.h
04826 17 ixgbe-5.17.1/src/ixgbe_dcb_82599.c
63969 10 ixgbe-5.17.1/src/ixgbe_api.h
36173 2 ixgbe-5.17.1/src/kcompat_oracle_defs.h
33940 51 ixgbe-5.17.1/src/ixgbe_ptp.c
55592 23 ixgbe-5.17.1/src/ixgbe_dcb_nl.c
13672 171 ixgbe-5.17.1/src/ixgbe_type.h
51835 2 ixgbe-5.17.1/src/ixgbe_fcoe.h
56361 220 ixgbe-5.17.1/src/kcompat.h
52716 8 ixgbe-5.17.1/src/ixgbe_sysfs.c
34956 8 ixgbe-5.17.1/src/ixgbe_phy.h
20464 20 ixgbe-5.17.1/src/ixgbe_dcb.c
25858 2 ixgbe-5.17.1/src/ixgbe_82599.h
02164 1 ixgbe-5.17.1/src/kcompat_defs.h
29027 30 ixgbe-5.17.1/src/ixgbe_mbx.c
10919 47 ixgbe-5.17.1/src/ixgbe_api.c
29968 4 ixgbe-5.17.1/src/ixgbe_dcb_82599.h
04527 6 ixgbe-5.17.1/src/ixgbe_osdep.h
27557 3 ixgbe-5.17.1/src/ixgbe_txrx_common.h
43231 375 ixgbe-5.17.1/src/ixgbe_main.c
41773 126 ixgbe-5.17.1/src/ixgbe_x550.c
13782 39 ixgbe-5.17.1/src/ixgbe_82598.c
25264 39 ixgbe-5.17.1/src/ixgbe_lib.c
00245 32 ixgbe-5.17.1/src/ixgbe_param.c
11416 7 ixgbe-5.17.1/src/ixgbe_common.h
18110 5 ixgbe-5.17.1/src/ixgbe_dcb.h
07223 8 ixgbe-5.17.1/src/ixgbe_mbx.h
40372 10 ixgbe-5.17.1/src/ixgbe_dcb_82598.c
15740 7 ixgbe-5.17.1/src/kcompat_rhel_defs.h
09539 3 ixgbe-5.17.1/src/ixgbe_model.h
62975 7 ixgbe-5.17.1/src/ixgbe_debugfs.c
28203 75 ixgbe-5.17.1/src/kcompat.c
54118 42 ixgbe-5.17.1/src/kcompat_impl.h
35446 9 ixgbe-5.17.1/src/kcompat_sles_defs.h
47955 10 ixgbe-5.17.1/src/kcompat_overflow.h
20484 19 ixgbe-5.17.1/src/common.mk
35540 76 ixgbe-5.17.1/src/ixgbe_82599.c
56103 12 ixgbe-5.17.1/ixgbe.spec
57879 9 ixgbe-5.17.1/scripts/set_irq_affinity
45537 9 ixgbe-5.17.1/ixgbe.7
12529 18 ixgbe-5.17.1/COPYING
39 changes: 28 additions & 11 deletions ixgbe.spec
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Name: ixgbe
Summary: Intel(R) 10GbE PCI Express Linux Network Driver
Version: 5.16.5
Version: 5.17.1
Release: 1
Source: %{name}-%{version}.tar.gz
Vendor: Intel Corporation
License: GPL-2.0
License: @
ExclusiveOS: linux
Group: System Environment/Kernel
Provides: %{name}
Expand All @@ -18,9 +18,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
%define pciids %find %{_pciids}
%define pcitable %find %{_pcitable}
Requires: kernel, findutils, gawk, bash
%define need_aux_rpm %(rpm -q --whatprovides /lib/modules/`uname -r`/build/include/linux/auxiliary_bus.h > /dev/null 2>&1 && echo 0 || echo 2)

%if 0%{?BUILD_KERNEL:1}
%define kernel_ver %{BUILD_KERNEL}
%define check_aux_args_kernel -b %{BUILD_KERNEL}
%else
%define kernel_ver %(uname -r)
%endif

%if 0%{?KSRC:1}
%define check_aux_args_ksrc -k %{KSRC}
%endif

%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: auxiliary
Requires: intel_auxiliary
%endif

# Check for existence of %kernel_module_package_buildreqs ...
Expand Down Expand Up @@ -55,13 +72,13 @@ find lib -name "ixgbe.ko" -printf "/%p\n" \
%if (%need_aux_rpm == 2)
make -C %{_builddir}/%{name}-%{version}/src INSTALL_MOD_PATH=%{buildroot} auxiliary_install

find lib -path "*extern-symvers/auxiliary.symvers" -printf "/%p\n" \
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; echo $?)" == "2" ] ; then
find lib -name "auxiliary.ko" -printf "/%p\n" \
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

Expand Down Expand Up @@ -423,16 +440,16 @@ else
fi

%if (%need_aux_rpm == 2) && (%req_aux == 0)
%package -n auxiliary
%package -n intel_auxiliary
Summary: Auxiliary bus driver (backport)
Version: 1.0.0

%description -n auxiliary
The Auxiliary bus driver (auxiliary.ko), backported from upstream, for use by kernels that don't have auxiliary bus.
%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 auxiliary -f aux.list
%files -n intel_auxiliary -f aux.list
%doc aux.list
%endif

23 changes: 17 additions & 6 deletions src/common.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ ifneq ($(and $(SIGN_FILE_EXISTS),$(PRIV_KEY_EXISTS),$(PUB_KEY_EXISTS)),)
echo "*** Is public key present: ${PUB_KEY_EXISTS}" ;
info_signed_modules += echo "*** All files are present, signing driver." ;
sign_driver = $(shell ${SCRIPT_PATH}/sign-file sha256 intel-linux-key.key \
intel-linux-key.crt i40e.ko)
intel-linux-key.crt ${DRIVER}.ko)
else
info_signed_modules += echo "*** Files are missing, cannot sign driver." ;
sign_driver =
Expand Down Expand Up @@ -199,6 +199,7 @@ warn_signed_modules += \
echo "*** disabled for this build." ;
endif # CONFIG_MODULE_SIG_ALL=y
ifeq (${CONFIG_MODULE_SIG_FORCE},1)
warn_signed_modules += \
echo "warning: The target kernel has CONFIG_MODULE_SIG_FORCE enabled," ; \
echo "warning: but the signing key cannot be found. The module must" ; \
echo "warning: be signed manually using 'scripts/sign-file'." ;
Expand Down Expand Up @@ -269,6 +270,13 @@ endif
endif
endif

# Check if it is Oracle Linux UEK kernel and take release patch number from it
ifneq (,$(findstring uek,${BUILD_KERNEL}))
EXTRAVERSION := $(shell BK=${BUILD_KERNEL}; echo $${BK\#*-})
UEK_RELEASE_NUMBER := $(shell EV=${EXTRAVERSION}; echo $${EV%%\.*})
EXTRA_CFLAGS += -DUEK_RELEASE_NUMBER=${UEK_RELEASE_NUMBER}
endif

EXTRA_CFLAGS += ${CFLAGS_EXTRA}

# get the kernel version - we use this to find the correct install path
Expand Down Expand Up @@ -424,10 +432,10 @@ export INSTALL_AUX_DIR ?= updates/drivers/net/ethernet/intel/auxiliary
AUX_BUS_HEADER ?= linux/auxiliary_bus.h
ifeq (${NEED_AUX_BUS},2)
define auxiliary_post_install
install -D -m 644 Module.symvers ${INSTALL_MOD_PATH}/lib/modules/${KVER}/extern-symvers/auxiliary.symvers
install -D -m 644 Module.symvers ${INSTALL_MOD_PATH}/lib/modules/${KVER}/extern-symvers/intel_auxiliary.symvers
install -d ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_AUX_DIR}
mv -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/auxiliary.ko \
${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_AUX_DIR}/auxiliary.ko
mv -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/intel_auxiliary.ko \
${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_AUX_DIR}/intel_auxiliary.ko
install -D -m 644 ${AUX_BUS_HEADER} ${INSTALL_MOD_PATH}/${KSRC}/include/linux/auxiliary_bus.h
endef
else
Expand All @@ -436,14 +444,17 @@ endif

ifeq (${NEED_AUX_BUS},2)
define auxiliary_post_uninstall
rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/extern-symvers/auxiliary.symvers
rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_AUX_DIR}/auxiliary.ko
rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/extern-symvers/intel_auxiliary.symvers
rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_AUX_DIR}/intel_auxiliary.ko
rm -f ${INSTALL_MOD_PATH}/${KSRC}/include/linux/auxiliary_bus.h
endef
else
auxiliary_post_uninstall =
endif

ifeq (${NEED_AUX_BUS},2)
EXTRA_CFLAGS += -DUSE_INTEL_AUX_BUS
endif
######################
# Kernel Build Macro #
######################
Expand Down
2 changes: 2 additions & 0 deletions src/ixgbe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ struct vf_stats {
u64 gotc;
u64 mprc;
};

struct vf_data_storage {
struct pci_dev *vfdev;
unsigned char vf_mac_addresses[ETH_ALEN];
Expand Down Expand Up @@ -482,6 +483,7 @@ struct ixgbe_ring {
struct ixgbe_tx_queue_stats tx_stats;
struct ixgbe_rx_queue_stats rx_stats;
};
u16 rx_offset;
spinlock_t tx_lock; /* used in XDP mode */
#ifdef HAVE_XDP_BUFF_RXQ
struct xdp_rxq_info xdp_rxq;
Expand Down
Loading

0 comments on commit 067fc67

Please sign in to comment.