From 0f039195d03a972fa9e1eb0df6b773b19c36d99a Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 17 Jun 2024 15:10:08 +0800 Subject: [PATCH] qualcommax: ipq807x: fix IPQ807x devices NSS build and nss-firmware --- package/qca/nss-firmware/Makefile | 2 +- ...-arm64-dts-ipq8074-add-reserved-memory-nodes.patch | 2 +- .../0603-1-qca-nss-clients-add-qdisc-support.patch | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/qca/nss-firmware/Makefile b/package/qca/nss-firmware/Makefile index b4d6f46ae..1b686174a 100644 --- a/package/qca/nss-firmware/Makefile +++ b/package/qca/nss-firmware/Makefile @@ -43,7 +43,7 @@ endef define Package/nss-firmware-ipq8074 $(Package/nss-firmware-default) TITLE:=NSS firmware for IPQ8074 devices - NSS_ARCHIVE:=$(VERSION_PATH)/IPQ8074.ATH.12.0.0/BIN-NSS.FW.12.0.r1-002-HK.R.tar.bz2 + NSS_ARCHIVE:=$(VERSION_PATH)/IPQ8074.ATH.12.0.0/BIN-NSS.FW.12.1-022-HK.R.tar.bz2 endef define Build/Compile diff --git a/target/linux/qualcommax/patches-6.1/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch b/target/linux/qualcommax/patches-6.1/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch index 3996d15d9..8fe58e798 100644 --- a/target/linux/qualcommax/patches-6.1/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch +++ b/target/linux/qualcommax/patches-6.1/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch @@ -23,7 +23,7 @@ Signed-off-by: Robert Marko #size-cells = <2>; ranges; -+ nss@40000000 { ++ nss_region: nss@40000000 { + no-map; + reg = <0x0 0x40000000 0x0 0x01000000>; + }; diff --git a/target/linux/qualcommax/patches-6.1/0603-1-qca-nss-clients-add-qdisc-support.patch b/target/linux/qualcommax/patches-6.1/0603-1-qca-nss-clients-add-qdisc-support.patch index 7b778ca46..81b51d033 100644 --- a/target/linux/qualcommax/patches-6.1/0603-1-qca-nss-clients-add-qdisc-support.patch +++ b/target/linux/qualcommax/patches-6.1/0603-1-qca-nss-clients-add-qdisc-support.patch @@ -1,13 +1,16 @@ --- a/include/linux/timer.h +++ b/include/linux/timer.h -@@ -17,6 +17,7 @@ struct timer_list { +@@ -17,10 +17,7 @@ unsigned long expires; void (*function)(struct timer_list *); u32 flags; -+ unsigned long cust_data; - - #ifdef CONFIG_SHORTCUT_FE +- +-#ifdef CONFIG_SHORTCUT_FE unsigned long cust_data; +-#endif + + #ifdef CONFIG_LOCKDEP + struct lockdep_map lockdep_map; --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -151,6 +151,31 @@ resched: