From db1f6699bfc3c3148336b3270444e5cb339c293f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 1 Feb 2024 08:49:08 +0100
Subject: Kernel: T5887: update Linux Kernel to v6.6.15

(cherry picked from commit c910d5843ac4f7f96d9cb2d9c564f7fe8587c50f)
---
 data/defaults.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/defaults.toml b/data/defaults.toml
index 59563c53..4939077d 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta"
 vyos_branch = "sagitta"
 release_train = "sagitta"
 
-kernel_version = "6.6.13"
+kernel_version = "6.6.15"
 bootloaders = "syslinux,grub-efi"
 
 squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"
-- 
cgit v1.2.3


From e3be537a9fd4686173b1064326d7fa7d51b67662 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
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 'data')

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 6240342b215fef2f390a17d9d7ee3bc9cd67c700 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
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 'data')

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 <maintainers@vyos.net>" \
+    --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