From patchwork Wed Apr 6 02:25:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 606812 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 3qfqQz5GPmz9t5p for ; Wed, 6 Apr 2016 12:28:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b=wY1P69QG; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760343AbcDFC2l (ORCPT ); Tue, 5 Apr 2016 22:28:41 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:33140 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759981AbcDFC2b (ORCPT ); Tue, 5 Apr 2016 22:28:31 -0400 Received: by mail-pf0-f180.google.com with SMTP id 184so23191833pff.0 for ; Tue, 05 Apr 2016 19:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fAMBf9aBMoj02ZSQMGxeqDyZOHn7nfA2Gu43rrnFjFw=; b=wY1P69QGrdLGOuwfJmvrpwChvcp2uovexpmfE7nBy7n7emi629D+7g4R6kLBr4XGMa ZIaZnHyu9iX9c2D8nwpFp9UTL8U1ljsVOzfMVVofGCDH249wTlVEz3wGHLLk6SxXv3LP +C3k2EAB7AW5igdoZviwS7WGU6C7p27RL0tD3s2zinoSS8Fb4PXIoHLE11fVRgY0LtvB GlIiN7E0ySXs5eYpnxICvTHFo+thnpjb0ForN8n3s+2tKNHXiVo47X9tqFDFOrk25gzP dt9RmZj+t9K8PflER0dokQl/m7Ct1K/qcSKNDVdM/p4PQf2mLZWTXrZfbcMzHkzvb4y0 E1tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fAMBf9aBMoj02ZSQMGxeqDyZOHn7nfA2Gu43rrnFjFw=; b=CK9HK9Ihf+50bHpHHbx2rys0S013qTwZ7IwG2tC2RFZCriT+AmhIwabHEBNia22Eg8 JW7YRJrJdlGuM/Ab/CRYVEpjw/zunWLCvG/o0+sk/rA7TBTseAW2PhUfIAEcXFrxq6Tc ZhTk+KNcq6YU2nVfgvI0mvCfUC0NqA0hbzOmkwv6cTbud1YVSow6e4sj9HZLcNS/Zm/I Rm80LOPe2aHrn9VRiftg05M9DlDy3s7oSoYjEoDjN/dOca/zllXeY81EIiF3qk9Cqn25 CtuB0cFNzR35DHqwR15p2OkJc/a91DnnrCe30RNwofu8UvaiFB76aTwp4d4/jkWQ/+4n Icvg== X-Gm-Message-State: AD7BkJI+2aw9Jiw8TUgN0r7AAaDEGhPRnA5j8FnH4ahNTXer7nrCXNGgWFNTBKCorkHiHg== X-Received: by 10.98.32.218 with SMTP id m87mr34632438pfj.48.1459909710486; Tue, 05 Apr 2016 19:28:30 -0700 (PDT) Received: from localhost.localdomain (wsip-70-184-93-199.ph.ph.cox.net. [70.184.93.199]) by smtp.googlemail.com with ESMTPSA id l14sm528682pfi.23.2016.04.05.19.28.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Apr 2016 19:28:30 -0700 (PDT) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, fugang.duan@nxp.com, lznuaa@gmail.com Cc: fabio.estevam@nxp.com, l.stach@pengutronix.de, andrew@lunn.ch, tremyfr@gmail.com, gerg@uclinux.org, linux-arm-kernel@lists.infradead.org, johannes@sipsolutions.net, stillcompiling@gmail.com, sergei.shtylyov@cogentembedded.com, arnd@arndb.de, Troy Kisky Subject: [PATCH net-next V3 13/16] net: fec: detect tx int lost Date: Tue, 5 Apr 2016 19:25:59 -0700 Message-Id: <1459909562-22865-14-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459909562-22865-1-git-send-email-troy.kisky@boundarydevices.com> References: <1459909562-22865-1-git-send-email-troy.kisky@boundarydevices.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If a tx int is lost, no need to reset the fec. Just mark the event and call napi_schedule. Signed-off-by: Troy Kisky --- v3: no change --- drivers/net/ethernet/freescale/fec_main.c | 38 ++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index be875fd..445443d 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1094,14 +1094,50 @@ fec_stop(struct net_device *ndev) } } +static const uint txint_flags[] = { + FEC_ENET_TXF_0, FEC_ENET_TXF_1, FEC_ENET_TXF_2 +}; static void fec_timeout(struct net_device *ndev) { struct fec_enet_private *fep = netdev_priv(ndev); + struct bufdesc *bdp; + unsigned short status; + int i; + uint events = 0; - fec_dump(ndev); + for (i = 0; i < fep->num_tx_queues; i++) { + struct fec_enet_priv_tx_q *txq = fep->tx_queue[i]; + int index; + struct sk_buff *skb = NULL; + bdp = txq->dirty_tx; + while (1) { + bdp = fec_enet_get_nextdesc(bdp, &txq->bd); + if (bdp == txq->bd.cur) + break; + index = fec_enet_get_bd_index(bdp, &txq->bd); + skb = txq->tx_skbuff[index]; + if (skb) { + status = fec16_to_cpu(bdp->cbd_sc); + if ((status & BD_ENET_TX_READY) == 0) + events |= txint_flags[i]; + break; + } + } + } + if (events) { + fep->events |= events; + /* Disable the RX/TX interrupt */ + writel(FEC_NAPI_IMASK, fep->hwp + FEC_IMASK); + napi_schedule(&fep->napi); + netif_wake_queue(fep->netdev); + pr_err("%s: tx int lost\n", __func__); + return; + } + + fec_dump(ndev); ndev->stats.tx_errors++; schedule_work(&fep->tx_timeout_work);