diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2014-10-23 08:34:26 +0200 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2014-10-24 13:28:18 +0200 |
| commit | f435628cbba777d7e46f46f9f813a1dd9206a68b (patch) | |
| tree | 4677855ccf26715452ab656952cf9f32414deffd | |
| parent | eb4ea6b1094ce3452c376c12a529178d202d229b (diff) | |
workaround for the ioremap_cache(d) problem
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
| -rw-r--r-- | core/armv7/tee_tz.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/armv7/tee_tz.c b/core/armv7/tee_tz.c index 4bc441a..f99f8c5 100644 --- a/core/armv7/tee_tz.c +++ b/core/armv7/tee_tz.c @@ -63,6 +63,11 @@ static struct miscdevice tee_tz_miscdev; static bool tee_tz_ready; +/* Temporary workaround until we're only using post 3.13 kernels */ +#ifdef ioremap_cached +#define ioremap_cache ioremap_cached +#endif + /******************************************************************* * Calling TEE *******************************************************************/ @@ -671,7 +676,7 @@ static int register_l2cc_mutex(bool reg) } paddr = param.a2; - vaddr = ioremap_cached(paddr, sizeof(u32)); + vaddr = ioremap_cache(paddr, sizeof(u32)); if (vaddr == NULL) { dev_warn(DEV, "TZ l2cc mutex disabled: ioremap failed\n"); ret = -ENOMEM; @@ -734,7 +739,7 @@ static int configure_shm(void) shm_cached = (bool)param.a3; if (shm_cached) - shm_vaddr = ioremap_cached(shm_paddr, shm_size); + shm_vaddr = ioremap_cache(shm_paddr, shm_size); else shm_vaddr = ioremap_nocache(shm_paddr, shm_size); |