Sun May 30 02:28:59 2021 UTC ()

Don't use V8 atomic instruction for AA32 mode.


(joerg)

diff -r1.38 -r1.39 src/sys/arch/arm/include/lock.h

--- src/sys/arch/arm/include/lock.h 2021/04/27 06:03:09	1.38
+++ src/sys/arch/arm/include/lock.h 2021/05/30 02:28:59	1.39

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lock.h,v 1.38 2021/04/27 06:03:09 skrll Exp $	*/
+/*	$NetBSD: lock.h,v 1.39 2021/05/30 02:28:59 joerg Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -194,27 +194,27 @@ __cpu_simple_lock_try(__cpu_simple_lock_
 	return 1;
 #else
 	return (__swp(__SIMPLELOCK_LOCKED, __alp) == __SIMPLELOCK_UNLOCKED);
 #endif
+}
 #else
 int __cpu_simple_lock_try(__cpu_simple_lock_t *);
 #endif
 static __inline void __unused
 __cpu_simple_unlock(__cpu_simple_lock_t *__alp)
+{
-#if defined(_ARM_ARCH_8)
+#if defined(_ARM_ARCH_8) && defined(__LP64__)
 	if (sizeof(*__alp) == 1) {
 		__asm __volatile("stlrb\t%w0, [%1]"
 		    :: "r"(__SIMPLELOCK_UNLOCKED), "r"(__alp) : "memory");
 	} else {
 		__asm __volatile("stlr\t%0, [%1]"
 		    :: "r"(__SIMPLELOCK_UNLOCKED), "r"(__alp) : "memory");
+	}
 #else
 	__arm_dmb_store();
 	*__alp = __SIMPLELOCK_UNLOCKED;
 #endif
+}