kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/powerpc/lib/pmem.c
..
..
@@ -1,14 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright(c) 2017 IBM Corporation. All rights reserved.
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of version 2 of the GNU General Public License as
6
- * published by the Free Software Foundation.
7
- *
8
- * This program is distributed in the hope that it will be useful, but
9
- * WITHOUT ANY WARRANTY; without even the implied warranty of
10
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
11
- * General Public License for more details.
12
4
  */
13
5
 
14
6
 #include <linux/string.h>
..
..
@@ -17,22 +9,58 @@
17
9
 
18
10
 #include <asm/cacheflush.h>
19
11
 
12
+static inline void __clean_pmem_range(unsigned long start, unsigned long stop)
13
+{
14
+	unsigned long shift = l1_dcache_shift();
15
+	unsigned long bytes = l1_dcache_bytes();
16
+	void *addr = (void *)(start & ~(bytes - 1));
17
+	unsigned long size = stop - (unsigned long)addr + (bytes - 1);
18
+	unsigned long i;
19
+
20
+	for (i = 0; i < size >> shift; i++, addr += bytes)
21
+		asm volatile(PPC_DCBSTPS(%0, %1): :"i"(0), "r"(addr): "memory");
22
+}
23
+
24
+static inline void __flush_pmem_range(unsigned long start, unsigned long stop)
25
+{
26
+	unsigned long shift = l1_dcache_shift();
27
+	unsigned long bytes = l1_dcache_bytes();
28
+	void *addr = (void *)(start & ~(bytes - 1));
29
+	unsigned long size = stop - (unsigned long)addr + (bytes - 1);
30
+	unsigned long i;
31
+
32
+	for (i = 0; i < size >> shift; i++, addr += bytes)
33
+		asm volatile(PPC_DCBFPS(%0, %1): :"i"(0), "r"(addr): "memory");
34
+}
35
+
36
+static inline void clean_pmem_range(unsigned long start, unsigned long stop)
37
+{
38
+	if (cpu_has_feature(CPU_FTR_ARCH_207S))
39
+		return __clean_pmem_range(start, stop);
40
+}
41
+
42
+static inline void flush_pmem_range(unsigned long start, unsigned long stop)
43
+{
44
+	if (cpu_has_feature(CPU_FTR_ARCH_207S))
45
+		return __flush_pmem_range(start, stop);
46
+}
47
+
20
48
 /*
21
49
  * CONFIG_ARCH_HAS_PMEM_API symbols
22
50
  */
23
51
 void arch_wb_cache_pmem(void *addr, size_t size)
24
52
 {
25
53
 	unsigned long start = (unsigned long) addr;
26
-	flush_inval_dcache_range(start, start + size);
54
+	clean_pmem_range(start, start + size);
27
55
 }
28
-EXPORT_SYMBOL(arch_wb_cache_pmem);
56
+EXPORT_SYMBOL_GPL(arch_wb_cache_pmem);
29
57
 
30
58
 void arch_invalidate_pmem(void *addr, size_t size)
31
59
 {
32
60
 	unsigned long start = (unsigned long) addr;
33
-	flush_inval_dcache_range(start, start + size);
61
+	flush_pmem_range(start, start + size);
34
62
 }
35
-EXPORT_SYMBOL(arch_invalidate_pmem);
63
+EXPORT_SYMBOL_GPL(arch_invalidate_pmem);
36
64
 
37
65
 /*
38
66
  * CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE symbols
..
..
@@ -43,19 +71,17 @@
43
71
 	unsigned long copied, start = (unsigned long) dest;
44
72
 
45
73
 	copied = __copy_from_user(dest, src, size);
46
-	flush_inval_dcache_range(start, start + size);
74
+	clean_pmem_range(start, start + size);
47
75
 
48
76
 	return copied;
49
77
 }
50
78
 
51
-void *memcpy_flushcache(void *dest, const void *src, size_t size)
79
+void memcpy_flushcache(void *dest, const void *src, size_t size)
52
80
 {
53
81
 	unsigned long start = (unsigned long) dest;
54
82
 
55
83
 	memcpy(dest, src, size);
56
-	flush_inval_dcache_range(start, start + size);
57
-
58
-	return dest;
84
+	clean_pmem_range(start, start + size);
59
85
 }
60
86
 EXPORT_SYMBOL(memcpy_flushcache);
61
87