diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile index 6843e70..d410ffa 100644 --- a/qca/qca-nss-drv/Makefile +++ b/qca/qca-nss-drv/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-06-09 -PKG_SOURCE_VERSION:=22b485ac89a3a1b60f3a6d5b2fe3236d170934b9 -PKG_MIRROR_HASH:=ef94ba959cde4bd56d1bc4ffbbc5d91fb9a7766cd7096dc1538127e73bbae89a +PKG_SOURCE_DATE:=2022-03-07 +PKG_SOURCE_VERSION:=397c88cf184e0eb011dd44ad82c2dfae60ece1b4 +PKG_MIRROR_HASH:=a3bea305d85fcec3d77f9b40d06a71b65ccf3d8b98018d9c8c23d6ad95e6aedc PKG_BUILD_PARALLEL:=1 diff --git a/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch b/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch index 7715575..89d650b 100644 --- a/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch +++ b/qca/qca-nss-drv/patches/0002-nss-drv-replace-ioremap_nocache-with-ioremap.patch @@ -1,7 +1,7 @@ -From b5e2a7167ca3df9fce34f0d7c05468d4f5597275 Mon Sep 17 00:00:00 2001 +From 0cffa7bb366a4e0ff5665d6fc2fa33c1437cb397 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Thu, 13 May 2021 23:33:18 +0200 -Subject: [PATCH] nss-drv: replace ioremap_nocache() with ioremap() +Subject: [PATCH 2/8] nss-drv: replace ioremap_nocache() with ioremap() ioremap_nocache() does not exist anymore. @@ -16,9 +16,11 @@ Signed-off-by: Robert Marko nss_ppe.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) +diff --git a/nss_hal/ipq50xx/nss_hal_pvt.c b/nss_hal/ipq50xx/nss_hal_pvt.c +index 3d6dfd0..e3e4bd2 100644 --- a/nss_hal/ipq50xx/nss_hal_pvt.c +++ b/nss_hal/ipq50xx/nss_hal_pvt.c -@@ -184,13 +184,13 @@ static struct nss_platform_data *__nss_h +@@ -184,13 +184,13 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->nphys = res_nphys.start; npd->qgic_phys = res_qgic_phys.start; @@ -34,7 +36,7 @@ Signed-off-by: Robert Marko 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 +@@ -348,7 +348,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) of_node_put(cmn); @@ -43,9 +45,11 @@ Signed-off-by: Robert Marko if (!nss_misc_reset) { pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev); return -EFAULT; +diff --git a/nss_hal/ipq60xx/nss_hal_pvt.c b/nss_hal/ipq60xx/nss_hal_pvt.c +index 4c84cb9..e76ef6d 100644 --- a/nss_hal/ipq60xx/nss_hal_pvt.c +++ b/nss_hal/ipq60xx/nss_hal_pvt.c -@@ -207,13 +207,13 @@ static struct nss_platform_data *__nss_h +@@ -207,13 +207,13 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->nphys = res_nphys.start; npd->qgic_phys = res_qgic_phys.start; @@ -61,7 +65,7 @@ Signed-off-by: Robert Marko 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 +@@ -433,13 +433,13 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) of_node_put(cmn); @@ -77,9 +81,11 @@ Signed-off-by: Robert Marko if (!nss_misc_reset_flag) { pr_err("%px: ioremap fail for nss_misc_reset_flag\n", nss_dev); return -EFAULT; +diff --git a/nss_hal/ipq806x/nss_hal_pvt.c b/nss_hal/ipq806x/nss_hal_pvt.c +index b8733e0..52d63b0 100644 --- a/nss_hal/ipq806x/nss_hal_pvt.c +++ b/nss_hal/ipq806x/nss_hal_pvt.c -@@ -458,7 +458,7 @@ static struct nss_platform_data *__nss_h +@@ -458,7 +458,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->nphys = res_nphys.start; npd->vphys = res_vphys.start; @@ -88,7 +94,7 @@ Signed-off-by: Robert Marko 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 +@@ -711,7 +711,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) } of_node_put(cmn); @@ -97,9 +103,11 @@ Signed-off-by: Robert Marko if (!fpb_base) { pr_err("%px: ioremap fail for nss_fpb_base\n", nss_dev); return -EFAULT; +diff --git a/nss_hal/ipq807x/nss_hal_pvt.c b/nss_hal/ipq807x/nss_hal_pvt.c +index b95a23c..bb8f42f 100644 --- a/nss_hal/ipq807x/nss_hal_pvt.c +++ b/nss_hal/ipq807x/nss_hal_pvt.c -@@ -234,7 +234,7 @@ static struct nss_platform_data *__nss_h +@@ -234,7 +234,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->vphys = res_vphys.start; npd->qgic_phys = res_qgic_phys.start; @@ -108,7 +116,7 @@ Signed-off-by: Robert Marko 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 +@@ -247,7 +247,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * goto out; } @@ -117,7 +125,7 @@ Signed-off-by: Robert Marko 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 +@@ -467,7 +467,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) } of_node_put(cmn); @@ -126,9 +134,11 @@ Signed-off-by: Robert Marko if (!nss_misc_reset) { pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev); return -EFAULT; +diff --git a/nss_hal/nss_hal.c b/nss_hal/nss_hal.c +index d58bb57..57974c1 100644 --- a/nss_hal/nss_hal.c +++ b/nss_hal/nss_hal.c -@@ -78,9 +78,9 @@ int nss_hal_firmware_load(struct nss_ctx +@@ -78,9 +78,9 @@ int nss_hal_firmware_load(struct nss_ctx_instance *nss_ctx, struct platform_devi return rc; } @@ -140,9 +150,11 @@ Signed-off-by: Robert Marko release_firmware(nss_fw); return rc; } +diff --git a/nss_meminfo.c b/nss_meminfo.c +index e24e6be..2255eae 100644 --- a/nss_meminfo.c +++ b/nss_meminfo.c -@@ -728,7 +728,7 @@ bool nss_meminfo_init(struct nss_ctx_ins +@@ -728,7 +728,7 @@ bool nss_meminfo_init(struct nss_ctx_instance *nss_ctx) /* * meminfo_start is the label where the start address of meminfo map is stored. */ @@ -151,6 +163,8 @@ Signed-off-by: Robert Marko NSS_MEMINFO_RESERVE_AREA_SIZE); if (!meminfo_start) { nss_info_always("%px: cannot remap meminfo start\n", nss_ctx); +diff --git a/nss_ppe.c b/nss_ppe.c +index 46ce217..644fc98 100644 --- a/nss_ppe.c +++ b/nss_ppe.c @@ -357,7 +357,7 @@ void nss_ppe_init(void) @@ -162,3 +176,6 @@ Signed-off-by: Robert Marko if (!ppe_pvt.ppe_base) { nss_warning("DRV can't get PPE base address\n"); return; +-- +2.34.1 +