mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
208 lines
8.1 KiB
Diff
208 lines
8.1 KiB
Diff
From dddfe22459a988a5b86d195bc3cc3bd3c2ac7037 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sat, 14 Jan 2023 21:52:38 +0100
|
|
Subject: [PATCH 1/4] nss-drv: replace ioremap_nocache() with ioremap()
|
|
|
|
Since 5.5 ioremap_nocache is equal to ioremap on all archs and was removed
|
|
from the kernel, so just use ioremap instead.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
nss_hal/fsm9010/nss_hal_pvt.c | 2 +-
|
|
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/ipq95xx/nss_hal_pvt.c | 6 +++---
|
|
nss_hal/nss_hal.c | 4 ++--
|
|
nss_meminfo.c | 2 +-
|
|
nss_ppe.c | 2 +-
|
|
9 files changed, 20 insertions(+), 20 deletions(-)
|
|
|
|
--- 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("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
--- a/nss_hal/ipq50xx/nss_hal_pvt.c
|
|
+++ b/nss_hal/ipq50xx/nss_hal_pvt.c
|
|
@@ -185,13 +185,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("%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;
|
|
@@ -349,7 +349,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("%px: ioremap fail for nss_misc_reset\n", nss_dev);
|
|
return -EFAULT;
|
|
--- a/nss_hal/ipq60xx/nss_hal_pvt.c
|
|
+++ b/nss_hal/ipq60xx/nss_hal_pvt.c
|
|
@@ -208,13 +208,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("%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;
|
|
@@ -434,13 +434,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("%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;
|
|
--- a/nss_hal/ipq806x/nss_hal_pvt.c
|
|
+++ b/nss_hal/ipq806x/nss_hal_pvt.c
|
|
@@ -461,7 +461,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("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -714,7 +714,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("%px: 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
|
|
@@ -237,7 +237,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("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -250,7 +250,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("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -470,7 +470,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("%px: ioremap fail for nss_misc_reset\n", nss_dev);
|
|
return -EFAULT;
|
|
--- a/nss_hal/ipq95xx/nss_hal_pvt.c
|
|
+++ b/nss_hal/ipq95xx/nss_hal_pvt.c
|
|
@@ -291,7 +291,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("%px: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -303,7 +303,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("%px: nss%d: ioremap() fail for qgic map\n", nss_ctx, nss_ctx->id);
|
|
goto out;
|
|
@@ -608,7 +608,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("%px: ioremap fail for nss_misc_reset\n", nss_dev);
|
|
return -EFAULT;
|
|
--- a/nss_hal/nss_hal.c
|
|
+++ b/nss_hal/nss_hal.c
|
|
@@ -81,9 +81,9 @@ int nss_hal_firmware_load(struct nss_ctx
|
|
}
|
|
|
|
|
|
- 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;
|
|
}
|
|
--- a/nss_meminfo.c
|
|
+++ b/nss_meminfo.c
|
|
@@ -736,7 +736,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("%px: cannot remap meminfo start\n", nss_ctx);
|
|
--- 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;
|