add qca

2025-03-09 15:40:03 +00:00 · 2022-09-13 12:59:02 +08:00 · 2022-09-13 12:59:02 +08:00 · 8f8028cb7f
commit 8f8028cb7f
parent 083306174f
86 changed files with 50519 additions and 0 deletions
--- a/qca/qca-nss-drv/Makefile
+++ b/qca/qca-nss-drv/Makefile
@ -0,0 +1,129 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-nss-drv
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2022-03-07
+PKG_SOURCE_VERSION:=397c88cf184e0eb011dd44ad82c2dfae60ece1b4
+PKG_MIRROR_HASH:=a3bea305d85fcec3d77f9b40d06a71b65ccf3d8b98018d9c8c23d6ad95e6aedc
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+NSS_CLIENTS_DIR:=$(TOPDIR)/qca/src/qca-nss-clients
+
+define KernelPackage/qca-nss-drv
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx) +kmod-qca-nss-dp
+  TITLE:=Kernel driver for NSS (core driver)
+  FILES:=$(PKG_BUILD_DIR)/qca-nss-drv.ko
+  AUTOLOAD:=$(call AutoLoad,32,qca-nss-drv)
+endef
+
+define KernelPackage/qca-nss-drv/install
+	$(INSTALL_DIR) $(1)/lib/debug
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/sysctl.d
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/firmware
+	$(INSTALL_DIR) $(1)/etc/config
+
+	$(INSTALL_BIN) ./files/qca-nss-drv.debug $(1)/lib/debug/qca-nss-drv
+	$(INSTALL_BIN) ./files/qca-nss-drv.init $(1)/etc/init.d/qca-nss-drv
+	$(INSTALL_BIN) ./files/qca-nss-drv.sysctl $(1)/etc/sysctl.d/qca-nss-drv.conf
+	$(INSTALL_BIN) ./files/qca-nss-drv.hotplug $(1)/etc/hotplug.d/firmware/10-qca-nss-fw
+	$(INSTALL_BIN) ./files/qca-nss-drv.conf $(1)/etc/config/nss
+
+endef
+
+define KernelPackage/qca-nss-drv/Description
+This package contains a NSS driver for QCA chipset
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include/qca-nss-drv
+	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-drv/
+endef
+
+EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-nss-gmac \
+			   -I$(STAGING_DIR)/usr/include/qca-nss-dp \
+			   -I$(STAGING_DIR)/usr/include/qca-ssdk \
+			   -Wno-unused-variable
+
+ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "ipq807x" "ipq60xx"))
+EXTRA_CFLAGS+= -DNSS_MEM_PROFILE_MEDIUM
+LOW_MEM_PROFILE_MAKE_OPTS=y
+endif
+
+ifeq ($(CONFIG_KERNEL_SKB_FIXED_SIZE_2K),y)
+EXTRA_CFLAGS+= -DNSS_SKB_FIXED_SIZE_2K
+endif
+
+DRV_MAKE_OPTS:=
+ifeq ($(LOW_MEM_PROFILE_MAKE_OPTS),y)
+DRV_MAKE_OPTS+= \
+	NSS_DRV_C2C_ENABLE=n \
+	NSS_DRV_CAPWAP_ENABLE=n \
+	NSS_DRV_CLMAP_ENABLE=n \
+	NSS_DRV_CRYPTO_ENABLE=y \
+	NSS_DRV_DTLS_ENABLE=n \
+	NSS_DRV_GRE_ENABLE=n \
+	NSS_DRV_GRE_REDIR_ENABLE=n \
+	NSS_DRV_GRE_TUNNEL_ENABLE=n \
+	NSS_DRV_IGS_ENABLE=n \
+	NSS_DRV_IPSEC_ENABLE=n \
+	NSS_DRV_LAG_ENABLE=n \
+	NSS_DRV_L2TP_ENABLE=n \
+	NSS_DRV_MAPT_ENABLE=n \
+	NSS_DRV_OAM_ENABLE=n \
+	NSS_DRV_PPTP_ENABLE=n \
+	NSS_DRV_PORTID_ENABLE=n \
+	NSS_DRV_PVXLAN_ENABLE=n \
+	NSS_DRV_QRFS_ENABLE=n \
+	NSS_DRV_QVPN_ENABLE=n \
+	NSS_DRV_RMNET_ENABLE=n \
+	NSS_DRV_SHAPER_ENABLE=n \
+	NSS_DRV_SJACK_ENABLE=n \
+	NSS_DRV_TLS_ENABLE=n \
+	NSS_DRV_TRUSTSEC_ENABLE=n \
+	NSS_DRV_TSTAMP_ENABLE=n \
+	NSS_DRV_TUN6RD_ENABLE=n \
+	NSS_DRV_TUNIPIP6_ENABLE=n \
+	NSS_DRV_VXLAN_ENABLE=n \
+	NSS_DRV_MATCH_ENABLE=n \
+	NSS_DRV_MIRROR_ENABLE=n \
+	NSS_DRV_PPPOE_ENABLE=n \
+	NSS_DRV_VIRT_IF_ENABLE=n \
+	NSS_DRV_VLAN_ENABLE=n \
+	NSS_DRV_BRIDGE_ENABLE=n \
+	NSS_DRV_WIFI_EXT_VDEV_ENABLE=n \
+	NSS_DRV_WIFI_MESH_ENABLE=n
+endif
+
+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+    SOC="ipq807x_64"
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+    SOC="ipq60xx_64"
+endif
+
+define Build/Configure
+	$(LN) arch/nss_$(SOC).h $(PKG_BUILD_DIR)/exports/nss_arch.h
+endef
+
+define Build/Compile
+	+$(MAKE) -C "$(LINUX_DIR)" $(strip $(DRV_MAKE_OPTS)) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		M="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC=$(SOC) \
+		$(KERNEL_MAKE_FLAGS) \
+		$(PKG_JOBS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,qca-nss-drv))
--- a/qca/qca-nss-drv/files/qca-nss-drv.conf
+++ b/qca/qca-nss-drv/files/qca-nss-drv.conf
@ -0,0 +1,6 @@
+config nss_firmware 'qca_nss_0'
+
+config nss_firmware 'qca_nss_1'
+
+config general
+	option enable_rps	'1'
--- a/qca/qca-nss-drv/files/qca-nss-drv.debug
+++ b/qca/qca-nss-drv/files/qca-nss-drv.debug
@ -0,0 +1,26 @@
+#!/bin/sh /sbin/sysdebug
+#
+# Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+log cat /sys/kernel/debug/qca-nss-drv/stats/pppoe
+log cat /sys/kernel/debug/qca-nss-drv/stats/n2h
+log cat /sys/kernel/debug/qca-nss-drv/stats/ipv6
+log cat /sys/kernel/debug/qca-nss-drv/stats/ipv4
+log cat /sys/kernel/debug/qca-nss-drv/stats/gmac
+log cat /sys/kernel/debug/qca-nss-drv/stats/drv
+log cat /sys/kernel/debug/qca-nss-drv/stats/wifi
+log cat /sys/kernel/debug/qca-nss-drv/stats/wifi_if
+log cat /sys/kernel/debug/qca-nss-drv/stats/eth_rx
--- a/qca/qca-nss-drv/files/qca-nss-drv.hotplug
+++ b/qca/qca-nss-drv/files/qca-nss-drv.hotplug
@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+KERNEL=`uname -r`
+case "${KERNEL}" in
+	3.4*)
+		select_or_load=load_nss_fw
+		;;
+	*)
+		select_or_load=select_nss_fw
+		;;
+esac
+
+load_nss_fw () {
+	ls -l $1 | awk ' { print $9,$5 } '> /dev/console
+	echo 1 > /sys/class/firmware/$DEVICENAME/loading
+	cat $1 > /sys/class/firmware/$DEVICENAME/data
+	echo 0 > /sys/class/firmware/$DEVICENAME/loading
+}
+
+select_nss_fw () {
+	rm -f /lib/firmware/$DEVICENAME
+	ln -s $1 /lib/firmware/$DEVICENAME
+	ls -l /lib/firmware/$DEVICENAME | awk ' { print $9,$5 } '> /dev/console
+}
+
+[ "$ACTION" != "add" ] && exit
+
+# dev name for UCI, since it doesn't let you use . or -
+SDEVNAME=$(echo ${DEVICENAME} | sed s/[.-]/_/g)
+
+SELECTED_FW=$(uci get nss.${SDEVNAME}.firmware 2>/dev/null)
+[ -e "${SELECTED_FW}" ] && {
+	$select_or_load ${SELECTED_FW}
+	exit
+}
+
+case $DEVICENAME in
+        qca-nss0* | qca-nss.0*)
+                if [ -e /lib/firmware/qca-nss0-enterprise.bin ] ; then
+                        $select_or_load /lib/firmware/qca-nss0-enterprise.bin
+                else
+                        $select_or_load /lib/firmware/qca-nss0-retail.bin
+                fi
+                exit
+                ;;
+        qca-nss1* | qca-nss.1*)
+                if [ -e /lib/firmware/qca-nss1-enterprise.bin ] ; then
+                        $select_or_load /lib/firmware/qca-nss1-enterprise.bin
+                else
+                        $select_or_load /lib/firmware/qca-nss1-retail.bin
+                fi
+                exit
+                ;;
+esac
+
--- a/qca/qca-nss-drv/files/qca-nss-drv.init
+++ b/qca/qca-nss-drv/files/qca-nss-drv.init
@ -0,0 +1,50 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+START=70
+
+enable_rps() {
+	irq_nss_rps=`grep nss_queue1 /proc/interrupts | cut -d ':' -f 1 | tr -d ' '`
+	for entry in $irq_nss_rps
+	do
+		echo 2 > /proc/irq/$entry/smp_affinity
+	done
+
+	irq_nss_rps=`grep nss_queue2 /proc/interrupts | cut -d ':' -f 1 | tr -d ' '`
+	for entry in $irq_nss_rps
+	do
+		echo 4 > /proc/irq/$entry/smp_affinity
+	done
+
+	irq_nss_rps=`grep nss_queue3 /proc/interrupts | cut -d ':' -f 1 | tr -d ' '`
+	for entry in $irq_nss_rps
+	do
+		echo 8 > /proc/irq/$entry/smp_affinity
+	done
+
+	# Enable NSS RPS
+	sysctl -w dev.nss.rps.enable=1 >/dev/null 2>/dev/null
+
+}
+
+
+start() {
+	local rps_enabled="$(uci_get nss @general[0] enable_rps)"
+	if [ "$rps_enabled" -eq 1 ]; then
+		enable_rps
+	fi
+}
--- a/qca/qca-nss-drv/files/qca-nss-drv.sysctl
+++ b/qca/qca-nss-drv/files/qca-nss-drv.sysctl
@ -0,0 +1,4 @@
+# Default Number of connection configuration
+dev.nss.ipv4cfg.ipv4_conn=4096
+dev.nss.ipv6cfg.ipv6_conn=4096
+
--- a/qca/qca-nss-drv/patches/0001-core-add-5.10-kernel-to-version-check.patch
+++ b/qca/qca-nss-drv/patches/0001-core-add-5.10-kernel-to-version-check.patch
@ -0,0 +1,25 @@
+From 3885c752e12f74cad6c97888b797e5903ad1930d Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 13 May 2021 23:22:38 +0200
+Subject: [PATCH] core: add 5.10 kernel to version check
+
+NSS DRV has a kernel version check, so simply add
+5.10 as supported.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ nss_core.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/nss_core.c
+++ b/nss_core.c
+@@ -52,7 +52,8 @@
+ (((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)))) || \
+ (((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)))) || \
+ (((LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)))) || \
+-(((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0))))))
+(((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)))) || \
+(((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))))))
+ #error "Check skb recycle code in this file to match Linux version"
+ #endif
+ 
--- a/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch
+++ b/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch
@ -0,0 +1,181 @@
+From 0cffa7bb366a4e0ff5665d6fc2fa33c1437cb397 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 13 May 2021 23:33:18 +0200
+Subject: [PATCH 2/8] nss-drv: replace ioremap_nocache() with ioremap()
+
+ioremap_nocache() does not exist anymore.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ nss_hal/ipq50xx/nss_hal_pvt.c | 6 +++---
+ nss_hal/ipq60xx/nss_hal_pvt.c | 8 ++++----
+ nss_hal/ipq806x/nss_hal_pvt.c | 4 ++--
+ nss_hal/ipq807x/nss_hal_pvt.c | 6 +++---
+ nss_hal/nss_hal.c             | 4 ++--
+ nss_meminfo.c                 | 2 +-
+ nss_ppe.c                     | 2 +-
+ 7 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/nss_hal/ipq50xx/nss_hal_pvt.c b/nss_hal/ipq50xx/nss_hal_pvt.c
+index 3d6dfd0..e3e4bd2 100644
+--- a/nss_hal/ipq50xx/nss_hal_pvt.c
+++ b/nss_hal/ipq50xx/nss_hal_pvt.c
+@@ -184,13 +184,13 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 	npd->nphys = res_nphys.start;
+ 	npd->qgic_phys = res_qgic_phys.start;
+ 
+-	npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys));
+	npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys));
+ 	if (!npd->nmap) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+ 	}
+ 
+-	npd->qgic_map = ioremap_nocache(npd->qgic_phys, resource_size(&res_qgic_phys));
+	npd->qgic_map = ioremap(npd->qgic_phys, resource_size(&res_qgic_phys));
+ 	if (!npd->qgic_map) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+@@ -348,7 +348,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev)
+ 
+ 	of_node_put(cmn);
+ 
+-	nss_misc_reset = ioremap_nocache(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset));
+	nss_misc_reset = ioremap(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset));
+ 	if (!nss_misc_reset) {
+ 		pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev);
+ 		return -EFAULT;
+diff --git a/nss_hal/ipq60xx/nss_hal_pvt.c b/nss_hal/ipq60xx/nss_hal_pvt.c
+index 4c84cb9..e76ef6d 100644
+--- a/nss_hal/ipq60xx/nss_hal_pvt.c
+++ b/nss_hal/ipq60xx/nss_hal_pvt.c
+@@ -207,13 +207,13 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 	npd->nphys = res_nphys.start;
+ 	npd->qgic_phys = res_qgic_phys.start;
+ 
+-	npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys));
+	npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys));
+ 	if (!npd->nmap) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+ 	}
+ 
+-	npd->qgic_map = ioremap_nocache(npd->qgic_phys, resource_size(&res_qgic_phys));
+	npd->qgic_map = ioremap(npd->qgic_phys, resource_size(&res_qgic_phys));
+ 	if (!npd->qgic_map) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+@@ -433,13 +433,13 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev)
+ 
+ 	of_node_put(cmn);
+ 
+-	nss_misc_reset = ioremap_nocache(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset));
+	nss_misc_reset = ioremap(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset));
+ 	if (!nss_misc_reset) {
+ 		pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev);
+ 		return -EFAULT;
+ 	}
+ 
+-	nss_misc_reset_flag = ioremap_nocache(res_nss_misc_reset_flag.start, resource_size(&res_nss_misc_reset_flag));
+	nss_misc_reset_flag = ioremap(res_nss_misc_reset_flag.start, resource_size(&res_nss_misc_reset_flag));
+ 	if (!nss_misc_reset_flag) {
+ 		pr_err("%px: ioremap fail for nss_misc_reset_flag\n", nss_dev);
+ 		return -EFAULT;
+diff --git a/nss_hal/ipq806x/nss_hal_pvt.c b/nss_hal/ipq806x/nss_hal_pvt.c
+index b8733e0..52d63b0 100644
+--- a/nss_hal/ipq806x/nss_hal_pvt.c
+++ b/nss_hal/ipq806x/nss_hal_pvt.c
+@@ -458,7 +458,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 	npd->nphys = res_nphys.start;
+ 	npd->vphys = res_vphys.start;
+ 
+-	npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys));
+	npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys));
+ 	if (!npd->nmap) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+@@ -711,7 +711,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev)
+ 	}
+ 	of_node_put(cmn);
+ 
+-	fpb_base = ioremap_nocache(res_nss_fpb_base.start, resource_size(&res_nss_fpb_base));
+	fpb_base = ioremap(res_nss_fpb_base.start, resource_size(&res_nss_fpb_base));
+ 	if (!fpb_base) {
+ 		pr_err("%px: ioremap fail for nss_fpb_base\n", nss_dev);
+ 		return -EFAULT;
+diff --git a/nss_hal/ipq807x/nss_hal_pvt.c b/nss_hal/ipq807x/nss_hal_pvt.c
+index b95a23c..bb8f42f 100644
+--- a/nss_hal/ipq807x/nss_hal_pvt.c
+++ b/nss_hal/ipq807x/nss_hal_pvt.c
+@@ -234,7 +234,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 	npd->vphys = res_vphys.start;
+ 	npd->qgic_phys = res_qgic_phys.start;
+ 
+-	npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys));
+	npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys));
+ 	if (!npd->nmap) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+@@ -247,7 +247,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 		goto out;
+ 	}
+ 
+-	npd->qgic_map = ioremap_nocache(npd->qgic_phys, resource_size(&res_qgic_phys));
+	npd->qgic_map = ioremap(npd->qgic_phys, resource_size(&res_qgic_phys));
+ 	if (!npd->qgic_map) {
+ 		nss_info_always("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
+ 		goto out;
+@@ -467,7 +467,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev)
+ 	}
+ 	of_node_put(cmn);
+ 
+-	nss_misc_reset = ioremap_nocache(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset));
+	nss_misc_reset = ioremap(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset));
+ 	if (!nss_misc_reset) {
+ 		pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev);
+ 		return -EFAULT;
+diff --git a/nss_hal/nss_hal.c b/nss_hal/nss_hal.c
+index d58bb57..57974c1 100644
+--- a/nss_hal/nss_hal.c
+++ b/nss_hal/nss_hal.c
+@@ -78,9 +78,9 @@ int nss_hal_firmware_load(struct nss_ctx_instance *nss_ctx, struct platform_devi
+ 		return rc;
+ 	}
+ 
+-	load_mem = ioremap_nocache(npd->load_addr, nss_fw->size);
+	load_mem = ioremap(npd->load_addr, nss_fw->size);
+ 	if (!load_mem) {
+-		nss_info_always("%px: ioremap_nocache failed: %x", nss_ctx, npd->load_addr);
+		nss_info_always("%px: ioremap failed: %x", nss_ctx, npd->load_addr);
+ 		release_firmware(nss_fw);
+ 		return rc;
+ 	}
+diff --git a/nss_meminfo.c b/nss_meminfo.c
+index e24e6be..2255eae 100644
+--- a/nss_meminfo.c
+++ b/nss_meminfo.c
+@@ -728,7 +728,7 @@ bool nss_meminfo_init(struct nss_ctx_instance *nss_ctx)
+ 	/*
+ 	 * meminfo_start is the label where the start address of meminfo map is stored.
+ 	 */
+-	meminfo_start = (uint32_t *)ioremap_nocache(nss_ctx->load + NSS_MEMINFO_MAP_START_OFFSET,
+	meminfo_start = (uint32_t *)ioremap(nss_ctx->load + NSS_MEMINFO_MAP_START_OFFSET,
+ 							NSS_MEMINFO_RESERVE_AREA_SIZE);
+ 	if (!meminfo_start) {
+ 		nss_info_always("%px: cannot remap meminfo start\n", nss_ctx);
+diff --git a/nss_ppe.c b/nss_ppe.c
+index 46ce217..644fc98 100644
+--- a/nss_ppe.c
+++ b/nss_ppe.c
+@@ -357,7 +357,7 @@ void nss_ppe_init(void)
+ 	/*
+ 	 * Get the PPE base address
+ 	 */
+-	ppe_pvt.ppe_base = ioremap_nocache(PPE_BASE_ADDR, PPE_REG_SIZE);
+	ppe_pvt.ppe_base = ioremap(PPE_BASE_ADDR, PPE_REG_SIZE);
+ 	if (!ppe_pvt.ppe_base) {
+ 		nss_warning("DRV can't get PPE base address\n");
+ 		return;
+-- 
+2.34.1
+
--- a/qca/qca-nss-drv/patches/0003-DMA-Fix-NULL-pointer-exceptions.patch
+++ b/qca/qca-nss-drv/patches/0003-DMA-Fix-NULL-pointer-exceptions.patch
@ -0,0 +1,49 @@
+From 62e457f262aaa0db7113ad3ccbcb7ae49d4d7ea8 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Tue, 8 Jun 2021 23:24:43 +0200
+Subject: [PATCH] DMA: Fix NULL pointer exceptions
+
+There are multiple instances that pass NULL instead
+of device to DMA functions.
+That is incorrect and will cause kernel NULL pointer
+exceptions.
+
+So, simply pass the device structure pointers.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ nss_core.c     | 2 +-
+ nss_coredump.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/nss_core.c
+++ b/nss_core.c
+@@ -1617,7 +1617,7 @@ static int32_t nss_core_handle_cause_que
+ 		 *
+ 		 */
+ 		if (unlikely((buffer_type == N2H_BUFFER_CRYPTO_RESP))) {
+-			dma_unmap_single(NULL, (desc->buffer + desc->payload_offs), desc->payload_len, DMA_FROM_DEVICE);
+			dma_unmap_single(nss_ctx->dev, (desc->buffer + desc->payload_offs), desc->payload_len, DMA_FROM_DEVICE);
+ 			goto consume;
+ 		}
+ 
+--- a/nss_coredump.c
+++ b/nss_coredump.c
+@@ -154,7 +154,7 @@ void nss_fw_coredump_notify(struct nss_c
+ 		dma_addr = nss_own->meminfo_ctx.logbuffer_dma;
+ 	}
+ 
+-	dma_sync_single_for_cpu(NULL, dma_addr, sizeof(struct nss_log_descriptor), DMA_FROM_DEVICE);
+	dma_sync_single_for_cpu(nss_own->dev, dma_addr, sizeof(struct nss_log_descriptor), DMA_FROM_DEVICE);
+ 
+ 	/*
+ 	 * If the current entry is smaller than or equal to the number of NSS_LOG_COREDUMP_LINE_NUM,
+@@ -181,7 +181,7 @@ void nss_fw_coredump_notify(struct nss_c
+ 
+ 		offset = (index * sizeof(struct nss_log_entry))
+ 			+ offsetof(struct nss_log_descriptor, log_ring_buffer);
+-		dma_sync_single_for_cpu(NULL, dma_addr + offset,
+		dma_sync_single_for_cpu(nss_own->dev, dma_addr + offset,
+ 				sizeof(struct nss_log_entry), DMA_FROM_DEVICE);
+ 		nss_info_always("%px: %s\n", nss_own, nle_print->message);
+ 		nle_print++;
--- a/qca/qca-nss-drv/patches/0004-nss-drv-rework-NSS_CORE_DMA_CACHE_MAINT-ops.patch
+++ b/qca/qca-nss-drv/patches/0004-nss-drv-rework-NSS_CORE_DMA_CACHE_MAINT-ops.patch
@ -0,0 +1,573 @@
+From 12cf63f66bfe509da6d845e5c716efd99dadf01e Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Tue, 5 Apr 2022 15:38:18 +0200
+Subject: [PATCH 4/8] nss-drv: rework NSS_CORE_DMA_CACHE_MAINT ops
+
+Rework NSS_CORE_DMA_CACHE_MAINT ops to use standard dma sync ops instead
+of using the direct arch function. This permit to skip any hack/patch
+needed for nss-drv to correctly compile on upstream kernel.
+
+We drop any NSS_CORE_DMA_CACHE_MAINT use in nss_core and we correctly
+use the dma_sync_single_for_device we correctly dma addr using the new
+DMA helper.
+We drop sync for IOREMAP addr and we just leave a memory block.
+We hope the nss_profiler is correctly ported.
+We finally drop the NSS_CORE_DMA_CACHE_MAINT jus in case someone wants
+to use it.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ nss_core.c                    | 136 +++++++++++++++++++++++++---------
+ nss_core.h                    |  41 +++++-----
+ nss_hal/ipq806x/nss_hal_pvt.c |   5 +-
+ nss_hal/ipq807x/nss_hal_pvt.c |   5 +-
+ nss_meminfo.c                 |   5 +-
+ nss_profiler.c                |   3 +-
+ 6 files changed, 127 insertions(+), 68 deletions(-)
+
+diff --git a/nss_core.c b/nss_core.c
+index 23dc155..f9e6014 100644
+--- a/nss_core.c
+++ b/nss_core.c
+@@ -1429,6 +1429,8 @@ static inline void nss_core_handle_empty_buffers(struct nss_ctx_instance *nss_ct
+ 						 uint32_t count, uint32_t hlos_index,
+ 						 uint16_t mask)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+
+ 	while (count) {
+ 		/*
+ 		 * Since we only return the primary skb, we have no way to unmap
+@@ -1482,7 +1484,9 @@ next:
+ 	n2h_desc_ring->hlos_index = hlos_index;
+ 	if_map->n2h_hlos_index[NSS_IF_N2H_EMPTY_BUFFER_RETURN_QUEUE] = hlos_index;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)&if_map->n2h_hlos_index[NSS_IF_N2H_EMPTY_BUFFER_RETURN_QUEUE], sizeof(uint32_t), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev,
+				   n2h_hlos_index_to_dma(mem_ctx->if_map_dma, NSS_IF_N2H_EMPTY_BUFFER_RETURN_QUEUE),
+				   sizeof(uint32_t), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ }
+ 
+@@ -1504,6 +1508,7 @@ static int32_t nss_core_handle_cause_queue(struct int_ctx_instance *int_ctx, uin
+ 	struct nss_ctx_instance *nss_ctx = int_ctx->nss_ctx;
+ 	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	struct nss_if_mem_map *if_map = mem_ctx->if_map;
+	int dma_size;
+ 
+ 	qid = nss_core_cause_to_queue(cause);
+ 
+@@ -1515,7 +1520,8 @@ static int32_t nss_core_handle_cause_queue(struct int_ctx_instance *int_ctx, uin
+ 	n2h_desc_ring = &nss_ctx->n2h_desc_ring[qid];
+ 	desc_if = &n2h_desc_ring->desc_ring;
+ 	desc_ring = desc_if->desc;
+-	NSS_CORE_DMA_CACHE_MAINT((void *)&if_map->n2h_nss_index[qid], sizeof(uint32_t), DMA_FROM_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, n2h_nss_index_to_dma(mem_ctx->if_map_dma, qid),
+				   sizeof(uint32_t), DMA_FROM_DEVICE);
+ 	NSS_CORE_DSB();
+ 	nss_index = if_map->n2h_nss_index[qid];
+ 
+@@ -1544,13 +1550,23 @@ static int32_t nss_core_handle_cause_queue(struct int_ctx_instance *int_ctx, uin
+ 	start = hlos_index;
+ 	end = (hlos_index + count) & mask;
+ 	if (end > start) {
+-		dmac_inv_range((void *)&desc_ring[start], (void *)&desc_ring[end] + sizeof(struct n2h_descriptor));
+		dma_size = sizeof(struct n2h_descriptor) * (end - start + 1);
+
+		dma_sync_single_for_device(nss_ctx->dev, n2h_desc_index_to_dma(if_map, qid, start),
+					   dma_size, DMA_FROM_DEVICE);
+ 	} else {
+ 		/*
+ 		 * We have wrapped around
+ 		 */
+-		dmac_inv_range((void *)&desc_ring[start], (void *)&desc_ring[mask] + sizeof(struct n2h_descriptor));
+-		dmac_inv_range((void *)&desc_ring[0], (void *)&desc_ring[end] + sizeof(struct n2h_descriptor));
+		dma_size = sizeof(struct n2h_descriptor) * (mask - start + 1);
+
+		dma_sync_single_for_device(nss_ctx->dev, n2h_desc_index_to_dma(if_map, qid, start),
+					   dma_size, DMA_FROM_DEVICE);
+
+		dma_size = sizeof(struct n2h_descriptor) * (end + 1);
+
+		dma_sync_single_for_device(nss_ctx->dev, n2h_desc_index_to_dma(if_map, qid, 0), dma_size,
+					   DMA_FROM_DEVICE);
+ 	}
+ 
+ 	/*
+@@ -1679,7 +1695,8 @@ next:
+ 	n2h_desc_ring->hlos_index = hlos_index;
+ 	if_map->n2h_hlos_index[qid] = hlos_index;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)&if_map->n2h_hlos_index[qid], sizeof(uint32_t), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, n2h_hlos_index_to_dma(mem_ctx->if_map_dma, qid),
+				   sizeof(uint32_t), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	return count;
+@@ -1691,11 +1708,12 @@ next:
+  */
+ static void nss_core_init_nss(struct nss_ctx_instance *nss_ctx, struct nss_if_mem_map *if_map)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	struct nss_top_instance *nss_top;
+ 	int ret;
+	int i;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)if_map, sizeof(*if_map), DMA_FROM_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, mem_ctx->if_map_dma, sizeof(*if_map), DMA_FROM_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	/*
+@@ -1762,6 +1780,7 @@ static void nss_core_alloc_paged_buffers(struct nss_ctx_instance *nss_ctx, struc
+ 				uint16_t count, int16_t mask, int32_t hlos_index, uint32_t alloc_fail_count,
+ 				uint32_t buffer_type, uint32_t buffer_queue, uint32_t stats_index)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	struct sk_buff *nbuf;
+ 	struct page *npage;
+ 	struct hlos_h2n_desc_rings *h2n_desc_ring = &nss_ctx->h2n_desc_rings[buffer_queue];
+@@ -1831,7 +1850,9 @@ static void nss_core_alloc_paged_buffers(struct nss_ctx_instance *nss_ctx, struc
+ 		/*
+ 		 * Flush the descriptor
+ 		 */
+-		NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+		dma_sync_single_for_device(nss_ctx->dev,
+					   h2n_desc_index_to_dma(if_map, buffer_queue, hlos_index),
+					   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 		hlos_index = (hlos_index + 1) & (mask);
+ 		count--;
+@@ -1845,7 +1866,8 @@ static void nss_core_alloc_paged_buffers(struct nss_ctx_instance *nss_ctx, struc
+ 	h2n_desc_ring->hlos_index = hlos_index;
+ 	if_map->h2n_hlos_index[buffer_queue] = hlos_index;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT(&if_map->h2n_hlos_index[buffer_queue], sizeof(uint32_t), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_hlos_index_to_dma(mem_ctx->if_map_dma, buffer_queue),
+				   sizeof(uint32_t), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	NSS_PKT_STATS_INC(&nss_top->stats_drv[stats_index]);
+@@ -1858,7 +1880,7 @@ static void nss_core_alloc_paged_buffers(struct nss_ctx_instance *nss_ctx, struc
+ static void nss_core_alloc_jumbo_mru_buffers(struct nss_ctx_instance *nss_ctx, struct nss_if_mem_map *if_map,
+ 				int jumbo_mru, uint16_t count, int16_t mask, int32_t hlos_index)
+ {
+-
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	struct sk_buff *nbuf;
+ 	struct hlos_h2n_desc_rings *h2n_desc_ring = &nss_ctx->h2n_desc_rings[NSS_IF_H2N_EMPTY_BUFFER_QUEUE];
+ 	struct h2n_desc_if_instance *desc_if = &h2n_desc_ring->desc_ring;
+@@ -1905,7 +1927,9 @@ static void nss_core_alloc_jumbo_mru_buffers(struct nss_ctx_instance *nss_ctx, s
+ 		/*
+ 		 * Flush the descriptor
+ 		 */
+-		NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+		dma_sync_single_for_device(nss_ctx->dev,
+					   h2n_desc_index_to_dma(if_map, NSS_IF_H2N_EMPTY_BUFFER_QUEUE, hlos_index),
+					   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 		hlos_index = (hlos_index + 1) & (mask);
+ 		count--;
+@@ -1919,7 +1943,8 @@ static void nss_core_alloc_jumbo_mru_buffers(struct nss_ctx_instance *nss_ctx, s
+ 	h2n_desc_ring->hlos_index = hlos_index;
+ 	if_map->h2n_hlos_index[NSS_IF_H2N_EMPTY_BUFFER_QUEUE] = hlos_index;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT(&if_map->h2n_hlos_index[NSS_IF_H2N_EMPTY_BUFFER_QUEUE], sizeof(uint32_t), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_hlos_index_to_dma(mem_ctx->if_map_dma, NSS_IF_H2N_EMPTY_BUFFER_QUEUE),
+				   sizeof(uint32_t), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	NSS_PKT_STATS_INC(&nss_top->stats_drv[NSS_DRV_STATS_TX_EMPTY]);
+@@ -1932,6 +1957,7 @@ static void nss_core_alloc_jumbo_mru_buffers(struct nss_ctx_instance *nss_ctx, s
+ static void nss_core_alloc_max_avail_size_buffers(struct nss_ctx_instance *nss_ctx, struct nss_if_mem_map *if_map,
+ 				uint16_t max_buf_size, uint16_t count, int16_t mask, int32_t hlos_index)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	struct hlos_h2n_desc_rings *h2n_desc_ring = &nss_ctx->h2n_desc_rings[NSS_IF_H2N_EMPTY_BUFFER_QUEUE];
+ 	struct h2n_desc_if_instance *desc_if = &h2n_desc_ring->desc_ring;
+ 	struct h2n_descriptor *desc_ring = desc_if->desc;
+@@ -1939,6 +1965,7 @@ static void nss_core_alloc_max_avail_size_buffers(struct nss_ctx_instance *nss_c
+ 	uint16_t payload_len = max_buf_size + NET_SKB_PAD;
+ 	uint16_t start = hlos_index;
+ 	uint16_t prev_hlos_index;
+	int dma_size;
+ 
+ 	while (count) {
+ 		dma_addr_t buffer;
+@@ -1991,13 +2018,26 @@ static void nss_core_alloc_max_avail_size_buffers(struct nss_ctx_instance *nss_c
+ 	 * Flush the descriptors, including the descriptor at prev_hlos_index.
+ 	 */
+ 	if (prev_hlos_index > start) {
+-		dmac_clean_range((void *)&desc_ring[start], (void *)&desc_ring[prev_hlos_index] + sizeof(struct h2n_descriptor));
+		dma_size = sizeof(struct h2n_descriptor) * (prev_hlos_index - start + 1);
+
+		dma_sync_single_for_device(nss_ctx->dev,
+					   h2n_desc_index_to_dma(if_map, NSS_IF_H2N_EMPTY_BUFFER_QUEUE, start),
+					   dma_size, DMA_TO_DEVICE);
+ 	} else {
+ 		/*
+ 		 * We have wrapped around
+ 		 */
+-		dmac_clean_range((void *)&desc_ring[start], (void *)&desc_ring[mask] + sizeof(struct h2n_descriptor));
+-		dmac_clean_range((void *)&desc_ring[0], (void *)&desc_ring[prev_hlos_index] + sizeof(struct h2n_descriptor));
+		dma_size = sizeof(struct h2n_descriptor) * (mask - start + 1);
+
+		dma_sync_single_for_device(nss_ctx->dev,
+					   h2n_desc_index_to_dma(if_map, NSS_IF_H2N_EMPTY_BUFFER_QUEUE, start),
+					   dma_size, DMA_TO_DEVICE);
+
+		dma_size = sizeof(struct h2n_descriptor) * (prev_hlos_index + 1);
+
+		dma_sync_single_for_device(nss_ctx->dev,
+					   h2n_desc_index_to_dma(if_map, NSS_IF_H2N_EMPTY_BUFFER_QUEUE, 0),
+					   dma_size, DMA_TO_DEVICE);
+ 	}
+ 
+ 	/*
+@@ -2008,7 +2048,8 @@ static void nss_core_alloc_max_avail_size_buffers(struct nss_ctx_instance *nss_c
+ 	h2n_desc_ring->hlos_index = hlos_index;
+ 	if_map->h2n_hlos_index[NSS_IF_H2N_EMPTY_BUFFER_QUEUE] = hlos_index;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT(&if_map->h2n_hlos_index[NSS_IF_H2N_EMPTY_BUFFER_QUEUE], sizeof(uint32_t), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_hlos_index_to_dma(mem_ctx->if_map_dma, NSS_IF_H2N_EMPTY_BUFFER_QUEUE),
+				   sizeof(uint32_t), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	NSS_PKT_STATS_INC(&nss_top->stats_drv[NSS_DRV_STATS_TX_EMPTY]);
+@@ -2021,6 +2062,7 @@ static void nss_core_alloc_max_avail_size_buffers(struct nss_ctx_instance *nss_c
+ static inline void nss_core_handle_empty_buffer_sos(struct nss_ctx_instance *nss_ctx,
+ 				struct nss_if_mem_map *if_map, uint16_t max_buf_size)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	uint16_t count, size, mask;
+ 	int32_t nss_index, hlos_index;
+ 	struct hlos_h2n_desc_rings *h2n_desc_ring = &nss_ctx->h2n_desc_rings[NSS_IF_H2N_EMPTY_BUFFER_QUEUE];
+@@ -2031,7 +2073,8 @@ static inline void nss_core_handle_empty_buffer_sos(struct nss_ctx_instance *nss
+ 	/*
+ 	 * Check how many empty buffers could be filled in queue
+ 	 */
+-	NSS_CORE_DMA_CACHE_MAINT(&if_map->h2n_nss_index[NSS_IF_H2N_EMPTY_BUFFER_QUEUE], sizeof(uint32_t), DMA_FROM_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_nss_index_to_dma(mem_ctx->if_map_dma, NSS_IF_H2N_EMPTY_BUFFER_QUEUE),
+				   sizeof(uint32_t), DMA_FROM_DEVICE);
+ 	NSS_CORE_DSB();
+ 	nss_index = if_map->h2n_nss_index[NSS_IF_H2N_EMPTY_BUFFER_QUEUE];
+ 
+@@ -2076,6 +2119,7 @@ static inline void nss_core_handle_empty_buffer_sos(struct nss_ctx_instance *nss
+ static inline void nss_core_handle_paged_empty_buffer_sos(struct nss_ctx_instance *nss_ctx,
+ 				struct nss_if_mem_map *if_map, uint16_t max_buf_size)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+ 	uint16_t count, size, mask;
+ 	int32_t nss_index, hlos_index;
+ 	struct hlos_h2n_desc_rings *h2n_desc_ring = &nss_ctx->h2n_desc_rings[NSS_IF_H2N_EMPTY_PAGED_BUFFER_QUEUE];
+@@ -2083,7 +2127,8 @@ static inline void nss_core_handle_paged_empty_buffer_sos(struct nss_ctx_instanc
+ 	/*
+ 	 * Check how many empty buffers could be filled in queue
+ 	 */
+-	NSS_CORE_DMA_CACHE_MAINT((void *)&if_map->h2n_nss_index[NSS_IF_H2N_EMPTY_PAGED_BUFFER_QUEUE], sizeof(uint32_t), DMA_FROM_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_nss_index_to_dma(mem_ctx->if_map_dma, NSS_IF_H2N_EMPTY_PAGED_BUFFER_QUEUE),
+				   sizeof(uint32_t), DMA_FROM_DEVICE);
+ 	NSS_CORE_DSB();
+ 	nss_index = if_map->h2n_nss_index[NSS_IF_H2N_EMPTY_PAGED_BUFFER_QUEUE];
+ 
+@@ -2651,9 +2696,11 @@ void nss_skb_reuse(struct sk_buff *nbuf)
+  *	Sends one skb to NSS FW
+  */
+ static inline int32_t nss_core_send_buffer_simple_skb(struct nss_ctx_instance *nss_ctx,
+-	struct h2n_desc_if_instance *desc_if, uint32_t if_num,
+-	struct sk_buff *nbuf, uint16_t hlos_index, uint16_t flags, uint8_t buffer_type, uint16_t mss)
+	struct h2n_desc_if_instance *desc_if, uint32_t if_num, struct sk_buff *nbuf, 
+	uint16_t qid, uint16_t hlos_index, uint16_t flags, uint8_t buffer_type, uint16_t mss)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+	struct nss_if_mem_map *if_map = mem_ctx->if_map;
+ 	struct h2n_descriptor *desc_ring = desc_if->desc;
+ 	struct h2n_descriptor *desc;
+ 	uint16_t bit_flags;
+@@ -2707,7 +2754,8 @@ static inline int32_t nss_core_send_buffer_simple_skb(struct nss_ctx_instance *n
+ 		(nss_ptr_t)nbuf, (uint16_t)(nbuf->data - nbuf->head), nbuf->len,
+ 		sz, (uint32_t)nbuf->priority, mss, bit_flags);
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+				   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	/*
+ 	 * We are done using the skb fields and can reuse it now
+@@ -2731,7 +2779,8 @@ no_reuse:
+ 		(nss_ptr_t)nbuf, (uint16_t)(nbuf->data - nbuf->head), nbuf->len,
+ 		(uint16_t)skb_end_offset(nbuf), (uint32_t)nbuf->priority, mss, bit_flags);
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+				   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	NSS_PKT_STATS_INC(&nss_ctx->nss_top->stats_drv[NSS_DRV_STATS_TX_SIMPLE]);
+ 	return 1;
+@@ -2745,9 +2794,11 @@ no_reuse:
+  * Used to differentiate from FRAGLIST
+  */
+ static inline int32_t nss_core_send_buffer_nr_frags(struct nss_ctx_instance *nss_ctx,
+-	struct h2n_desc_if_instance *desc_if, uint32_t if_num,
+-	struct sk_buff *nbuf, uint16_t hlos_index, uint16_t flags, uint8_t buffer_type, uint16_t mss)
+	struct h2n_desc_if_instance *desc_if, uint32_t if_num, struct sk_buff *nbuf,
+	uint16_t qid, uint16_t hlos_index, uint16_t flags, uint8_t buffer_type, uint16_t mss)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+	struct nss_if_mem_map *if_map = mem_ctx->if_map;
+ 	struct h2n_descriptor *desc_ring = desc_if->desc;
+ 	struct h2n_descriptor *desc;
+ 	const skb_frag_t *frag;
+@@ -2787,7 +2838,8 @@ static inline int32_t nss_core_send_buffer_nr_frags(struct nss_ctx_instance *nss
+ 		(nss_ptr_t)NULL, nbuf->data - nbuf->head, nbuf->len - nbuf->data_len,
+ 		skb_end_offset(nbuf), (uint32_t)nbuf->priority, mss, bit_flags | H2N_BIT_FLAG_FIRST_SEGMENT);
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+				   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	/*
+ 	 * Now handle rest of the fragments.
+@@ -2811,7 +2863,8 @@ static inline int32_t nss_core_send_buffer_nr_frags(struct nss_ctx_instance *nss
+ 			(nss_ptr_t)NULL, 0, skb_frag_size(frag), skb_frag_size(frag),
+ 			nbuf->priority, mss, bit_flags);
+ 
+-		NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+		dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+					   sizeof(*desc), DMA_TO_DEVICE);
+ 	}
+ 
+ 	/*
+@@ -2827,7 +2880,8 @@ static inline int32_t nss_core_send_buffer_nr_frags(struct nss_ctx_instance *nss
+ 	desc->bit_flags &= ~(H2N_BIT_FLAG_DISCARD);
+ 	desc->opaque = (nss_ptr_t)nbuf;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+				   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	NSS_PKT_STATS_INC(&nss_ctx->nss_top->stats_drv[NSS_DRV_STATS_TX_NR_FRAGS]);
+ 	return i+1;
+@@ -2841,9 +2895,11 @@ static inline int32_t nss_core_send_buffer_nr_frags(struct nss_ctx_instance *nss
+  * Used to differentiate from FRAGS
+  */
+ static inline int32_t nss_core_send_buffer_fraglist(struct nss_ctx_instance *nss_ctx,
+-	struct h2n_desc_if_instance *desc_if, uint32_t if_num,
+-	struct sk_buff *nbuf, uint16_t hlos_index, uint16_t flags, uint8_t buffer_type, uint16_t mss)
+	struct h2n_desc_if_instance *desc_if, uint32_t if_num, struct sk_buff *nbuf,
+	uint16_t qid, uint16_t hlos_index, uint16_t flags, uint8_t buffer_type, uint16_t mss)
+ {
+	struct nss_meminfo_ctx *mem_ctx = &nss_ctx->meminfo_ctx;
+	struct nss_if_mem_map *if_map = mem_ctx->if_map;
+ 	struct h2n_descriptor *desc_ring = desc_if->desc;
+ 	struct h2n_descriptor *desc;
+ 	dma_addr_t buffer;
+@@ -2882,7 +2938,8 @@ static inline int32_t nss_core_send_buffer_fraglist(struct nss_ctx_instance *nss
+ 		(nss_ptr_t)nbuf, nbuf->data - nbuf->head, nbuf->len - nbuf->data_len,
+ 		skb_end_offset(nbuf), (uint32_t)nbuf->priority, mss, bit_flags | H2N_BIT_FLAG_FIRST_SEGMENT);
+ 
+-	NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+				   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	/*
+ 	 * Walk the frag_list in nbuf
+@@ -2935,7 +2992,8 @@ static inline int32_t nss_core_send_buffer_fraglist(struct nss_ctx_instance *nss
+ 			(nss_ptr_t)iter, iter->data - iter->head, iter->len - iter->data_len,
+ 			skb_end_offset(iter), iter->priority, mss, bit_flags);
+ 
+-		NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+		dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+					   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 		i++;
+ 	}
+@@ -2954,7 +3012,8 @@ static inline int32_t nss_core_send_buffer_fraglist(struct nss_ctx_instance *nss
+ 	 * Update bit flag for last descriptor.
+ 	 */
+ 	desc->bit_flags |= H2N_BIT_FLAG_LAST_SEGMENT;
+-	NSS_CORE_DMA_CACHE_MAINT((void *)desc, sizeof(*desc), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_desc_index_to_dma(if_map, qid, hlos_index),
+				   sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	NSS_PKT_STATS_INC(&nss_ctx->nss_top->stats_drv[NSS_DRV_STATS_TX_FRAGLIST]);
+ 	return i+1;
+@@ -3025,8 +3084,10 @@ int32_t nss_core_send_buffer(struct nss_ctx_instance *nss_ctx, uint32_t if_num,
+ 		 * We need to work out if there's sufficent space in our transmit descriptor
+ 		 * ring to place all the segments of a nbuf.
+ 		 */
+-		NSS_CORE_DMA_CACHE_MAINT((void *)&if_map->h2n_nss_index[qid], sizeof(uint32_t), DMA_FROM_DEVICE);
+		dma_sync_single_for_device(nss_ctx->dev, h2n_nss_index_to_dma(mem_ctx->if_map_dma, qid),
+					   sizeof(uint32_t), DMA_FROM_DEVICE);
+ 		NSS_CORE_DSB();
+
+ 		nss_index = if_map->h2n_nss_index[qid];
+ 		h2n_desc_ring->nss_index_local = nss_index;
+ 		count = ((nss_index - hlos_index - 1) + size) & (mask);
+@@ -3095,13 +3156,13 @@ int32_t nss_core_send_buffer(struct nss_ctx_instance *nss_ctx, uint32_t if_num,
+ 	count = 0;
+ 	if (likely((segments == 0) || is_bounce)) {
+ 		count = nss_core_send_buffer_simple_skb(nss_ctx, desc_if, if_num,
+-			nbuf, hlos_index, flags, buffer_type, mss);
+			nbuf, qid, hlos_index, flags, buffer_type, mss);
+ 	} else if (skb_has_frag_list(nbuf)) {
+ 		count = nss_core_send_buffer_fraglist(nss_ctx, desc_if, if_num,
+-			nbuf, hlos_index, flags, buffer_type, mss);
+			nbuf, qid, hlos_index, flags, buffer_type, mss);
+ 	} else {
+ 		count = nss_core_send_buffer_nr_frags(nss_ctx, desc_if, if_num,
+-			nbuf, hlos_index, flags, buffer_type, mss);
+			nbuf, qid, hlos_index, flags, buffer_type, mss);
+ 	}
+ 
+ 	if (unlikely(count <= 0)) {
+@@ -3125,7 +3186,8 @@ int32_t nss_core_send_buffer(struct nss_ctx_instance *nss_ctx, uint32_t if_num,
+ 	h2n_desc_ring->hlos_index = hlos_index;
+ 	if_map->h2n_hlos_index[qid] = hlos_index;
+ 
+-	NSS_CORE_DMA_CACHE_MAINT(&if_map->h2n_hlos_index[qid], sizeof(uint32_t), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, h2n_hlos_index_to_dma(mem_ctx->if_map_dma, qid),
+				   sizeof(uint32_t), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ #ifdef CONFIG_DEBUG_KMEMLEAK
+diff --git a/nss_core.h b/nss_core.h
+index d7f62fe..7ddf6ce 100644
+--- a/nss_core.h
+++ b/nss_core.h
+@@ -100,31 +100,30 @@
+ #endif
+ 
+ /*
+- * Cache operation
+ * DMA Offset helper
+  */
+-#define NSS_CORE_DSB() dsb(sy)
+-#define NSS_CORE_DMA_CACHE_MAINT(start, size, dir) nss_core_dma_cache_maint(start, size, dir)
+#define n2h_desc_index_offset(_index) sizeof(struct n2h_descriptor) * (_index)
+#define h2n_desc_index_offset(_index) sizeof(struct h2n_descriptor) * (_index)
+
+#define n2h_desc_index_to_dma(_if_map_addr, _qid, _index) (_if_map_addr)->n2h_desc_if[(_qid)].desc_addr + n2h_desc_index_offset(_index)
+#define h2n_desc_index_to_dma(_if_map_addr, _qid, _index) (_if_map_addr)->h2n_desc_if[(_qid)].desc_addr + h2n_desc_index_offset(_index)
+
+#define h2n_nss_index_offset offsetof(struct nss_if_mem_map, h2n_nss_index)
+#define n2h_nss_index_offset offsetof(struct nss_if_mem_map, n2h_nss_index)
+#define h2n_hlos_index_offset offsetof(struct nss_if_mem_map, h2n_hlos_index)
+#define n2h_hlos_index_offset offsetof(struct nss_if_mem_map, n2h_hlos_index)
+
+#define h2n_nss_index_to_dma(_if_map_addr, _index) (_if_map_addr) + h2n_nss_index_offset + (sizeof(uint32_t) * (_index))
+#define n2h_nss_index_to_dma(_if_map_addr, _index) (_if_map_addr) + n2h_nss_index_offset + (sizeof(uint32_t) * (_index))
+#define h2n_hlos_index_to_dma(_if_map_addr, _index) (_if_map_addr) + h2n_hlos_index_offset + (sizeof(uint32_t) * (_index))
+#define n2h_hlos_index_to_dma(_if_map_addr, _index) (_if_map_addr) + n2h_hlos_index_offset + (sizeof(uint32_t) * (_index))
+ 
+ /*
+- * nss_core_dma_cache_maint()
+- *	Perform the appropriate cache op based on direction
+ * Cache operation
+  */
+-static inline void nss_core_dma_cache_maint(void *start, uint32_t size, int direction)
+-{
+-	switch (direction) {
+-	case DMA_FROM_DEVICE:/* invalidate only */
+-		dmac_inv_range(start, start + size);
+-		break;
+-	case DMA_TO_DEVICE:/* writeback only */
+-		dmac_clean_range(start, start + size);
+-		break;
+-	case DMA_BIDIRECTIONAL:/* writeback and invalidate */
+-		dmac_flush_range(start, start + size);
+-		break;
+-	default:
+-		BUG();
+-	}
+-}
+#define NSS_CORE_DSB() dsb(sy)
+#define NSS_CORE_DMA_CACHE_MAINT(dev, start, size, dir) BUILD_BUG_ON_MSG(1, \
+	"NSS_CORE_DMA_CACHE_MAINT is deprecated. Fix the code to use correct dma_sync_* API")
+ 
+ #define NSS_DEVICE_IF_START NSS_PHYSICAL_IF_START
+ 
+diff --git a/nss_hal/ipq806x/nss_hal_pvt.c b/nss_hal/ipq806x/nss_hal_pvt.c
+index 52d63b0..5375087 100644
+--- a/nss_hal/ipq806x/nss_hal_pvt.c
+++ b/nss_hal/ipq806x/nss_hal_pvt.c
+@@ -474,10 +474,9 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 	/*
+ 	 * Clear TCM memory used by this core
+ 	 */
+-	for (i = 0; i < resource_size(&res_vphys) ; i += 4) {
+	for (i = 0; i < resource_size(&res_vphys) ; i += 4)
+ 		nss_write_32(npd->vmap, i, 0);
+-		NSS_CORE_DMA_CACHE_MAINT((npd->vmap + i), 4, DMA_TO_DEVICE);
+-	}
+
+ 	NSS_CORE_DSB();
+ 
+ 	/*
+diff --git a/nss_hal/ipq807x/nss_hal_pvt.c b/nss_hal/ipq807x/nss_hal_pvt.c
+index bb8f42f..733d7f1 100644
+--- a/nss_hal/ipq807x/nss_hal_pvt.c
+++ b/nss_hal/ipq807x/nss_hal_pvt.c
+@@ -256,10 +256,9 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device *
+ 	/*
+ 	 * Clear TCM memory used by this core
+ 	 */
+-	for (i = 0; i < resource_size(&res_vphys) ; i += 4) {
+	for (i = 0; i < resource_size(&res_vphys) ; i += 4)
+ 		nss_write_32(npd->vmap, i, 0);
+-		NSS_CORE_DMA_CACHE_MAINT((npd->vmap + i), 4, DMA_TO_DEVICE);
+-	}
+
+ 	NSS_CORE_DSB();
+ 
+ 	/*
+diff --git a/nss_meminfo.c b/nss_meminfo.c
+index 2255eae..d804524 100644
+--- a/nss_meminfo.c
+++ b/nss_meminfo.c
+@@ -414,7 +414,6 @@ static bool nss_meminfo_init_block_lists(struct nss_ctx_instance *nss_ctx)
+ 		/*
+ 		 * Flush the updated meminfo request.
+ 		 */
+-		NSS_CORE_DMA_CACHE_MAINT(r, sizeof(struct nss_meminfo_request), DMA_TO_DEVICE);
+ 		NSS_CORE_DSB();
+ 
+ 		/*
+@@ -538,7 +537,7 @@ static bool nss_meminfo_configure_n2h_h2n_rings(struct nss_ctx_instance *nss_ctx
+ 	 * Bring a fresh copy of if_map from memory in order to read it correctly.
+ 	 */
+ 	if_map = mem_ctx->if_map;
+-	NSS_CORE_DMA_CACHE_MAINT((void *)if_map, sizeof(struct nss_if_mem_map), DMA_FROM_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, mem_ctx->if_map_dma, sizeof(struct nss_if_mem_map), DMA_FROM_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	if_map->n2h_rings = NSS_N2H_RING_COUNT;
+@@ -576,7 +575,7 @@ static bool nss_meminfo_configure_n2h_h2n_rings(struct nss_ctx_instance *nss_ctx
+ 	/*
+ 	 * Flush the updated nss_if_mem_map.
+ 	 */
+-	NSS_CORE_DMA_CACHE_MAINT((void *)if_map, sizeof(struct nss_if_mem_map), DMA_TO_DEVICE);
+	dma_sync_single_for_device(nss_ctx->dev, mem_ctx->if_map_dma, sizeof(struct nss_if_mem_map), DMA_TO_DEVICE);
+ 	NSS_CORE_DSB();
+ 
+ 	return true;
+diff --git a/nss_profiler.c b/nss_profiler.c
+index 5717ac3..aadc7c9 100755
+--- a/nss_profiler.c
+++ b/nss_profiler.c
+@@ -199,11 +199,12 @@ EXPORT_SYMBOL(nss_profile_dma_deregister_cb);
+ struct nss_profile_sdma_ctrl *nss_profile_dma_get_ctrl(struct nss_ctx_instance *nss_ctx)
+ {
+ 	struct nss_profile_sdma_ctrl *ctrl = nss_ctx->meminfo_ctx.sdma_ctrl;
+	int size = offsetof(struct nss_profile_sdma_ctrl, cidx);
+ 	if (!ctrl) {
+ 		return ctrl;
+ 	}
+ 
+-	dmac_inv_range(ctrl, &ctrl->cidx);
+	dma_sync_single_for_device(nss_ctx->dev, (dma_addr_t) ctrl, size, DMA_FROM_DEVICE);
+ 	dsb(sy);
+ 	return ctrl;
+ }
+-- 
+2.34.1
+
--- a/qca/qca-nss-drv/patches/0005-nss-drv-add-support-for-kernel-5.15.patch
+++ b/qca/qca-nss-drv/patches/0005-nss-drv-add-support-for-kernel-5.15.patch
@ -0,0 +1,70 @@
+From 6e65f6daecb09463688eaea0a234018a728196b8 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Tue, 5 Apr 2022 18:10:57 +0200
+Subject: [PATCH 5/8] nss-drv: add support for kernel 5.15
+
+- Fix coredump panic notifier include change.
+- Fix skb ZEROCOPY flag.
+- Add skb reuse support for 5.15 kernel version.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ nss_core.c        | 5 +++--
+ nss_coredump.c    | 4 ++++
+ nss_hal/nss_hal.c | 1 +
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/nss_core.c b/nss_core.c
+index f9e6014..8cd1d4b 100644
+--- a/nss_core.c
+++ b/nss_core.c
+@@ -53,7 +53,8 @@
+ (((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)))) || \
+ (((LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)))) || \
+ (((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)))) || \
+-(((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))))))
+(((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)))) || \
+(((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0))))))
+ #error "Check skb recycle code in this file to match Linux version"
+ #endif
+ 
+@@ -2623,7 +2624,7 @@ static inline bool nss_core_skb_can_reuse(struct nss_ctx_instance *nss_ctx,
+ 	if (unlikely(irqs_disabled()))
+ 		return false;
+ 
+-	if (unlikely(skb_shinfo(nbuf)->tx_flags & SKBTX_DEV_ZEROCOPY))
+	if (unlikely(skb_shinfo(nbuf)->flags & SKBFL_ZEROCOPY_ENABLE))
+ 		return false;
+ 
+ 	if (unlikely(skb_is_nonlinear(nbuf)))
+diff --git a/nss_coredump.c b/nss_coredump.c
+index ecad659..3ecef7e 100644
+--- a/nss_coredump.c
+++ b/nss_coredump.c
+@@ -23,7 +23,11 @@
+ #include "nss_hal.h"
+ #include "nss_log.h"
+ #include <linux/kernel.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0))
+ #include <linux/notifier.h>	/* for panic_notifier_list */
+#else
+#include <linux/panic_notifier.h>
+#endif
+ #include <linux/jiffies.h>	/* for time */
+ #include "nss_tx_rx_common.h"
+ 
+diff --git a/nss_hal/nss_hal.c b/nss_hal/nss_hal.c
+index 57974c1..d8c703b 100644
+--- a/nss_hal/nss_hal.c
+++ b/nss_hal/nss_hal.c
+@@ -24,6 +24,7 @@
+ #include <linux/firmware.h>
+ #include <linux/of.h>
+ #include <linux/irq.h>
+#include <linux/ethtool.h>
+ 
+ #include "nss_hal.h"
+ #include "nss_arch.h"
+-- 
+2.34.1
+
--- a/qca/qca-nss-drv/patches/0005-nss-drv-use-standard-skb_skip_tc_classify-instead-of.patch
+++ b/qca/qca-nss-drv/patches/0005-nss-drv-use-standard-skb_skip_tc_classify-instead-of.patch
@ -0,0 +1,30 @@
+From 4dd701916186803172a9f35e7e982a953613ad55 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Mon, 11 Apr 2022 21:32:41 +0200
+Subject: [PATCH 5/9] nss-drv: use standard skb_skip_tc_classify instead of
+ custom api
+
+Use skb_skip_tc_classify to skip classify for packet handled by nss
+instead of custom api.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ nss_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss_core.c b/nss_core.c
+index f9e6014..6ab8038 100644
+--- a/nss_core.c
+++ b/nss_core.c
+@@ -1075,7 +1075,7 @@ static inline void nss_core_set_skb_classify(struct sk_buff *nbuf)
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0))
+ 		nbuf->tc_verd = SET_TC_NCLS_NSS(nbuf->tc_verd);
+ #else
+-		skb_set_tc_classify_offload(nbuf);
+		skb_skip_tc_classify(nbuf);
+ #endif
+ #endif
+ }
+-- 
+2.34.1
+
--- a/qca/qca-nss-drv/patches/0008-Makefile-modularize-driver-even-more.patch
+++ b/qca/qca-nss-drv/patches/0008-Makefile-modularize-driver-even-more.patch
@ -0,0 +1,172 @@
+From 895de8e4119afe3cbad2aa81566b1ebcb2b39dcd Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Tue, 17 May 2022 20:23:19 +0200
+Subject: [PATCH] Makefile: modularize driver even more
+
+Permit to disable even more module.
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ Makefile          | 56 ++++++++++++++++++++++++++++++++---------------
+ nss_hal/nss_hal.c |  6 +++++
+ nss_init.c        |  4 ++++
+ 3 files changed, 48 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f5c4b90..0194dbd 100644
+--- a/Makefile
+++ b/Makefile
+@@ -39,35 +39,55 @@ qca-nss-drv-objs := \
+ 			nss_pm.o \
+ 			nss_profiler.o \
+ 			nss_project.o \
+-			nss_pppoe.o \
+-			nss_pppoe_log.o \
+-			nss_pppoe_stats.o \
+-			nss_pppoe_strings.o \
+ 			nss_rps.o \
+ 			nss_stats.o \
+ 			nss_strings.o \
+ 			nss_tx_msg_sync.o \
+ 			nss_unaligned.o \
+ 			nss_unaligned_log.o \
+-			nss_unaligned_stats.o \
+-			nss_virt_if.o \
+-			nss_virt_if_stats.o \
+-			nss_vlan.o \
+-			nss_vlan_log.o \
+-			nss_wifi.o \
+-			nss_wifi_log.o \
+-			nss_wifi_stats.o \
+-			nss_wifi_vdev.o \
+-			nss_wifili.o \
+-			nss_wifili_log.o \
+-			nss_wifili_stats.o \
+-			nss_wifili_strings.o \
+-			nss_wifi_mac_db.o
+			nss_unaligned_stats.o
+ 
+ # Base NSS data plane/HAL support
+ qca-nss-drv-objs += nss_data_plane/nss_data_plane_common.o
+ qca-nss-drv-objs += nss_hal/nss_hal.o
+ 
+ifneq "$(NSS_DRV_PPPOE_ENABLE)" "n"
+ccflags-y += -DNSS_DRV_PPPOE_ENABLE
+qca-nss-drv-objs += \
+		    nss_pppoe.o \
+		    nss_pppoe_log.o \
+		    nss_pppoe_stats.o \
+		    nss_pppoe_strings.o
+endif
+
+ifneq "$(NSS_DRV_VIRT_IF_ENABLE)" "n"
+ccflags-y += -DNSS_DRV_VIRT_IF_ENABLE
+qca-nss-drv-objs += \
+		    nss_virt_if.o \
+		    nss_virt_if_stats.o
+endif
+
+ifneq "$(NSS_DRV_VLAN_ENABLE)" "n"
+ccflags-y += -DNSS_DRV_VLAN_ENABLE
+qca-nss-drv-objs += \
+		    nss_vlan.o \
+		    nss_vlan_log.o
+endif
+
+ifneq "$(NSS_DRV_WIFI_ENABLE)" "n"
+ccflags-y += -DNSS_DRV_WIFI_ENABLE
+qca-nss-drv-objs += \
+		    nss_wifi.o \
+		    nss_wifi_log.o \
+		    nss_wifi_stats.o \
+		    nss_wifi_vdev.o \
+		    nss_wifili.o \
+		    nss_wifili_log.o \
+		    nss_wifili_stats.o \
+		    nss_wifili_strings.o \
+		    nss_wifi_mac_db.o
+endif
+
+ ifneq "$(NSS_DRV_BRIDGE_ENABLE)" "n"
+ ccflags-y += -DNSS_DRV_BRIDGE_ENABLE
+ qca-nss-drv-objs += \
+diff --git a/nss_hal/nss_hal.c b/nss_hal/nss_hal.c
+index 7e9a044..c0051e4 100644
+--- a/nss_hal/nss_hal.c
+++ b/nss_hal/nss_hal.c
+@@ -460,10 +460,12 @@ int nss_hal_probe(struct platform_device *nss_dev)
+ 	}
+ #endif
+ 
+#ifdef NSS_DRV_PPPOE_ENABLE
+ 	if (npd->pppoe_enabled == NSS_FEATURE_ENABLED) {
+ 		nss_top->pppoe_handler_id = nss_dev->id;
+ 		nss_pppoe_register_handler();
+ 	}
+#endif
+ 
+ #ifdef NSS_DRV_PPE_ENABLE
+ 	if (npd->ppe_enabled == NSS_FEATURE_ENABLED) {
+@@ -558,6 +560,7 @@ int nss_hal_probe(struct platform_device *nss_dev)
+ 	}
+ #endif
+ 
+#ifdef NSS_DRV_WIFI_ENABLE
+ 	if (npd->wifioffload_enabled == NSS_FEATURE_ENABLED) {
+ 		nss_top->wifi_handler_id = nss_dev->id;
+ 		nss_top->dynamic_interface_table[NSS_DYNAMIC_INTERFACE_TYPE_VAP] = nss_dev->id;
+@@ -585,6 +588,7 @@ int nss_hal_probe(struct platform_device *nss_dev)
+ 		 */
+ 		nss_wifili_thread_scheme_db_init(nss_dev->id);
+ 	}
+#endif
+ 
+ #ifdef NSS_DRV_OAM_ENABLE
+ 	if (npd->oam_enabled == NSS_FEATURE_ENABLED) {
+@@ -601,11 +605,13 @@ int nss_hal_probe(struct platform_device *nss_dev)
+ 	}
+ #endif
+ 
+#ifdef NSS_DRV_VLAN_ENABLE
+ 	if (npd->vlan_enabled == NSS_FEATURE_ENABLED) {
+ 		nss_top->vlan_handler_id = nss_dev->id;
+ 		nss_top->dynamic_interface_table[NSS_DYNAMIC_INTERFACE_TYPE_VLAN] = nss_dev->id;
+ 		nss_vlan_register_handler();
+ 	}
+#endif
+ 
+ #ifdef NSS_DRV_QVPN_ENABLE
+ #if defined(NSS_HAL_IPQ807x_SUPPORT) || defined(NSS_HAL_IPQ60XX_SUPPORT)
+diff --git a/nss_init.c b/nss_init.c
+index ebd2a12..40e9351 100644
+--- a/nss_init.c
+++ b/nss_init.c
+@@ -775,10 +775,12 @@ static int __init nss_init(void)
+ 	 */
+ 	nss_project_register_sysctl();
+ 
+#ifdef NSS_DRV_PPPOE_ENABLE
+ 	/*
+ 	 * Registering sysctl for pppoe specific config.
+ 	 */
+ 	nss_pppoe_register_sysctl();
+#endif
+ 
+ 	/*
+ 	 * Setup Runtime Sample values
+@@ -913,10 +915,12 @@ static void __exit nss_cleanup(void)
+ 	nss_c2c_tx_unregister_sysctl();
+ #endif
+ 
+#ifdef NSS_DRV_PPPOE_ENABLE
+ 	/*
+ 	 * Unregister pppoe specific sysctl
+ 	 */
+ 	nss_pppoe_unregister_sysctl();
+#endif
+ 
+ 	/*
+ 	 * Unregister ipv4/6 specific sysctl and free allocated to connection tables
+-- 
+2.34.1
+