Skip to contentSkip to conversation

MIPS: Fix build warning about "PTR_STR" redefinition

PATCH In review Huacai Chen 3 participants 8 messages May 29, 2020 – May 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: Fix build warning about "PTR_STR" redefinition

PTR_STR is redefined when CONFIG_TEST_PRINTF is set. This causes the following build warning:

CC lib/test_printf.o
lib/test_printf.c:214:0: warning: "PTR_STR" redefined
#define PTR_STR "ffff0123456789ab"
^
In file included from ./arch/mips/include/asm/dsemul.h:11:0,

                 from ./arch/mips/include/asm/processor.h:22,
                 from ./arch/mips/include/asm/thread_info.h:16,
                 from ./include/linux/thread_info.h:38,
                 from ./include/asm-generic/preempt.h:5,
                 from ./arch/mips/include/generated/asm/preempt.h:1,
                 from ./include/linux/preempt.h:78,
                 from ./include/linux/spinlock.h:51,
                 from ./include/linux/seqlock.h:36,
                 from ./include/linux/time.h:6,
                 from ./include/linux/stat.h:19,
                 from ./include/linux/module.h:13,
                 from lib/test_printf.c:10:

./arch/mips/include/asm/inst.h:20:0: note: this is the location of the previous definition
#define PTR_STR ".dword"
^

Instead of renaming PTR_STR again and again, it is better to move the unaligned load/store helpers from inst.h to unaligned.h, suggested by Maciej W. Rozycki.

Fixes e701656ec4db ("MIPS: inst.h: Stop including asm.h to avoid various build failures")
Cc Maciej W. Rozycki" <[email protected]>
---
 arch/mips/include/asm/inst.h      | 779 ------------------------------------
 arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++
 arch/mips/kernel/unaligned.c      |   1 +
 arch/mips/loongson64/cop2-ex.c    |   1 +
 4 files changed, 804 insertions(+), 779 deletions(-)
 create mode 100644 arch/mips/include/asm/unaligned.h
arch/mips/include/asm/inst.h +0 -779
index 6d74ba3..22912f7 100644
@@ -13,13 +13,6 @@
 
 #include <uapi/asm/inst.h>
 
-#if (_MIPS_SZPTR == 32)
-#define PTR_STR		".word"
-#endif
-#if (_MIPS_SZPTR == 64)
-#define PTR_STR		".dword"
-#endif
-
 /* HACHACHAHCAHC ...  */
 
 /* In case some other massaging is needed, keep MIPSInst as wrapper */
