• Christophe Leroy's avatar
    Revert "powerpc/64: Fix checksum folding in csum_add()" · 96f391cf
    Christophe Leroy authored
    This reverts commit 6ad966d7.
    
    That commit was pointless, because csum_add() sums two 32 bits
    values, so the sum is 0x1fffffffe at the maximum.
    And then when adding upper part (1) and lower part (0xfffffffe),
    the result is 0xffffffff which doesn't carry.
    Any lower value will not carry either.
    
    And behind the fact that this commit is useless, it also kills the
    whole purpose of having an arch specific inline csum_add()
    because the resulting code gets even worse than what is obtained
    with the generic implementation of csum_add()
    
    0000000000000240 <.csum_add>:
     240:	38 00 ff ff 	li      r0,-1
     244:	7c 84 1a 14 	add     r4,r4,r3
     248:	78 00 00 20 	clrldi  r0,r0,32
     24c:	78 89 00 22 	rldicl  r9,r4,32,32
     250:	7c 80 00 38 	and     r0,r4,r0
     254:	7c 09 02 14 	add     r0,r9,r0
     258:	78 09 00 22 	rldicl  r9,r0,32,32
     25c:	7c 00 4a 14 	add     r0,r0,r9
     260:	78 03 00 20 	clrldi  r3,r0,32
     264:	4e 80 00 20 	blr
    
    In comparison, the generic implementation of csum_add() gives:
    
    0000000000000290 <.csum_add>:
     290:	7c 63 22 14 	add     r3,r3,r4
     294:	7f 83 20 40 	cmplw   cr7,r3,r4
     298:	7c 10 10 26 	mfocrf  r0,1
     29c:	54 00 ef fe 	rlwinm  r0,r0,29,31,31
     2a0:	7c 60 1a 14 	add     r3,r0,r3
     2a4:	78 63 00 20 	clrldi  r3,r3,32
     2a8:	4e 80 00 20 	blr
    
    And the reverted implementation for PPC64 gives:
    
    0000000000000240 <.csum_add>:
     240:	7c 84 1a 14 	add     r4,r4,r3
     244:	78 80 00 22 	rldicl  r0,r4,32,32
     248:	7c 80 22 14 	add     r4,r0,r4
     24c:	78 83 00 20 	clrldi  r3,r4,32
     250:	4e 80 00 20 	blr
    
    Fixes: 6ad966d7 ("powerpc/64: Fix checksum folding in csum_add()")
    Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
    Acked-by: default avatarPaul Mackerras <paulus@ozlabs.org>
    Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
    96f391cf
checksum.h 5.86 KB