From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965258AbcBSOiH (ORCPT ); Fri, 19 Feb 2016 09:38:07 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:55859 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964960AbcBSOiE (ORCPT ); Fri, 19 Feb 2016 09:38:04 -0500 From: Arnd Bergmann To: Murali Karicheri Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net Subject: Re: [PATCH v1 3/4] net: netcp: rename {get/set}pad_info to {get/set}_sw_data Date: Fri, 19 Feb 2016 15:37:51 +0100 Message-ID: <3448016.8sm2r4rFcb@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1455824777-15571-3-git-send-email-m-karicheri2@ti.com> References: <1455824777-15571-1-git-send-email-m-karicheri2@ti.com> <1455824777-15571-3-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:e20XUFg1k34Ht1K9va25CcTecy56lh4UTf0GskVjbk/LcG5KMGu JXw4xyzT6WlGpGmBaC3FMpxRPwKtBfSuItaLRRhWbIXuAtwiVHCVT/qQiEOVtOzfldHzB0w N4YJY7MZQosbY5Uw0YPgG6Wqs0MAtZ5qn7doVu1oZsM7QT1QdqPdvmv9uHHIz5+/sQqJlLD 6tXCrt2qt2qQSZ/c8laHw== X-UI-Out-Filterresults: notjunk:1;V01:K0:WzW2mWrlKVk=:fnYPnC4xf0ibqiQkwKHciU ku20IOIDLtWH1/MDopbEHaoDMl0RqoaHIJkAw+BWFRSYdxBOQLgTXbhgpaKy+iYT8xvguR5np DAg7LkrH3Wt5ZEZxyPlNd+TUk+srZGuzDwiqGPC1YvwuL3RhjDa+GPmYC4dhGySdyqsa89YM8 StndTjH4s33zkzJ5JoZMxSGjK6+IJOBpM2UDJ0M65hRNIZrgUG8ZhQKFPAJRimbuIKJjrigLd TPhGsgAfDUkqqgncapmy+niFGq86a3qfotOTV0+KmaXqA2rkEgRkIe8rTAGbWyfetNlHdYJWk AdAu+Wr3djgQUTGhyOyxtxRTMIruHSFFTj4g3V7VCcr+XyC6psN0lfk/L07mHuMRsKuuQrrxK /MhyeuTYJQSya8wS0o/HQWALAkhtrHkhzQ74faylwERHeo1avpSUWdyOlEupLnT1sKzXy9tbZ 4p36oJFcIqZgV42ujqSjx7MPdWD0WirQK3HOtLU55jIn402ccW4XWggBnLtTuhHh8JUALiVTQ 1UMexjZkkL+ltHTriDnKIKITiEmfHtgFUyCWPgFhZNDw6Ky/nW+DldabvmBT/hhyU0u2FavxL 8ZfVTl3DixLRyD1nSxUug3jAmmHYQ41MpMlMjcZsOHZCKGg4GHUJ0D0FocAtqW/+JNT9Ls1D7 R3TQyZBnz5RofrsvI8vsaLFzZRWgZc6AjHjdYAoF3Rsx5a7H6qWeXff9b7kaMmBJ60czzltx2 rij8aA5OpiPEXIZw Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 18 February 2016 14:46:16 Murali Karicheri wrote: > Rename the helpers to match with the updated dma desc field sw_data. > > Cc: Wingman Kwok > Cc: Mugunthan V N > CC: Arnd Bergmann > CC: Grygorii Strashko > CC: David Laight > Signed-off-by: Murali Karicheri > --- > v1 - new patch to based on discussion at > https://patchwork.ozlabs.org/patch/580860/ > drivers/net/ethernet/ti/netcp_core.c | 40 +++++++++++++++++++----------------- > 1 file changed, 21 insertions(+), 19 deletions(-) > > diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c > index 0b26e52..1d07cca 100644 > --- a/drivers/net/ethernet/ti/netcp_core.c > +++ b/drivers/net/ethernet/ti/netcp_core.c > @@ -117,10 +117,11 @@ static void get_pkt_info(dma_addr_t *buff, u32 *buff_len, dma_addr_t *ndesc, > *ndesc = le32_to_cpu(desc->next_desc); > } > > -static void get_pad_info(u32 *pad0, u32 *pad1, struct knav_dma_desc *desc) > +static void get_sw_data(u32 *data0, u32 *data1, struct knav_dma_desc *desc) > { > - *pad0 = le32_to_cpu(desc->pad[0]); > - *pad1 = le32_to_cpu(desc->pad[1]); > + /* No Endian conversion needed as this data is untouched by hw */ > + *data0 = desc->sw_data[0]; > + *data1 = desc->sw_data[1]; > } Actually this needs to be done together with patch 2, or you get a build failure if this one is not yet applied. > @@ -1174,7 +1176,7 @@ static int netcp_tx_submit_skb(struct netcp_intf *netcp, > } > > set_words(&tmp, 1, &desc->packet_info); > - set_words((u32 *)&skb, 1, &desc->pad[0]); > + set_words((u32 *)&skb, 1, &desc->sw_data[0]); > > if (tx_pipe->flags & SWITCH_TO_PORT_IN_TAGINFO) { > tmp = tx_pipe->switch_to_port; > This seems to introduce a bug, and should produce an "sparse" warning about a u32 being passed into a function expecting a __le32. The other bug I originally tried to address here is the way an indirect pointer is converted to a 'u32' pointer, which won't work on 64-bit architectures when pointers are wider than u32. Maybe at least put a comment here that this is a known deficiency. Arnd