diff --git a/srcpkgs/rpi-kernel/patches/irqsoff-tracer.patch b/srcpkgs/rpi-kernel/patches/irqsoff-tracer.patch deleted file mode 100644 index 09501632fd8..00000000000 --- a/srcpkgs/rpi-kernel/patches/irqsoff-tracer.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 342c7ee49e862edc30c893f141f55b9211b7a43b Mon Sep 17 00:00:00 2001 -From: Yangyu Chen -Date: Mon, 18 Dec 2023 23:26:59 +0800 -Subject: [PATCH] configs: rpi: Disable CONFIG_IRQSOFF_TRACER by default - -This configuration hindered performance by ~74% measured from RPI 4B -from ~680Mbps to ~390Mbps when benchmarking wireguard locally using -netns and iperf3. Remove it by default for better performance. - -Signed-off-by: Yangyu Chen ---- - arch/arm/configs/bcm2709_defconfig | 1 - - arch/arm/configs/bcm2711_defconfig | 1 - - arch/arm/configs/bcmrpi_defconfig | 1 - - arch/arm64/configs/bcm2711_defconfig | 1 - - arch/arm64/configs/bcm2712_defconfig | 1 - - arch/arm64/configs/bcmrpi3_defconfig | 1 - - 6 files changed, 6 deletions(-) - -diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 980e70d0178fa..c8aa65e82d8bb 100644 ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1586,7 +1586,6 @@ CONFIG_DETECT_HUNG_TASK=y - CONFIG_LATENCYTOP=y - CONFIG_FUNCTION_PROFILER=y - CONFIG_STACK_TRACER=y --CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y - # CONFIG_UPROBE_EVENTS is not set -diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig -index 806c6d81590a6..2578d23b1886e 100644 ---- a/arch/arm/configs/bcm2711_defconfig -+++ b/arch/arm/configs/bcm2711_defconfig -@@ -1613,7 +1613,6 @@ CONFIG_DETECT_HUNG_TASK=y - CONFIG_LATENCYTOP=y - CONFIG_FUNCTION_PROFILER=y - CONFIG_STACK_TRACER=y --CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y - # CONFIG_UPROBE_EVENTS is not set -diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index fad465fe4c70e..a2519b5abb6d6 100644 ---- a/arch/arm/configs/bcmrpi_defconfig -+++ b/arch/arm/configs/bcmrpi_defconfig -@@ -1580,7 +1580,6 @@ CONFIG_DETECT_HUNG_TASK=y - CONFIG_LATENCYTOP=y - CONFIG_FUNCTION_PROFILER=y - CONFIG_STACK_TRACER=y --CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y - # CONFIG_UPROBE_EVENTS is not set -diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig -index 819c442e5acfe..afbd8ef3e8d3b 100644 ---- a/arch/arm64/configs/bcm2711_defconfig -+++ b/arch/arm64/configs/bcm2711_defconfig -@@ -1675,7 +1675,6 @@ CONFIG_DETECT_HUNG_TASK=y - CONFIG_LATENCYTOP=y - CONFIG_FUNCTION_PROFILER=y - CONFIG_STACK_TRACER=y --CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y - # CONFIG_UPROBE_EVENTS is not set -diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig -index 15a0aa6c77137..76effcbc199b5 100644 ---- a/arch/arm64/configs/bcm2712_defconfig -+++ b/arch/arm64/configs/bcm2712_defconfig -@@ -1678,7 +1678,6 @@ CONFIG_DETECT_HUNG_TASK=y - CONFIG_LATENCYTOP=y - CONFIG_FUNCTION_PROFILER=y - CONFIG_STACK_TRACER=y --CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y - # CONFIG_UPROBE_EVENTS is not set -diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig -index d3d879d03ff45..6fca561ba4084 100644 ---- a/arch/arm64/configs/bcmrpi3_defconfig -+++ b/arch/arm64/configs/bcmrpi3_defconfig -@@ -1561,7 +1561,6 @@ CONFIG_DETECT_HUNG_TASK=y - CONFIG_LATENCYTOP=y - CONFIG_FUNCTION_PROFILER=y - CONFIG_STACK_TRACER=y --CONFIG_IRQSOFF_TRACER=y - CONFIG_SCHED_TRACER=y - CONFIG_BLK_DEV_IO_TRACE=y - # CONFIG_UPROBE_EVENTS is not set diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 704cc1f6646..123ae02eb58 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -12,9 +12,9 @@ # # Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html pkgname=rpi-kernel -version=6.1.69 +version=6.1.77 revision=1 -_githash=aabc6f6d0b13ac177f9b383e59a542ddb6c32e59 +_githash=fdd0eca49f6d09d4520d9d9827abfef1c605ce74 archs="armv6l* armv7l* aarch64*" hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" @@ -23,7 +23,7 @@ maintainer="classabbyamp " license="GPL-2.0-only" homepage="http://www.kernel.org" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=31a39457e4f3075bf7a1113aae17f9a17241b425aa194639c886bc639cf1da5d +checksum=611dd843760ea80753ed8c67e665dbe923827e79a381c27c353d33b1da52e211 python_version=3 provides="rpi-kernel-${version}_${revision}" replaces="rpi5-kernel>=0" @@ -112,6 +112,7 @@ _configure() { CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LEDS_TRIGGER_ACTIVITY=m + CONFIG_MACVTAP=m ! while read -r line; do