Skip to contentSkip to conversation

MIPS: remove local_irq_[save|restore] from CP0 macros

PATCH New Daniel Schwierzeck 1 participant 2 messages Dec 19, 2018 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: remove local_irq_[save|restore] from CP0 macros

With moving write_on_tlb() to arch/mips/include/asm/mipsregs.h there are now compiler warnings when some generic code includes asm/io.h. This happens for example when enabling OF live tree.

---

 arch/mips/include/asm/mipsregs.h | 7 -------
 1 file changed, 7 deletions(-)
arch/mips/include/asm/mipsregs.h +0 -7
index 930562ebb2..f80311e64e 100644
@@ -1013,9 +1013,7 @@ do {									\
 #define __read_64bit_c0_split(source, sel)				\
 ({									\
 	unsigned long long __val;					\
-	unsigned long __flags;						\
 									\
-	local_irq_save(__flags);					\
 	if (sel == 0)							\
 		__asm__ __volatile__(					\
 			".set\tmips64\n\t"				\
@@ -1034,16 +1032,12 @@ do {									\
 			"dsra\t%L0, %L0, 32\n\t"			\
 			".set\tmips0"					\
 			: "=r" (__val));				\
-	local_irq_restore(__flags);					\
 									\
 	__val;								\
 })
 
 #define __write_64bit_c0_split(source, sel, val)			\
 do {									\
-	unsigned long __flags;						\
-									\
-	local_irq_save(__flags);					\
 	if (sel == 0)							\
 		__asm__ __volatile__(					\
 			".set\tmips64\n\t"				\
@@ -1064,7 +1058,6 @@ do {									\
 			"dmtc0\t%L0, " #source ", " #sel "\n\t"		\
 			".set\tmips0"					\
 			: : "r" (val));					\
-	local_irq_restore(__flags);					\
 } while (0)
 
 #define __readx_32bit_c0_register(source)				\
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 MIPS: remove local_irq_[save|restore] from CP0 macros

Am 19.12.18 um 15:18 schrieb Daniel Schwierzeck:

Quoted 11 lines

With moving write_on_tlb() to arch/mips/include/asm/mipsregs.h there are now compiler warnings when some generic code includes asm/io.h. This happens for example when enabling OF live tree.

---

 arch/mips/include/asm/mipsregs.h | 7 -------
 1 file changed, 7 deletions(-)

applied to u-boot-mips

Signature · 1 line
- Daniel