From 0cffa7bb366a4e0ff5665d6fc2fa33c1437cb397 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Thu, 13 May 2021 23:33:18 +0200 Subject: [PATCH 2/8] nss-drv: replace ioremap_nocache() with ioremap() ioremap_nocache() does not exist anymore. Signed-off-by: Robert Marko --- nss_hal/ipq50xx/nss_hal_pvt.c | 6 +++--- nss_hal/ipq60xx/nss_hal_pvt.c | 8 ++++---- nss_hal/ipq806x/nss_hal_pvt.c | 4 ++-- nss_hal/ipq807x/nss_hal_pvt.c | 6 +++--- nss_hal/nss_hal.c | 4 ++-- nss_meminfo.c | 2 +- nss_ppe.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nss_hal/ipq50xx/nss_hal_pvt.c b/nss_hal/ipq50xx/nss_hal_pvt.c index 3d6dfd0..e3e4bd2 100644 --- a/nss_hal/ipq50xx/nss_hal_pvt.c +++ b/nss_hal/ipq50xx/nss_hal_pvt.c @@ -184,13 +184,13 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->nphys = res_nphys.start; npd->qgic_phys = res_qgic_phys.start; - npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys)); + npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys)); if (!npd->nmap) { nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id); goto out; } - npd->qgic_map = ioremap_nocache(npd->qgic_phys, resource_size(&res_qgic_phys)); + npd->qgic_map = ioremap(npd->qgic_phys, resource_size(&res_qgic_phys)); if (!npd->qgic_map) { nss_info_always("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id); goto out; @@ -348,7 +348,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) of_node_put(cmn); - nss_misc_reset = ioremap_nocache(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset)); + nss_misc_reset = ioremap(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset)); if (!nss_misc_reset) { pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev); return -EFAULT; diff --git a/nss_hal/ipq60xx/nss_hal_pvt.c b/nss_hal/ipq60xx/nss_hal_pvt.c index 4c84cb9..e76ef6d 100644 --- a/nss_hal/ipq60xx/nss_hal_pvt.c +++ b/nss_hal/ipq60xx/nss_hal_pvt.c @@ -207,13 +207,13 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->nphys = res_nphys.start; npd->qgic_phys = res_qgic_phys.start; - npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys)); + npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys)); if (!npd->nmap) { nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id); goto out; } - npd->qgic_map = ioremap_nocache(npd->qgic_phys, resource_size(&res_qgic_phys)); + npd->qgic_map = ioremap(npd->qgic_phys, resource_size(&res_qgic_phys)); if (!npd->qgic_map) { nss_info_always("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id); goto out; @@ -433,13 +433,13 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) of_node_put(cmn); - nss_misc_reset = ioremap_nocache(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset)); + nss_misc_reset = ioremap(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset)); if (!nss_misc_reset) { pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev); return -EFAULT; } - nss_misc_reset_flag = ioremap_nocache(res_nss_misc_reset_flag.start, resource_size(&res_nss_misc_reset_flag)); + nss_misc_reset_flag = ioremap(res_nss_misc_reset_flag.start, resource_size(&res_nss_misc_reset_flag)); if (!nss_misc_reset_flag) { pr_err("%px: ioremap fail for nss_misc_reset_flag\n", nss_dev); return -EFAULT; diff --git a/nss_hal/ipq806x/nss_hal_pvt.c b/nss_hal/ipq806x/nss_hal_pvt.c index b8733e0..52d63b0 100644 --- a/nss_hal/ipq806x/nss_hal_pvt.c +++ b/nss_hal/ipq806x/nss_hal_pvt.c @@ -458,7 +458,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->nphys = res_nphys.start; npd->vphys = res_vphys.start; - npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys)); + npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys)); if (!npd->nmap) { nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id); goto out; @@ -711,7 +711,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) } of_node_put(cmn); - fpb_base = ioremap_nocache(res_nss_fpb_base.start, resource_size(&res_nss_fpb_base)); + fpb_base = ioremap(res_nss_fpb_base.start, resource_size(&res_nss_fpb_base)); if (!fpb_base) { pr_err("%px: ioremap fail for nss_fpb_base\n", nss_dev); return -EFAULT; diff --git a/nss_hal/ipq807x/nss_hal_pvt.c b/nss_hal/ipq807x/nss_hal_pvt.c index b95a23c..bb8f42f 100644 --- a/nss_hal/ipq807x/nss_hal_pvt.c +++ b/nss_hal/ipq807x/nss_hal_pvt.c @@ -234,7 +234,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * npd->vphys = res_vphys.start; npd->qgic_phys = res_qgic_phys.start; - npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys)); + npd->nmap = ioremap(npd->nphys, resource_size(&res_nphys)); if (!npd->nmap) { nss_info_always("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id); goto out; @@ -247,7 +247,7 @@ static struct nss_platform_data *__nss_hal_of_get_pdata(struct platform_device * goto out; } - npd->qgic_map = ioremap_nocache(npd->qgic_phys, resource_size(&res_qgic_phys)); + npd->qgic_map = ioremap(npd->qgic_phys, resource_size(&res_qgic_phys)); if (!npd->qgic_map) { nss_info_always("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id); goto out; @@ -467,7 +467,7 @@ static int __nss_hal_common_reset(struct platform_device *nss_dev) } of_node_put(cmn); - nss_misc_reset = ioremap_nocache(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset)); + nss_misc_reset = ioremap(res_nss_misc_reset.start, resource_size(&res_nss_misc_reset)); if (!nss_misc_reset) { pr_err("%px: ioremap fail for nss_misc_reset\n", nss_dev); return -EFAULT; diff --git a/nss_hal/nss_hal.c b/nss_hal/nss_hal.c index d58bb57..57974c1 100644 --- a/nss_hal/nss_hal.c +++ b/nss_hal/nss_hal.c @@ -78,9 +78,9 @@ int nss_hal_firmware_load(struct nss_ctx_instance *nss_ctx, struct platform_devi return rc; } - load_mem = ioremap_nocache(npd->load_addr, nss_fw->size); + load_mem = ioremap(npd->load_addr, nss_fw->size); if (!load_mem) { - nss_info_always("%px: ioremap_nocache failed: %x", nss_ctx, npd->load_addr); + nss_info_always("%px: ioremap failed: %x", nss_ctx, npd->load_addr); release_firmware(nss_fw); return rc; } diff --git a/nss_meminfo.c b/nss_meminfo.c index e24e6be..2255eae 100644 --- a/nss_meminfo.c +++ b/nss_meminfo.c @@ -728,7 +728,7 @@ bool nss_meminfo_init(struct nss_ctx_instance *nss_ctx) /* * meminfo_start is the label where the start address of meminfo map is stored. */ - meminfo_start = (uint32_t *)ioremap_nocache(nss_ctx->load + NSS_MEMINFO_MAP_START_OFFSET, + meminfo_start = (uint32_t *)ioremap(nss_ctx->load + NSS_MEMINFO_MAP_START_OFFSET, NSS_MEMINFO_RESERVE_AREA_SIZE); if (!meminfo_start) { nss_info_always("%px: cannot remap meminfo start\n", nss_ctx); diff --git a/nss_ppe.c b/nss_ppe.c index 46ce217..644fc98 100644 --- a/nss_ppe.c +++ b/nss_ppe.c @@ -357,7 +357,7 @@ void nss_ppe_init(void) /* * Get the PPE base address */ - ppe_pvt.ppe_base = ioremap_nocache(PPE_BASE_ADDR, PPE_REG_SIZE); + ppe_pvt.ppe_base = ioremap(PPE_BASE_ADDR, PPE_REG_SIZE); if (!ppe_pvt.ppe_base) { nss_warning("DRV can't get PPE base address\n"); return; -- 2.34.1