From db1f6699bfc3c3148336b3270444e5cb339c293f Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 1 Feb 2024 08:49:08 +0100 Subject: Kernel: T5887: update Linux Kernel to v6.6.15 (cherry picked from commit c910d5843ac4f7f96d9cb2d9c564f7fe8587c50f) --- .../linux-kernel/arch/x86/configs/vyos_defconfig | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index b42dec00..9446cdc1 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.10 Kernel Configuration +# Linux/x86 6.6.15 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14) 12.2.0" CONFIG_CC_IS_GCC=y @@ -338,7 +338,6 @@ CONFIG_IOSF_MBI=y CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_HYPERVISOR_GUEST=y -CONFIG_HYPERV_UTILS=m CONFIG_PARAVIRT=y CONFIG_PARAVIRT_XXL=y # CONFIG_PARAVIRT_DEBUG is not set @@ -864,7 +863,7 @@ CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_ICQ=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_INTEGRITY_T10=m +CONFIG_BLK_DEV_INTEGRITY_T10=y # CONFIG_BLK_DEV_ZONED is not set CONFIG_BLK_WBT=y CONFIG_BLK_WBT_MQ=y @@ -1930,6 +1929,7 @@ CONFIG_DMA_SHARED_BUFFER=y # end of Cache Drivers CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y # # Firmware Drivers @@ -1983,11 +1983,7 @@ CONFIG_UEFI_CPER_X86=y # end of Tegra firmware driver # end of Firmware Drivers -CONFIG_GNSS=m -# CONFIG_GNSS_MTK_SERIAL is not set -# CONFIG_GNSS_SIRF_SERIAL is not set -# CONFIG_GNSS_UBX_SERIAL is not set -# CONFIG_GNSS_USB is not set +# CONFIG_GNSS is not set # CONFIG_MTD is not set # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -2025,11 +2021,11 @@ CONFIG_VIRTIO_BLK=m # # NVME Support # -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y # CONFIG_NVME_VERBOSE_ERRORS is not set -CONFIG_NVME_HWMON=m +CONFIG_NVME_HWMON=y # CONFIG_NVME_RDMA is not set # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set @@ -3595,6 +3591,7 @@ CONFIG_GPIO_VIPERBOARD=m # end of Virtual GPIO drivers CONFIG_W1=m +CONFIG_W1_CON=y # # 1-wire Bus Masters @@ -4229,6 +4226,7 @@ CONFIG_FB=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set +# CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set @@ -5034,6 +5032,7 @@ CONFIG_VHOST_VSOCK=m CONFIG_HYPERV=m # CONFIG_HYPERV_VTL_MODE is not set CONFIG_HYPERV_TIMER=y +CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_BALLOON=m # end of Microsoft Hyper-V guest support @@ -5771,7 +5770,7 @@ CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_CRC64_ROCKSOFT=m +CONFIG_CRYPTO_CRC64_ROCKSOFT=y # end of CRCs (cyclic redundancy checks) # @@ -5947,7 +5946,7 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC_T10DIF=y -CONFIG_CRC64_ROCKSOFT=m +CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -5955,7 +5954,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -CONFIG_CRC64=m +CONFIG_CRC64=y # CONFIG_CRC4 is not set CONFIG_CRC7=m CONFIG_LIBCRC32C=y -- cgit v1.2.3 From c93d6cb951fb2e89ffb45d79249daa538ab48107 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 1 Feb 2024 08:49:56 +0100 Subject: Kernel: T5619: remove build-in Intel IXGBE driver for out-of-tree version (cherry picked from commit 6c6fe821de20eaf18640285587e960726c1ea39b) --- packages/linux-kernel/arch/x86/configs/vyos_defconfig | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 9446cdc1..0c7e5926 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -2535,13 +2535,8 @@ CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -# CONFIG_IXGBE_DCB is not set -CONFIG_IXGBE_IPSEC=y -CONFIG_IXGBEVF=m -CONFIG_IXGBEVF_IPSEC=y +# CONFIG_IXGBE is not set +# CONFIG_IXGBEVF is not set CONFIG_I40E=m # CONFIG_I40E_DCB is not set CONFIG_IAVF=m -- cgit v1.2.3 From 8bd0c92abf4b1991e11b33fe21bb24148cc21a60 Mon Sep 17 00:00:00 2001 From: Skyler Mäntysaari Date: Wed, 18 Oct 2023 22:33:35 +0300 Subject: T5619: Add out-of-tree Intel ixgbe driver (cherry picked from commit 738ce141fb1c5cf77832bb93e21029b882910921) --- packages/linux-kernel/Jenkinsfile | 7 ++- packages/linux-kernel/build-intel-ixgbe.sh | 94 ++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100755 packages/linux-kernel/build-intel-ixgbe.sh (limited to 'packages') diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index 200e5b54..f83ca681 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2021 VyOS maintainers and contributors +// Copyright (C) 2020-2024 VyOS maintainers and contributors // // This program is free software; you can redistribute it and/or modify // in order to easy exprort images built to "external" world @@ -53,9 +53,12 @@ def pkgList = [ 'scmUrl': 'https://github.com/accel-ppp/accel-ppp.git', 'buildCmd': 'cd ..; pwd; ls -al; ./build-accel-ppp.sh'], - // Intel-QAT + // Intel QAT ['name': 'qat', 'buildCmd': 'cd ..; ./build-intel-qat.sh'], + // Intel IXGBE + ['name': 'ixgbe', 'buildCmd': 'cd ..; ./build-intel-ixgbe.sh'], + // Jool ['name': 'jool', 'buildCmd': 'cd ..; ./build-jool.py'], diff --git a/packages/linux-kernel/build-intel-ixgbe.sh b/packages/linux-kernel/build-intel-ixgbe.sh new file mode 100755 index 00000000..8ca01a9e --- /dev/null +++ b/packages/linux-kernel/build-intel-ixgbe.sh @@ -0,0 +1,94 @@ +#!/bin/sh +CWD=$(pwd) +KERNEL_VAR_FILE=${CWD}/kernel-vars + +if ! dpkg-architecture -iamd64; then + echo "Intel ixgbe is only buildable on amd64 platforms" + exit 0 +fi + +if [ ! -f ${KERNEL_VAR_FILE} ]; then + echo "Kernel variable file '${KERNEL_VAR_FILE}' does not exist, run ./build_kernel.sh first" + exit 1 +fi + +. ${KERNEL_VAR_FILE} + +url="https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.19.6/ixgbe-5.19.6.tar.gz" + +cd ${CWD} + +DRIVER_FILE=$(basename ${url} | sed -e s/tar_0/tar/) +DRIVER_DIR="${DRIVER_FILE%.tar.gz}" +DRIVER_NAME="ixgbe" +DRIVER_VERSION=$(echo ${DRIVER_DIR} | awk -F${DRIVER_NAME} '{print $2}' | sed 's/^-//') +DRIVER_VERSION_EXTRA="" + +# Build up Debian related variables required for packaging +DEBIAN_ARCH=$(dpkg --print-architecture) +DEBIAN_DIR="${CWD}/vyos-intel-${DRIVER_NAME}_${DRIVER_VERSION}_${DEBIAN_ARCH}" +DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control" +DEBIAN_POSTINST="${CWD}/vyos-intel-ixgbe.postinst" + +# Fetch Intel driver source from SourceForge +if [ -e ${DRIVER_FILE} ]; then + rm -f ${DRIVER_FILE} +fi +curl -L -o ${DRIVER_FILE} ${url} +if [ "$?" -ne "0" ]; then + exit 1 +fi + +# Unpack archive +if [ -d ${DRIVER_DIR} ]; then + rm -rf ${DRIVER_DIR} +fi +mkdir -p ${DRIVER_DIR} +tar -C ${DRIVER_DIR} --strip-components=1 -xf ${DRIVER_FILE} + +cd ${DRIVER_DIR}/src +if [ -z $KERNEL_DIR ]; then + echo "KERNEL_DIR not defined" + exit 1 +fi + +echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver" +make INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} -j $(getconf _NPROCESSORS_ONLN) install + +if [ "x$?" != "x0" ]; then + exit 1 +fi + +if [ -f ${DEBIAN_DIR}.deb ]; then + rm ${DEBIAN_DIR}.deb +fi + +# build Debian package +echo "I: Building Debian package vyos-intel-${DRIVER_NAME}" +cd ${CWD} + +# delete non required files which are also present in the kernel package +# und thus lead to duplicated files +find ${DEBIAN_DIR} -name "modules.*" | xargs rm -f + +echo "#!/bin/sh" > ${DEBIAN_POSTINST} +echo "/sbin/depmod -a ${KERNEL_VERSION}${KERNEL_SUFFIX}" >> ${DEBIAN_POSTINST} + +fpm --input-type dir --output-type deb --name vyos-intel-${DRIVER_NAME} \ + --version ${DRIVER_VERSION} --deb-compression gz \ + --maintainer "VyOS Package Maintainers " \ + --description "Vendor based driver for Intel ${DRIVER_NAME}" \ + --depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \ + --license "GPL2" -C ${DEBIAN_DIR} --after-install ${DEBIAN_POSTINST} + +echo "I: Cleanup ${DRIVER_NAME} source" +cd ${CWD} +if [ -e ${DRIVER_FILE} ]; then + rm -f ${DRIVER_FILE} +fi +if [ -d ${DRIVER_DIR} ]; then + rm -rf ${DRIVER_DIR} +fi +if [ -d ${DEBIAN_DIR} ]; then + rm -rf ${DEBIAN_DIR} +fi -- cgit v1.2.3 From e3be537a9fd4686173b1064326d7fa7d51b67662 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 1 Feb 2024 08:42:25 +0000 Subject: ixgbe: T5619: remove pci_*_pcie_error_reporting() code to work with Kernel 6.6 This fixes commit 0f80a22b5 ("T5619: Add out-of-tree Intel ixgbe driver") to work with the latest 6.6 code base. For more information see https://lore.kernel.org/lkml/f90837d0-810e-5772-7841-28d47c44d260@intel.com (cherry picked from commit 36065ae874e170f3f60829b0b5348119b7e15e9a) --- data/architectures/amd64.toml | 1 + packages/linux-kernel/build-intel-ixgbe.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 640a7f49..aa201f1d 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -10,6 +10,7 @@ packages = [ "grub-pc", "vyos-linux-firmware", "vyos-intel-qat", + "vyos-intel-ixgbe", "openvpn-dco", "telegraf" ] diff --git a/packages/linux-kernel/build-intel-ixgbe.sh b/packages/linux-kernel/build-intel-ixgbe.sh index 8ca01a9e..4f6d974b 100755 --- a/packages/linux-kernel/build-intel-ixgbe.sh +++ b/packages/linux-kernel/build-intel-ixgbe.sh @@ -14,7 +14,7 @@ fi . ${KERNEL_VAR_FILE} -url="https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.19.6/ixgbe-5.19.6.tar.gz" +url="https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.19.9/ixgbe-5.19.9.tar.gz" cd ${CWD} @@ -52,8 +52,13 @@ if [ -z $KERNEL_DIR ]; then exit 1 fi +# See https://lore.kernel.org/lkml/f90837d0-810e-5772-7841-28d47c44d260@intel.com/ +echo "I: remove pci_enable_pcie_error_reporting() code no longer present in Kernel" +sed -i '/.*pci_disable_pcie_error_reporting(pdev);/d' ixgbe_main.c +sed -i '/.*pci_enable_pcie_error_reporting(pdev);/d' ixgbe_main.c + echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver" -make INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} -j $(getconf _NPROCESSORS_ONLN) install +make KSRC=${KERNEL_DIR} INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} -j $(getconf _NPROCESSORS_ONLN) install if [ "x$?" != "x0" ]; then exit 1 -- cgit v1.2.3 From a188f939ccc2876547ac2b15528020068647c7a5 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 1 Feb 2024 09:44:38 +0100 Subject: Kernel: T5995: enable CONFIG_HINIC for Huawei NICs (cherry picked from commit ea4d2746ae77ce7e20eb1b65e5508332f1a42e8e) --- packages/linux-kernel/arch/x86/configs/vyos_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 0c7e5926..77f7b728 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -2524,7 +2524,7 @@ CONFIG_NET_VENDOR_FUNGIBLE=y CONFIG_NET_VENDOR_GOOGLE=y CONFIG_GVE=m CONFIG_NET_VENDOR_HUAWEI=y -# CONFIG_HINIC is not set +CONFIG_HINIC=y CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y CONFIG_E100=m -- cgit v1.2.3 From 6240342b215fef2f390a17d9d7ee3bc9cd67c700 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 1 Feb 2024 10:02:54 +0100 Subject: T5619: Add out-of-tree Intel ixgbevf driver (cherry picked from commit 9376117efbe5022ece7942cf5e3e9606ca6586bf) --- data/architectures/amd64.toml | 1 + packages/linux-kernel/Jenkinsfile | 3 + packages/linux-kernel/build-intel-ixgbevf.sh | 100 +++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100755 packages/linux-kernel/build-intel-ixgbevf.sh (limited to 'packages') diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index aa201f1d..7d3e3674 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -11,6 +11,7 @@ packages = [ "vyos-linux-firmware", "vyos-intel-qat", "vyos-intel-ixgbe", + "vyos-intel-ixgbevf", "openvpn-dco", "telegraf" ] diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index f83ca681..b8766611 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -59,6 +59,9 @@ def pkgList = [ // Intel IXGBE ['name': 'ixgbe', 'buildCmd': 'cd ..; ./build-intel-ixgbe.sh'], + // Intel IXGBEVF + ['name': 'ixgbevf', 'buildCmd': 'cd ..; ./build-intel-ixgbevf.sh'], + // Jool ['name': 'jool', 'buildCmd': 'cd ..; ./build-jool.py'], diff --git a/packages/linux-kernel/build-intel-ixgbevf.sh b/packages/linux-kernel/build-intel-ixgbevf.sh new file mode 100755 index 00000000..a965e0de --- /dev/null +++ b/packages/linux-kernel/build-intel-ixgbevf.sh @@ -0,0 +1,100 @@ +#!/bin/sh +CWD=$(pwd) +KERNEL_VAR_FILE=${CWD}/kernel-vars + +if ! dpkg-architecture -iamd64; then + echo "Intel ixgbevf is only buildable on amd64 platforms" + exit 0 +fi + +if [ ! -f ${KERNEL_VAR_FILE} ]; then + echo "Kernel variable file '${KERNEL_VAR_FILE}' does not exist, run ./build_kernel.sh first" + exit 1 +fi + +. ${KERNEL_VAR_FILE} + +url="https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/4.18.9/ixgbevf-4.18.9.tar.gz" + +cd ${CWD} + +DRIVER_FILE=$(basename ${url} | sed -e s/tar_0/tar/) +DRIVER_DIR="${DRIVER_FILE%.tar.gz}" +DRIVER_NAME="ixgbevf" +DRIVER_VERSION=$(echo ${DRIVER_DIR} | awk -F${DRIVER_NAME} '{print $2}' | sed 's/^-//') +DRIVER_VERSION_EXTRA="" + +# Build up Debian related variables required for packaging +DEBIAN_ARCH=$(dpkg --print-architecture) +DEBIAN_DIR="${CWD}/vyos-intel-${DRIVER_NAME}_${DRIVER_VERSION}_${DEBIAN_ARCH}" +DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control" +DEBIAN_POSTINST="${CWD}/vyos-intel-ixgbevf.postinst" + +# Fetch Intel driver source from SourceForge +if [ -e ${DRIVER_FILE} ]; then + rm -f ${DRIVER_FILE} +fi +curl -L -o ${DRIVER_FILE} ${url} +if [ "$?" -ne "0" ]; then + exit 1 +fi + +# Unpack archive +if [ -d ${DRIVER_DIR} ]; then + rm -rf ${DRIVER_DIR} +fi +mkdir -p ${DRIVER_DIR} +tar -C ${DRIVER_DIR} --strip-components=1 -xf ${DRIVER_FILE} + +cd ${DRIVER_DIR}/src +if [ -z $KERNEL_DIR ]; then + echo "KERNEL_DIR not defined" + exit 1 +fi + +# See https://lore.kernel.org/lkml/f90837d0-810e-5772-7841-28d47c44d260@intel.com/ +echo "I: remove pci_enable_pcie_error_reporting() code no longer present in Kernel" +sed -i '/.*pci_disable_pcie_error_reporting(pdev);/d' ixgbevf_main.c +sed -i '/.*pci_enable_pcie_error_reporting(pdev);/d' ixgbevf_main.c + +echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver" +make KSRC=${KERNEL_DIR} INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} -j $(getconf _NPROCESSORS_ONLN) install + +if [ "x$?" != "x0" ]; then + exit 1 +fi + +if [ -f ${DEBIAN_DIR}.deb ]; then + rm ${DEBIAN_DIR}.deb +fi + +# build Debian package +echo "I: Building Debian package vyos-intel-${DRIVER_NAME}" +cd ${CWD} + +# delete non required files which are also present in the kernel package +# und thus lead to duplicated files +find ${DEBIAN_DIR} -name "modules.*" | xargs rm -f + +echo "#!/bin/sh" > ${DEBIAN_POSTINST} +echo "/sbin/depmod -a ${KERNEL_VERSION}${KERNEL_SUFFIX}" >> ${DEBIAN_POSTINST} + +fpm --input-type dir --output-type deb --name vyos-intel-${DRIVER_NAME} \ + --version ${DRIVER_VERSION} --deb-compression gz \ + --maintainer "VyOS Package Maintainers " \ + --description "Vendor based driver for Intel ${DRIVER_NAME}" \ + --depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \ + --license "GPL2" -C ${DEBIAN_DIR} --after-install ${DEBIAN_POSTINST} + +echo "I: Cleanup ${DRIVER_NAME} source" +cd ${CWD} +if [ -e ${DRIVER_FILE} ]; then + rm -f ${DRIVER_FILE} +fi +if [ -d ${DRIVER_DIR} ]; then + rm -rf ${DRIVER_DIR} +fi +if [ -d ${DEBIAN_DIR} ]; then + rm -rf ${DEBIAN_DIR} +fi + -- cgit v1.2.3