From patchwork Fri Jun 28 07:35:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 255285 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DC84C2C0362 for ; Fri, 28 Jun 2013 17:35:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754794Ab3F1Hff (ORCPT ); Fri, 28 Jun 2013 03:35:35 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:19324 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754779Ab3F1Hfd (ORCPT ); Fri, 28 Jun 2013 03:35:33 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MP300FJFEF6CT20@mailout1.samsung.com> for netdev@vger.kernel.org; Fri, 28 Jun 2013 16:35:32 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id A7.9E.17404.4CC3DC15; Fri, 28 Jun 2013 16:35:32 +0900 (KST) X-AuditID: cbfee68d-b7f096d0000043fc-fc-51cd3cc48191 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8D.93.21068.4CC3DC15; Fri, 28 Jun 2013 16:35:32 +0900 (KST) Received: from DObh74an01 ([12.23.120.86]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MP3001AUEF70Q60@mmp1.samsung.com>; Fri, 28 Jun 2013 16:35:32 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org Cc: 'Giuseppe CAVALLARO' , =?ks_c_5601-1987?B?J7HosbnB+Cc=?= , davem@davemloft.net, cpgs@samsung.com Subject: [PATCH] net: stmmac: fixed enh_desc set always zero Date: Fri, 28 Jun 2013 16:35:32 +0900 Message-id: <015801ce73d2$12332070$36996150$%an@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=ks_c_5601-1987 Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac5z0hIfjdEEojPAR/e54d5NpgPeUg== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRmVeSWpSXmKPExsVy+t8zfd0jNmcDDc6+07d4eUjTYs75FhaL 3gVX2SyOLRCz+P96K6MDq8eWlTeZPPq2rGL0ePpjL7PH501yASxRXDYpqTmZZalF+nYJXBlH 57xhLtjDXfFl9W7GBsZTnF2MnBwSAiYSp85tZoSwxSQu3FvP1sXIxSEksIxR4sz/PUxdjBxg RVv/5kHEFzFKXLwyiR2kQUjgF6PEnEYVEJtNQE2ieeZlNhBbREBK4uOO7ewgDcwC0xklll74 wwqSEBawkfg8Yy1YEYuAqsT2I8eYQWxeoPiUda/YIGxBiR+T77GA2MwCBhLvZ/WxQtjyEpvX vGWGOEhd4tFfXRBTREBPYsUJRYgKEYl9L94xgqyVENjHLjH9wQKoVQIS3yYfYoFolZXYdIAZ 4l9JiYMrbrBMYBSbhWTxLCSLZyFZPAvJigWMLKsYRVMLkguKk9KLDPWKE3OLS/PS9ZLzczcx QiKtdwfj7QPWhxiTgdZPZJYSTc4HRmpeSbyhsZmRhamJqbGRuaUZacJK4rxqLdaBQgLpiSWp 2ampBalF8UWlOanFhxiZODilGhh5jzYo3JCJjo6OudTy4e75Se+yTEUdNUQm8b6cLRB4scry QOFpTaPpSyNi/X+Lfp3bWCsl7KHeKhSgX+NUll2ov0/bwOUv9xmnrU8+r4oNKDb5UWgX8+TQ w09HLkl8ev/ueab2u2aPdeqv5tw6Ws507Uv5wXMfU3tuqG3vPvHPmke9ycnAL1WJpTgj0VCL uag4EQBGToYOygIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCKsWRmVeSWpSXmKPExsVy+t9jAd0jNmcDDdpm61i8PKRpMed8C4tF 74KrbBbHFohZ/H+9ldGB1WPLyptMHn1bVjF6PP2xl9nj8ya5AJaoBkabjNTElNQihdS85PyU zLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKC1SgpliTmlQKGAxOJiJX07TBNC Q9x0LWAaI3R9Q4LgeowM0EDCOsaMo3PeMBfs4a74sno3YwPjKc4uRg4OCQETia1/87oYOYFM MYkL99azdTFycQgJLGKUuHhlEjtIQkjgF6PEnEYVEJtNQE2ieeZlNhBbREBK4uOO7ewgDcwC 0xklll74wwqSEBawkfg8Yy1YEYuAqsT2I8eYQWxeoPiUda/YIGxBiR+T77GA2MwCBhLvZ/Wx QtjyEpvXvGWGOE5d4tFfXRBTREBPYsUJRYgKEYl9L94xTmAUmIVk0Cwkg2YhGTQLScsCRpZV jKKpBckFxUnpuUZ6xYm5xaV56XrJ+bmbGMFx/Ex6B+OqBotDjAIcjEo8vA2JZwKFWBPLiitz DzFKcDArifDeWQAU4k1JrKxKLcqPLyrNSS0+xJgM9OdEZinR5HxgiskriTc0NjEzsjQyszAy MTcnTVhJnPdgq3WgkEB6YklqdmpqQWoRzBYmDk6pBsZlXPytd587SK408La+eUdS+l6Z6cE3 V5pUy1Xzuz0q1ztP/B8lZbp419Yz3ye3zYpa/+8254fC/vlf3nXdM/esjZ2wKfWX25PIjY7f jdKfPemMuevuLHBGQ9d1reKznmeb73LdEjT07Elmm3ojUzj0WZ3Em7kfHqpoutx66LLVIfDo FF7XwzeUWIozEg21mIuKEwE2MnqYJwMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixed that enh_desc value is always zero. Due to calling order of stmmac_selec_desc_mode(), enh_desc value is always zero. Even though mac is set to use enhanced dma descriptor, if enh_desc is zero, functions related dma descriptor are not working correctly. Signed-off-by: Byungho An Acked-by: Giuseppe Cavallaro --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index e5e221e..40efd55 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2567,9 +2567,6 @@ static int stmmac_hw_init(struct stmmac_priv *priv) /* Get and dump the chip ID */ priv->synopsys_id = stmmac_get_synopsys_id(priv); - /* To use alternate (extended) or normal descriptor structures */ - stmmac_selec_desc_mode(priv); - /* To use the chained or ring mode */ if (chain_mode) { priv->hw->chain = &chain_mode_ops; @@ -2604,6 +2601,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv) } else pr_info(" No HW DMA feature register supported"); + /* To use alternate (extended) or normal descriptor structures */ + stmmac_selec_desc_mode(priv); + ret = priv->hw->mac->rx_ipc(priv->ioaddr); if (!ret) { pr_warn(" RX IPC Checksum Offload not configured.\n");