parisc: add support for cmpxchg on u8 pointers
The kernel test bot reported[1] that using set_mask_bits on a u8 causes the following issue on parisc: hppa-linux-ld: drivers/phy/ti/phy-tusb1210.o: in function `tusb1210_probe': >> (.text+0x2f4): undefined reference to `__cmpxchg_called_with_bad_pointer' >> hppa-linux-ld: (.text+0x324): undefined reference to `__cmpxchg_called_with_bad_pointer' hppa-linux-ld: (.text+0x354): undefined reference to `__cmpxchg_called_with_bad_pointer' Add support for cmpxchg on u8 pointers. [1] https://lore.kernel.org/patchwork/patch/1272617/#1468946 Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Liam Beguin <liambeguin@gmail.com> Tested-by: Dave Anglin <dave.anglin@bell.net> Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Родитель
ba47d845d7
Коммит
b344d6a83d
|
@ -60,6 +60,7 @@ extern void __cmpxchg_called_with_bad_pointer(void);
|
||||||
extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old,
|
extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old,
|
||||||
unsigned int new_);
|
unsigned int new_);
|
||||||
extern u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new_);
|
extern u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new_);
|
||||||
|
extern u8 __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new_);
|
||||||
|
|
||||||
/* don't worry...optimizer will get rid of most of this */
|
/* don't worry...optimizer will get rid of most of this */
|
||||||
static inline unsigned long
|
static inline unsigned long
|
||||||
|
@ -71,6 +72,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
|
||||||
#endif
|
#endif
|
||||||
case 4: return __cmpxchg_u32((unsigned int *)ptr,
|
case 4: return __cmpxchg_u32((unsigned int *)ptr,
|
||||||
(unsigned int)old, (unsigned int)new_);
|
(unsigned int)old, (unsigned int)new_);
|
||||||
|
case 1: return __cmpxchg_u8((u8 *)ptr, (u8)old, (u8)new_);
|
||||||
}
|
}
|
||||||
__cmpxchg_called_with_bad_pointer();
|
__cmpxchg_called_with_bad_pointer();
|
||||||
return old;
|
return old;
|
||||||
|
|
|
@ -79,3 +79,15 @@ unsigned long __cmpxchg_u32(volatile unsigned int *ptr, unsigned int old, unsign
|
||||||
_atomic_spin_unlock_irqrestore(ptr, flags);
|
_atomic_spin_unlock_irqrestore(ptr, flags);
|
||||||
return (unsigned long)prev;
|
return (unsigned long)prev;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u8 __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new)
|
||||||
|
{
|
||||||
|
unsigned long flags;
|
||||||
|
u8 prev;
|
||||||
|
|
||||||
|
_atomic_spin_lock_irqsave(ptr, flags);
|
||||||
|
if ((prev = *ptr) == old)
|
||||||
|
*ptr = new;
|
||||||
|
_atomic_spin_unlock_irqrestore(ptr, flags);
|
||||||
|
return prev;
|
||||||
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче