staging: vc04_services: Convert kmap() to kmap_local_page()

The use of kmap() is being deprecated in favor of kmap_local_page()
where it is feasible. In file interface/vchiq_arm/vchiq_arm.c,
function free_pagelist() calls kmap() / kunmap() from two places.

With kmap_local_page(), the mapping is per thread, CPU local and not
globally visible. Therefore, free_pagelist() is a function where the
use of kmap_local_page() in place of kmap() is correctly suited.

Convert to kmap_local_page() but, instead of open coding it, use the
memcpy_to_page() helper.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20220330191414.23141-1-fmdefrancesco@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 313a4e9e5dbafe8953e421982e673071ee031a35..0596ac61e2861a148f0097559c939d30268fbec0 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -431,21 +431,18 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
                        if (head_bytes > actual)
                                head_bytes = actual;
 
-                       memcpy((char *)kmap(pages[0]) +
+                       memcpy_to_page(pages[0],
                                pagelist->offset,
                                fragments,
                                head_bytes);
-                       kunmap(pages[0]);
                }
                if ((actual >= 0) && (head_bytes < actual) &&
-                   (tail_bytes != 0)) {
-                       memcpy((char *)kmap(pages[num_pages - 1]) +
-                               ((pagelist->offset + actual) &
-                               (PAGE_SIZE - 1) & ~(g_cache_line_size - 1)),
+                   (tail_bytes != 0))
+                       memcpy_to_page(pages[num_pages - 1],
+                               (pagelist->offset + actual) &
+                               (PAGE_SIZE - 1) & ~(g_cache_line_size - 1),
                                fragments + g_cache_line_size,
                                tail_bytes);
-                       kunmap(pages[num_pages - 1]);
-               }
 
                down(&g_free_fragments_mutex);
                *(char **)fragments = g_free_fragments;