add qca nss

2025-03-09 15:40:20 +00:00 · 2021-12-30 23:05:56 +08:00 · 2021-12-30 23:05:56 +08:00 · 6681763234
commit 6681763234
parent 26ce7abbf9
171 changed files with 3656 additions and 0 deletions
--- a/root/include/netfilter.mk
+++ b/root/include/netfilter.mk
--- a/root/package/boot/uboot-envtools/files/ipq60xx
+++ b/root/package/boot/uboot-envtools/files/ipq60xx
--- a/root/package/kernel/linux/modules/netdevices.mk
+++ b/root/package/kernel/linux/modules/netdevices.mk
--- a/root/package/qca/firmware/nss-firmware/Makefile
+++ b/root/package/qca/firmware/nss-firmware/Makefile
@ -0,0 +1,72 @@
+#
+# Copyright (C) 2021 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nss-firmware
+PKG_SOURCE_DATE:=2021-09-13
+PKG_SOURCE_VERSION:=b06171cb0d14360c90a4b8f9f835dc1c4647ea07
+PKG_MIRROR_HASH:=b4638a25f1b4f63c91d57cad3d4b955fee7c796679cee55c557c2644db0f20e9
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/quic/qca-sdk-nss-fw.git
+
+PKG_LICENSE_FILES:=LICENSE.md
+
+PKG_MAINTAINER:=Robert Marko <robimarko@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+
+VERSION_PATH=$(PKG_BUILD_DIR)/QCA_Networking_2021.SPF_11.4/CS
+
+define Package/nss-firmware-default
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  URL:=$(PKG_SOURCE_URL)
+  DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx)
+endef
+
+define Package/nss-firmware-ipq6018
+$(Package/nss-firmware-default)
+  TITLE:=NSS firmware for IPQ6018 devices
+  NSS_ARCHIVE:=$(VERSION_PATH)/IPQ6018.ATH.11.4/BIN-NSS.CP.11.4.0.5-5-R.tar.bz2
+endef
+
+define Package/nss-firmware-ipq8074
+$(Package/nss-firmware-default)
+  TITLE:=NSS firmware for IPQ8074 devices
+  NSS_ARCHIVE:=$(VERSION_PATH)/IPQ8074.ATH.11.4/BIN-NSS.HK.11.4.0.5-5-R.tar.bz2
+endef
+
+define Build/Compile
+
+endef
+
+define Package/nss-firmware-ipq6018/install
+	mkdir -p $(PKG_BUILD_DIR)/IPQ6018
+	$(TAR) -C $(PKG_BUILD_DIR)/IPQ6018 -xf $(NSS_ARCHIVE) --strip-components=1
+	$(INSTALL_DIR) $(1)/lib/firmware/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/IPQ6018/retail_router0.bin \
+		$(1)/lib/firmware/qca-nss0-retail.bin
+endef
+
+define Package/nss-firmware-ipq8074/install
+	mkdir -p $(PKG_BUILD_DIR)/IPQ8074
+	$(TAR) -C $(PKG_BUILD_DIR)/IPQ8074 -xf $(NSS_ARCHIVE) --strip-components=1
+	$(INSTALL_DIR) $(1)/lib/firmware/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/IPQ8074/retail_router0.bin \
+		$(1)/lib/firmware/qca-nss0-retail.bin
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/IPQ8074/retail_router1.bin \
+		$(1)/lib/firmware/qca-nss1-retail.bin
+endef
+
+$(eval $(call BuildPackage,nss-firmware-ipq6018))
+$(eval $(call BuildPackage,nss-firmware-ipq8074))
--- a/root/package/qca/qca/qca-nss-clients/Makefile
+++ b/root/package/qca/qca/qca-nss-clients/Makefile
@ -0,0 +1,102 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-nss-clients
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/cc-qrdk/oss/lklm/nss-clients
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-04-29
+PKG_SOURCE_VERSION:=b93c72c1b72c591c2ddc2f0b24f0e2b457720118
+PKG_MIRROR_HASH:=9fab23da994bfbac9a3cef32cdfec31a87a03ed415f36bc926da32b7b0934259
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/qca-nss-drv-pppoe
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS (connection manager) - PPPoE
+  DEPENDS:=@TARGET_ipq807x +kmod-qca-nss-drv +kmod-ppp +kmod-pppoe
+  FILES:=$(PKG_BUILD_DIR)/pppoe/qca-nss-pppoe.ko
+  AUTOLOAD:=$(call AutoLoad,51,qca-nss-pppoe)
+endef
+
+define KernelPackage/qca-nss-drv-pppoe/Description
+Kernel modules for NSS connection manager - Support for PPPoE
+endef
+
+define KernelPackage/qca-nss-drv-bridge-mgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS bridge manager
+  DEPENDS:=@TARGET_ipq807x +kmod-qca-nss-drv +kmod-qca-nss-drv-vlan-mgr
+  FILES:=$(PKG_BUILD_DIR)/bridge/qca-nss-bridge-mgr.ko
+  AUTOLOAD:=$(call AutoLoad,51,qca-nss-bridge-mgr)
+endef
+
+define KernelPackage/qca-nss-drv-bridge-mgr/Description
+Kernel modules for NSS bridge manager
+endef
+
+define KernelPackage/qca-nss-drv-vlan-mgr
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for NSS vlan manager
+  DEPENDS:=@TARGET_ipq807x +kmod-qca-nss-drv
+  FILES:=$(PKG_BUILD_DIR)/vlan/qca-nss-vlan.ko
+  AUTOLOAD:=$(call AutoLoad,51,qca-nss-vlan)
+endef
+
+define KernelPackage/qca-nss-drv-vlan-mgr/Description
+Kernel modules for NSS vlan manager
+endef
+
+EXTRA_CFLAGS+= \
+	-I$(STAGING_DIR)/usr/include/qca-nss-drv \
+	-I$(STAGING_DIR)/usr/include/qca-nss-crypto \
+	-I$(STAGING_DIR)/usr/include/qca-nss-cfi \
+	-I$(STAGING_DIR)/usr/include/qca-nss-gmac \
+	-I$(STAGING_DIR)/usr/include/qca-ssdk \
+	-I$(STAGING_DIR)/usr/include/qca-ssdk/fal \
+	-I$(STAGING_DIR)/usr/include/nat46
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pppoe),)
+NSS_CLIENTS_MAKE_OPTS+=pppoe=y
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr),)
+NSS_CLIENTS_MAKE_OPTS+=bridge-mgr=y
+#enable OVS bridge if ovsmgr is enabled
+ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
+NSS_CLIENTS_MAKE_OPTS+= NSS_BRIDGE_MGR_OVS_ENABLE=y
+EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-ovsmgr
+endif
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr),)
+NSS_CLIENTS_MAKE_OPTS+=vlan-mgr=y
+endif
+
+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+    SOC="ipq807x_64"
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+    SOC="ipq60xx_64"
+endif
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" $(strip $(NSS_CLIENTS_MAKE_OPTS)) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		M="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+		SoC=$(SOC) \
+		$(KERNEL_MAKE_FLAGS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,qca-nss-drv-pppoe))
+$(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
+$(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
--- a/root/package/qca/qca/qca-nss-clients/files/qca-nss-ipsec
+++ b/root/package/qca/qca/qca-nss-clients/files/qca-nss-ipsec
@ -0,0 +1,214 @@
+#!/bin/sh  /etc/rc.common
+#
+# Copyright (c) 2018-2019, 2021 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.
+
+NSS_IPSEC_LOG_FILE=/tmp/.nss_ipsec_log
+NSS_IPSEC_LOG_STR_ECM="ECM_Loaded"
+NSS_IPSEC_OL_FILE=/tmp/qca_nss_ipsec_ol
+
+ecm_load () {
+	if [ ! -d /sys/module/ecm ]; then
+		/etc/init.d/qca-nss-ecm start
+		if [ -d /sys/module/ecm ]; then
+			echo ${NSS_IPSEC_LOG_STR_ECM} >> ${NSS_IPSEC_LOG_FILE}
+		fi
+	fi
+}
+
+ecm_unload () {
+	if [ -f /tmp/.nss_ipsec_log ]; then
+		str=`grep ${NSS_IPSEC_LOG_STR_ECM} ${NSS_IPSEC_LOG_FILE}`
+		if [[ $str == ${NSS_IPSEC_LOG_STR_ECM} ]]; then
+			/etc/init.d/qca-nss-ecm stop
+			`sed 's/${NSS_IPSEC_LOG_STR_ECM}/ /g' $NSS_IPSEC_LOG_FILE >  $NSS_IPSEC_LOG_FILE`
+		fi
+	fi
+}
+
+ecm_disable() {
+
+	if [ ! -d /sys/module/ecm ]; then
+		return;
+	fi
+
+	echo 1 > /sys/kernel/debug/ecm/front_end_ipv4_stop
+	echo 1 > /sys/kernel/debug/ecm/front_end_ipv6_stop
+	echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+	sleep 2
+}
+
+ecm_enable() {
+	if [ ! -d /sys/module/ecm ]; then
+		return;
+	fi
+
+	echo 0 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+	echo 0 > /sys/kernel/debug/ecm/front_end_ipv4_stop
+	echo 0 > /sys/kernel/debug/ecm/front_end_ipv6_stop
+}
+
+kernel_version_check_5_4() {
+	major_ver=$(uname -r | awk -F '.' '{print $1}')
+	minor_ver=$(uname -r | awk -F '.' '{print $2}')
+	if [ $major_ver -lt 5 ] || ([ $major_ver -eq 5 ] && [ $minor_ver -lt 4 ] ) ; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start_klips() {
+	if kernel_version_check_5_4
+	then
+		echo "Kernel 5.4 doesn't support klips stack."
+		return $?
+	fi
+
+	touch $NSS_IPSEC_OL_FILE
+	ecm_load
+
+	local kernel_version=$(uname -r)
+
+	insmod /lib/modules/${kernel_version}/qca-nss-ipsec-klips.ko
+	if [ "$?" -gt 0 ]; then
+		echo "Failed to load plugin. Please start ecm if not done already"
+		ecm_enable
+		rm $NSS_IPSEC_OL_FILE
+		return
+	fi
+
+	/etc/init.d/ipsec start
+	sleep 2
+	ipsec eroute
+
+	ecm_enable
+}
+
+stop_klips() {
+	if kernel_version_check_5_4
+	then
+		echo "Kernel 5.4 doesn't support klips stack."
+		return $?
+	fi
+
+	ecm_disable
+
+	/etc/init.d/ipsec stop
+	rmmod qca-nss-ipsec-klips
+	rm $NSS_IPSEC_OL_FILE
+
+	ecm_unload
+}
+
+start_xfrm() {
+	touch $NSS_IPSEC_OL_FILE
+	ecm_load
+
+	local kernel_version=$(uname -r)
+
+	# load all NETKEY modules first.
+	for mod in xfrm_ipcomp ipcomp xfrm6_tunnel ipcomp6 xfrm6_mode_tunnel xfrm6_mode_beet xfrm6_mode_ro \
+		xfrm6_mode_transport xfrm4_mode_transport xfrm4_mode_tunnel \
+		xfrm4_tunnel xfrm4_mode_beet esp4 esp6 ah4 ah6 af_key
+		do
+			insmod $mod 2> /dev/null
+		done
+
+	# Now load the xfrm plugin
+	insmod /lib/modules/${kernel_version}/qca-nss-ipsec-xfrm.ko
+	if [ "$?" -gt 0 ]; then
+		echo "Failed to load plugin. Please start ecm if not done already"
+		ecm_enable
+		rm $NSS_IPSEC_OL_FILE
+		return
+	fi
+
+	/etc/init.d/ipsec start
+	sleep 2
+
+	ecm_enable
+}
+
+stop_xfrm() {
+	ecm_disable
+
+	#Shutdown Pluto first. Then only plugin can be removed.
+	plutopid=/var/run/pluto/pluto.pid
+	if [ -f $plutopid ]; then
+		pid=`cat $plutopid`
+		if [ ! -z "$pid" ]; then
+			ipsec whack --shutdown | grep -v "002";
+			if [ -s $plutopid ]; then
+				echo "Attempt to shut Pluto down failed!  Trying kill:"
+				kill $pid;
+				sleep 5;
+			fi
+		fi
+		rm -rf $plutopid
+	fi
+	ip xfrm state flush;
+	ip xfrm policy flush;
+	sleep 2
+
+	#Now we can remove the plugin
+	retries=5
+	while [ -d /sys/module/qca_nss_ipsec_xfrm ]
+	do
+		rmmod qca-nss-ipsec-xfrm
+		if [ "$?" -eq 0 ]; then
+			rm $NSS_IPSEC_OL_FILE
+			break
+		fi
+
+		if [ ${retries} -eq 0 ]; then
+			echo "Failed to unload qca-nss-ipsec-xfrm plugin!"
+			exit
+		fi
+
+		echo "XFRM plugin unload failed; retrying ${retries} times"
+		sleep 1
+		retries=`expr ${retries} - 1`
+	done
+
+	/etc/init.d/ipsec stop
+	ecm_unload
+}
+
+start() {
+	local protostack=`uci -q get ipsec.setup.protostack`
+	if [ "$protostack" = "klips" ]; then
+		start_klips
+		return $?
+	fi
+
+	start_xfrm
+	return $?
+}
+
+stop() {
+	local protostack=`uci -q get ipsec.setup.protostack`
+	if [ "$protostack" = "klips" ]; then
+		stop_klips
+		return $?
+	fi
+
+	stop_xfrm
+	return $?
+}
+
+restart() {
+	stop
+	start
+}
--- a/root/package/qca/qca/qca-nss-clients/files/qca-nss-mirred.init
+++ b/root/package/qca/qca/qca-nss-clients/files/qca-nss-mirred.init
@ -0,0 +1,28 @@
+#!/bin/sh /etc/rc.common
+
+###########################################################################
+# Copyright (c) 2019, 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.
+###########################################################################
+
+restart() {
+	rmmod act_nssmirred.ko
+	insmod act_nssmirred.ko
+}
+
+start() {
+	insmod act_nssmirred.ko
+}
+
+stop() {
+	rmmod act_nssmirred.ko
+}
--- a/root/package/qca/qca/qca-nss-clients/files/qca-nss-ovpn.init
+++ b/root/package/qca/qca/qca-nss-clients/files/qca-nss-ovpn.init
@ -0,0 +1,69 @@
+#!/bin/sh /etc/rc.common
+
+###########################################################################
+# Copyright (c) 2019, 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.
+###########################################################################
+
+ecm_disable() {
+	if [ ! -d /sys/module/ecm ]; then
+	   return
+	fi
+
+	echo 1 > /sys/kernel/debug/ecm/front_end_ipv4_stop
+	echo 1 > /sys/kernel/debug/ecm/front_end_ipv6_stop
+	echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+	sleep 2
+}
+
+ecm_enable() {
+	if [ ! -d /sys/module/ecm ]; then
+	   return
+	fi
+
+	echo 0 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+	echo 0 > /sys/kernel/debug/ecm/front_end_ipv4_stop
+	echo 0 > /sys/kernel/debug/ecm/front_end_ipv6_stop
+}
+
+restart() {
+	ecm_disable
+
+	/etc/init.d/openvpn stop
+	rmmod qca-nss-ovpn-link
+	rmmod qca-nss-ovpn-mgr
+
+	insmod qca-nss-ovpn-mgr
+	insmod qca-nss-ovpn-link
+
+	if [ "$?" -gt 0 ]; then
+		echo "Failed to load plugin. Please start ecm if not done already"
+		ecm_enable
+		return
+	fi
+
+	ecm_enable
+}
+
+start() {
+	restart
+}
+
+stop() {
+	ecm_disable
+
+	/etc/init.d/openvpn stop
+	rmmod qca-nss-ovpn-link
+	rmmod qca-nss-ovpn-mgr
+
+	ecm_enable
+}
--- a/root/package/qca/qca/qca-nss-dp/Makefile
+++ b/root/package/qca/qca/qca-nss-dp/Makefile
@ -0,0 +1,62 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-nss-dp
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/cc-qrdk/oss/lklm/nss-dp
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-03-26
+PKG_SOURCE_VERSION:=e0c89348d5ad99559ce2fbe15d37b3b5bc66aa03
+PKG_MIRROR_HASH:=f369f0c3b33b5f4ad6d0a6ad6ac5495f63c9ecaf94e4e7fa345169f3e44fcf45
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/qca-nss-dp
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx) +kmod-qca-ssdk-nohnat
+  TITLE:=Kernel driver for NSS data plane
+  FILES:=$(PKG_BUILD_DIR)/qca-nss-dp.ko
+  AUTOLOAD:=$(call AutoLoad,31,qca-nss-dp)
+endef
+
+define KernelPackage/qca-nss-dp/Description
+This package contains a NSS data plane driver for QCA chipset
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include/qca-nss-dp
+	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-dp/
+endef
+
+EXTRA_CFLAGS+= \
+	-I$(STAGING_DIR)/usr/include/qca-ssdk
+
+NSS_DP_HAL_DIR:=$(PKG_BUILD_DIR)/hal
+define Build/Configure
+	$(LN) $(NSS_DP_HAL_DIR)/arch/$(CONFIG_TARGET_BOARD)/nss_$(CONFIG_TARGET_BOARD).h \
+		$(PKG_BUILD_DIR)/exports/nss_dp_arch.h
+endef
+
+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+    SOC="ipq807x_64"
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+    SOC="ipq60xx_64"
+endif
+
+define Build/Compile
+	+$(MAKE) -C "$(LINUX_DIR)" \
+		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-dp))
--- a/root/package/qca/qca/qca-nss-dp/patches/0001-edma_tx_rx-support-newer-kernels-time-stamping-API.patch
+++ b/root/package/qca/qca/qca-nss-dp/patches/0001-edma_tx_rx-support-newer-kernels-time-stamping-API.patch
@ -0,0 +1,44 @@
+From 40979666b4371012405715ffa61ab5760fcdc6b3 Mon Sep 17 00:00:00 2001
+Message-Id: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Mon, 3 May 2021 20:07:36 +0300
+Subject: [PATCH 1/3] edma_tx_rx: support newer kernels time stamping API
+
+---
+ hal/edma/edma_tx_rx.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/hal/edma/edma_tx_rx.c
+++ b/hal/edma/edma_tx_rx.c
+@@ -226,10 +226,16 @@ void nss_phy_tstamp_rx_buf(__attribute__
+ 	 * set to the correct PTP class value by calling ptp_classify_raw
+ 	 * in drv->rxtstamp function.
+ 	 */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0))
+ 	if (ndev && ndev->phydev && ndev->phydev->drv &&
+ 			ndev->phydev->drv->rxtstamp)
+ 		if(ndev->phydev->drv->rxtstamp(ndev->phydev, skb, 0))
+ 			return;
+#else
+	if (ndev && phy_has_rxtstamp(ndev->phydev))
+		if (phy_rxtstamp(ndev->phydev, skb, 0))
+			return;
+#endif
+ 
+ 	netif_receive_skb(skb);
+ }
+@@ -247,9 +253,14 @@ void nss_phy_tstamp_tx_buf(struct net_de
+ 	 * set to the correct PTP class value by calling ptp_classify_raw
+ 	 * in the drv->txtstamp function.
+ 	 */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0))
+ 	if (ndev && ndev->phydev && ndev->phydev->drv &&
+ 			ndev->phydev->drv->txtstamp)
+ 		ndev->phydev->drv->txtstamp(ndev->phydev, skb, 0);
+#else
+	if (ndev && phy_has_txtstamp(ndev->phydev))
+		phy_rxtstamp(ndev->phydev, skb, 0);
+#endif
+ }
+ EXPORT_SYMBOL(nss_phy_tstamp_tx_buf);
+ 
--- a/root/package/qca/qca/qca-nss-dp/patches/0002-nss_dp_main-make-phy-mode-code-compatible-with-newer.patch
+++ b/root/package/qca/qca/qca-nss-dp/patches/0002-nss_dp_main-make-phy-mode-code-compatible-with-newer.patch
@ -0,0 +1,48 @@
+From cef7873a2d77df13ee702d902ed4e06b2248904b Mon Sep 17 00:00:00 2001
+Message-Id: <cef7873a2d77df13ee702d902ed4e06b2248904b.1620066716.git.baruch@tkos.co.il>
+In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
+References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Mon, 3 May 2021 20:17:22 +0300
+Subject: [PATCH 2/3] nss_dp_main: make phy mode code compatible with newer
+ kernels
+
+---
+ include/nss_dp_dev.h | 4 ++--
+ nss_dp_main.c        | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+--- a/include/nss_dp_dev.h
+++ b/include/nss_dp_dev.h
+@@ -25,7 +25,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/platform_device.h>
+ #include <linux/if_vlan.h>
+-#include <linux/switch.h>
+#include <linux/phy.h>
+ 
+ #include "nss_dp_api_if.h"
+ #include "nss_dp_hal_if.h"
+@@ -46,7 +46,7 @@ struct nss_dp_dev {
+ 	/* Phy related stuff */
+ 	struct phy_device *phydev;	/* Phy device */
+ 	struct mii_bus *miibus;		/* MII bus */
+-	uint32_t phy_mii_type;		/* RGMII/SGMII/QSGMII */
+	phy_interface_t phy_mii_type;	/* RGMII/SGMII/QSGMII */
+ 	uint32_t phy_mdio_addr;		/* Mdio address */
+ 	bool link_poll;			/* Link polling enable? */
+ 	uint32_t forced_speed;		/* Forced speed? */
+--- a/nss_dp_main.c
+++ b/nss_dp_main.c
+@@ -463,7 +463,11 @@ static int32_t nss_dp_of_get_pdata(struc
+ 	hal_pdata->netdev = netdev;
+ 	hal_pdata->macid = dp_priv->macid;
+ 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0))
+ 	dp_priv->phy_mii_type = of_get_phy_mode(np);
+#else
+	of_get_phy_mode(np, &dp_priv->phy_mii_type);
+#endif
+ 	dp_priv->link_poll = of_property_read_bool(np, "qcom,link-poll");
+ 	if (of_property_read_u32(np, "qcom,phy-mdio-addr",
+ 		&dp_priv->phy_mdio_addr) && dp_priv->link_poll) {
--- a/root/package/qca/qca/qca-nss-dp/patches/0003-Drop-_nocache-variants-of-ioremap.patch
+++ b/root/package/qca/qca/qca-nss-dp/patches/0003-Drop-_nocache-variants-of-ioremap.patch
@ -0,0 +1,48 @@
+From c8c52512ff48bee578901c381a42f027e79eadf9 Mon Sep 17 00:00:00 2001
+Message-Id: <c8c52512ff48bee578901c381a42f027e79eadf9.1620066716.git.baruch@tkos.co.il>
+In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
+References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Mon, 3 May 2021 20:20:29 +0300
+Subject: [PATCH 3/3] Drop _nocache variants of ioremap()
+
+Recent kernels removed them.
+---
+ hal/edma/edma_data_plane.c          | 2 +-
+ hal/gmac_hal_ops/qcom/qcom_if.c     | 2 +-
+ hal/gmac_hal_ops/syn/xgmac/syn_if.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/hal/edma/edma_data_plane.c
+++ b/hal/edma/edma_data_plane.c
+@@ -797,7 +797,7 @@ int edma_init(void)
+ 	/*
+ 	 * Remap register resource
+ 	 */
+-	edma_hw.reg_base = ioremap_nocache((edma_hw.reg_resource)->start,
+	edma_hw.reg_base = ioremap((edma_hw.reg_resource)->start,
+ 				resource_size(edma_hw.reg_resource));
+ 	if (!edma_hw.reg_base) {
+ 		pr_warn("Unable to remap EDMA register memory.\n");
+--- a/hal/gmac_hal_ops/qcom/qcom_if.c
+++ b/hal/gmac_hal_ops/qcom/qcom_if.c
+@@ -400,7 +400,7 @@ static void *qcom_init(struct gmac_hal_p
+ 	qhd->nghd.mac_id = gmacpdata->macid;
+ 
+ 	/* Populate the mac base addresses */
+-	qhd->nghd.mac_base = devm_ioremap_nocache(&dp_priv->pdev->dev,
+	qhd->nghd.mac_base = devm_ioremap(&dp_priv->pdev->dev,
+ 						res->start, resource_size(res));
+ 	if (!qhd->nghd.mac_base) {
+ 		netdev_dbg(ndev, "ioremap fail.\n");
+--- a/hal/gmac_hal_ops/syn/xgmac/syn_if.c
+++ b/hal/gmac_hal_ops/syn/xgmac/syn_if.c
+@@ -422,7 +422,7 @@ static void *syn_init(struct gmac_hal_pl
+ 
+ 	/* Populate the mac base addresses */
+ 	shd->nghd.mac_base =
+-		devm_ioremap_nocache(&dp_priv->pdev->dev, res->start,
+		devm_ioremap(&dp_priv->pdev->dev, res->start,
+ 				     resource_size(res));
+ 	if (!shd->nghd.mac_base) {
+ 		netdev_dbg(ndev, "ioremap fail.\n");
--- a/root/package/qca/qca/qca-nss-dp/patches/0004-EDMA-Fix-NAPI-packet-counting.patch
+++ b/root/package/qca/qca/qca-nss-dp/patches/0004-EDMA-Fix-NAPI-packet-counting.patch
@ -0,0 +1,31 @@
+From d74920e2a7c413ef40eed72f9cf287cf6fbd5fb8 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 20 May 2021 14:56:46 +0200
+Subject: [PATCH 1/2] EDMA: Fix NAPI packet counting
+
+There is a bug in the NAPI packet counting that will
+cause NAPI over budget warnings.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ hal/edma/edma_tx_rx.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/hal/edma/edma_tx_rx.c
+++ b/hal/edma/edma_tx_rx.c
+@@ -458,12 +458,12 @@ int edma_napi(struct napi_struct *napi,
+ 
+ 	for (i = 0; i < ehw->txcmpl_rings; i++) {
+ 		txcmpl_ring = &ehw->txcmpl_ring[i];
+-		work_done += edma_clean_tx(ehw, txcmpl_ring);
+		edma_clean_tx(ehw, txcmpl_ring);
+ 	}
+ 
+ 	for (i = 0; i < ehw->rxfill_rings; i++) {
+ 		rxfill_ring = &ehw->rxfill_ring[i];
+-		work_done += edma_alloc_rx_buffer(ehw, rxfill_ring);
+		edma_alloc_rx_buffer(ehw, rxfill_ring);
+ 	}
+ 
+ 	/*
--- a/root/package/qca/qca/qca-nss-dp/patches/0005-EDMA-Use-NAPI_POLL_WEIGHT-as-NAPI-weight.patch
+++ b/root/package/qca/qca/qca-nss-dp/patches/0005-EDMA-Use-NAPI_POLL_WEIGHT-as-NAPI-weight.patch
@ -0,0 +1,41 @@
+From 44a30d94abcbb10aacc21db29be212518a6b1bf7 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 20 May 2021 14:57:46 +0200
+Subject: [PATCH] EDMA: Use NAPI_POLL_WEIGHT as NAPI weight
+
+Currently a weight of 100 is used by the EDMA, according
+to upstream max of 64 should be used and that is used for
+almost any driver.
+
+They also introduced NAPI_POLL_WEIGHT define which equals
+to 64.
+
+So use NAPI_POLL_WEIGHT as the weight.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ hal/edma/edma_data_plane.c | 2 +-
+ hal/edma/edma_data_plane.h | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+--- a/hal/edma/edma_data_plane.c
+++ b/hal/edma/edma_data_plane.c
+@@ -582,7 +582,7 @@ static int edma_register_netdevice(struc
+ 	 */
+ 	if (!edma_hw.napi_added) {
+ 		netif_napi_add(netdev, &edma_hw.napi, edma_napi,
+-				EDMA_NAPI_WORK);
+				NAPI_POLL_WEIGHT);
+ 		/*
+ 		 * Register the interrupt handlers and enable interrupts
+ 		 */
+--- a/hal/edma/edma_data_plane.h
+++ b/hal/edma/edma_data_plane.h
+@@ -27,7 +27,6 @@
+ #define EDMA_RX_PREHDR_SIZE		(sizeof(struct edma_rx_preheader))
+ #define EDMA_TX_PREHDR_SIZE		(sizeof(struct edma_tx_preheader))
+ #define EDMA_RING_SIZE			128
+-#define EDMA_NAPI_WORK			100
+ #define EDMA_START_GMACS		NSS_DP_START_IFNUM
+ #define EDMA_MAX_GMACS			NSS_DP_HAL_MAX_PORTS
+ #define EDMA_TX_PKT_MIN_SIZE		33	/* IPQ807x EDMA needs a minimum packet size of 33 bytes */
--- a/root/package/qca/qca/qca-nss-dp/patches/0006-NSS-DP-fix-of_get_mac_address.patch
+++ b/root/package/qca/qca/qca-nss-dp/patches/0006-NSS-DP-fix-of_get_mac_address.patch
@ -0,0 +1,51 @@
+From cadeb62a42296563141d6954eec58e34ef86778d Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 13 Aug 2021 20:12:08 +0200
+Subject: [PATCH] NSS-DP: fix of_get_mac_address()
+
+Recently OpenWrt backported the updated of_get_mac_address()
+function which returns and error code instead.
+
+So, patch the SSDK to use it and fix the compilation error.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ nss_dp_main.c | 13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/nss_dp_main.c b/nss_dp_main.c
+index 5580b13..28df280 100644
+--- a/nss_dp_main.c
+++ b/nss_dp_main.c
+@@ -434,9 +434,10 @@ static int32_t nss_dp_of_get_pdata(struct device_node *np,
+ 				   struct net_device *netdev,
+ 				   struct gmac_hal_platform_data *hal_pdata)
+ {
+-	uint8_t *maddr;
+	u8 maddr[ETH_ALEN];
+ 	struct nss_dp_dev *dp_priv;
+ 	struct resource memres_devtree = {0};
+	int ret;
+ 
+ 	dp_priv = netdev_priv(netdev);
+ 
+@@ -475,14 +476,8 @@ static int32_t nss_dp_of_get_pdata(struct device_node *np,
+ 	of_property_read_u32(np, "qcom,forced-speed", &dp_priv->forced_speed);
+ 	of_property_read_u32(np, "qcom,forced-duplex", &dp_priv->forced_duplex);
+ 
+-	maddr = (uint8_t *)of_get_mac_address(np);
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0))
+-	if (IS_ERR((void *)maddr)) {
+-		maddr = NULL;
+-	}
+-#endif
+-
+-	if (maddr && is_valid_ether_addr(maddr)) {
+	ret = of_get_mac_address(np, maddr);
+	if (!ret && is_valid_ether_addr(maddr)) {
+ 		ether_addr_copy(netdev->dev_addr, maddr);
+ 	} else {
+ 		random_ether_addr(netdev->dev_addr);
+-- 
+2.31.1
+
--- a/root/package/qca/qca/qca-nss-drv/Makefile
+++ b/root/package/qca/qca/qca-nss-drv/Makefile
@ -0,0 +1,119 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-nss-drv
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/nss-drv
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-04-26
+PKG_SOURCE_VERSION:=1cf4bf81fd395f61648efeae78cdf1df60e954ff
+PKG_MIRROR_HASH:=86b7455565d28a72da981099c67a89ea9e0ae3874a34be30959dcf48f5e2196c
+
+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
+
+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=n \
+	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
+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/root/package/qca/qca/qca-nss-drv/files/qca-nss-drv.conf
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-drv/files/qca-nss-drv.debug
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-drv/files/qca-nss-drv.hotplug
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-drv/files/qca-nss-drv.init
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-drv/files/qca-nss-drv.sysctl
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-drv/patches/0001-core-add-5.10-kernel-to-version-check.patch
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch
+++ b/root/package/qca/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch
@ -0,0 +1,164 @@
+From b5e2a7167ca3df9fce34f0d7c05468d4f5597275 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 13 May 2021 23:33:18 +0200
+Subject: [PATCH] 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(-)
+
+--- 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_h
+ 	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
+ 
+ 	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;
+--- 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_h
+ 	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
+ 
+ 	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;
+--- 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_h
+ 	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
+ 	}
+ 	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;
+--- 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_h
+ 	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_h
+ 		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
+ 	}
+ 	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;
+--- a/nss_hal/nss_hal.c
+++ b/nss_hal/nss_hal.c
+@@ -78,9 +78,9 @@ int nss_hal_firmware_load(struct nss_ctx
+ 		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;
+ 	}
+--- a/nss_meminfo.c
+++ b/nss_meminfo.c
+@@ -728,7 +728,7 @@ bool nss_meminfo_init(struct nss_ctx_ins
+ 	/*
+ 	 * 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);
+--- 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;
--- a/root/package/qca/qca/qca-nss-drv/patches/0003-DMA-Fix-NULL-pointer-exceptions.patch
+++ b/root/package/qca/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/root/package/qca/qca/qca-nss-ecm/Makefile
+++ b/root/package/qca/qca/qca-nss-ecm/Makefile
@ -0,0 +1,97 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-nss-ecm
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/cc-qrdk/oss/lklm/qca-nss-ecm
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-04-29
+PKG_SOURCE_VERSION:=c115aec34867b582e2e5ea79fc5315971e0e953c
+PKG_MIRROR_HASH:=a772996af7bbae7031eebc2f789431d29be67f11eb0a1e874c08b74eec6f4585
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/qca-nss-ecm
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Support
+  DEPENDS:=@(TARGET_ipq807x||TARGET_ipq60xx) \
+  	+kmod-qca-nss-drv \
+	+iptables-mod-extra \
+	+kmod-ipt-conntrack \
+	+kmod-ipt-physdev \
+	+iptables-mod-physdev \
+	+kmod-ppp \
+	+kmod-pppoe
+  TITLE:=QCA NSS Enhanced Connection Manager (ECM)
+  FILES:=$(PKG_BUILD_DIR)/*.ko
+  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \
+	CONFIG_NF_CONNTRACK_EVENTS=y \
+	CONFIG_NF_CONNTRACK_CHAIN_EVENTS=n \
+	CONFIG_NF_CONNTRACK_DSCPREMARK_EXT=n
+endef
+
+define KernelPackage/qca-nss-ecm/Description
+This package contains the QCA NSS Enhanced Connection Manager
+endef
+
+define KernelPackage/qca-nss-ecm/install
+	$(INSTALL_DIR) $(1)/etc/firewall.d $(1)/etc/init.d $(1)/usr/bin $(1)/lib/netifd/offload $(1)/etc/config $(1)/etc/uci-defaults $(1)/etc/sysctl.d
+	$(INSTALL_DATA) ./files/qca-nss-ecm.firewall $(1)/etc/firewall.d/qca-nss-ecm
+	$(INSTALL_BIN) ./files/qca-nss-ecm.init $(1)/etc/init.d/qca-nss-ecm
+	$(INSTALL_BIN) ./files/ecm_dump.sh $(1)/usr/bin/
+	$(INSTALL_BIN) ./files/on-demand-down $(1)/lib/netifd/offload/on-demand-down
+	$(INSTALL_DATA) ./files/qca-nss-ecm.uci $(1)/etc/config/ecm
+	$(INSTALL_DATA) ./files/qca-nss-ecm.defaults $(1)/etc/uci-defaults/99-qca-nss-ecm
+	$(INSTALL_BIN) ./files/qca-nss-ecm.sysctl $(1)/etc/sysctl.d/qca-nss-ecm.conf
+	echo 'net.netfilter.nf_conntrack_max=8192' >> $(1)/etc/sysctl.d/qca-nss-ecm.conf
+endef
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/qca-nss-drv
+
+ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "ipq807x" "ipq60xx"))
+ECM_MAKE_OPTS+= ECM_FRONT_END_NSS_ENABLE=y \
+		ECM_CLASSIFIER_HYFI_ENABLE=n \
+		ECM_MULTICAST_ENABLE=n \
+		ECM_INTERFACE_IPSEC_ENABLE=n \
+		ECM_INTERFACE_PPTP_ENABLE=n \
+		ECM_INTERFACE_L2TPV2_ENABLE=n \
+		ECM_INTERFACE_GRE_TAP_ENABLE=n \
+		ECM_INTERFACE_GRE_TUN_ENABLE=n \
+		ECM_INTERFACE_SIT_ENABLE=n \
+		ECM_INTERFACE_TUNIPIP6_ENABLE=n \
+		ECM_INTERFACE_RAWIP_ENABLE=n \
+		ECM_INTERFACE_VLAN_ENABLE=n \
+		ECM_CLASSIFIER_MARK_ENABLE=n \
+		ECM_CLASSIFIER_DSCP_ENABLE=n \
+		ECM_CLASSIFIER_PCC_ENABLE=n \
+		ECM_BAND_STEERING_ENABLE=n \
+		ECM_INTERFACE_PPPOE_ENABLE=y
+endif
+
+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+    SOC="ipq807x_64"
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+    SOC="ipq60xx_64"
+endif
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include/qca-nss-ecm
+	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-ecm
+endef
+
+define Build/Compile
+	+$(MAKE) -C "$(LINUX_DIR)" $(strip $(ECM_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-ecm))
--- a/root/package/qca/qca/qca-nss-ecm/files/ecm_dump.sh
+++ b/root/package/qca/qca/qca-nss-ecm/files/ecm_dump.sh
@ -0,0 +1,95 @@
+#!/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.
+#
+
+ECM_MODULE=${1:-ecm_state}
+MOUNT_ROOT=/dev/ecm
+
+#
+# usage: ecm_dump.sh [module=ecm_db]
+#
+# with no parameters, ecm_dump.sh will attempt to mount the
+# ecm_db state file and cat its contents.
+#
+# example with a parameter: ecm_dump.sh ecm_classifier_default
+#
+# this will cause ecm_dump to attempt to find and mount the state
+# file for the ecm_classifier_default module, and if successful
+# cat the contents.
+#
+
+# this is one of the state files, which happens to be the
+# last module started in ecm
+ECM_STATE=/sys/kernel/debug/ecm/ecm_state/state_dev_major
+
+# tests to see if ECM is up and ready to receive commands.
+# returns 0 if ECM is fully up and ready, else 1
+ecm_is_ready() {
+	if [ ! -e "${ECM_STATE}" ]
+	then
+		return 1
+	fi
+	return 0
+}
+
+#
+# module_state_mount(module_name)
+#      Mounts the state file of the module, if supported
+#
+module_state_mount() {
+	local module_name=$1
+	local mount_dir=$2
+	local state_file="/sys/kernel/debug/ecm/${module_name}/state_dev_major"
+
+	if [ -e "${mount_dir}/${module_name}" ]
+	then
+		# already mounted
+		return 0
+	fi
+
+	#echo "Mount state file for $module_name ..."
+	if [ ! -e "$state_file" ]
+	then
+		#echo "... $module_name does not support state"
+		return 1
+	fi
+
+	local major="`cat $state_file`"
+	#echo "... Mounting state $state_file with major: $major"
+	mknod "${mount_dir}/${module_name}" c $major 0
+}
+
+#
+# main
+#
+ecm_is_ready || {
+	#echo "ECM is not running"
+	exit 1
+}
+
+# all state files are mounted under MOUNT_ROOT, so make sure it exists
+mkdir -p ${MOUNT_ROOT}
+
+#
+# attempt to mount state files for the requested module and cat it
+# if the mount succeeded
+#
+module_state_mount ${ECM_MODULE} ${MOUNT_ROOT} && {
+	cat ${MOUNT_ROOT}/${ECM_MODULE}
+	exit 0
+}
+
+exit 2
--- a/root/package/qca/qca/qca-nss-ecm/files/on-demand-down
+++ b/root/package/qca/qca/qca-nss-ecm/files/on-demand-down
@ -0,0 +1,6 @@
+#!/bin/sh
+# Copyright (c) 2016 The Linux Foundation. All rights reserved.
+
+[ -e "/sys/kernel/debug/ecm/ecm_db/defunct_all" ] && {
+	echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+}
--- a/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.defaults
+++ b/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.defaults
@ -0,0 +1,28 @@
+#!/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.
+#
+
+uci -q batch << EOF
+	delete firewall.qcanssecm
+	set firewall.qcanssecm=include
+	set firewall.qcanssecm.type=script
+	set firewall.qcanssecm.path=/etc/firewall.d/qca-nss-ecm
+	set firewall.qcanssecm.family=any
+	set firewall.qcanssecm.reload=1
+	commit firewall
+EOF
+
+exit 0
--- a/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.firewall
+++ b/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.firewall
@ -0,0 +1,18 @@
+#!/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.
+#
+
+iptables -A FORWARD -m physdev --physdev-is-bridged -j ACCEPT
--- a/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.init
+++ b/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.init
@ -0,0 +1,140 @@
+#!/bin/sh  /etc/rc.common
+#
+# Copyright (c) 2014, 2019-2020 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.
+
+# The shebang above has an extra space intentially to avoid having
+# openwrt build scripts automatically enable this package starting
+# at boot.
+
+START=19
+
+get_front_end_mode() {
+	config_load "ecm"
+	config_get front_end global acceleration_engine "auto"
+
+	case $front_end in
+	auto)
+		echo '0'
+		;;
+	nss)
+		echo '1'
+		;;
+	sfe)
+		echo '2'
+		;;
+	*)
+		echo 'uci_option_acceleration_engine is invalid'
+	esac
+}
+
+support_bridge() {
+	#NSS support bridge acceleration
+	[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && return 0
+	#SFE doesn't support bridge acceleration
+	[ -d /sys/kernel/debug/ecm/ecm_sfe_ipv4 ] && return 1
+}
+
+load_sfe() {
+	local kernel_version=$(uname -r)
+
+	[ -e "/lib/modules/$kernel_version/shortcut-fe.ko" ] && {
+		[ -d /sys/module/shortcut_fe ] || insmod shortcut-fe
+	}
+
+	[ -e "/lib/modules/$kernel_version/shortcut-fe-ipv6.ko" ] && {
+		[ -d /sys/module/shortcut_fe_ipv6 ] || insmod shortcut-fe-ipv6
+	}
+
+	[ -e "/lib/modules/$kernel_version/shortcut-fe-drv.ko" ] && {
+		[ -d /sys/module/shortcut_fe_drv ] || insmod shortcut-fe-drv
+	}
+}
+
+load_ecm() {
+	[ -d /sys/module/ecm ] || {
+		[ ! -e /proc/device-tree/MP_256 ] && load_sfe
+		insmod ecm front_end_selection=$(get_front_end_mode)
+	}
+
+	support_bridge && {
+		sysctl -w net.bridge.bridge-nf-call-ip6tables=1
+		sysctl -w net.bridge.bridge-nf-call-iptables=1
+	}
+}
+
+unload_ecm() {
+	sysctl -w net.bridge.bridge-nf-call-ip6tables=0
+	sysctl -w net.bridge.bridge-nf-call-iptables=0
+
+	if [ -d /sys/module/ecm ]; then
+		#
+		# Stop ECM frontends
+		#
+		echo 1 > /sys/kernel/debug/ecm/front_end_ipv4_stop
+		echo 1 > /sys/kernel/debug/ecm/front_end_ipv6_stop
+
+		#
+		# Defunct the connections
+		#
+	        echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+		sleep 5;
+
+		rmmod ecm
+		sleep 1
+	fi
+}
+
+start() {
+	# If SFE CM is loaded, return.
+	if [ -d /sys/module/shortcut_fe_cm ]; then
+		echo "shortcut_fe CM is loaded, unload it first"
+		echo "cmd: /etc/init.d/shortcut_fe stop"
+		return
+	fi
+
+	load_ecm
+
+	# If the acceleration engine is NSS, enable wifi redirect.
+	[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && sysctl -w dev.nss.general.redirect=1
+
+	support_bridge && {
+		echo 'net.bridge.bridge-nf-call-ip6tables=1' >> /etc/sysctl.d/qca-nss-ecm.conf
+		echo 'net.bridge.bridge-nf-call-iptables=1' >> /etc/sysctl.d/qca-nss-ecm.conf
+	}
+
+	if [ -d /sys/module/qca_ovsmgr ]; then
+		insmod ecm_ovs
+	fi
+
+}
+
+stop() {
+	# If ECM is already not loaded, just return.
+	if [ ! -d /sys/module/ecm ]; then
+		return
+	fi
+
+	# If the acceleration engine is NSS, disable wifi redirect.
+	[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && sysctl -w dev.nss.general.redirect=0
+
+	sed '/net.bridge.bridge-nf-call-ip6tables=1/d' -i /etc/sysctl.d/qca-nss-ecm.conf
+	sed '/net.bridge.bridge-nf-call-iptables=1/d' -i /etc/sysctl.d/qca-nss-ecm.conf
+
+	if [ -d /sys/module/ecm_ovs ]; then
+		rmmod ecm_ovs
+	fi
+
+	unload_ecm
+}
--- a/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.sysctl
+++ b/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.sysctl
@ -0,0 +1,2 @@
+# nf_conntrack_tcp_no_window_check is 0 by default, set it to 1
+net.netfilter.nf_conntrack_tcp_no_window_check=1
--- a/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.uci
+++ b/root/package/qca/qca/qca-nss-ecm/files/qca-nss-ecm.uci
@ -0,0 +1,2 @@
+config ecm 'global'
+	option acceleration_engine 'auto'
--- a/root/package/qca/qca/qca-nss-ecm/patches/001-treewide-componentize-the-module-even-more.patch
+++ b/root/package/qca/qca/qca-nss-ecm/patches/001-treewide-componentize-the-module-even-more.patch
@ -0,0 +1,335 @@
+From 73345c87b28a473b35b57e673f8de963c3d73da1 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Wed, 19 May 2021 02:38:53 +0200
+Subject: [PATCH] treewide: componentize the module even more
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ Makefile                         | 56 +++++++++++++++++++++++++-------
+ ecm_db/ecm_db_connection.c       |  8 +++++
+ ecm_db/ecm_db_node.c             |  4 +++
+ ecm_interface.c                  |  8 +++++
+ frontends/ecm_front_end_common.c |  7 ++++
+ 5 files changed, 72 insertions(+), 11 deletions(-)
+
+--- a/Makefile
+++ b/Makefile
+@@ -82,10 +82,18 @@ ccflags-$(ECM_INTERFACE_BOND_ENABLE) +=
+ # Define ECM_INTERFACE_PPPOE_ENABLE=y in order
+ # to enable support for PPPoE acceleration.
+ # #############################################################################
+-ECM_INTERFACE_PPPOE_ENABLE=y
+ifndef $(ECM_INTERFACE_PPPOE_ENABLE)
+	ECM_INTERFACE_PPPOE_ENABLE=y
+endif
+ ccflags-$(ECM_INTERFACE_PPPOE_ENABLE) += -DECM_INTERFACE_PPPOE_ENABLE
+ 
+ # #############################################################################
+# Define ECM_INTERFACE_L2TPV2_PPTP_ENABLE=y in order
+# to enable support for l2tpv2 or PPTP detection.
+# #############################################################################
+ccflags-$(ECM_INTERFACE_L2TPV2_PPTP_ENABLE) += -DECM_INTERFACE_L2TPV2_PPTP_ENABLE
+
+# #############################################################################
+ # Define ECM_INTERFACE_L2TPV2_ENABLE=y in order
+ # to enable support for l2tpv2 acceleration.
+ # #############################################################################
+@@ -118,6 +126,12 @@ ccflags-$(ECM_INTERFACE_PPP_ENABLE) += -
+ ccflags-$(ECM_INTERFACE_MAP_T_ENABLE) += -DECM_INTERFACE_MAP_T_ENABLE
+ 
+ # #############################################################################
+# Define ECM_INTERFACE_GRE_ENABLE=y in order
+# to enable support for GRE detection.
+# #############################################################################
+ccflags-$(ECM_INTERFACE_GRE_ENABLE) += -DECM_INTERFACE_GRE_ENABLE
+
+# #############################################################################
+ # Define ECM_INTERFACE_GRE_TAP_ENABLE=y in order
+ # to enable support for GRE TAP interface.
+ # #############################################################################
+@@ -186,7 +200,9 @@ ccflags-$(ECM_INTERFACE_OVS_BRIDGE_ENABL
+ # #############################################################################
+ # Define ECM_INTERFACE_VLAN_ENABLE=y in order to enable support for VLAN
+ # #############################################################################
+-ECM_INTERFACE_VLAN_ENABLE=y
+ifndef $(ECM_INTERFACE_VLAN_ENABLE)
+	ECM_INTERFACE_VLAN_ENABLE=y
+endif
+ ccflags-$(ECM_INTERFACE_VLAN_ENABLE) += -DECM_INTERFACE_VLAN_ENABLE
+ 
+ # #############################################################################
+@@ -228,7 +244,9 @@ ccflags-$(ECM_CLASSIFIER_OVS_ENABLE) +=
+ # #############################################################################
+ # Define ECM_CLASSIFIER_MARK_ENABLE=y in order to enable mark classifier.
+ # #############################################################################
+-ECM_CLASSIFIER_MARK_ENABLE=y
+ifndef $(ECM_CLASSIFIER_MARK_ENABLE)
+	ECM_CLASSIFIER_MARK_ENABLE=y
+endif
+ ecm-$(ECM_CLASSIFIER_MARK_ENABLE) += ecm_classifier_mark.o
+ ccflags-$(ECM_CLASSIFIER_MARK_ENABLE) += -DECM_CLASSIFIER_MARK_ENABLE
+ 
+@@ -247,7 +265,9 @@ ccflags-$(ECM_CLASSIFIER_NL_ENABLE) += -
+ # #############################################################################
+ # Define ECM_CLASSIFIER_DSCP_ENABLE=y in order to enable DSCP classifier.
+ # #############################################################################
+-ECM_CLASSIFIER_DSCP_ENABLE=y
+ifndef $(ECM_CLASSIFIER_DSCP_ENABLE)
+	ECM_CLASSIFIER_DSCP_ENABLE=y
+endif
+ ecm-$(ECM_CLASSIFIER_DSCP_ENABLE) += ecm_classifier_dscp.o
+ ccflags-$(ECM_CLASSIFIER_DSCP_ENABLE) += -DECM_CLASSIFIER_DSCP_ENABLE
+ ccflags-$(ECM_CLASSIFIER_DSCP_IGS) += -DECM_CLASSIFIER_DSCP_IGS
+@@ -274,7 +294,9 @@ endif
+ # the Parental Controls subsystem classifier in ECM. Currently disabled until
+ # customers require it / if they need to integrate their Parental Controls with it.
+ # #############################################################################
+-ECM_CLASSIFIER_PCC_ENABLE=y
+ifndef $(ECM_CLASSIFIER_PCC_ENABLE)
+	ECM_CLASSIFIER_PCC_ENABLE=y
+endif
+ ecm-$(ECM_CLASSIFIER_PCC_ENABLE) += ecm_classifier_pcc.o
+ ccflags-$(ECM_CLASSIFIER_PCC_ENABLE) += -DECM_CLASSIFIER_PCC_ENABLE
+ 
+@@ -301,28 +323,36 @@ ccflags-$(ECM_NON_PORTED_SUPPORT_ENABLE)
+ # #############################################################################
+ # Define ECM_STATE_OUTPUT_ENABLE=y to support XML state output
+ # #############################################################################
+-ECM_STATE_OUTPUT_ENABLE=y
+ifndef $(ECM_STATE_OUTPUT_ENABLE)
+	ECM_STATE_OUTPUT_ENABLE=y
+endif
+ ecm-$(ECM_STATE_OUTPUT_ENABLE) += ecm_state.o
+ ccflags-$(ECM_STATE_OUTPUT_ENABLE) += -DECM_STATE_OUTPUT_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_DB_ADVANCED_STATS_ENABLE to support XML state output
+ # #############################################################################
+-ECM_DB_ADVANCED_STATS_ENABLE=y
+ifndef $(ECM_DB_ADVANCED_STATS_ENABLE)
+	ECM_DB_ADVANCED_STATS_ENABLE=y
+endif
+ ccflags-$(ECM_DB_ADVANCED_STATS_ENABLE) += -DECM_DB_ADVANCED_STATS_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE=y in order to enable
+ # the database to track relationships between objects.
+ # #############################################################################
+-ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE=y
+ifndef $(ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE)
+	ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE=y
+endif
+ ccflags-$(ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE) += -DECM_DB_XREF_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_TRACKER_DPI_SUPPORT_ENABLE=y in order to enable support for
+ # deep packet inspection and tracking of data with the trackers.
+ # #############################################################################
+-ECM_TRACKER_DPI_SUPPORT_ENABLE=y
+ifndef $(ECM_TRACKER_DPI_SUPPORT_ENABLE)
+	ECM_TRACKER_DPI_SUPPORT_ENABLE=y
+endif
+ ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE) += -DECM_TRACKER_DPI_SUPPORT_ENABLE
+ 
+ # #############################################################################
+@@ -330,14 +360,18 @@ ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE
+ # support for the database keeping lists of connections that are assigned
+ # on a per TYPE of classifier basis.
+ # #############################################################################
+-ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE=y
+ifndef $(ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE)
+	ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE=y
+endif
+ ccflags-$(ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE) += -DECM_DB_CTA_TRACK_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_BAND_STEERING_ENABLE=y in order to enable
+ # band steering feature.
+ # #############################################################################
+-ECM_BAND_STEERING_ENABLE=y
+ifndef $(ECM_BAND_STEERING_ENABLE)
+	ECM_BAND_STEERING_ENABLE=y
+endif
+ ccflags-$(ECM_BAND_STEERING_ENABLE) += -DECM_BAND_STEERING_ENABLE
+ 
+ # #############################################################################
+--- a/ecm_db/ecm_db_connection.c
+++ b/ecm_db/ecm_db_connection.c
+@@ -430,7 +430,9 @@ EXPORT_SYMBOL(ecm_db_connection_make_def
+  */
+ void ecm_db_connection_data_totals_update(struct ecm_db_connection_instance *ci, bool is_from, uint64_t size, uint64_t packets)
+ {
+#ifdef ECM_DB_ADVANCED_STATS_ENABLE
+ 	int32_t i;
+#endif
+ 
+ 	DEBUG_CHECK_MAGIC(ci, ECM_DB_CONNECTION_INSTANCE_MAGIC, "%px: magic failed\n", ci);
+ 
+@@ -529,7 +531,9 @@ EXPORT_SYMBOL(ecm_db_connection_data_tot
+  */
+ void ecm_db_connection_data_totals_update_dropped(struct ecm_db_connection_instance *ci, bool is_from, uint64_t size, uint64_t packets)
+ {
+#ifdef ECM_DB_ADVANCED_STATS_ENABLE
+ 	int32_t i;
+#endif
+ 
+ 	DEBUG_CHECK_MAGIC(ci, ECM_DB_CONNECTION_INSTANCE_MAGIC, "%px: magic failed\n", ci);
+ 
+@@ -1508,6 +1512,7 @@ void ecm_db_connection_defunct_all(void)
+ }
+ EXPORT_SYMBOL(ecm_db_connection_defunct_all);
+ 
+#ifdef ECM_INTERFACE_OVS_BRIDGE_ENABLE
+ /*
+  * ecm_db_connection_defunct_by_classifier()
+  *	Make defunct based on masked fields
+@@ -1667,6 +1672,7 @@ next_ci:
+ 				ECM_IP_ADDR_TO_OCTAL(dest_addr_mask), dest_port_mask, proto_mask, cnt);
+ 	}
+ }
+#endif
+ 
+ /*
+  * ecm_db_connection_defunct_by_port()
+@@ -1956,6 +1962,7 @@ struct ecm_db_node_instance *ecm_db_conn
+ }
+ EXPORT_SYMBOL(ecm_db_connection_node_get_and_ref);
+ 
+#ifdef ECM_DB_XREF_ENABLE
+ /*
+  * ecm_db_connection_mapping_get_and_ref_next()
+  *	Return reference to next connection in the mapping chain in the specified direction.
+@@ -1997,6 +2004,7 @@ struct ecm_db_connection_instance *ecm_d
+ 	return nci;
+ }
+ EXPORT_SYMBOL(ecm_db_connection_iface_get_and_ref_next);
+#endif
+ 
+ /*
+  * ecm_db_connection_mapping_get_and_ref()
+--- a/ecm_db/ecm_db_node.c
+++ b/ecm_db/ecm_db_node.c
+@@ -224,9 +224,11 @@ EXPORT_SYMBOL(ecm_db_node_get_and_ref_ne
+  */
+ int ecm_db_node_deref(struct ecm_db_node_instance *ni)
+ {
+#ifdef ECM_DB_XREF_ENABLE
+ #if (DEBUG_LEVEL >= 1)
+ 	int dir;
+ #endif
+#endif
+ 	DEBUG_CHECK_MAGIC(ni, ECM_DB_NODE_INSTANCE_MAGIC, "%px: magic failed\n", ni);
+ 
+ 	spin_lock_bh(&ecm_db_lock);
+@@ -486,9 +488,11 @@ EXPORT_SYMBOL(ecm_db_node_iface_get_and_
+ void ecm_db_node_add(struct ecm_db_node_instance *ni, struct ecm_db_iface_instance *ii, uint8_t *address,
+ 					ecm_db_node_final_callback_t final, void *arg)
+ {
+#ifdef ECM_DB_XREF_ENABLE
+ #if (DEBUG_LEVEL >= 1)
+ 	int dir;
+ #endif
+#endif
+ 	ecm_db_node_hash_t hash_index;
+ 	struct ecm_db_listener_instance *li;
+ 
+--- a/ecm_interface.c
+++ b/ecm_interface.c
+@@ -1343,6 +1343,7 @@ struct neighbour *ecm_interface_ipv6_nei
+  */
+ bool ecm_interface_is_pptp(struct sk_buff *skb, const struct net_device *out)
+ {
+#ifdef ECM_INTERFACE_PPTP_ENABLE
+ 	struct net_device *in;
+ 
+ 	/*
+@@ -1367,6 +1368,7 @@ bool ecm_interface_is_pptp(struct sk_buf
+ 	}
+ 
+ 	dev_put(in);
+#endif
+ 	return false;
+ }
+ 
+@@ -1379,6 +1381,7 @@ bool ecm_interface_is_pptp(struct sk_buf
+  */
+ bool ecm_interface_is_l2tp_packet_by_version(struct sk_buff *skb, const struct net_device *out, int ver)
+ {
+#ifdef ECM_INTERFACE_L2TPV2_PPTP_ENABLE
+ 	uint32_t flag = 0;
+ 	struct net_device *in;
+ 
+@@ -1411,6 +1414,7 @@ bool ecm_interface_is_l2tp_packet_by_ver
+ 	}
+ 
+ 	dev_put(in);
+#endif
+ 	return false;
+ }
+ 
+@@ -1423,6 +1427,7 @@ bool ecm_interface_is_l2tp_packet_by_ver
+  */
+ bool ecm_interface_is_l2tp_pptp(struct sk_buff *skb, const struct net_device *out)
+ {
+#ifdef ECM_INTERFACE_L2TPV2_PPTP_ENABLE
+ 	struct net_device *in;
+ 
+ 	/*
+@@ -1445,6 +1450,7 @@ bool ecm_interface_is_l2tp_pptp(struct s
+ 	}
+ 
+ 	dev_put(in);
+#endif
+ 	return false;
+ }
+ 
+@@ -6630,6 +6636,7 @@ static void ecm_interface_regenerate_con
+ 		return;
+ 	}
+ 
+#ifdef ECM_DB_XREF_ENABLE
+ 	for (dir = 0; dir < ECM_DB_OBJ_DIR_MAX; dir++) {
+ 		/*
+ 		 * Re-generate all connections associated with this interface
+@@ -6645,6 +6652,7 @@ static void ecm_interface_regenerate_con
+ 			ci[dir] = cin;
+ 		}
+ 	}
+#endif
+ 
+ #ifdef ECM_MULTICAST_ENABLE
+ 	/*
+--- a/frontends/ecm_front_end_common.c
+++ b/frontends/ecm_front_end_common.c
+@@ -106,6 +106,7 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 							     struct nf_conntrack_tuple *tuple,
+ 							     int ip_version)
+ {
+#ifdef ECM_INTERFACE_GRE_ENABLE
+ 	struct net_device *dev;
+ 	struct gre_base_hdr *greh;
+ 
+@@ -117,10 +118,12 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 		/*
+ 		 * Case 1: PPTP locally terminated
+ 		 */
+#ifdef ECM_INTERFACE_PPTP_ENABLE
+ 		if (ecm_interface_is_pptp(skb, outdev)) {
+ 			DEBUG_TRACE("%px: PPTP GRE locally terminated - allow acceleration\n", skb);
+ 			return true;
+ 		}
+#endif
+ 
+ 		/*
+ 		 * Case 2: PPTP pass through
+@@ -223,6 +226,10 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 	 */
+ 	DEBUG_TRACE("%px: GRE IPv%d pass through - allow acceleration\n", skb, ip_version);
+ 	return true;
+#else
+	DEBUG_TRACE("%px: GRE%d feature is disabled - do not allow acceleration\n", skb, ip_version);
+	return false;
+#endif
+ }
+ 
+ #ifdef ECM_CLASSIFIER_DSCP_ENABLE
--- a/root/package/qca/qca/qca-nss-ecm/patches/100-kernel-5.10-support.patch
+++ b/root/package/qca/qca/qca-nss-ecm/patches/100-kernel-5.10-support.patch
@ -0,0 +1,831 @@
+From e8b642c23af9146c973e828a7f4e0fb56cfc8d0b Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Sat, 15 May 2021 03:51:14 +0200
+Subject: [PATCH] add support for kernel 5.10
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ ecm_classifier_default.c                | 24 +++---------
+ ecm_classifier_dscp.c                   |  8 +---
+ ecm_classifier_emesh.c                  | 16 ++------
+ ecm_classifier_hyfi.c                   |  7 +---
+ ecm_classifier_mark.c                   |  8 +---
+ ecm_classifier_ovs.c                    |  8 +---
+ ecm_classifier_pcc.c                    |  8 +---
+ ecm_conntrack_notifier.c                |  8 +---
+ ecm_db/ecm_db_connection.c              |  7 +---
+ ecm_db/ecm_db_host.c                    |  7 +---
+ ecm_db/ecm_db_iface.c                   |  7 +---
+ ecm_db/ecm_db_mapping.c                 |  7 +---
+ ecm_db/ecm_db_node.c                    |  7 +---
+ ecm_interface.c                         |  4 +-
+ ecm_state.c                             | 14 ++-----
+ frontends/ecm_front_end_common.c        |  4 +-
+ frontends/ecm_front_end_ipv4.c          |  7 +---
+ frontends/ecm_front_end_ipv6.c          |  7 +---
+ frontends/nss/ecm_nss_bond_notifier.c   |  8 +---
+ frontends/nss/ecm_nss_ipv4.c            | 49 +++++++------------------
+ frontends/nss/ecm_nss_ipv6.c            | 49 +++++++------------------
+ frontends/nss/ecm_nss_multicast_ipv4.c  |  7 +---
+ frontends/nss/ecm_nss_multicast_ipv6.c  |  7 +---
+ frontends/nss/ecm_nss_non_ported_ipv4.c |  7 +---
+ frontends/nss/ecm_nss_non_ported_ipv6.c |  7 +---
+ frontends/nss/ecm_nss_ported_ipv4.c     |  8 +---
+ frontends/nss/ecm_nss_ported_ipv6.c     |  8 +---
+ frontends/sfe/ecm_sfe_ipv4.c            | 49 +++++++------------------
+ frontends/sfe/ecm_sfe_ipv6.c            | 49 +++++++------------------
+ frontends/sfe/ecm_sfe_non_ported_ipv4.c |  7 +---
+ frontends/sfe/ecm_sfe_non_ported_ipv6.c |  7 +---
+ frontends/sfe/ecm_sfe_ported_ipv4.c     |  8 +---
+ frontends/sfe/ecm_sfe_ported_ipv6.c     |  8 +---
+ 33 files changed, 122 insertions(+), 314 deletions(-)
+
+--- a/ecm_classifier_default.c
+++ b/ecm_classifier_default.c
+@@ -776,26 +776,14 @@ int ecm_classifier_default_init(struct d
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+-					(u32 *)&ecm_classifier_default_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm deafult classifier enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_default_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+					(u32 *)&ecm_classifier_default_enabled);
+ 
+-	if (!debugfs_create_u32("accel_mode", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+-					(u32 *)&ecm_classifier_default_accel_mode)) {
+-		DEBUG_ERROR("Failed to create ecm deafult classifier accel_mode file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_default_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("accel_mode", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+					(u32 *)&ecm_classifier_default_accel_mode);
+ 
+-	if (!debugfs_create_u32("accel_delay_pkts", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+-					(u32 *)&ecm_classifier_accel_delay_pkts)) {
+-		DEBUG_ERROR("Failed to create accel delay packet counts in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_default_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("accel_delay_pkts", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+					(u32 *)&ecm_classifier_accel_delay_pkts);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_dscp.c
+++ b/ecm_classifier_dscp.c
+@@ -747,12 +747,8 @@ int ecm_classifier_dscp_init(struct dent
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_dscp_dentry,
+-					(u32 *)&ecm_classifier_dscp_enabled)) {
+-		DEBUG_ERROR("Failed to create dscp enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_dscp_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_dscp_dentry,
+					(u32 *)&ecm_classifier_dscp_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_emesh.c
+++ b/ecm_classifier_emesh.c
+@@ -977,19 +977,11 @@ int ecm_classifier_emesh_init(struct den
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+-				(u32 *)&ecm_classifier_emesh_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm emesh classifier enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_emesh_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+				(u32 *)&ecm_classifier_emesh_enabled);
+ 
+-	if (!debugfs_create_u32("latency_config_enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+-				(u32 *)&ecm_classifier_emesh_latency_config_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm emesh classifier latency config enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_emesh_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("latency_config_enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+				(u32 *)&ecm_classifier_emesh_latency_config_enabled);
+ 
+ 	/*
+ 	 * Register for service prioritization notification update.
+--- a/ecm_classifier_hyfi.c
+++ b/ecm_classifier_hyfi.c
+@@ -1099,11 +1099,8 @@ int ecm_classifier_hyfi_rules_init(struc
+ 		goto classifier_task_cleanup;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_hyfi_dentry,
+-					(u32 *)&ecm_classifier_hyfi_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm hyfi classifier enabled file in debugfs\n");
+-		goto classifier_task_cleanup;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_hyfi_dentry,
+					(u32 *)&ecm_classifier_hyfi_enabled);
+ 
+ 	if (!debugfs_create_file("cmd", S_IWUSR, ecm_classifier_hyfi_dentry,
+ 					NULL, &ecm_classifier_hyfi_cmd_fops)) {
+--- a/ecm_classifier_mark.c
+++ b/ecm_classifier_mark.c
+@@ -753,12 +753,8 @@ int ecm_classifier_mark_init(struct dent
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_mark_dentry,
+-					(u32 *)&ecm_classifier_mark_enabled)) {
+-		DEBUG_ERROR("Failed to create mark enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_mark_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_mark_dentry,
+					(u32 *)&ecm_classifier_mark_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_ovs.c
+++ b/ecm_classifier_ovs.c
+@@ -2200,12 +2200,8 @@ int ecm_classifier_ovs_init(struct dentr
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_ovs_dentry,
+-					(u32 *)&ecm_classifier_ovs_enabled)) {
+-		DEBUG_ERROR("Failed to create ovs enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_ovs_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_ovs_dentry,
+					(u32 *)&ecm_classifier_ovs_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_pcc.c
+++ b/ecm_classifier_pcc.c
+@@ -1308,12 +1308,8 @@ int ecm_classifier_pcc_init(struct dentr
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO, ecm_classifier_pcc_dentry,
+-					(u32 *)&ecm_classifier_pcc_enabled)) {
+-		DEBUG_ERROR("Failed to create pcc enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_pcc_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO, ecm_classifier_pcc_dentry,
+					(u32 *)&ecm_classifier_pcc_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_conntrack_notifier.c
+++ b/ecm_conntrack_notifier.c
+@@ -414,12 +414,8 @@ int ecm_conntrack_notifier_init(struct d
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_conntrack_notifier_dentry,
+-					(u32 *)&ecm_conntrack_notifier_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm conntrack notifier stopped file in debugfs\n");
+-		debugfs_remove_recursive(ecm_conntrack_notifier_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_conntrack_notifier_dentry,
+					(u32 *)&ecm_conntrack_notifier_stopped);
+ 
+ #ifdef CONFIG_NF_CONNTRACK_EVENTS
+ 	/*
+--- a/ecm_db/ecm_db_connection.c
+++ b/ecm_db/ecm_db_connection.c
+@@ -3642,11 +3642,8 @@ static struct file_operations ecm_db_con
+  */
+ bool ecm_db_connection_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("connection_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_connection_count)) {
+-		DEBUG_ERROR("Failed to create ecm db connection count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("connection_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_connection_count);
+ 
+ 	if (!debugfs_create_file("connection_count_simple", S_IRUGO, dentry,
+ 					NULL, &ecm_db_connection_count_simple_fops)) {
+--- a/ecm_db/ecm_db_host.c
+++ b/ecm_db/ecm_db_host.c
+@@ -770,11 +770,8 @@ EXPORT_SYMBOL(ecm_db_host_alloc);
+ bool ecm_db_host_init(struct dentry *dentry)
+ {
+ 
+-	if (!debugfs_create_u32("host_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_host_count)) {
+-		DEBUG_ERROR("Failed to create ecm db host count file in debugfs\n");
+-		return false;;
+-	}
+	debugfs_create_u32("host_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_host_count);
+ 
+ 	ecm_db_host_table = vzalloc(sizeof(struct ecm_db_host_instance *) * ECM_DB_HOST_HASH_SLOTS);
+ 	if (!ecm_db_host_table) {
+--- a/ecm_db/ecm_db_iface.c
+++ b/ecm_db/ecm_db_iface.c
+@@ -3670,11 +3670,8 @@ EXPORT_SYMBOL(ecm_db_iface_alloc);
+  */
+ bool ecm_db_iface_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("iface_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_iface_count)) {
+-		DEBUG_ERROR("Failed to create ecm db iface count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("iface_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_iface_count);
+ 
+ 	return true;
+ }
+--- a/ecm_db/ecm_db_mapping.c
+++ b/ecm_db/ecm_db_mapping.c
+@@ -806,11 +806,8 @@ EXPORT_SYMBOL(ecm_db_mapping_alloc);
+  */
+ bool ecm_db_mapping_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("mapping_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_mapping_count)) {
+-		DEBUG_ERROR("Failed to create ecm db mapping count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("mapping_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_mapping_count);
+ 
+ 	ecm_db_mapping_table = vzalloc(sizeof(struct ecm_db_mapping_instance *) * ECM_DB_MAPPING_HASH_SLOTS);
+ 	if (!ecm_db_mapping_table) {
+--- a/ecm_db/ecm_db_node.c
+++ b/ecm_db/ecm_db_node.c
+@@ -1187,11 +1187,8 @@ keep_sni_conn:
+  */
+ bool ecm_db_node_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("node_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_node_count)) {
+-		DEBUG_ERROR("Failed to create ecm db node count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("node_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_node_count);
+ 
+ 	ecm_db_node_table = vzalloc(sizeof(struct ecm_db_node_instance *) * ECM_DB_NODE_HASH_SLOTS);
+ 	if (!ecm_db_node_table) {
+--- a/ecm_interface.c
+++ b/ecm_interface.c
+@@ -332,7 +332,7 @@ static struct net_device *ecm_interface_
+ 	struct net_device *dev;
+ 
+ 	ECM_IP_ADDR_TO_NIN6_ADDR(addr6, addr);
+-	dev = (struct net_device *)ipv6_dev_find(&init_net, &addr6, 1);
+	dev = (struct net_device *)ipv6_dev_find_and_hold(&init_net, &addr6, 1);
+ 	return dev;
+ }
+ #endif
+@@ -734,7 +734,7 @@ static bool ecm_interface_mac_addr_get_i
+ 	 * Get the MAC address that corresponds to IP address given.
+ 	 */
+ 	ECM_IP_ADDR_TO_NIN6_ADDR(daddr, addr);
+-	local_dev = ipv6_dev_find(&init_net, &daddr, 1);
+	local_dev = ipv6_dev_find_and_hold(&init_net, &daddr, 1);
+ 	if (local_dev) {
+ 		DEBUG_TRACE("%pi6 is a local address\n", &daddr);
+ 		memcpy(mac_addr, dev->dev_addr, ETH_ALEN);
+--- a/ecm_state.c
+++ b/ecm_state.c
+@@ -899,17 +899,11 @@ int ecm_state_init(struct dentry *dentry
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("state_dev_major", S_IRUGO, ecm_state_dentry,
+-					(u32 *)&ecm_state_dev_major_id)) {
+-		DEBUG_ERROR("Failed to create ecm state dev major file in debugfs\n");
+-		goto init_cleanup;
+-	}
+	debugfs_create_u32("state_dev_major", S_IRUGO, ecm_state_dentry,
+					(u32 *)&ecm_state_dev_major_id);
+ 
+-	if (!debugfs_create_u32("state_file_output_mask", S_IRUGO | S_IWUSR, ecm_state_dentry,
+-					(u32 *)&ecm_state_file_output_mask)) {
+-		DEBUG_ERROR("Failed to create ecm state output mask file in debugfs\n");
+-		goto init_cleanup;
+-	}
+	debugfs_create_u32("state_file_output_mask", S_IRUGO | S_IWUSR, ecm_state_dentry,
+					(u32 *)&ecm_state_file_output_mask);
+ 
+ 	/*
+ 	 * Register a char device that we will use to provide a dump of our state
+--- a/frontends/ecm_front_end_common.c
+++ b/frontends/ecm_front_end_common.c
+@@ -192,7 +192,7 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 			return false;
+ 		}
+ 	} else {
+-		dev = ipv6_dev_find(&init_net, &(tuple->src.u3.in6), 1);
+		dev = ipv6_dev_find_and_hold(&init_net, &(tuple->src.u3.in6), 1);
+ 		if (dev) {
+ 			/*
+ 			 * Source IP address is local
+@@ -202,7 +202,7 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 			return false;
+ 		}
+ 
+-		dev = ipv6_dev_find(&init_net, &(tuple->dst.u3.in6), 1);
+		dev = ipv6_dev_find_and_hold(&init_net, &(tuple->dst.u3.in6), 1);
+ 		if (dev) {
+ 			/*
+ 			 * Destination IP address is local
+--- a/frontends/ecm_front_end_ipv4.c
+++ b/frontends/ecm_front_end_ipv4.c
+@@ -376,11 +376,8 @@ void ecm_front_end_ipv4_stop(int num)
+  */
+ int ecm_front_end_ipv4_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("front_end_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv4_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv4 stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("front_end_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+			   (u32 *)&ecm_front_end_ipv4_stopped);
+ 
+ 	switch (ecm_front_end_type_get()) {
+ 	case ECM_FRONT_END_TYPE_NSS:
+--- a/frontends/ecm_front_end_ipv6.c
+++ b/frontends/ecm_front_end_ipv6.c
+@@ -255,11 +255,8 @@ void ecm_front_end_ipv6_stop(int num)
+  */
+ int ecm_front_end_ipv6_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("front_end_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv6_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv6 stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("front_end_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+			   (u32 *)&ecm_front_end_ipv6_stopped);
+ 
+ 	switch (ecm_front_end_type_get()) {
+ 	case ECM_FRONT_END_TYPE_NSS:
+--- a/frontends/nss/ecm_nss_bond_notifier.c
+++ b/frontends/nss/ecm_nss_bond_notifier.c
+@@ -240,12 +240,8 @@ int ecm_nss_bond_notifier_init(struct de
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_nss_bond_notifier_dentry,
+-					(u32 *)&ecm_nss_bond_notifier_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm bond notifier stopped file in debugfs\n");
+-		debugfs_remove_recursive(ecm_nss_bond_notifier_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_nss_bond_notifier_dentry,
+					(u32 *)&ecm_nss_bond_notifier_stopped);
+ 
+ 	/*
+ 	 * Register Link Aggregation callbacks with the bonding driver
+--- a/frontends/nss/ecm_nss_ipv4.c
+++ b/frontends/nss/ecm_nss_ipv4.c
+@@ -2802,41 +2802,23 @@ int ecm_nss_ipv4_init(struct dentry *den
+ 		return result;
+ 	}
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+ 					NULL, &ecm_nss_ipv4_accel_limit_mode_fops)) {
+@@ -2867,11 +2849,8 @@ int ecm_nss_ipv4_init(struct dentry *den
+ 		goto task_cleanup;
+ 	}
+ 
+-	if (!debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_vlan_passthrough_enable)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 vlan passthrough file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_vlan_passthrough_enable);
+ 
+ #ifdef ECM_NON_PORTED_SUPPORT_ENABLE
+ 	if (!ecm_nss_non_ported_ipv4_debugfs_init(ecm_nss_ipv4_dentry)) {
+--- a/frontends/nss/ecm_nss_ipv6.c
+++ b/frontends/nss/ecm_nss_ipv6.c
+@@ -2542,41 +2542,23 @@ int ecm_nss_ipv6_init(struct dentry *den
+ 		return result;
+ 	}
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+ 					NULL, &ecm_nss_ipv6_accel_limit_mode_fops)) {
+@@ -2607,11 +2589,8 @@ int ecm_nss_ipv6_init(struct dentry *den
+ 		goto task_cleanup;
+ 	}
+ 
+-	if (!debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_vlan_passthrough_enable)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 vlan passthrough file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_vlan_passthrough_enable);
+ 
+ #ifdef ECM_NON_PORTED_SUPPORT_ENABLE
+ 	if (!ecm_nss_non_ported_ipv6_debugfs_init(ecm_nss_ipv6_dentry)) {
+--- a/frontends/nss/ecm_nss_multicast_ipv4.c
+++ b/frontends/nss/ecm_nss_multicast_ipv4.c
+@@ -4139,11 +4139,8 @@ void ecm_nss_multicast_ipv4_stop(int num
+  */
+ int ecm_nss_multicast_ipv4_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("ecm_nss_multicast_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv4_mc_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv4 mc stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("ecm_nss_multicast_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+					(u32 *)&ecm_front_end_ipv4_mc_stopped);
+ 
+ 	/*
+ 	 * Register multicast update callback to MCS snooper
+--- a/frontends/nss/ecm_nss_multicast_ipv6.c
+++ b/frontends/nss/ecm_nss_multicast_ipv6.c
+@@ -3939,11 +3939,8 @@ void ecm_nss_multicast_ipv6_stop(int num
+  */
+ int ecm_nss_multicast_ipv6_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("ecm_nss_multicast_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv6_mc_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv6 mc stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("ecm_nss_multicast_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+					(u32 *)&ecm_front_end_ipv6_mc_stopped);
+ 
+ 	/*
+ 	 * Register multicast update callback to MCS snooper
+--- a/frontends/nss/ecm_nss_non_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_non_ported_ipv4.c
+@@ -2615,11 +2615,8 @@ done:
+  */
+ bool ecm_nss_non_ported_ipv4_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_nss_non_ported_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_nss_non_ported_ipv4_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/nss/ecm_nss_non_ported_ipv6.c
+++ b/frontends/nss/ecm_nss_non_ported_ipv6.c
+@@ -2329,11 +2329,8 @@ done:
+  */
+ bool ecm_nss_non_ported_ipv6_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_nss_non_ported_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_nss_non_ported_ipv6_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/nss/ecm_nss_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_ported_ipv4.c
+@@ -2944,12 +2944,8 @@ bool ecm_nss_ported_ipv4_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_TCP]);
+ 
+ 	return true;
+ }
+--- a/frontends/nss/ecm_nss_ported_ipv6.c
+++ b/frontends/nss/ecm_nss_ported_ipv6.c
+@@ -2732,12 +2732,8 @@ bool ecm_nss_ported_ipv6_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_TCP]);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_ipv4.c
+++ b/frontends/sfe/ecm_sfe_ipv4.c
+@@ -1808,48 +1808,27 @@ int ecm_sfe_ipv4_init(struct dentry *den
+ 	}
+ 
+ #ifdef CONFIG_XFRM
+-	if (!debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_reject_acceleration_for_ipsec)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 reject_acceleration_for_ipsec file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_reject_acceleration_for_ipsec);
+ #endif
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+ 					NULL, &ecm_sfe_ipv4_accel_limit_mode_fops)) {
+--- a/frontends/sfe/ecm_sfe_ipv6.c
+++ b/frontends/sfe/ecm_sfe_ipv6.c
+@@ -1532,48 +1532,27 @@ int ecm_sfe_ipv6_init(struct dentry *den
+ 	}
+ 
+ #ifdef CONFIG_XFRM
+-	if (!debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_reject_acceleration_for_ipsec)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 reject_acceleration_for_ipsec file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_reject_acceleration_for_ipsec);
+ #endif
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+ 					NULL, &ecm_sfe_ipv6_accel_limit_mode_fops)) {
+--- a/frontends/sfe/ecm_sfe_non_ported_ipv4.c
+++ b/frontends/sfe/ecm_sfe_non_ported_ipv4.c
+@@ -2284,11 +2284,8 @@ done:
+  */
+ bool ecm_sfe_non_ported_ipv4_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_sfe_non_ported_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_sfe_non_ported_ipv4_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_non_ported_ipv6.c
+++ b/frontends/sfe/ecm_sfe_non_ported_ipv6.c
+@@ -2083,11 +2083,8 @@ done:
+  */
+ bool ecm_sfe_non_ported_ipv6_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_sfe_non_ported_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_sfe_non_ported_ipv6_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_ported_ipv4.c
+++ b/frontends/sfe/ecm_sfe_ported_ipv4.c
+@@ -2528,12 +2528,8 @@ bool ecm_sfe_ported_ipv4_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_sfe_ported_ipv4_accelerated_count[ECM_SFE_PORTED_IPV4_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_sfe_ported_ipv4_accelerated_count[ECM_SFE_PORTED_IPV4_PROTO_TCP]);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_ported_ipv6.c
+++ b/frontends/sfe/ecm_sfe_ported_ipv6.c
+@@ -2374,12 +2374,8 @@ bool ecm_sfe_ported_ipv6_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_sfe_ported_ipv6_accelerated_count[ECM_SFE_PORTED_IPV6_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_sfe_ported_ipv6_accelerated_count[ECM_SFE_PORTED_IPV6_PROTO_TCP]);
+ 
+ 	return true;
+ }
--- a/root/package/qca/qca/qca-nss-ecm/patches/203-rework-nfct-notification.patch
+++ b/root/package/qca/qca/qca-nss-ecm/patches/203-rework-nfct-notification.patch
@ -0,0 +1,25 @@
+--- a/ecm_conntrack_notifier.c
+++ b/ecm_conntrack_notifier.c
+@@ -421,7 +421,11 @@ int ecm_conntrack_notifier_init(struct d
+ 	/*
+ 	 * Eventing subsystem is available so we register a notifier hook to get fast notifications of expired connections
+ 	 */
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
+	result = nf_conntrack_register_chain_notifier(&init_net, &ecm_conntrack_notifier);
+#else
+ 	result = nf_conntrack_register_notifier(&init_net, &ecm_conntrack_notifier);
+#endif
+ 	if (result < 0) {
+ 		DEBUG_ERROR("Can't register nf notifier hook.\n");
+ 		debugfs_remove_recursive(ecm_conntrack_notifier_dentry);
+@@ -439,7 +443,9 @@ EXPORT_SYMBOL(ecm_conntrack_notifier_ini
+ void ecm_conntrack_notifier_exit(void)
+ {
+ 	DEBUG_INFO("ECM Conntrack Notifier exit\n");
+-#ifdef CONFIG_NF_CONNTRACK_EVENTS
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
+	nf_conntrack_unregister_chain_notifier(&init_net, &ecm_conntrack_notifier);
+#else
+ 	nf_conntrack_unregister_notifier(&init_net, &ecm_conntrack_notifier);
+ #endif
+ 	/*
--- a/root/package/qca/qca/qca-nss-ecm/patches/204-More-compile-fixes.patch
+++ b/root/package/qca/qca/qca-nss-ecm/patches/204-More-compile-fixes.patch
@ -0,0 +1,58 @@
+From e6d701c0d454d841366c556b2ef07a5203ffb35d Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 21 May 2021 21:41:31 +0200
+Subject: [PATCH] More compile fixes
+
+More runtime compile fixes.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ frontends/nss/ecm_nss_ported_ipv4.c | 12 +++---------
+ frontends/nss/ecm_nss_ported_ipv6.c | 12 +++---------
+ 2 files changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/frontends/nss/ecm_nss_ported_ipv4.c b/frontends/nss/ecm_nss_ported_ipv4.c
+index 3522f0f..7f5fcd1 100644
+--- a/frontends/nss/ecm_nss_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_ported_ipv4.c
+@@ -2935,14 +2935,8 @@ done:
+  */
+ bool ecm_nss_ported_ipv4_debugfs_init(struct dentry *dentry)
+ {
+-	struct dentry *udp_dentry;
+-
+-	udp_dentry = debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+	debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+ 						&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_UDP]);
+-	if (!udp_dentry) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 udp_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+ 
+ 	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+ 					&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_TCP]);
+diff --git a/frontends/nss/ecm_nss_ported_ipv6.c b/frontends/nss/ecm_nss_ported_ipv6.c
+index f43ac95..e0f779c 100644
+--- a/frontends/nss/ecm_nss_ported_ipv6.c
+++ b/frontends/nss/ecm_nss_ported_ipv6.c
+ /*
+  * ecm_nss_ported_ipv6_connection_callback()
+@@ -2723,14 +2723,8 @@ done:
+  */
+ bool ecm_nss_ported_ipv6_debugfs_init(struct dentry *dentry)
+ {
+-	struct dentry *udp_dentry;
+-
+-	udp_dentry = debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+	debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+ 						&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_UDP]);
+-	if (!udp_dentry) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 udp_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+ 
+ 	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+ 					&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_TCP]);
+-- 
+2.31.1
+
--- a/root/package/qca/qca/qca-nss-ecm/patches/205-resolve-high-load.patch
+++ b/root/package/qca/qca/qca-nss-ecm/patches/205-resolve-high-load.patch
@ -0,0 +1,62 @@
+From 6924b71ed809b37fffd74d6428a8ca83e5919746 Mon Sep 17 00:00:00 2001
+From: Dirk Buchwalder <buchwalder@posteo.de>
+Date: Sun, 27 Jun 2021 16:52:39 +0200
+Subject: [PATCH] qca-nss-ecm: resolve the cpu high load regarding ecm
+
+If using ECM, cpu load goes up (around 1.0) and stucks there.
+This is due to using uninterruptible sleep function,
+the patch changes this to interruptible sleep function.
+
+Signed-off-by: Dirk Buchwalder buchwalder@posteo.de
+---
+ frontends/nss/ecm_nss_ipv4.c | 4 ++--
+ frontends/nss/ecm_nss_ipv6.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/frontends/nss/ecm_nss_ipv4.c b/frontends/nss/ecm_nss_ipv4.c
+index e00553c..94b39cd 100644
+--- a/frontends/nss/ecm_nss_ipv4.c
+++ b/frontends/nss/ecm_nss_ipv4.c
+@@ -2471,7 +2471,7 @@ static void ecm_nss_ipv4_stats_sync_req_work(struct work_struct *work)
+ 	}
+ 	spin_unlock_bh(&ecm_nss_ipv4_lock);
+ 
+-	usleep_range(ECM_NSS_IPV4_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV4_STATS_SYNC_UDELAY);
+	msleep_interruptible(ECM_NSS_IPV4_STATS_SYNC_UDELAY / 1000);
+ 
+ 	/*
+ 	 * If index is 0, we are starting a new round, but if we still have time remain
+@@ -2485,7 +2485,7 @@ static void ecm_nss_ipv4_stats_sync_req_work(struct work_struct *work)
+ 		}
+ 
+ 		if (time_after(ecm_nss_ipv4_next_req_time, current_jiffies)) {
+-			msleep(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
+			msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
+ 		}
+ 		ecm_nss_ipv4_roll_check_jiffies = jiffies;
+ 		ecm_nss_ipv4_next_req_time = ecm_nss_ipv4_roll_check_jiffies + ECM_NSS_IPV4_STATS_SYNC_PERIOD;
+diff --git a/frontends/nss/ecm_nss_ipv6.c b/frontends/nss/ecm_nss_ipv6.c
+index 82e739f..30af050 100644
+--- a/frontends/nss/ecm_nss_ipv6.c
+++ b/frontends/nss/ecm_nss_ipv6.c
+@@ -2210,7 +2210,7 @@ static void ecm_nss_ipv6_stats_sync_req_work(struct work_struct *work)
+ 	}
+ 	spin_unlock_bh(&ecm_nss_ipv6_lock);
+ 
+-	usleep_range(ECM_NSS_IPV6_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV6_STATS_SYNC_UDELAY);
+	msleep_interruptible(ECM_NSS_IPV6_STATS_SYNC_UDELAY / 1000);
+ 
+ 	/*
+ 	 * If index is 0, we are starting a new round, but if we still have time remain
+@@ -2224,7 +2224,7 @@ static void ecm_nss_ipv6_stats_sync_req_work(struct work_struct *work)
+ 		}
+ 
+ 		if (time_after(ecm_nss_ipv6_next_req_time, current_jiffies)) {
+-			msleep(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
+			msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
+ 		}
+ 		ecm_nss_ipv6_roll_check_jiffies = jiffies;
+ 		ecm_nss_ipv6_next_req_time = ecm_nss_ipv6_roll_check_jiffies + ECM_NSS_IPV6_STATS_SYNC_PERIOD;
+-- 
+2.31.1
+
--- a/root/package/qca/qca/qca-ssdk-shell/Makefile
+++ b/root/package/qca/qca/qca-ssdk-shell/Makefile
@ -0,0 +1,48 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-ssdk-shell
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/cc-qrdk/oss/ssdk-shell
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-01-27
+PKG_SOURCE_VERSION:=5661366d471a78314bc7010f985ad8cc15be832a
+PKG_MIRROR_HASH:=73111e09e896f0abbe3ee1c358aea7ec14fe5e668ce8753b8968e03c78f9599b
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/qca-ssdk-shell
+  SECTION:=QCA
+  CATEGORY:=Utilities
+  TITLE:=Shell application for QCA SSDK
+endef
+
+
+define Package/qca-ssdk-shell/Description
+  This package contains a qca-ssdk shell application for QCA chipset
+endef
+
+ifndef CONFIG_TOOLCHAIN_BIN_PATH
+CONFIG_TOOLCHAIN_BIN_PATH=$(TOOLCHAIN_DIR)/bin
+endif
+
+QCASSDK_CONFIG_OPTS+= TOOL_PATH=$(CONFIG_TOOLCHAIN_BIN_PATH) \
+                SYS_PATH=$(LINUX_DIR) \
+                TOOLPREFIX=$(TARGET_CROSS) \
+                KVER=$(LINUX_VERSION) \
+                CFLAGS="$(TARGET_CFLAGS)" \
+                LDFLAGS="$(TARGET_LDFLAGS)" \
+                ARCH=$(LINUX_KARCH)
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(strip $(QCASSDK_CONFIG_OPTS))
+endef
+
+define Package/qca-ssdk-shell/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/bin/ssdk_sh $(1)/usr/sbin/
+endef
+
+
+$(eval $(call BuildPackage,qca-ssdk-shell))
--- a/root/package/qca/qca/qca-ssdk/Makefile
+++ b/root/package/qca/qca/qca-ssdk/Makefile
@ -0,0 +1,91 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-ssdk
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/cc-qrdk/oss/lklm/qca-ssdk
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-04-28
+PKG_SOURCE_VERSION:=c9bc3bc34eaaac78083573524097356e2dcc1b66
+PKG_MIRROR_HASH:=29db78529be32427b8b96fcbfec22a016a243676781ec96d9d65b810944fa405
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/qca-ssdk-nohnat
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Devices
+  TITLE:=Kernel driver for QCA SSDK
+  DEPENDS:=@(TARGET_ipq807x)
+  FILES:=$(PKG_BUILD_DIR)/build/bin/qca-ssdk.ko
+  AUTOLOAD:=$(call AutoLoad,30,qca-ssdk)
+endef
+
+define KernelPackage/qca-ssdk-nohnat/Description
+This package contains a qca-ssdk driver for QCA chipset
+endef
+
+GCC_VERSION=$(shell echo "$(CONFIG_GCC_VERSION)" | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
+
+ifdef CONFIG_TOOLCHAIN_BIN_PATH
+TOOLCHAIN_BIN_PATH=$(CONFIG_TOOLCHAIN_BIN_PATH)
+else
+TOOLCHAIN_BIN_PATH=$(TOOLCHAIN_DIR)/bin
+endif
+
+MAKE_FLAGS+= \
+	TARGET_NAME=$(CONFIG_TARGET_NAME) \
+	TOOL_PATH=$(TOOLCHAIN_BIN_PATH) \
+	SYS_PATH=$(LINUX_DIR) \
+	TOOLPREFIX=$(TARGET_CROSS) \
+	KVER=$(LINUX_VERSION) \
+	ARCH=$(LINUX_KARCH) \
+	TARGET_SUFFIX=$(CONFIG_TARGET_SUFFIX) \
+	GCC_VERSION=$(GCC_VERSION) \
+	EXTRA_CFLAGS=-fno-stack-protector -I$(STAGING_DIR)/usr/include \
+	$(KERNEL_MAKE_FLAGS)
+
+ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "ipq60xx" "ipq807x"))
+    MAKE_FLAGS+= PTP_FEATURE=disable SWCONFIG_FEATURE=disable
+endif
+
+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+    MAKE_FLAGS+= CHIP_TYPE=HPPE
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+    MAKE_FLAGS+= CHIP_TYPE=CPPE
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/qca-ssdk
+	$(INSTALL_DIR) $(1)/usr/include/qca-ssdk/api
+	$(INSTALL_DIR) $(1)/usr/include/qca-ssdk/ref
+	$(INSTALL_DIR) $(1)/usr/include/qca-ssdk/fal
+	$(INSTALL_DIR) $(1)/usr/include/qca-ssdk/sal
+	$(INSTALL_DIR) $(1)/usr/include/qca-ssdk/init
+	$(CP) -rf $(PKG_BUILD_DIR)/include/api/sw_ioctl.h $(1)/usr/include/qca-ssdk/api
+	if [ -f $(PKG_BUILD_DIR)/include/ref/ref_vsi.h ]; then \
+	$(CP) -rf $(PKG_BUILD_DIR)/include/ref/ref_vsi.h $(1)/usr/include/qca-ssdk/ref/; \
+	fi
+	if [ -f $(PKG_BUILD_DIR)/include/ref/ref_fdb.h ]; then \
+	$(CP) -rf $(PKG_BUILD_DIR)/include/ref/ref_fdb.h $(1)/usr/include/qca-ssdk/ref/; \
+	fi
+	if [ -f $(PKG_BUILD_DIR)/include/ref/ref_port_ctrl.h ]; then \
+	$(CP) -rf $(PKG_BUILD_DIR)/include/ref/ref_port_ctrl.h $(1)/usr/include/qca-ssdk/ref/; \
+	fi
+	if [ -f $(PKG_BUILD_DIR)/include/init/ssdk_init.h ]; then \
+	$(CP) -rf $(PKG_BUILD_DIR)/include/init/ssdk_init.h $(1)/usr/include/qca-ssdk/init/; \
+	fi
+	$(CP) -rf $(PKG_BUILD_DIR)/include/fal $(1)/usr/include/qca-ssdk
+	$(CP) -rf $(PKG_BUILD_DIR)/include/common/*.h $(1)/usr/include/qca-ssdk
+	$(CP) -rf $(PKG_BUILD_DIR)/include/sal/os/linux/*.h $(1)/usr/include/qca-ssdk
+	$(CP) -rf $(PKG_BUILD_DIR)/include/sal/os/*.h $(1)/usr/include/qca-ssdk
+
+endef
+
+define KernelPackage/qca-ssdk-nohnat/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/qca-ssdk $(1)/etc/init.d/qca-ssdk
+endef
+
+$(eval $(call KernelPackage,qca-ssdk-nohnat))
--- a/root/package/qca/qca/qca-ssdk/files/qca-ssdk
+++ b/root/package/qca/qca/qca-ssdk/files/qca-ssdk
@ -0,0 +1,206 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2018, 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=16
+
+#!/bin/sh
+ruletype="ip4 ip6"
+side="wan lan"
+qwan="1 3 2 0 5 7 6 4"
+qlan="0 1 2 3 4 5 6 7"
+
+function create_war_acl_rules(){
+	for lw in $side
+	do
+		#echo $lw
+		if [ "$lw" == "wan" ];then
+			listid=254
+			queue=$qwan
+			portmap=0x20
+		else
+			listid=255
+			queue=$qlan
+			portmap=0x1e
+		fi
+		#echo $queue
+		#echo "creating list $listid"
+		ssdk_sh acl list create $listid 255
+		ruleid=0
+		for rt in $ruletype
+		do
+			for qid in $queue
+			do
+				cmd="ssdk_sh acl rule add $listid $ruleid  1 n 0 0"
+				#echo $cmd
+				if [ "$rt" == "ip4" ];then
+					cmd="$cmd ip4 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
+					#echo $cmd
+				else
+					cmd="$cmd ip6 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
+					#echo $cmd
+				fi
+				if [ $ruleid -le 3 ];then
+					#non-zero dscp
+					cmd="$cmd y 0x0 0xff"
+				elif [ $ruleid -le 7 ];then
+					#zero dscp
+					cmd="$cmd n"
+				elif [ $ruleid -le 11 ];then
+					#non-zero dscp
+					cmd="$cmd y 0x0 0xff"
+				else
+					#zero dscp
+					cmd="$cmd n"
+				fi
+				p=$((ruleid/2))
+				cmd="$cmd y mask $((ruleid%2)) 0x1 y mask $((p%2)) 0x1 n n n n n n n n n n n n n n n y n n n n n n n y $qid n n 0 0 n n n n n n n n n n n n n n n n n n n n 0"
+				#echo $cmd
+				$cmd
+				ruleid=`expr $ruleid + 1`
+			done
+		done
+		ssdk_sh acl list bind $listid 0 1 $portmap
+	done
+}
+
+function create_war_cosmap(){
+	ssdk_sh cosmap pri2q set 0 0
+	ssdk_sh cosmap pri2q set 1 0
+	ssdk_sh cosmap pri2q set 2 0
+	ssdk_sh cosmap pri2q set 3 0
+	ssdk_sh cosmap pri2q set 4 1
+	ssdk_sh cosmap pri2q set 5 1
+	ssdk_sh cosmap pri2q set 6 1
+	ssdk_sh cosmap pri2q set 7 1
+	ssdk_sh cosmap pri2ehq set 0 0
+	ssdk_sh cosmap pri2ehq set 1 0
+	ssdk_sh cosmap pri2ehq set 2 0
+	ssdk_sh cosmap pri2ehq set 3 0
+	ssdk_sh cosmap pri2ehq set 4 1
+	ssdk_sh cosmap pri2ehq set 5 1
+	ssdk_sh cosmap pri2ehq set 6 1
+	ssdk_sh cosmap pri2ehq set 7 1
+}
+
+function create_acl_byp_egstp_rules(){
+	ssdk_sh debug module_func set servcode 0xf 0x0 0x0
+	ssdk_sh servcode config set 1 n 0 0xfffefc7f 0xffbdff 0 0 0 0 0 0
+	ssdk_sh debug module_func set servcode 0x0 0x0 0x0
+	ssdk_sh acl list create 56 48
+	ssdk_sh acl rule add 56 0 1 n 0 0 mac n n n n n y 01-80-c2-00-00-00 ff-ff-ff-ff-ff-ff n n n n n n n n n n n n n n n n n n n n n n n y n n n n n n n n n n 0 0 n n n n n n n n n n n n n y n n n n n n n n n n n n y n n n n n n n n n n n n 0
+	ssdk_sh acl rule add 56 1 1 n 0 0 mac n n n n n n n yes 0x8809 0xffff n n n n n n n n n n n n n n n n n n n n n y n n n n n n n n n n 0 0 n n n n n n n n n n n n n y n n n n n n n n n n n n y n n n n n n n n n n n n 0
+	ssdk_sh acl rule add 56 2 1 n 0 0 mac n n n n n n n yes 0x888e 0xffff n n n n n n n n n n n n n n n n n n n n n y n n n n n n n n n n 0 0 n n n n n n n n n n n n n y n n n n n n n n n n n n y n n n n n n n n n n n n 0
+	ssdk_sh acl list bind 56 0 2 1
+}
+
+function delete_war_acl_rules(){
+	for lw in $side
+	do
+		#echo $lw
+		if [ "$lw" == "wan" ];then
+			listid=254
+			queue=$qwan
+			portmap=0x20
+		else
+			listid=255
+			queue=$qlan
+			portmap=0x1e
+		fi
+		ssdk_sh acl list unbind $listid 0 1 $portmap
+		for rt in $ruletype
+		do
+			for qid in $queue
+			do
+				cmd="ssdk_sh acl rule del $listid 0 1"
+				echo $cmd
+				$cmd
+			done
+		done
+		#echo "deleting list $listid"
+		ssdk_sh acl list destroy $listid
+	done
+}
+
+function delete_war_cosmap(){
+	ssdk_sh cosmap pri2q set 0 0
+	ssdk_sh cosmap pri2q set 1 0
+	ssdk_sh cosmap pri2q set 2 1
+	ssdk_sh cosmap pri2q set 3 1
+	ssdk_sh cosmap pri2q set 4 2
+	ssdk_sh cosmap pri2q set 5 2
+	ssdk_sh cosmap pri2q set 6 3
+	ssdk_sh cosmap pri2q set 7 3
+	ssdk_sh cosmap pri2ehq set 0 1
+	ssdk_sh cosmap pri2ehq set 1 0
+	ssdk_sh cosmap pri2ehq set 2 2
+	ssdk_sh cosmap pri2ehq set 3 2
+	ssdk_sh cosmap pri2ehq set 4 3
+	ssdk_sh cosmap pri2ehq set 5 3
+	ssdk_sh cosmap pri2ehq set 6 4
+	ssdk_sh cosmap pri2ehq set 7 5
+}
+
+function delete_acl_byp_egstp_rules(){
+	ssdk_sh debug module_func set servcode 0xf 0x0 0x0
+	ssdk_sh servcode config set 1 n 0 0xfffefcff 0xffbfff 0 0 0 0 0 0
+	ssdk_sh debug module_func set servcode 0x0 0x0 0x0
+	ssdk_sh acl list unbind 56 0 2 1
+	ssdk_sh acl rule del 56 0 1
+	ssdk_sh acl rule del 56 1 1
+	ssdk_sh acl rule del 56 2 1
+	ssdk_sh acl list destroy 56
+}
+
+function edma_war_config_add(){
+	create_war_cosmap
+	ssdk_sh acl status set enable
+	create_war_acl_rules
+}
+
+function edma_war_config_del(){
+	delete_war_acl_rules
+	delete_war_cosmap
+}
+
+start() {
+	chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
+	#The following commands should be uncommented to enable EDMA WAR
+	if [ "$chip_ver" = "0x1401" ]; then
+		#edma_war_config_add
+		echo ''
+	fi
+	#The following commands should be uncommented to add acl egress stp bypass rules
+	if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ]; then
+		#create_acl_byp_egstp_rules
+		echo ''
+	fi
+	echo starting
+}
+
+stop() {
+	chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
+	#The following commands should be uncommented to disable EDMA WAR
+	if [ "$chip_ver" = "0x1401" ]; then
+		#edma_war_config_del
+		echo ''
+	fi
+	#The following commands should be uncommented to delete acl egress stp bypass rules
+	if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ]; then
+		#delete_acl_byp_egstp_rules
+		echo ''
+	fi
+	echo stoping
+}
--- a/root/package/qca/qca/qca-ssdk/patches/0001-SSDK-config-add-kernel-5.10.patch
+++ b/root/package/qca/qca/qca-ssdk/patches/0001-SSDK-config-add-kernel-5.10.patch
@ -0,0 +1,56 @@
+From 472c0c8132784608312c80c4b02c03ea7c132235 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Wed, 12 May 2021 13:41:12 +0200
+Subject: [PATCH] SSDK: config: add kernel 5.10
+
+This is purely to identify it and be able to set
+flags correctly.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ config            | 6 +++++-
+ make/linux_opt.mk | 4 ++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+--- a/config
+++ b/config
+@@ -22,6 +22,10 @@ ifeq ($(KVER),$(filter 5.4%,$(KVER)))
+ OS_VER=5_4
+ endif
+ 
+ifeq ($(KVER),$(filter 5.10%,$(KVER)))
+OS_VER=5_10
+endif
+
+ ifeq ($(KVER), 3.4.0)
+ OS_VER=3_4
+ endif
+@@ -123,7 +127,7 @@ endif
+ endif
+ 
+ ifeq ($(ARCH), arm64)
+-ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4%,$(KVER)))
+ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.10%,$(KVER)))
+   CPU_CFLAG=  -DMODULE -Os -pipe -march=armv8-a -mcpu=cortex-a53+crypto -fno-caller-saves -fno-strict-aliasing -Werror -fno-common -Wno-format-security -Wno-pointer-sign -Wno-unused-but-set-variable -Wno-error=unused-result -mcmodel=large
+ endif
+ endif
+--- a/make/linux_opt.mk
+++ b/make/linux_opt.mk
+@@ -388,7 +388,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
+       KASAN_SHADOW_SCALE_SHIFT := 3
+   endif
+ 
+-  ifeq (5_4, $(OS_VER))
+  ifeq ($(OS_VER),$(filter 5_4 5_10, $(OS_VER)))
+       ifeq ($(ARCH), arm64)
+           KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)
+        endif
+@@ -419,7 +419,7 @@ ifeq (KSLIB, $(MODULE_TYPE))
+ 
+   endif
+ 
+-  ifeq ($(OS_VER),$(filter 4_4 5_4, $(OS_VER)))
+  ifeq ($(OS_VER),$(filter 4_4 5_4 5_10, $(OS_VER)))
+                 MODULE_CFLAG += -DKVER34
+                 MODULE_CFLAG += -DKVER32
+             MODULE_CFLAG += -DLNX26_22
--- a/root/package/qca/qca/qca-ssdk/patches/0002-SSDK-replace-ioremap_nocache-with-ioremap.patch
+++ b/root/package/qca/qca/qca-ssdk/patches/0002-SSDK-replace-ioremap_nocache-with-ioremap.patch
@ -0,0 +1,102 @@
+From 784f2cfdfaf3bdf44917924e157049230a0ef5f8 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Wed, 12 May 2021 13:45:45 +0200
+Subject: [PATCH] SSDK: replace ioremap_nocache with ioremap
+
+ioremap_nocache was dropped upstream, simply use the
+generic variety.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ src/init/ssdk_clk.c  | 10 +++++-----
+ src/init/ssdk_init.c |  2 +-
+ src/init/ssdk_plat.c |  6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/src/init/ssdk_clk.c
+++ b/src/init/ssdk_clk.c
+@@ -623,7 +623,7 @@ ssdk_mp_tcsr_get(a_uint32_t tcsr_offset,
+ {
+ 	void __iomem *tcsr_base = NULL;
+ 
+-	tcsr_base = ioremap_nocache(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
+	tcsr_base = ioremap(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
+ 	if (!tcsr_base)
+ 	{
+ 		SSDK_ERROR("Failed to map tcsr eth address!\n");
+@@ -640,7 +640,7 @@ ssdk_mp_tcsr_set(a_uint32_t tcsr_offset,
+ {
+ 	void __iomem *tcsr_base = NULL;
+ 
+-	tcsr_base = ioremap_nocache(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
+	tcsr_base = ioremap(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
+ 	if (!tcsr_base)
+ 	{
+ 		SSDK_ERROR("Failed to map tcsr eth address!\n");
+@@ -688,7 +688,7 @@ ssdk_mp_cmnblk_stable_check(void)
+ 	a_uint32_t reg_val;
+ 	int i, loops = 20;
+ 
+-	pll_lock = ioremap_nocache(CMN_PLL_LOCKED_ADDR, CMN_PLL_LOCKED_SIZE);
+	pll_lock = ioremap(CMN_PLL_LOCKED_ADDR, CMN_PLL_LOCKED_SIZE);
+ 	if (!pll_lock) {
+ 		SSDK_ERROR("Failed to map CMN PLL LOCK register!\n");
+ 		return A_FALSE;
+@@ -745,7 +745,7 @@ static void ssdk_cmnblk_pll_src_set(enum
+ 	void __iomem *cmn_pll_src_base = NULL;
+ 	a_uint32_t reg_val;
+ 
+-	cmn_pll_src_base = ioremap_nocache(CMN_BLK_PLL_SRC_ADDR, CMN_BLK_SIZE);
+	cmn_pll_src_base = ioremap(CMN_BLK_PLL_SRC_ADDR, CMN_BLK_SIZE);
+ 	if (!cmn_pll_src_base) {
+ 		SSDK_ERROR("Failed to map cmn pll source address!\n");
+ 		return;
+@@ -766,7 +766,7 @@ static void ssdk_cmnblk_init(enum cmnblk
+ 	void __iomem *gcc_pll_base = NULL;
+ 	a_uint32_t reg_val;
+ 
+-	gcc_pll_base = ioremap_nocache(CMN_BLK_ADDR, CMN_BLK_SIZE);
+	gcc_pll_base = ioremap(CMN_BLK_ADDR, CMN_BLK_SIZE);
+ 	if (!gcc_pll_base) {
+ 		SSDK_ERROR("Failed to map gcc pll address!\n");
+ 		return;
+--- a/src/init/ssdk_init.c
+++ b/src/init/ssdk_init.c
+@@ -2770,7 +2770,7 @@ static int ssdk_dess_mac_mode_init(a_uin
+ 							(a_uint8_t *)&reg_value, 4);
+ 			mdelay(10);
+ 			/*softreset psgmii, fixme*/
+-			gcc_addr = ioremap_nocache(0x1812000, 0x200);
+			gcc_addr = ioremap(0x1812000, 0x200);
+ 			if (!gcc_addr) {
+ 				SSDK_ERROR("gcc map fail!\n");
+ 				return 0;
+--- a/src/init/ssdk_plat.c
+++ b/src/init/ssdk_plat.c
+@@ -1312,7 +1312,7 @@ ssdk_plat_init(ssdk_init_cfg *cfg, a_uin
+ 	reg_mode = ssdk_uniphy_reg_access_mode_get(dev_id);
+ 	if(reg_mode == HSL_REG_LOCAL_BUS) {
+ 		ssdk_uniphy_reg_map_info_get(dev_id, &map);
+-		qca_phy_priv_global[dev_id]->uniphy_hw_addr = ioremap_nocache(map.base_addr,
+		qca_phy_priv_global[dev_id]->uniphy_hw_addr = ioremap(map.base_addr,
+ 									map.size);
+ 		if (!qca_phy_priv_global[dev_id]->uniphy_hw_addr) {
+ 			SSDK_ERROR("%s ioremap fail.", __func__);
+@@ -1327,7 +1327,7 @@ ssdk_plat_init(ssdk_init_cfg *cfg, a_uin
+ 	reg_mode = ssdk_switch_reg_access_mode_get(dev_id);
+ 	if(reg_mode == HSL_REG_LOCAL_BUS) {
+ 		ssdk_switch_reg_map_info_get(dev_id, &map);
+-		qca_phy_priv_global[dev_id]->hw_addr = ioremap_nocache(map.base_addr,
+		qca_phy_priv_global[dev_id]->hw_addr = ioremap(map.base_addr,
+ 								map.size);
+ 		if (!qca_phy_priv_global[dev_id]->hw_addr) {
+ 			SSDK_ERROR("%s ioremap fail.", __func__);
+@@ -1358,7 +1358,7 @@ ssdk_plat_init(ssdk_init_cfg *cfg, a_uin
+ 			return -1;
+ 		}
+ 
+-		qca_phy_priv_global[dev_id]->psgmii_hw_addr = ioremap_nocache(map.base_addr,
+		qca_phy_priv_global[dev_id]->psgmii_hw_addr = ioremap(map.base_addr,
+ 								map.size);
+ 		if (!qca_phy_priv_global[dev_id]->psgmii_hw_addr) {
+ 			SSDK_ERROR("%s ioremap fail.", __func__);
--- a/root/package/qca/qca/qca-ssdk/patches/0003-add-aquantia-phy-id-113CB0-0x31c31C12.patch
+++ b/root/package/qca/qca/qca-ssdk/patches/0003-add-aquantia-phy-id-113CB0-0x31c31C12.patch
@ -0,0 +1,44 @@
+From 440ab349813e5aa9dbeddab4d82ab64ff5347c5f Mon Sep 17 00:00:00 2001
+From: Dirk Buchwalder <buchwalder@posteo.de>
+Date: Sat, 30 Oct 2021 19:51:06 +0200
+Subject: [PATCH] add aquantia phy id 113CB0 / 0x31c31C12
+
+This adds support for the AQR113C with the id 
+"113CB0 / 0x31c31C12" to the ssdk.
+
+This is used in the QNAP 301w
+
+Signed-off-by: Dirk Buchwalder <buchwalder@posteo.de>
+
+---
+ include/hsl/phy/hsl_phy.h | 1 +
+ src/hsl/phy/hsl_phy.c     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/include/hsl/phy/hsl_phy.h b/include/hsl/phy/hsl_phy.h
+index 4621e725..7551574a 100755
+--- a/include/hsl/phy/hsl_phy.h
+++ b/include/hsl/phy/hsl_phy.h
+@@ -579,6 +579,7 @@ typedef struct {
+ #define AQUANTIA_PHY_112        0x03a1b660
+ #define AQUANTIA_PHY_113C_A0    0x31c31C10
+ #define AQUANTIA_PHY_113C_A1    0x31c31C11
+#define AQUANTIA_PHY_113CB0     0x31c31C12
+ #define AQUANTIA_PHY_112C       0x03a1b792
+ 
+ #define PHY_805XV2              0x004DD082
+diff --git a/src/hsl/phy/hsl_phy.c b/src/hsl/phy/hsl_phy.c
+index 5866a522..02e6aeea 100755
+--- a/src/hsl/phy/hsl_phy.c
+++ b/src/hsl/phy/hsl_phy.c
+@@ -235,6 +235,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_uint32_t dev_id, a_uint32_t phy_id)
+ 		case AQUANTIA_PHY_112:
+ 		case AQUANTIA_PHY_113C_A0:
+ 		case AQUANTIA_PHY_113C_A1:
+		case AQUANTIA_PHY_113CB0:
+ 		case AQUANTIA_PHY_112C:
+ 			phytype = AQUANTIA_PHY_CHIP;
+ 			break;
+-- 
+2.31.1
+
--- a/root/package/qca/qca/qca-ssdk/patches/0004-platform-use-of_mdio_find_bus-to-get-MDIO-bus.patch
+++ b/root/package/qca/qca/qca-ssdk/patches/0004-platform-use-of_mdio_find_bus-to-get-MDIO-bus.patch
@ -0,0 +1,40 @@
+From b6190ca46287d01a895c7cc14de30410c09ff1b8 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Wed, 12 May 2021 17:15:46 +0200
+Subject: [PATCH] SSDK: platform: use of_mdio_find_bus() to get MDIO bus
+
+Kernel has a generic of_mdio_find_bus() which can get the appropriate
+MDIO bus based on the DT node.
+So, drop the getting MDIO from platform data, which no longer works
+in 5.4 and later and use of_mdio_find_bus().
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ src/init/ssdk_plat.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+--- a/src/init/ssdk_plat.c
+++ b/src/init/ssdk_plat.c
+@@ -551,7 +551,6 @@ static int miibus_get(a_uint32_t dev_id)
+ 	struct device_node *mdio_node = NULL;
+ 	struct device_node *switch_node = NULL;
+ 	struct platform_device *mdio_plat = NULL;
+-	struct ipq40xx_mdio_data *mdio_data = NULL;
+ 	struct qca_phy_priv *priv;
+ 	hsl_reg_mode reg_mode = HSL_REG_LOCAL_BUS;
+ 	priv = qca_phy_priv_global[dev_id];
+@@ -584,12 +583,7 @@ static int miibus_get(a_uint32_t dev_id)
+ 
+ 	if(reg_mode == HSL_REG_LOCAL_BUS)
+ 	{
+-		mdio_data = dev_get_drvdata(&mdio_plat->dev);
+-		if (!mdio_data) {
+-			SSDK_ERROR("cannot get mdio_data reference from device data\n");
+-			return 1;
+-		}
+-		priv->miibus = mdio_data->mii_bus;
+		priv->miibus = of_mdio_find_bus(mdio_node);
+ 	}
+ 	else
+ 		priv->miibus = dev_get_drvdata(&mdio_plat->dev);
--- a/root/package/qca/qca/qca-ssdk/patches/0005-SSDK-dts-fix-of_get_mac_address.patch
+++ b/root/package/qca/qca/qca-ssdk/patches/0005-SSDK-dts-fix-of_get_mac_address.patch
@ -0,0 +1,47 @@
+From f3a7b93137c1a6a1b8010b86296242178eed5d9e Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 13 Aug 2021 20:03:21 +0200
+Subject: [PATCH] SSDK: dts: fix of_get_mac_address()
+
+Recently OpenWrt backported the updated of_get_mac_address()
+function which returns and error code instead.
+
+So, patch the SSDK to use it and fix the compilation error.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ src/init/ssdk_dts.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/init/ssdk_dts.c b/src/init/ssdk_dts.c
+index 21804970..257bbf71 100644
+--- a/src/init/ssdk_dts.c
+++ b/src/init/ssdk_dts.c
+@@ -779,8 +779,9 @@ static void ssdk_dt_parse_intf_mac(void)
+ {
+ 	struct device_node *dp_node = NULL;
+ 	a_uint32_t dp = 0;
+-	a_uint8_t *maddr = NULL;
+	u8 maddr[ETH_ALEN];
+ 	char dp_name[8] = {0};
+	int ret;
+ 
+ 	for (dp = 1; dp <= SSDK_MAX_NR_ETH; dp++) {
+ 		snprintf(dp_name, sizeof(dp_name), "dp%d", dp);
+@@ -788,11 +789,11 @@ static void ssdk_dt_parse_intf_mac(void)
+ 		if (!dp_node) {
+ 			continue;
+ 		}
+-		maddr = (a_uint8_t *)of_get_mac_address(dp_node);
+		ret = of_get_mac_address(dp_node, maddr);
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
+ 		if (maddr && is_valid_ether_addr(maddr)) {
+ #else
+-		if (!IS_ERR(maddr) && is_valid_ether_addr(maddr)) {
+		if (!ret && is_valid_ether_addr(maddr)) {
+ #endif
+ 			ssdk_dt_global.num_intf_mac++;
+ 			ether_addr_copy(ssdk_dt_global.intf_mac[dp-1].uc, maddr);
+-- 
+2.31.1
+
--- a/root/target/linux/ipq60xx/Makefile
+++ b/root/target/linux/ipq60xx/Makefile
--- a/root/target/linux/ipq60xx/base-files/etc/board.d/01_leds
+++ b/root/target/linux/ipq60xx/base-files/etc/board.d/01_leds
--- a/root/target/linux/ipq60xx/base-files/etc/board.d/02_network
+++ b/root/target/linux/ipq60xx/base-files/etc/board.d/02_network
--- a/root/target/linux/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
+++ b/root/target/linux/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
--- a/root/target/linux/ipq60xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq60xx/base-files/lib/upgrade/platform.sh
--- a/root/target/linux/ipq60xx/config-5.10
+++ b/root/target/linux/ipq60xx/config-5.10
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-cp03-cpu.dtsi
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-cp03-cpu.dtsi
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-cpr-regulator.dtsi
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-cpr-regulator.dtsi
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-l6018.dts
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-l6018.dts
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cpr-regulator.dtsi
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cpr-regulator.dtsi
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-gl-ax1800.dts
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-gl-ax1800.dts
--- a/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-rpm-regulator.dtsi
+++ b/root/target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-rpm-regulator.dtsi
--- a/root/target/linux/ipq60xx/files/drivers/hwmon/emc2305.c
+++ b/root/target/linux/ipq60xx/files/drivers/hwmon/emc2305.c
--- a/root/target/linux/ipq60xx/generic/target.mk
+++ b/root/target/linux/ipq60xx/generic/target.mk
--- a/root/target/linux/ipq60xx/image/Makefile
+++ b/root/target/linux/ipq60xx/image/Makefile
--- a/root/target/linux/ipq60xx/image/generic.mk
+++ b/root/target/linux/ipq60xx/image/generic.mk
--- a/root/target/linux/ipq60xx/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch
--- a/root/target/linux/ipq60xx/patches-5.10/002-v5.11-remoteproc-qcom-q6v5-Query-sysmon-before-graceful-sh.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/002-v5.11-remoteproc-qcom-q6v5-Query-sysmon-before-graceful-sh.patch
--- a/root/target/linux/ipq60xx/patches-5.10/003-v5.13-remoteproc-qcom-wcss-populate-hardcoded-param-using-.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/003-v5.13-remoteproc-qcom-wcss-populate-hardcoded-param-using-.patch
--- a/root/target/linux/ipq60xx/patches-5.10/004-v5.13-remoteproc-qcom-wcss-Add-non-pas-wcss-Q6-support-for.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/004-v5.13-remoteproc-qcom-wcss-Add-non-pas-wcss-Q6-support-for.patch
--- a/root/target/linux/ipq60xx/patches-5.10/005-v5.13-remoteproc-qcom-wcss-explicitly-request-exclusive-re.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/005-v5.13-remoteproc-qcom-wcss-explicitly-request-exclusive-re.patch
--- a/root/target/linux/ipq60xx/patches-5.10/006-v5.13-remoteproc-qcom-wcss-Fix-return-value-check-in-q6v5_.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/006-v5.13-remoteproc-qcom-wcss-Fix-return-value-check-in-q6v5_.patch
--- a/root/target/linux/ipq60xx/patches-5.10/007-v5.13-remoteproc-qcom-wcss-Fix-wrong-pointer-passed-to-PTR.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/007-v5.13-remoteproc-qcom-wcss-Fix-wrong-pointer-passed-to-PTR.patch
--- a/root/target/linux/ipq60xx/patches-5.10/008-v5.13-remoteproc-qcom-wcss-Remove-unnecessary-PTR_ERR.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/008-v5.13-remoteproc-qcom-wcss-Remove-unnecessary-PTR_ERR.patch
--- a/root/target/linux/ipq60xx/patches-5.10/009-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/009-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch
--- a/root/target/linux/ipq60xx/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch
--- a/root/target/linux/ipq60xx/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch
--- a/root/target/linux/ipq60xx/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch
--- a/root/target/linux/ipq60xx/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch
--- a/root/target/linux/ipq60xx/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch
--- a/root/target/linux/ipq60xx/patches-5.10/100-clk-qcom-ipq8074-fix-PCI-E-clock-oops.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/100-clk-qcom-ipq8074-fix-PCI-E-clock-oops.patch
--- a/root/target/linux/ipq60xx/patches-5.10/101-arm64-dts-ipq8074-add-crypto-nodes.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/101-arm64-dts-ipq8074-add-crypto-nodes.patch
--- a/root/target/linux/ipq60xx/patches-5.10/102-arm64-dts-ipq8074-add-PRNG-node.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/102-arm64-dts-ipq8074-add-PRNG-node.patch
--- a/root/target/linux/ipq60xx/patches-5.10/103-remoteproc-qcom-Add-PRNG-proxy-clock.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/103-remoteproc-qcom-Add-PRNG-proxy-clock.patch
--- a/root/target/linux/ipq60xx/patches-5.10/104-remoteproc-qcom-Add-secure-PIL-support.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/104-remoteproc-qcom-Add-secure-PIL-support.patch
--- a/root/target/linux/ipq60xx/patches-5.10/105-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/105-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
--- a/root/target/linux/ipq60xx/patches-5.10/106-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/106-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
--- a/root/target/linux/ipq60xx/patches-5.10/107-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/107-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
--- a/root/target/linux/ipq60xx/patches-5.10/108-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/108-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
--- a/root/target/linux/ipq60xx/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch
--- a/root/target/linux/ipq60xx/patches-5.10/110-arm64-dts-Add-support-for-scm-on-IPQ8074-SoCs.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/110-arm64-dts-Add-support-for-scm-on-IPQ8074-SoCs.patch
--- a/root/target/linux/ipq60xx/patches-5.10/111-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/111-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
--- a/root/target/linux/ipq60xx/patches-5.10/112-qcom-socinfo-Add-IPQ8074-SoC-family-ID-s.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/112-qcom-socinfo-Add-IPQ8074-SoC-family-ID-s.patch
--- a/root/target/linux/ipq60xx/patches-5.10/113-net-mdio-ipq4019-add-clock-handling.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/113-net-mdio-ipq4019-add-clock-handling.patch
--- a/root/target/linux/ipq60xx/patches-5.10/114-arm64-dts-ipq8074-Add-MDIO-support.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/114-arm64-dts-ipq8074-Add-MDIO-support.patch
--- a/root/target/linux/ipq60xx/patches-5.10/115-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/115-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch
--- a/root/target/linux/ipq60xx/patches-5.10/116-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/116-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
--- a/root/target/linux/ipq60xx/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch
--- a/root/target/linux/ipq60xx/patches-5.10/118-arm64-dts-ipq8074-Fixup-PCIe-dts-nodes.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/118-arm64-dts-ipq8074-Fixup-PCIe-dts-nodes.patch
--- a/root/target/linux/ipq60xx/patches-5.10/119-qcom-backport-register-define.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/119-qcom-backport-register-define.patch
--- a/root/target/linux/ipq60xx/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch
--- a/root/target/linux/ipq60xx/patches-5.10/122-arm64-uaccess-include-scheduler.h.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/122-arm64-uaccess-include-scheduler.h.patch
--- a/root/target/linux/ipq60xx/patches-5.10/123-arm64-dts-ipq8074-add-networking-nodes.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/123-arm64-dts-ipq8074-add-networking-nodes.patch
--- a/root/target/linux/ipq60xx/patches-5.10/124-clk-ipq-support-for-resetting-multiple-bits.patch
+++ b/root/target/linux/ipq60xx/patches-5.10/124-clk-ipq-support-for-resetting-multiple-bits.patch
--- a/Show more
+++ b/Show more