write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/arch/x86/mm/iomap_32.c
..
..
@@ -1,23 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright © 2008 Ingo Molnar
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation; either version 2 of the License, or
7
- * (at your option) any later version.
8
- *
9
- * This program is distributed in the hope that it will be useful, but
10
- * WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
12
- * General Public License for more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along
15
- * with this program; if not, write to the Free Software Foundation, Inc.,
16
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
17
4
  */
18
5
 
19
6
 #include <asm/iomap.h>
20
-#include <asm/pat.h>
7
+#include <asm/memtype.h>
21
8
 #include <linux/export.h>
22
9
 #include <linux/highmem.h>
23
10
 
..
..
@@ -39,7 +26,7 @@
39
26
 	if (!is_io_mapping_possible(base, size))
40
27
 		return -EINVAL;
41
28
 
42
-	ret = io_reserve_memtype(base, base + size, &pcm);
29
+	ret = memtype_reserve_io(base, base + size, &pcm);
43
30
 	if (ret)
44
31
 		return ret;
45
32
 
..
..
@@ -53,13 +40,12 @@
53
40
 
54
41
 void iomap_free(resource_size_t base, unsigned long size)
55
42
 {
56
-	io_free_memtype(base, base + size);
43
+	memtype_free_io(base, base + size);
57
44
 }
58
45
 EXPORT_SYMBOL_GPL(iomap_free);
59
46
 
60
47
 void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
61
48
 {
62
-	pte_t pte = pfn_pte(pfn, prot);
63
49
 	unsigned long vaddr;
64
50
 	int idx, type;
65
51
 
..
..
@@ -69,12 +55,7 @@
69
55
 	type = kmap_atomic_idx_push();
70
56
 	idx = type + KM_TYPE_NR * smp_processor_id();
71
57
 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
72
-	WARN_ON(!pte_none(*(kmap_pte - idx)));
73
-
74
-#ifdef CONFIG_PREEMPT_RT_FULL
75
-	current->kmap_pte[type] = pte;
76
-#endif
77
-	set_pte(kmap_pte - idx, pte);
58
+	set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
78
59
 	arch_flush_lazy_mmu_mode();
79
60
 
80
61
 	return (void *)vaddr;
..
..
@@ -125,9 +106,6 @@
125
106
 		 * is a bad idea also, in case the page changes cacheability
126
107
 		 * attributes or becomes a protected page in a hypervisor.
127
108
 		 */
128
-#ifdef CONFIG_PREEMPT_RT_FULL
129
-		current->kmap_pte[type] = __pte(0);
130
-#endif
131
109
 		kpte_clear_flush(kmap_pte-idx, vaddr);
132
110
 		kmap_atomic_idx_pop();
133
111
 	}