.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * arch/arm/mm/highmem.c -- ARM highmem support |
---|
3 | 4 | * |
---|
4 | 5 | * Author: Nicolas Pitre |
---|
5 | 6 | * Created: september 8, 2008 |
---|
6 | 7 | * Copyright: Marvell Semiconductors Inc. |
---|
7 | | - * |
---|
8 | | - * This program is free software; you can redistribute it and/or modify |
---|
9 | | - * it under the terms of the GNU General Public License version 2 as |
---|
10 | | - * published by the Free Software Foundation. |
---|
11 | 8 | */ |
---|
12 | 9 | |
---|
13 | 10 | #include <linux/module.h> |
---|
.. | .. |
---|
21 | 18 | static inline void set_fixmap_pte(int idx, pte_t pte) |
---|
22 | 19 | { |
---|
23 | 20 | unsigned long vaddr = __fix_to_virt(idx); |
---|
24 | | - pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); |
---|
| 21 | + pte_t *ptep = virt_to_kpte(vaddr); |
---|
25 | 22 | |
---|
26 | 23 | set_pte_ext(ptep, pte, 0); |
---|
27 | 24 | local_flush_tlb_kernel_page(vaddr); |
---|
.. | .. |
---|
29 | 26 | |
---|
30 | 27 | static inline pte_t get_fixmap_pte(unsigned long vaddr) |
---|
31 | 28 | { |
---|
32 | | - pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); |
---|
| 29 | + pte_t *ptep = virt_to_kpte(vaddr); |
---|
33 | 30 | |
---|
34 | 31 | return *ptep; |
---|
35 | 32 | } |
---|
36 | 33 | |
---|
37 | | -void *kmap(struct page *page) |
---|
38 | | -{ |
---|
39 | | - might_sleep(); |
---|
40 | | - if (!PageHighMem(page)) |
---|
41 | | - return page_address(page); |
---|
42 | | - return kmap_high(page); |
---|
43 | | -} |
---|
44 | | -EXPORT_SYMBOL(kmap); |
---|
45 | | - |
---|
46 | | -void kunmap(struct page *page) |
---|
47 | | -{ |
---|
48 | | - BUG_ON(in_interrupt()); |
---|
49 | | - if (!PageHighMem(page)) |
---|
50 | | - return; |
---|
51 | | - kunmap_high(page); |
---|
52 | | -} |
---|
53 | | -EXPORT_SYMBOL(kunmap); |
---|
54 | | - |
---|
55 | | -void *kmap_atomic(struct page *page) |
---|
| 34 | +void *kmap_atomic_high_prot(struct page *page, pgprot_t prot) |
---|
56 | 35 | { |
---|
57 | 36 | unsigned int idx; |
---|
58 | 37 | unsigned long vaddr; |
---|
59 | 38 | void *kmap; |
---|
60 | 39 | int type; |
---|
61 | | - |
---|
62 | | - preempt_disable(); |
---|
63 | | - pagefault_disable(); |
---|
64 | | - if (!PageHighMem(page)) |
---|
65 | | - return page_address(page); |
---|
66 | 40 | |
---|
67 | 41 | #ifdef CONFIG_DEBUG_HIGHMEM |
---|
68 | 42 | /* |
---|
.. | .. |
---|
93 | 67 | * in place, so the contained TLB flush ensures the TLB is updated |
---|
94 | 68 | * with the new mapping. |
---|
95 | 69 | */ |
---|
96 | | - set_fixmap_pte(idx, mk_pte(page, kmap_prot)); |
---|
| 70 | + set_fixmap_pte(idx, mk_pte(page, prot)); |
---|
97 | 71 | |
---|
98 | 72 | return (void *)vaddr; |
---|
99 | 73 | } |
---|
100 | | -EXPORT_SYMBOL(kmap_atomic); |
---|
| 74 | +EXPORT_SYMBOL(kmap_atomic_high_prot); |
---|
101 | 75 | |
---|
102 | | -void __kunmap_atomic(void *kvaddr) |
---|
| 76 | +void kunmap_atomic_high(void *kvaddr) |
---|
103 | 77 | { |
---|
104 | 78 | unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; |
---|
105 | 79 | int idx, type; |
---|
.. | .. |
---|
121 | 95 | /* this address was obtained through kmap_high_get() */ |
---|
122 | 96 | kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)])); |
---|
123 | 97 | } |
---|
124 | | - pagefault_enable(); |
---|
125 | | - preempt_enable(); |
---|
126 | 98 | } |
---|
127 | | -EXPORT_SYMBOL(__kunmap_atomic); |
---|
| 99 | +EXPORT_SYMBOL(kunmap_atomic_high); |
---|
128 | 100 | |
---|
129 | 101 | void *kmap_atomic_pfn(unsigned long pfn) |
---|
130 | 102 | { |
---|