From patchwork Thu Feb 25 00:36:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 587805 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 04557140B9A for ; Thu, 25 Feb 2016 11:41:03 +1100 (AEDT) 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=REM3mSAI; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758964AbcBYAkk (ORCPT ); Wed, 24 Feb 2016 19:40:40 -0500 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33437 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758752AbcBYAkd (ORCPT ); Wed, 24 Feb 2016 19:40:33 -0500 Received: by mail-pf0-f182.google.com with SMTP id q63so22266457pfb.0 for ; Wed, 24 Feb 2016 16:40:33 -0800 (PST) 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=9t63t0I+95CVK0vkGQvLlNFH4UwuYfxFxxQjyEa40BA=; b=REM3mSAIrOpQUrCoOlEp2hZbdjDbeE/zfGfzlFW+s+kTqGT6XMjauYnmlEaOTpHe1F r6o5RB8CA5BXL70GXIhNdfKQu9dNV2LefmfKEsJ2KSB256Tpy/GoZfIyik344xVkntXn qz3OpdehjvEppDLgaqxTViYUjoY9ZSVQ+9Fsax8iasYmPKq8TETQEJ8aujWgdZRQ3mtq a5FyShDXLFJFNreXOiOQBe8GBSMuZncazssJjxOVcy5bU+Apla22kX17/q3s35z/1b5M 7uDA5jHm/Xhr2dvw08Y8f+QSwigffzYJL1zIIfN+Ww01Q5SK7WPJ/NABXOSeZSVdkjFh GeEg== 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=9t63t0I+95CVK0vkGQvLlNFH4UwuYfxFxxQjyEa40BA=; b=ZnkmiXUpllORAxJevDRnw1iX/2mZlKFoTn3TM1MF92Trn88iJvEmwsojjn7h8vE1CO XgIPJyAizGQGUnd3i7pgud5RtBMBGdn1hpWBHAC0G2yrnGNm9E2XX/ixQppCODEP4gKx hGoklkzxeBf2dfpl5lXQIU5pUEmUEQsCIFmpSxTvs5yU79AU68eAdBi3qmOn24b3klEG 3MLMni8hyfIgPBGwW7w2GXRqRXHbGKuISclXTrf/9GtmOhUB9vb/FW1xB+/Szkkwg1k2 vo51yrfjIk0rInacWqqxt26JUQneuJfmIN+zj7vRvH6c1duw+wzFSNPTadLnxmMkfsIB nApw== X-Gm-Message-State: AG10YOTp+Ngl7I3D2FE8hkww7ypF0DTbzII2A1Meku1P8CExTPfimubs7z2MIcvV2mXIGg== X-Received: by 10.98.71.147 with SMTP id p19mr59028582pfi.165.1456360833255; Wed, 24 Feb 2016 16:40:33 -0800 (PST) Received: from localhost.localdomain (wsip-70-184-93-199.ph.ph.cox.net. [70.184.93.199]) by smtp.googlemail.com with ESMTPSA id 79sm7561982pfr.22.2016.02.24.16.40.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Feb 2016 16:40:32 -0800 (PST) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Cc: fabio.estevam@freescale.com, l.stach@pengutronix.de, andrew@lunn.ch, tremyfr@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, laci@boundarydevices.com, shawnguo@kernel.org, johannes@sipsolutions.net, stillcompiling@gmail.com, sergei.shtylyov@cogentembedded.com, arnd@arndb.de, Troy Kisky Subject: [PATCH net-next V2 12/16] net: fec: detect tx int lost Date: Wed, 24 Feb 2016 17:36:55 -0700 Message-Id: <1456360619-24390-13-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456360619-24390-1-git-send-email-troy.kisky@boundarydevices.com> References: <1456360619-24390-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 --- 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 9b24669..afd4060 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);