From c109a1b1582fe3e4dcdf928d76301cf7d002dcb3 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 5 Jul 2023 09:26:22 +0200 Subject: [PATCH] Fix qnap 301w with kernel 6.1 compilation --- .../0016-replace-random-ether-addr.patch | 11 ---- .../qca-nss-dp/patches/0017-Makefile.patch | 9 --- .../patches/0018-fixes-for-6.1.patch | 12 ---- .../0012-SSDK-config-add-kernel-6.1.patch | 56 ------------------- .../qca-ssdk/patches/0014-fixes-for-6.1.patch | 12 ---- config-qnap-301w | 6 +- 6 files changed, 3 insertions(+), 103 deletions(-) delete mode 100644 6.1/package/kernel/qca-nss-dp/patches/0016-replace-random-ether-addr.patch delete mode 100644 6.1/package/kernel/qca-nss-dp/patches/0017-Makefile.patch delete mode 100644 6.1/package/kernel/qca-nss-dp/patches/0018-fixes-for-6.1.patch delete mode 100644 6.1/package/kernel/qca-ssdk/patches/0012-SSDK-config-add-kernel-6.1.patch delete mode 100644 6.1/package/kernel/qca-ssdk/patches/0014-fixes-for-6.1.patch diff --git a/6.1/package/kernel/qca-nss-dp/patches/0016-replace-random-ether-addr.patch b/6.1/package/kernel/qca-nss-dp/patches/0016-replace-random-ether-addr.patch deleted file mode 100644 index 790825b4..00000000 --- a/6.1/package/kernel/qca-nss-dp/patches/0016-replace-random-ether-addr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/nss_dp_main.c 2023-04-19 13:59:34.762040822 +0200 -+++ b/nss_dp_main.c 2023-04-19 13:59:50.057767685 +0200 -@@ -601,7 +601,7 @@ - if (!ret && is_valid_ether_addr(maddr)) { - ether_addr_copy(netdev->dev_addr, maddr); - } else { -- random_ether_addr(netdev->dev_addr); -+ eth_random_addr(netdev->dev_addr); - pr_info("GMAC%d(%px) Invalid MAC@ - using %pM\n", dp_priv->macid, - dp_priv, netdev->dev_addr); - } diff --git a/6.1/package/kernel/qca-nss-dp/patches/0017-Makefile.patch b/6.1/package/kernel/qca-nss-dp/patches/0017-Makefile.patch deleted file mode 100644 index b2c1a0bb..00000000 --- a/6.1/package/kernel/qca-nss-dp/patches/0017-Makefile.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/Makefile 2023-04-19 14:17:15.575068565 +0200 -+++ b/Makefile 2023-04-19 14:17:28.166843041 +0200 -@@ -64,5 +64,5 @@ - endif - - ccflags-y += $(NSS_DP_INCLUDE) --ccflags-y += -Wall -Werror -+ccflags-y += -Wall - ccflags-y += -DEDMA_DEBUG_LEVEL=2 diff --git a/6.1/package/kernel/qca-nss-dp/patches/0018-fixes-for-6.1.patch b/6.1/package/kernel/qca-nss-dp/patches/0018-fixes-for-6.1.patch deleted file mode 100644 index 7c181c8b..00000000 --- a/6.1/package/kernel/qca-nss-dp/patches/0018-fixes-for-6.1.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c 2023-04-19 14:29:23.502166413 +0200 -+++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c 2023-04-19 14:29:35.865951285 +0200 -@@ -838,8 +838,7 @@ - * NAPI add - */ - if (!edma_hw.napi_added) { -- netif_napi_add(netdev, &edma_hw.napi, edma_napi, -- NAPI_POLL_WEIGHT); -+ netif_napi_add(netdev, &edma_hw.napi, edma_napi); - /* - * Register the interrupt handlers and enable interrupts - */ diff --git a/6.1/package/kernel/qca-ssdk/patches/0012-SSDK-config-add-kernel-6.1.patch b/6.1/package/kernel/qca-ssdk/patches/0012-SSDK-config-add-kernel-6.1.patch deleted file mode 100644 index d80c3f27..00000000 --- a/6.1/package/kernel/qca-ssdk/patches/0012-SSDK-config-add-kernel-6.1.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0c509f8d8e5a6a03933a112d4487fd1c005442d6 Mon Sep 17 00:00:00 2001 -From: Robert Marko -Date: Fri, 24 Dec 2021 19:39:02 +0100 -Subject: [PATCH 05/11] SSDK: config: add kernel 6.1 - -This is purely to identify it and be able to set -flags correctly. - -Signed-off-by: Robert Marko ---- - config | 6 +++++- - make/linux_opt.mk | 4 ++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - ---- a/config -+++ b/config -@@ -28,6 +28,10 @@ ifeq ($(KVER),$(filter 5.15%,$(KVER))) - OS_VER=5_15 - endif - -+ifeq ($(KVER),$(filter 6.1%,$(KVER))) -+OS_VER=6_1 -+endif -+ - ifeq ($(KVER), 3.4.0) - OS_VER=3_4 - endif -@@ -140,7 +144,7 @@ - endif - - ifeq ($(ARCH), arm64) -- ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.10% 5.15%,$(KVER))) -+ ifeq ($(KVER),$(filter 4.1% 4.4% 4.9% 5.4% 5.10% 5.15% 6.1%,$(KVER))) - CPU_CFLAG= -DMODULE -Os -pipe -march=armv8-a -mcpu=cortex-a53+crypto -fno-caller-saves -fno-strict-aliasing -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 -@@ -437,7 +437,7 @@ ifeq (KSLIB, $(MODULE_TYPE)) - KASAN_SHADOW_SCALE_SHIFT := 3 - endif - -- ifeq ($(OS_VER),$(filter 5_4 5_10 5_15, $(OS_VER))) -+ ifeq ($(OS_VER),$(filter 5_4 5_10 5_15 6_1, $(OS_VER))) - ifeq ($(ARCH), arm64) - KASAN_OPTION += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) - endif -@@ -468,7 +468,7 @@ ifeq (KSLIB, $(MODULE_TYPE)) - - endif - -- ifeq ($(OS_VER),$(filter 4_4 5_4 5_10 5_15, $(OS_VER))) -+ ifeq ($(OS_VER),$(filter 4_4 5_4 5_10 5_15 6_1, $(OS_VER))) - MODULE_CFLAG += -DKVER34 - MODULE_CFLAG += -DKVER32 - MODULE_CFLAG += -DLNX26_22 diff --git a/6.1/package/kernel/qca-ssdk/patches/0014-fixes-for-6.1.patch b/6.1/package/kernel/qca-ssdk/patches/0014-fixes-for-6.1.patch deleted file mode 100644 index e153a1ac..00000000 --- a/6.1/package/kernel/qca-ssdk/patches/0014-fixes-for-6.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurN src2/hsl/phy/qca808x_phy.c src/hsl/phy/qca808x_phy.c ---- a/src/hsl/phy/qca808x_phy.c 2023-04-18 20:11:11.095219045 +0200 -+++ b/src/hsl/phy/qca808x_phy.c 2023-04-18 20:15:18.570795360 +0200 -@@ -299,7 +299,7 @@ - phy_data = qca808x_phy_debug_read(dev_id, phy_id, - QCA808X_DEBUG_LOCAL_SEED); - phy_data &= ~(QCA808X_MASTER_SLAVE_SEED_CFG); -- phy_data |= (prandom_u32()%QCA808X_MASTER_SLAVE_SEED_RANGE) << 2; -+ phy_data |= (get_random_u32()%QCA808X_MASTER_SLAVE_SEED_RANGE) << 2; - SSDK_DEBUG("QCA808X_DEBUG_LOCAL_SEED:%x\n", phy_data); - rv = qca808x_phy_debug_write(dev_id, phy_id, - QCA808X_DEBUG_LOCAL_SEED, phy_data); diff --git a/config-qnap-301w b/config-qnap-301w index 01a08524..cd2185f5 100644 --- a/config-qnap-301w +++ b/config-qnap-301w @@ -1,5 +1,5 @@ -CONFIG_TARGET_ipq807x=y -CONFIG_TARGET_ipq807x_generic=y -CONFIG_TARGET_ipq807x_generic_DEVICE_qnap_301w=y +CONFIG_TARGET_qualcommax=y +CONFIG_TARGET_qualcommax_ipq807x=y +CONFIG_TARGET_qualcommax_ipq807x_DEVICE_qnap_301w=y CONFIG_KERNEL_ARM64_MODULE_PLTS=y CONFIG_KERNEL_TCP_CONG_BBR2=y