disable i2c1

hc

2024-05-11 645e752c5a84baeb21015cdc85fc05b7d16312c8

 kernel/arch/xtensa/mm/highmem.c
..
..
@@ -37,15 +37,10 @@
37
37
 		color;
38
38
 }
39
39
 
40
-void *kmap_atomic(struct page *page)
40
+void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)
41
41
 {
42
42
 	enum fixed_addresses idx;
43
43
 	unsigned long vaddr;
44
-
45
-	preempt_disable();
46
-	pagefault_disable();
47
-	if (!PageHighMem(page))
48
-		return page_address(page);
49
44
 
50
45
 	idx = kmap_idx(kmap_atomic_idx_push(),
51
46
 		       DCACHE_ALIAS(page_to_phys(page)));
..
..
@@ -53,13 +48,13 @@
53
48
 #ifdef CONFIG_DEBUG_HIGHMEM
54
49
 	BUG_ON(!pte_none(*(kmap_pte + idx)));
55
50
 #endif
56
-	set_pte(kmap_pte + idx, mk_pte(page, PAGE_KERNEL_EXEC));
51
+	set_pte(kmap_pte + idx, mk_pte(page, prot));
57
52
 
58
53
 	return (void *)vaddr;
59
54
 }
60
-EXPORT_SYMBOL(kmap_atomic);
55
+EXPORT_SYMBOL(kmap_atomic_high_prot);
61
56
 
62
-void __kunmap_atomic(void *kvaddr)
57
+void kunmap_atomic_high(void *kvaddr)
63
58
 {
64
59
 	if (kvaddr >= (void *)FIXADDR_START &&
65
60
 	    kvaddr < (void *)FIXADDR_TOP) {
..
..
@@ -78,18 +73,19 @@
78
73
 
79
74
 		kmap_atomic_idx_pop();
80
75
 	}
81
-
82
-	pagefault_enable();
83
-	preempt_enable();
84
76
 }
85
-EXPORT_SYMBOL(__kunmap_atomic);
77
+EXPORT_SYMBOL(kunmap_atomic_high);
86
78
 
87
79
 void __init kmap_init(void)
88
80
 {
89
81
 	unsigned long kmap_vstart;
90
82
 
83
+	/* Check if this memory layout is broken because PKMAP overlaps
84
+	 * page table.
85
+	 */
86
+	BUILD_BUG_ON(PKMAP_BASE < TLBTEMP_BASE_1 + TLBTEMP_SIZE);
91
87
 	/* cache the first kmap pte */
92
88
 	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
93
-	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
89
+	kmap_pte = virt_to_kpte(kmap_vstart);
94
90
 	kmap_waitqueues_init();
95
91
 }