133 lines
5.1 KiB
Diff
133 lines
5.1 KiB
Diff
--- a/nss_meminfo.c
|
|
+++ b/nss_meminfo.c
|
|
@@ -687,7 +687,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("%p: cannot remap meminfo start\n", nss_ctx);
|
|
|
|
--- a/nss_hal/fsm9010/nss_hal_pvt.c
|
|
+++ b/nss_hal/fsm9010/nss_hal_pvt.c
|
|
@@ -145,7 +145,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("%p: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
--- a/nss_hal/ipq60xx/nss_hal_pvt.c
|
|
+++ b/nss_hal/ipq60xx/nss_hal_pvt.c
|
|
@@ -193,13 +193,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("%p: 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("%p: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -401,13 +401,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("%p: 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("%p: 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("%p: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -710,7 +710,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("%p: 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
|
|
@@ -233,7 +233,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("%p: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -245,7 +245,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("%p: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -463,7 +463,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("%p: 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("%p: ioremap_nocache failed: %x", nss_ctx, npd->load_addr);
|
|
+ nss_info_always("%p: ioremap failed: %x", nss_ctx, npd->load_addr);
|
|
release_firmware(nss_fw);
|
|
return rc;
|
|
}
|
|
--- a/nss_ppe.c
|
|
+++ b/nss_ppe.c
|
|
@@ -354,7 +354,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;
|
|
|