Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qualcommax: add 6.6 testing kernel #14844

Merged
9 commits merged into from Mar 22, 2024
@@ -0,0 +1,25 @@
From 01ec275bd0942ddc6b80e1d3671cdc66be670f57 Mon Sep 17 00:00:00 2001
From: Robert Marko <robimarko@gmail.com>
Date: Fri, 1 Sep 2023 12:23:58 +0200
Subject: [PATCH] nss-dp: include <net/netdev_rx_queue.h>

Since 6.5 netdev_rx_queue was moved out of netdevice.h so include the new
header since that is where it lives now.

Signed-off-by: Robert Marko <robimarko@gmail.com>
---
nss_dp_main.c | 3 +++
1 file changed, 3 insertions(+)

--- a/nss_dp_main.c
+++ b/nss_dp_main.c
@@ -34,6 +34,9 @@
#if defined(NSS_DP_MAC_POLL_SUPPORT)
#include <init/ssdk_init.h>
#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0))
+#include <net/netdev_rx_queue.h>
+#endif

#include "nss_dp_hal.h"

@@ -0,0 +1,47 @@
From f6c0115daaac586740e873a3b8145c5370a73dce Mon Sep 17 00:00:00 2001
From: Robert Marko <robimarko@gmail.com>
Date: Sat, 17 Feb 2024 13:02:31 +0100
Subject: [PATCH] config: identify kernel 6.6

Identify kernel 6.6 so it can be compiled against.

Signed-off-by: Robert Marko <robimarko@gmail.com>
---
config | 5 +++++
make/linux_opt.mk | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)

--- a/config
+++ b/config
@@ -27,6 +27,11 @@ endif
ifeq ($(KVER),$(filter 6.1%,$(KVER)))
OS_VER=6_1
endif
+
+ifeq ($(KVER),$(filter 6.6%,$(KVER)))
+ OS_VER=6_6
+endif
+
ifeq ($(KVER), 3.4.0)
OS_VER=3_4
endif
--- a/make/linux_opt.mk
+++ b/make/linux_opt.mk
@@ -450,7 +450,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
KASAN_SHADOW_SCALE_SHIFT := 3
endif

- ifeq ($(OS_VER),$(filter 5_4 6_1, $(OS_VER)))
+ ifeq ($(OS_VER),$(filter 5_4 6_1 6_6, $(OS_VER)))
ifeq ($(ARCH), arm64)
KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
endif
@@ -481,7 +481,7 @@ ifeq (KSLIB, $(MODULE_TYPE))

endif

- ifeq ($(OS_VER),$(filter 4_4 5_4 6_1, $(OS_VER)))
+ ifeq ($(OS_VER),$(filter 4_4 5_4 6_1 6_6, $(OS_VER)))
MODULE_CFLAG += -DKVER34
MODULE_CFLAG += -DKVER32
MODULE_CFLAG += -DLNX26_22
1 change: 1 addition & 0 deletions target/linux/qualcommax/Makefile
Expand Up @@ -9,6 +9,7 @@ CPU_TYPE:=cortex-a53
SUBTARGETS:=ipq807x ipq60xx

KERNEL_PATCHVER:=6.1
KERNEL_TESTING_PATCHVER:=6.6

include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \
Expand Down