Skip to content

Commit ed7741f

Browse files
vineetgarcxxkent
authored andcommitted
ARC: use LDH vs. LDW for 16-bit load/store
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
1 parent 1150d39 commit ed7741f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

arch/arc/include/asm/io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static inline u16 __raw_readw(const volatile void __iomem *addr)
6666
u16 s;
6767

6868
__asm__ __volatile__(
69-
" ldw%U1 %0, %1 \n"
69+
" ldh%U1 %0, %1 \n"
7070
: "=r" (s)
7171
: "m" (*(volatile u16 __force *)addr)
7272
: "memory");

arch/arc/include/asm/uaccess.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
long __ret = 0; /* success by default */ \
6262
switch (sz) { \
6363
case 1: __arc_get_user_one(*(k), u, "ldb", __ret); break; \
64-
case 2: __arc_get_user_one(*(k), u, "ldw", __ret); break; \
64+
case 2: __arc_get_user_one(*(k), u, "ldh", __ret); break; \
6565
case 4: __arc_get_user_one(*(k), u, "ld", __ret); break; \
6666
case 8: __arc_get_user_one_64(*(k), u, __ret); break; \
6767
} \
@@ -328,7 +328,7 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n)
328328
orig_n = orig_n % 2;
329329

330330
__asm__ __volatile__(
331-
"17: ldw.ab %3, [%2,2] \n"
331+
"17: ldh.ab %3, [%2,2] \n"
332332
" stw.ab %3, [%1,2] \n"
333333
" sub %0,%0,2 \n"
334334
"33: ;nop \n"
@@ -390,7 +390,7 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n)
390390
" st.ab %5, [%1,4] \n"
391391
" sub.f %0,%0,4 \n"
392392
"32: bbit0 %3,1,33f \n" /* 2 bytes left */
393-
"17: ldw.ab %5, [%2,2] \n"
393+
"17: ldh.ab %5, [%2,2] \n"
394394
" stw.ab %5, [%1,2] \n"
395395
" sub.f %0,%0,2 \n"
396396
"33: bbit0 %3,0,34f \n"
@@ -551,7 +551,7 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)
551551
orig_n = orig_n % 2;
552552

553553
__asm__ __volatile__(
554-
" ldw.ab %3, [%2,2] \n"
554+
" ldh.ab %3, [%2,2] \n"
555555
"17: stw.ab %3, [%1,2] \n"
556556
" sub %0, %0, 2 \n"
557557
"33:;nop \n"
@@ -613,7 +613,7 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)
613613
"16: st.ab %5, [%1,4] \n"
614614
" sub.f %0, %0, 4 \n"
615615
"32: bbit0 %3,1,33f \n" /* 2 bytes left */
616-
" ldw.ab %5, [%2,2] \n"
616+
" ldh.ab %5, [%2,2] \n"
617617
"17: stw.ab %5, [%1,2] \n"
618618
" sub.f %0, %0, 2 \n"
619619
"33: bbit0 %3,0,34f \n"

0 commit comments

Comments
 (0)