@@ -92,776 +85,4 @@ struct mm_decoded_insn {
 /* Recode table from 16-bit register notation to 32-bit GPR. Do NOT export!!! */
 extern const int reg16to32[];
 
-#ifdef __BIG_ENDIAN
-#define  _LoadHW(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (".set\tnoat\n"        \
-		"1:\t"type##_lb("%0", "0(%2)")"\n"  \
-		"2:\t"type##_lbu("$1", "1(%2)")"\n\t"\
-		"sll\t%0, 0x8\n\t"                  \
-		"or\t%0, $1\n\t"                    \
-		"li\t%1, 0\n"                       \
-		"3:\t.set\tat\n\t"                  \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#ifndef CONFIG_CPU_NO_LOAD_STORE_LR
-#define  _LoadW(addr, value, res, type)   \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\t"type##_lwl("%0", "(%2)")"\n"   \
-		"2:\t"type##_lwr("%0", "3(%2)")"\n\t"\
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#else /* CONFIG_CPU_NO_LOAD_STORE_LR */
-/* For CPUs without lwl instruction */
-#define  _LoadW(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (			    \
-		".set\tpush\n"			    \
-		".set\tnoat\n\t"		    \
-		"1:"type##_lb("%0", "0(%2)")"\n\t"  \
-		"2:"type##_lbu("$1", "1(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"3:"type##_lbu("$1", "2(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"4:"type##_lbu("$1", "3(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"li\t%1, 0\n"			    \
-		".set\tpop\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%1, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (value), "=r" (res)	    \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#endif /* CONFIG_CPU_NO_LOAD_STORE_LR */
-
-#define  _LoadHWU(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tnoat\n"                      \
-		"1:\t"type##_lbu("%0", "0(%2)")"\n" \
-		"2:\t"type##_lbu("$1", "1(%2)")"\n\t"\
-		"sll\t%0, 0x8\n\t"                  \
-		"or\t%0, $1\n\t"                    \
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".set\tat\n\t"                      \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#ifndef CONFIG_CPU_NO_LOAD_STORE_LR
-#define  _LoadWU(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\t"type##_lwl("%0", "(%2)")"\n"  \
-		"2:\t"type##_lwr("%0", "3(%2)")"\n\t"\
-		"dsll\t%0, %0, 32\n\t"              \
-		"dsrl\t%0, %0, 32\n\t"              \
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		"\t.section\t.fixup,\"ax\"\n\t"     \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#define  _LoadDW(addr, value, res)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\tldl\t%0, (%2)\n"               \
-		"2:\tldr\t%0, 7(%2)\n\t"            \
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		"\t.section\t.fixup,\"ax\"\n\t"     \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#else /* CONFIG_CPU_NO_LOAD_STORE_LR */
-/* For CPUs without lwl and ldl instructions */
-#define  _LoadWU(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (			    \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:"type##_lbu("%0", "0(%2)")"\n\t" \
-		"2:"type##_lbu("$1", "1(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"3:"type##_lbu("$1", "2(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"4:"type##_lbu("$1", "3(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"li\t%1, 0\n"			    \
-		".set\tpop\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%1, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (value), "=r" (res)	    \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#define  _LoadDW(addr, value, res)  \
-do {                                                \
-	__asm__ __volatile__ (			    \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:lb\t%0, 0(%2)\n\t"		    \
-		"2:lbu\t $1, 1(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"3:lbu\t$1, 2(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"4:lbu\t$1, 3(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"5:lbu\t$1, 4(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"6:lbu\t$1, 5(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"7:lbu\t$1, 6(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"8:lbu\t$1, 7(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"li\t%1, 0\n"			    \
-		".set\tpop\n\t"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%1, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		PTR_STR"\t5b, 11b\n\t"		    \
-		PTR_STR"\t6b, 11b\n\t"		    \
-		PTR_STR"\t7b, 11b\n\t"		    \
-		PTR_STR"\t8b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (value), "=r" (res)	    \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#endif /* CONFIG_CPU_NO_LOAD_STORE_LR */
-
-
-#define  _StoreHW(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tnoat\n"                      \
-		"1:\t"type##_sb("%1", "1(%2)")"\n"  \
-		"srl\t$1, %1, 0x8\n"                \
-		"2:\t"type##_sb("$1", "0(%2)")"\n"  \
-		".set\tat\n\t"                      \
-		"li\t%0, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%0, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"              \
-		PTR_STR"\t2b, 4b\n\t"              \
-		".previous"                         \
-		: "=r" (res)                        \
-		: "r" (value), "r" (addr), "i" (-EFAULT));\
-} while (0)
-
-#ifndef CONFIG_CPU_NO_LOAD_STORE_LR
-#define  _StoreW(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\t"type##_swl("%1", "(%2)")"\n"  \
-		"2:\t"type##_swr("%1", "3(%2)")"\n\t"\
-		"li\t%0, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%0, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=r" (res)                                \
-		: "r" (value), "r" (addr), "i" (-EFAULT));  \
-} while (0)
-
-#define  _StoreDW(addr, value, res) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\tsdl\t%1,(%2)\n"                \
-		"2:\tsdr\t%1, 7(%2)\n\t"            \
-		"li\t%0, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%0, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=r" (res)                                \
-		: "r" (value), "r" (addr), "i" (-EFAULT));  \
-} while (0)
-
-#else /* CONFIG_CPU_NO_LOAD_STORE_LR */
-#define  _StoreW(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:"type##_sb("%1", "3(%2)")"\n\t"  \
-		"srl\t$1, %1, 0x8\n\t"		    \
-		"2:"type##_sb("$1", "2(%2)")"\n\t"  \
-		"srl\t$1, $1,  0x8\n\t"		    \
-		"3:"type##_sb("$1", "1(%2)")"\n\t"  \
-		"srl\t$1, $1, 0x8\n\t"		    \
-		"4:"type##_sb("$1", "0(%2)")"\n\t"  \
-		".set\tpop\n\t"			    \
-		"li\t%0, 0\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%0, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (res)				    \
-		: "r" (value), "r" (addr), "i" (-EFAULT)    \
-		: "memory");                                \
-} while (0)
-
-#define  _StoreDW(addr, value, res) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:sb\t%1, 7(%2)\n\t"		    \
-		"dsrl\t$1, %1, 0x8\n\t"		    \
-		"2:sb\t$1, 6(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"3:sb\t$1, 5(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"4:sb\t$1, 4(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"5:sb\t$1, 3(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"6:sb\t$1, 2(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"7:sb\t$1, 1(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"8:sb\t$1, 0(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		".set\tpop\n\t"			    \
-		"li\t%0, 0\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%0, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		PTR_STR"\t5b, 11b\n\t"		    \
-		PTR_STR"\t6b, 11b\n\t"		    \
-		PTR_STR"\t7b, 11b\n\t"		    \
-		PTR_STR"\t8b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (res)				    \
-		: "r" (value), "r" (addr), "i" (-EFAULT)    \
-		: "memory");                                \
-} while (0)
-
-#endif /* CONFIG_CPU_NO_LOAD_STORE_LR */
-
-#else /* __BIG_ENDIAN */
-
-#define  _LoadHW(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (".set\tnoat\n"        \
-		"1:\t"type##_lb("%0", "1(%2)")"\n"  \
-		"2:\t"type##_lbu("$1", "0(%2)")"\n\t"\
-		"sll\t%0, 0x8\n\t"                  \
-		"or\t%0, $1\n\t"                    \
-		"li\t%1, 0\n"                       \
-		"3:\t.set\tat\n\t"                  \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#ifndef CONFIG_CPU_NO_LOAD_STORE_LR
-#define  _LoadW(addr, value, res, type)   \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\t"type##_lwl("%0", "3(%2)")"\n" \
-		"2:\t"type##_lwr("%0", "(%2)")"\n\t"\
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#else /* CONFIG_CPU_NO_LOAD_STORE_LR */
-/* For CPUs without lwl instruction */
-#define  _LoadW(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (			    \
-		".set\tpush\n"			    \
-		".set\tnoat\n\t"		    \
-		"1:"type##_lb("%0", "3(%2)")"\n\t"  \
-		"2:"type##_lbu("$1", "2(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"3:"type##_lbu("$1", "1(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"4:"type##_lbu("$1", "0(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"li\t%1, 0\n"			    \
-		".set\tpop\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%1, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (value), "=r" (res)	    \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#endif /* CONFIG_CPU_NO_LOAD_STORE_LR */
-
-
-#define  _LoadHWU(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tnoat\n"                      \
-		"1:\t"type##_lbu("%0", "1(%2)")"\n" \
-		"2:\t"type##_lbu("$1", "0(%2)")"\n\t"\
-		"sll\t%0, 0x8\n\t"                  \
-		"or\t%0, $1\n\t"                    \
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".set\tat\n\t"                      \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#ifndef CONFIG_CPU_NO_LOAD_STORE_LR
-#define  _LoadWU(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\t"type##_lwl("%0", "3(%2)")"\n" \
-		"2:\t"type##_lwr("%0", "(%2)")"\n\t"\
-		"dsll\t%0, %0, 32\n\t"              \
-		"dsrl\t%0, %0, 32\n\t"              \
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		"\t.section\t.fixup,\"ax\"\n\t"     \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#define  _LoadDW(addr, value, res)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\tldl\t%0, 7(%2)\n"              \
-		"2:\tldr\t%0, (%2)\n\t"             \
-		"li\t%1, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		"\t.section\t.fixup,\"ax\"\n\t"     \
-		"4:\tli\t%1, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=&r" (value), "=r" (res)         \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#else /* CONFIG_CPU_NO_LOAD_STORE_LR */
-/* For CPUs without lwl and ldl instructions */
-#define  _LoadWU(addr, value, res, type) \
-do {                                                \
-	__asm__ __volatile__ (			    \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:"type##_lbu("%0", "3(%2)")"\n\t" \
-		"2:"type##_lbu("$1", "2(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"3:"type##_lbu("$1", "1(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"4:"type##_lbu("$1", "0(%2)")"\n\t" \
-		"sll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"li\t%1, 0\n"			    \
-		".set\tpop\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%1, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (value), "=r" (res)	    \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-
-#define  _LoadDW(addr, value, res)  \
-do {                                                \
-	__asm__ __volatile__ (			    \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:lb\t%0, 7(%2)\n\t"		    \
-		"2:lbu\t$1, 6(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"3:lbu\t$1, 5(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"4:lbu\t$1, 4(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"5:lbu\t$1, 3(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"6:lbu\t$1, 2(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"7:lbu\t$1, 1(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"8:lbu\t$1, 0(%2)\n\t"		    \
-		"dsll\t%0, 0x8\n\t"		    \
-		"or\t%0, $1\n\t"		    \
-		"li\t%1, 0\n"			    \
-		".set\tpop\n\t"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%1, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		PTR_STR"\t5b, 11b\n\t"		    \
-		PTR_STR"\t6b, 11b\n\t"		    \
-		PTR_STR"\t7b, 11b\n\t"		    \
-		PTR_STR"\t8b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (value), "=r" (res)	    \
-		: "r" (addr), "i" (-EFAULT));       \
-} while (0)
-#endif /* CONFIG_CPU_NO_LOAD_STORE_LR */
-
-#define  _StoreHW(addr, value, res, type) \
-do {                                                 \
-	__asm__ __volatile__ (                      \
-		".set\tnoat\n"                      \
-		"1:\t"type##_sb("%1", "0(%2)")"\n"  \
-		"srl\t$1,%1, 0x8\n"                 \
-		"2:\t"type##_sb("$1", "1(%2)")"\n"  \
-		".set\tat\n\t"                      \
-		"li\t%0, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%0, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=r" (res)                        \
-		: "r" (value), "r" (addr), "i" (-EFAULT));\
-} while (0)
-
-#ifndef CONFIG_CPU_NO_LOAD_STORE_LR
-#define  _StoreW(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\t"type##_swl("%1", "3(%2)")"\n" \
-		"2:\t"type##_swr("%1", "(%2)")"\n\t"\
-		"li\t%0, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%0, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=r" (res)                                \
-		: "r" (value), "r" (addr), "i" (-EFAULT));  \
-} while (0)
-
-#define  _StoreDW(addr, value, res) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		"1:\tsdl\t%1, 7(%2)\n"              \
-		"2:\tsdr\t%1, (%2)\n\t"             \
-		"li\t%0, 0\n"                       \
-		"3:\n\t"                            \
-		".insn\n\t"                         \
-		".section\t.fixup,\"ax\"\n\t"       \
-		"4:\tli\t%0, %3\n\t"                \
-		"j\t3b\n\t"                         \
-		".previous\n\t"                     \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 4b\n\t"               \
-		PTR_STR"\t2b, 4b\n\t"               \
-		".previous"                         \
-		: "=r" (res)                                \
-		: "r" (value), "r" (addr), "i" (-EFAULT));  \
-} while (0)
-
-#else /* CONFIG_CPU_NO_LOAD_STORE_LR */
-/* For CPUs without swl and sdl instructions */
-#define  _StoreW(addr, value, res, type)  \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:"type##_sb("%1", "0(%2)")"\n\t"  \
-		"srl\t$1, %1, 0x8\n\t"		    \
-		"2:"type##_sb("$1", "1(%2)")"\n\t"  \
-		"srl\t$1, $1,  0x8\n\t"		    \
-		"3:"type##_sb("$1", "2(%2)")"\n\t"  \
-		"srl\t$1, $1, 0x8\n\t"		    \
-		"4:"type##_sb("$1", "3(%2)")"\n\t"  \
-		".set\tpop\n\t"			    \
-		"li\t%0, 0\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%0, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (res)				    \
-		: "r" (value), "r" (addr), "i" (-EFAULT)    \
-		: "memory");                                \
-} while (0)
-
-#define  _StoreDW(addr, value, res) \
-do {                                                \
-	__asm__ __volatile__ (                      \
-		".set\tpush\n\t"		    \
-		".set\tnoat\n\t"		    \
-		"1:sb\t%1, 0(%2)\n\t"		    \
-		"dsrl\t$1, %1, 0x8\n\t"		    \
-		"2:sb\t$1, 1(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"3:sb\t$1, 2(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"4:sb\t$1, 3(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"5:sb\t$1, 4(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"6:sb\t$1, 5(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"7:sb\t$1, 6(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		"8:sb\t$1, 7(%2)\n\t"		    \
-		"dsrl\t$1, $1, 0x8\n\t"		    \
-		".set\tpop\n\t"			    \
-		"li\t%0, 0\n"			    \
-		"10:\n\t"			    \
-		".insn\n\t"			    \
-		".section\t.fixup,\"ax\"\n\t"	    \
-		"11:\tli\t%0, %3\n\t"		    \
-		"j\t10b\n\t"			    \
-		".previous\n\t"			    \
-		".section\t__ex_table,\"a\"\n\t"    \
-		PTR_STR"\t1b, 11b\n\t"		    \
-		PTR_STR"\t2b, 11b\n\t"		    \
-		PTR_STR"\t3b, 11b\n\t"		    \
-		PTR_STR"\t4b, 11b\n\t"		    \
-		PTR_STR"\t5b, 11b\n\t"		    \
-		PTR_STR"\t6b, 11b\n\t"		    \
-		PTR_STR"\t7b, 11b\n\t"		    \
-		PTR_STR"\t8b, 11b\n\t"		    \
-		".previous"			    \
-		: "=&r" (res)				    \
-		: "r" (value), "r" (addr), "i" (-EFAULT)    \
-		: "memory");                                \
-} while (0)
-
-#endif /* CONFIG_CPU_NO_LOAD_STORE_LR */
-#endif
-
-#define LoadHWU(addr, value, res)	_LoadHWU(addr, value, res, kernel)
-#define LoadHWUE(addr, value, res)	_LoadHWU(addr, value, res, user)
-#define LoadWU(addr, value, res)	_LoadWU(addr, value, res, kernel)
-#define LoadWUE(addr, value, res)	_LoadWU(addr, value, res, user)
-#define LoadHW(addr, value, res)	_LoadHW(addr, value, res, kernel)
-#define LoadHWE(addr, value, res)	_LoadHW(addr, value, res, user)
-#define LoadW(addr, value, res)		_LoadW(addr, value, res, kernel)
-#define LoadWE(addr, value, res)	_LoadW(addr, value, res, user)
-#define LoadDW(addr, value, res)	_LoadDW(addr, value, res)
-
-#define StoreHW(addr, value, res)	_StoreHW(addr, value, res, kernel)
-#define StoreHWE(addr, value, res)	_StoreHW(addr, value, res, user)
-#define StoreW(addr, value, res)	_StoreW(addr, value, res, kernel)
-#define StoreWE(addr, value, res)	_StoreW(addr, value, res, user)
-#define StoreDW(addr, value, res)	_StoreDW(addr, value, res)
-
 #endif /* _ASM_INST_H */
arch/mips/include/asm/unaligned.h new file +802 -0

802 lines not on this page · raw message

arch/mips/kernel/unaligned.c +1 -0
index 19b906a..efb818c 100644
@@ -89,6 +89,7 @@
 #include <asm/fpu.h>
 #include <asm/fpu_emulator.h>
 #include <asm/inst.h>
+#include <asm/unaligned.h>
 #include <asm/mmu_context.h>
 #include <linux/uaccess.h>
 
arch/mips/loongson64/cop2-ex.c +1 -0
index af0600d..6096b03 100644
@@ -23,6 +23,7 @@
 #include <asm/branch.h>
 #include <asm/current.h>
 #include <asm/mipsregs.h>
+#include <asm/unaligned.h>
 
 static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
 	void *data)
Signature · 1 line
2.7.0
#1 lore raw

Hi Huacai,

Quoted 20 lines · Huacai Chen

PTR_STR is redefined when CONFIG_TEST_PRINTF is set. This causes the following build warning:

CC lib/test_printf.o
lib/test_printf.c:214:0: warning: "PTR_STR" redefined
#define PTR_STR "ffff0123456789ab"
^
In file included from ./arch/mips/include/asm/dsemul.h:11:0,

                  from ./arch/mips/include/asm/processor.h:22,
                  from ./arch/mips/include/asm/thread_info.h:16,
                  from ./include/linux/thread_info.h:38,
                  from ./include/asm-generic/preempt.h:5,
                  from ./arch/mips/include/generated/asm/preempt.h:1,
                  from ./include/linux/preempt.h:78,
                  from ./include/linux/spinlock.h:51,
                  from ./include/linux/seqlock.h:36,
                  from ./include/linux/time.h:6,
                  from ./include/linux/stat.h:19,
                  from ./include/linux/module.h:13,
                  from lib/test_printf.c:10:
Quoted 7 lines

./arch/mips/include/asm/inst.h:20:0: note: this is the location of the previous definition
#define PTR_STR ".dword"
^

Instead of renaming PTR_STR again and again, it is better to move the unaligned load/store helpers from inst.h to unaligned.h, suggested by Maciej W. Rozycki.

I don't have time to review the implementation at the moment, but you can use the Suggested-by tag to mention Maciej in a structured way.

Quoted 12 lines
Fixes e701656ec4db ("MIPS: inst.h: Stop including asm.h to avoid various build failures")
Cc Maciej W. Rozycki" <[email protected]>
---
  arch/mips/include/asm/inst.h      | 779 ------------------------------------
  arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++
  arch/mips/kernel/unaligned.c      |   1 +
  arch/mips/loongson64/cop2-ex.c    |   1 +
  4 files changed, 804 insertions(+), 779 deletions(-)

create mode 100644 arch/mips/include/asm/unaligned.h

#2 lore raw

I'm sorry I forgot that, should I send V2?

Huacai

Quoted 49 lines · WANG Xuerui

Hi Huacai,

Quoted 20 lines · Huacai Chen

PTR_STR is redefined when CONFIG_TEST_PRINTF is set. This causes the following build warning:

CC lib/test_printf.o
lib/test_printf.c:214:0: warning: "PTR_STR" redefined
#define PTR_STR "ffff0123456789ab"
^
In file included from ./arch/mips/include/asm/dsemul.h:11:0,

                  from ./arch/mips/include/asm/processor.h:22,
                  from ./arch/mips/include/asm/thread_info.h:16,
                  from ./include/linux/thread_info.h:38,
                  from ./include/asm-generic/preempt.h:5,
                  from ./arch/mips/include/generated/asm/preempt.h:1,
                  from ./include/linux/preempt.h:78,
                  from ./include/linux/spinlock.h:51,
                  from ./include/linux/seqlock.h:36,
                  from ./include/linux/time.h:6,
                  from ./include/linux/stat.h:19,
                  from ./include/linux/module.h:13,
                  from lib/test_printf.c:10:
Quoted 7 lines

./arch/mips/include/asm/inst.h:20:0: note: this is the location of the previous definition
#define PTR_STR ".dword"
^

Instead of renaming PTR_STR again and again, it is better to move the unaligned load/store helpers from inst.h to unaligned.h, suggested by Maciej W. Rozycki.

I don't have time to review the implementation at the moment, but you can use the Suggested-by tag to mention Maciej in a structured way.

Quoted 12 lines
Fixes e701656ec4db ("MIPS: inst.h: Stop including asm.h to avoid various build failures")
Cc Maciej W. Rozycki" <[email protected]>
---
  arch/mips/include/asm/inst.h      | 779 ------------------------------------
  arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++
  arch/mips/kernel/unaligned.c      |   1 +
  arch/mips/loongson64/cop2-ex.c    |   1 +
  4 files changed, 804 insertions(+), 779 deletions(-)

create mode 100644 arch/mips/include/asm/unaligned.h

#3 lore raw
Quoted 1 line · Huacai Chen

I'm sorry I forgot that, should I send V2?

Feel free to, at a *very* quick glance the implementation should have few problems if any...

P.S.: Please don't top post.

Quoted 50 lines

Huacai

Quoted 46 lines · WANG Xuerui

Hi Huacai,

Quoted 24 lines · Huacai Chen

PTR_STR is redefined when CONFIG_TEST_PRINTF is set. This causes the following build warning:

CC lib/test_printf.o
lib/test_printf.c:214:0: warning: "PTR_STR" redefined

   #define PTR_STR "ffff0123456789ab"
   ^
In file included from ./arch/mips/include/asm/dsemul.h:11:0,
                   from ./arch/mips/include/asm/processor.h:22,
                   from ./arch/mips/include/asm/thread_info.h:16,
                   from ./include/linux/thread_info.h:38,
                   from ./include/asm-generic/preempt.h:5,
                   from ./arch/mips/include/generated/asm/preempt.h:1,
                   from ./include/linux/preempt.h:78,
                   from ./include/linux/spinlock.h:51,
                   from ./include/linux/seqlock.h:36,
                   from ./include/linux/time.h:6,
                   from ./include/linux/stat.h:19,
                   from ./include/linux/module.h:13,
                   from lib/test_printf.c:10:
./arch/mips/include/asm/inst.h:20:0: note: this is the location of the previous definition
   #define PTR_STR  ".dword"
   ^
Quoted 3 lines

Instead of renaming PTR_STR again and again, it is better to move the unaligned load/store helpers from inst.h to unaligned.h, suggested by Maciej W. Rozycki.

I don't have time to review the implementation at the moment, but you can use the Suggested-by tag to mention Maciej in a structured way.

Quoted 11 lines
Fixes e701656ec4db ("MIPS: inst.h: Stop including asm.h to avoid various build failures")
Cc Maciej W. Rozycki" <[email protected]>
---
   arch/mips/include/asm/inst.h      | 779 ------------------------------------
   arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++
   arch/mips/kernel/unaligned.c      |   1 +
   arch/mips/loongson64/cop2-ex.c    |   1 +
   4 files changed, 804 insertions(+), 779 deletions(-)

create mode 100644 arch/mips/include/asm/unaligned.h

#4 lore raw
In reply to Huacai Chen
Quoted 2 lines · Huacai Chen
 arch/mips/include/asm/inst.h      | 779 ------------------------------------
 arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++

please use a different filename for this to avoid another disaster because asm/unaligned.h is already used.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
#5 lore raw

Hi, Thomas,

Quoted 7 lines · Thomas Bogendoerfer
Quoted 2 lines · Huacai Chen
 arch/mips/include/asm/inst.h      | 779 ------------------------------------
 arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++

please use a different filename for this to avoid another disaster because asm/unaligned.h is already used.

It seems like unaligned.h is the best place, because LoadXX/StoreXX is nearly the same thing as get_unaligned/put_unaligned in the original unaligned.h. For PTR_STR, the only confliction comes from lib/test_printf.c, but lib/test_printf.c doesn't include unaligned.h. And it seems there is no future problem, because unaligned.h has only one new macro (i.e., PTR_STR, while LoadXX/StoreXX has no problems).

Regards,
Huacai

Quoted 6 lines

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]

#6 lore raw
Quoted 9 lines · Huacai Chen

Hi, Thomas,

Quoted 5 lines · Thomas Bogendoerfer
Quoted 2 lines · Huacai Chen
 arch/mips/include/asm/inst.h      | 779 ------------------------------------
 arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++
Quoted 8 lines
Quoted 2 lines

please use a different filename for this to avoid another disaster because asm/unaligned.h is already used.

It seems like unaligned.h is the best place, because LoadXX/StoreXX is nearly the same thing as get_unaligned/put_unaligned in the original unaligned.h. For PTR_STR, the only confliction comes from lib/test_printf.c, but lib/test_printf.c doesn't include unaligned.h. And it seems there is no future problem, because unaligned.h has only one new macro (i.e., PTR_STR, while LoadXX/StoreXX has no problems).

this approach has two things I don't like. First it duplicates code from asm-generic/unaligned.h and second it again risks to leak PTR_STR since asm/unaligned.h is included by other kernel code.

I took your patch renamed unaligned.h to unaligned-emul.h, included asm/asm.h and replaced PTR_STR by STR(PTR). I've pushed it to mips-next with a Co-developed by you.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
#7 lore raw

Hi, Thomas,

Quoted 24 lines · Thomas Bogendoerfer
Quoted 9 lines · Huacai Chen

Hi, Thomas,

Quoted 5 lines · Thomas Bogendoerfer
Quoted 2 lines · Huacai Chen
 arch/mips/include/asm/inst.h      | 779 ------------------------------------
 arch/mips/include/asm/unaligned.h | 802 ++++++++++++++++++++++++++++++++++++++
Quoted 8 lines
Quoted 2 lines

please use a different filename for this to avoid another disaster because asm/unaligned.h is already used.

It seems like unaligned.h is the best place, because LoadXX/StoreXX is nearly the same thing as get_unaligned/put_unaligned in the original unaligned.h. For PTR_STR, the only confliction comes from lib/test_printf.c, but lib/test_printf.c doesn't include unaligned.h. And it seems there is no future problem, because unaligned.h has only one new macro (i.e., PTR_STR, while LoadXX/StoreXX has no problems).

this approach has two things I don't like. First it duplicates code from asm-generic/unaligned.h and second it again risks to leak PTR_STR since asm/unaligned.h is included by other kernel code.

Quoted 5 lines

I took your patch renamed unaligned.h to unaligned-emul.h, included asm/asm.h and replaced PTR_STR by STR(PTR). I've pushed it to mips-next with a Co-developed by you.

Thomas.

OK, thank you.

Quoted 4 lines

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]