All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: Fix find_next_zero_bit and related assembly
@ 2010-11-19 18:13 James Jones
  0 siblings, 0 replies; 16+ messages in thread
From: James Jones @ 2010-11-19 18:13 UTC (permalink / raw)
  To: linux-arm-kernel

The find_next_bit, find_first_bit, find_next_zero_bit
and find_first_zero_bit functions were not properly
clamping to the maxbit argument at the bit level. They
were instead only checking maxbit at the byte level.
To fix this, add a compare and a conditional move
instruction to the end of the common bit-within-the-
byte code used by all the functions and be sure not to
clobber the maxbit argument before it is used.

Signed-off-by: James Jones <jajones@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/lib/findbit.S |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index 1e4cbd4..64f6bc1 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be)
  */
 .L_found:
 #if __LINUX_ARM_ARCH__ >= 5
-		rsb	r1, r3, #0
-		and	r3, r3, r1
+		rsb	r0, r3, #0
+		and	r3, r3, r0
 		clz	r3, r3
 		rsb	r3, r3, #31
 		add	r0, r2, r3
@@ -190,5 +190,7 @@ ENDPROC(_find_next_bit_be)
 		addeq	r2, r2, #1
 		mov	r0, r2
 #endif
+		cmp	r1, r0			@ Clamp to maxbit
+		movlo	r0, r1
 		mov	pc, lr
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH] ARM: Fix find_next_zero_bit and related assembly
@ 2010-11-12  1:16 James Jones
  2010-11-23 21:26   ` Nicolas Pitre
  0 siblings, 1 reply; 16+ messages in thread
From: James Jones @ 2010-11-12  1:16 UTC (permalink / raw)
  To: Russell King; +Cc: linux-arm-kernel, linux-kernel, James Jones

The find_next_bit, find_first_bit, find_next_zero_bit
and find_first_zero_bit functions were not properly
clamping to the maxbit argument at the bit level. They
were instead only checking maxbit at the byte level.
To fix this, add a compare and a conditional move
instruction to the end of the common bit-within-the-
byte code used by all the functions and be sure not to
clobber the maxbit argument before it is used.

Signed-off-by: James Jones <jajones@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/lib/findbit.S |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index 1e4cbd4..64f6bc1 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be)
  */
 .L_found:
 #if __LINUX_ARM_ARCH__ >= 5
-		rsb	r1, r3, #0
-		and	r3, r3, r1
+		rsb	r0, r3, #0
+		and	r3, r3, r0
 		clz	r3, r3
 		rsb	r3, r3, #31
 		add	r0, r2, r3
@@ -190,5 +190,7 @@ ENDPROC(_find_next_bit_be)
 		addeq	r2, r2, #1
 		mov	r0, r2
 #endif
+		cmp	r1, r0			@ Clamp to maxbit
+		movlo	r0, r1
 		mov	pc, lr
 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2010-11-24 19:15 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-19 18:13 [PATCH] ARM: Fix find_next_zero_bit and related assembly James Jones
  -- strict thread matches above, loose matches on Subject: below --
2010-11-12  1:16 James Jones
2010-11-23 21:26 ` Nicolas Pitre
2010-11-23 21:26   ` Nicolas Pitre
2010-11-23 23:28   ` James Jones
2010-11-23 23:28     ` James Jones
2010-11-24 18:12     ` Stephen Boyd
2010-11-24 18:12       ` Stephen Boyd
2010-11-24 19:00       ` Nicolas Pitre
2010-11-24 19:00         ` Nicolas Pitre
2010-11-24 19:08         ` James Jones
2010-11-24 19:08           ` James Jones
2010-11-24 19:13           ` Nicolas Pitre
2010-11-24 19:13             ` Nicolas Pitre
2010-11-24 19:15             ` Russell King - ARM Linux
2010-11-24 19:15               ` Russell King - ARM Linux

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.