diff options
| author | David Miller <davem@davemloft.net> | 2006-06-05 11:27:10 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-06-22 12:16:11 -0700 |
| commit | 9d8e2ed7c51a756c8b6534af4fb82c406cfe0741 (patch) | |
| tree | 0f51d44b82747c13f556fd02f27ac0cb8f39564c | |
| parent | af948395f08691edd731bac85c1f4c334bd312ec (diff) | |
| download | linux-stable-9d8e2ed7c51a756c8b6534af4fb82c406cfe0741.tar.gz linux-stable-9d8e2ed7c51a756c8b6534af4fb82c406cfe0741.tar.bz2 linux-stable-9d8e2ed7c51a756c8b6534af4fb82c406cfe0741.zip | |
[PATCH] SPARC64: Fix missing fold at end of checksums.
Both csum_partial() and the csum_partial_copy*() family of routines
forget to do a final fold on the computed checksum value on sparc64.
So do the standard Sparc "add + set condition codes, add carry"
sequence, then make sure the high 32-bits of the return value are
clear.
Based upon some excellent detective work and debugging done by
Richard Braun and Samuel Thibault.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/sparc64/lib/checksum.S | 5 | ||||
| -rw-r--r-- | arch/sparc64/lib/csum_copy.S | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/sparc64/lib/checksum.S b/arch/sparc64/lib/checksum.S index ba9cd3ccc2b2..1d230f693dc4 100644 --- a/arch/sparc64/lib/checksum.S +++ b/arch/sparc64/lib/checksum.S @@ -165,8 +165,9 @@ csum_partial_end_cruft: sll %g1, 8, %g1 or %o5, %g1, %o4 -1: add %o2, %o4, %o2 +1: addcc %o2, %o4, %o2 + addc %g0, %o2, %o2 csum_partial_finish: retl - mov %o2, %o0 + srl %o2, 0, %o0 diff --git a/arch/sparc64/lib/csum_copy.S b/arch/sparc64/lib/csum_copy.S index 71af48839064..e566c770a0f6 100644 --- a/arch/sparc64/lib/csum_copy.S +++ b/arch/sparc64/lib/csum_copy.S @@ -221,11 +221,12 @@ FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */ sll %g1, 8, %g1 or %o5, %g1, %o4 -1: add %o3, %o4, %o3 +1: addcc %o3, %o4, %o3 + addc %g0, %o3, %o3 70: retl - mov %o3, %o0 + srl %o3, 0, %o0 95: mov 0, GLOBAL_SPARE brlez,pn %o2, 4f |