change otg to host mode

hc

2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777

 kernel/arch/powerpc/mm/highmem.c
..
..
@@ -24,54 +24,35 @@
24
24
 #include <linux/highmem.h>
25
25
 #include <linux/module.h>
26
26
 
27
-/*
28
- * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
29
- * gives a more generic (and caching) interface. But kmap_atomic can
30
- * be used in IRQ contexts, so in some (very limited) cases we need
31
- * it.
32
- */
33
-void *kmap_atomic_prot(struct page *page, pgprot_t prot)
27
+void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)
34
28
 {
35
29
 	unsigned long vaddr;
36
30
 	int idx, type;
37
31
 
38
-	preempt_disable();
39
-	pagefault_disable();
40
-	if (!PageHighMem(page))
41
-		return page_address(page);
42
-
43
32
 	type = kmap_atomic_idx_push();
44
33
 	idx = type + KM_TYPE_NR*smp_processor_id();
45
34
 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
46
-#ifdef CONFIG_DEBUG_HIGHMEM
47
-	BUG_ON(!pte_none(*(kmap_pte-idx)));
48
-#endif
35
+	WARN_ON(IS_ENABLED(CONFIG_DEBUG_HIGHMEM) && !pte_none(*(kmap_pte - idx)));
49
36
 	__set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot), 1);
50
37
 	local_flush_tlb_page(NULL, vaddr);
51
38
 
52
39
 	return (void*) vaddr;
53
40
 }
54
-EXPORT_SYMBOL(kmap_atomic_prot);
41
+EXPORT_SYMBOL(kmap_atomic_high_prot);
55
42
 
56
-void __kunmap_atomic(void *kvaddr)
43
+void kunmap_atomic_high(void *kvaddr)
57
44
 {
58
45
 	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
59
-	int type __maybe_unused;
60
46
 
61
-	if (vaddr < __fix_to_virt(FIX_KMAP_END)) {
62
-		pagefault_enable();
63
-		preempt_enable();
47
+	if (vaddr < __fix_to_virt(FIX_KMAP_END))
64
48
 		return;
65
-	}
66
49
 
67
-	type = kmap_atomic_idx();
68
-
69
-#ifdef CONFIG_DEBUG_HIGHMEM
70
-	{
50
+	if (IS_ENABLED(CONFIG_DEBUG_HIGHMEM)) {
51
+		int type = kmap_atomic_idx();
71
52
 		unsigned int idx;
72
53
 
73
54
 		idx = type + KM_TYPE_NR * smp_processor_id();
74
-		BUG_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx));
55
+		WARN_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx));
75
56
 
76
57
 		/*
77
58
 		 * force other mappings to Oops if they'll try to access
..
..
@@ -80,10 +61,7 @@
80
61
 		pte_clear(&init_mm, vaddr, kmap_pte-idx);
81
62
 		local_flush_tlb_page(NULL, vaddr);
82
63
 	}
83
-#endif
84
64
 
85
65
 	kmap_atomic_idx_pop();
86
-	pagefault_enable();
87
-	preempt_enable();
88
66
 }
89
-EXPORT_SYMBOL(__kunmap_atomic);
67
+EXPORT_SYMBOL(kunmap_atomic_high);