From patchwork Fri Jan 18 10:06:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 213531 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 51C172C007B for ; Fri, 18 Jan 2013 21:06:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751585Ab3ARKGo (ORCPT ); Fri, 18 Jan 2013 05:06:44 -0500 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:43942 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324Ab3ARKGn (ORCPT ); Fri, 18 Jan 2013 05:06:43 -0500 Received: from bigeasy by Chamillionaire.breakpoint.cc with local (Exim 4.72) (envelope-from ) id 1Tw8qJ-0001KP-Eu; Fri, 18 Jan 2013 11:06:35 +0100 From: Sebastian Andrzej Siewior To: netdev@vger.kernel.org Cc: "David S. Miller" , Thomas Gleixner , Rakesh Ranjan , Bruno Bittner , stable@vger.kernel.org, Holger Dengler , Jan Altenberg , Sebastian Andrzej Siewior Subject: [PATCH 2/4] net: ethernet: davinci_cpdma: fix descriptor handling Date: Fri, 18 Jan 2013 11:06:10 +0100 Message-Id: <1358503572-5057-2-git-send-email-sebastian@breakpoint.cc> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1358503572-5057-1-git-send-email-sebastian@breakpoint.cc> References: <1358503572-5057-1-git-send-email-sebastian@breakpoint.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thomas Gleixner According to the datasheet there is a miss-queued buffer condition handling required in the processing. This is implemented correctly when descriptors are queued for TX, but during TX cleanup of already transmitted descriptors the condition is not handled correctly. That leads to a stall of the TX queue which fills up and never gets processed. Cc: Rakesh Ranjan Cc: Bruno Bittner Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner [dengler: patch description] Signed-off-by: Holger Dengler [jan: forward ported] Signed-off-by: Jan Altenberg Signed-off-by: Sebastian Andrzej Siewior --- drivers/net/ethernet/ti/davinci_cpdma.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index dd5f2db..709c437 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -756,7 +756,8 @@ static int __cpdma_chan_process(struct cpdma_chan *chan) chan->count--; chan->stats.good_dequeue++; - if (status & CPDMA_DESC_EOQ) { + if ((status & CPDMA_DESC_EOQ) && (chan->head) && + (!(status & CPDMA_DESC_TD_COMPLETE))) { chan->stats.requeue++; chan_write(chan, hdp, desc_phys(pool, chan->head)); }