From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754914AbcHATfR (ORCPT <rfc822;w@1wt.eu>);
	Mon, 1 Aug 2016 15:35:17 -0400
Received: from gate.crashing.org ([63.228.1.57]:56439 "EHLO gate.crashing.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754451AbcHATfK (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 1 Aug 2016 15:35:10 -0400
Date: Mon, 1 Aug 2016 08:15:06 -0500
From: Segher Boessenkool <segher@kernel.crashing.org>
To: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>, Scott Wood <oss@buserror.net>,
        antoine.blangy@c-s.fr, linuxppc-dev@lists.ozlabs.org,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] powerpc/32: fix csum_partial_copy_generic()
Message-ID: <20160801131505.GA1742@gate.crashing.org>
References: <20160801125605.410371A23A2@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160801125605.410371A23A2@localhost.localdomain>
User-Agent: Mutt/1.4.2.3i
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Aug 01, 2016 at 02:56:05PM +0200, Christophe Leroy wrote:
> --- a/arch/powerpc/lib/checksum_32.S
> +++ b/arch/powerpc/lib/checksum_32.S
> @@ -127,7 +127,8 @@ _GLOBAL(csum_partial_copy_generic)
>  	stw	r7,12(r1)
>  	stw	r8,8(r1)
>  
> -	andi.	r0,r4,1			/* is destination address even ? */
> +	rlwinm	r0,r4,3,0x8		/* is destination address even ? */
> +	rlwnm	r6,r6,r0,0,31		/* swap bytes for odd destination */
>  	cmplwi	cr7,r0,0
>  	addic	r12,r6,0
>  	addi	r6,r4,-4

That does not "swap bytes"; it shifts the word up by 8 bits, instead.
That may or may not do what is intended.


Segher