From patchwork Fri Feb 5 21:52:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 8239921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B451FBEEE5 for ; Fri, 5 Feb 2016 21:58:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA7C5203B8 for ; Fri, 5 Feb 2016 21:58:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BC8A203B4 for ; Fri, 5 Feb 2016 21:58:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRoMw-0005R5-Mt; Fri, 05 Feb 2016 21:56:46 +0000 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRoLn-0004Kp-Dp for linux-arm-kernel@lists.infradead.org; Fri, 05 Feb 2016 21:55:38 +0000 Received: by mail-pa0-x229.google.com with SMTP id uo6so41087664pac.1 for ; Fri, 05 Feb 2016 13:55:15 -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=lXgl7tIyv6+yskya9kCiNpWBPN0dVOEsuforqlMtQd8=; b=kb63TyOwMWX5Pqqb+TMN/gKvGi6gv8HIH0eDGlnZzCYlxIkCjDRtJgaSTNGMSH21US lcOzynLn16J8M/YWJK0LkIi7pCiGgDXmuBiD3BVk4JRCi013nnyBRgdAcMANLLIkXuZl JCT/Jg6/eS0sfcVJ3Gh7psfVFS/1jLnXyTXXX0qrbi+pHlN3h1V/Tq7i8xiyyOyKntC1 FcUdB9/exBgvXOp7djhmN85eaKYzZx6bYXZ4I76ZkxiU7jLW6D0Rp74ipAXR5jn8kXhc ucXBx+RRPIiS74PUf2gLcEeXMOcP01+WjC5q4bOtuxdBgd1MTKSVRz78/WUxi52U1bAC 4UuQ== 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=lXgl7tIyv6+yskya9kCiNpWBPN0dVOEsuforqlMtQd8=; b=ChPBDCDaYbwJo601/ESQzASBxo2CFOlcF8ndQaQvew63FvxGK+KpjP98sIkSepvdVj xE4R9W2mGn9ydta1WsfOoH+MPvGM9KuRQlqDGStJezPYYDpqcrpHz2ZR0ba8xGQUqR1D DVXh71YYMyOhI1cBaSUejGDdwj4HEwbS8W4g+Xticy+zmr+Ql3Kg8YmBzmL+3og0tkgp mLhVS3o8hHNp7fx8Ruf1EUWVuSHmivLdilSZfDVCyaWjSZtUsHYN4MQ/5u8U/nBItebn 16bs3ytQ/YjCB1KQHfn1X6s+ZfLQ8AQqerjcu2Jvo7AvMm8PxLoBfN+UEIjAcvLQvXe6 aV/w== X-Gm-Message-State: AG10YORN6HPSJY4mKB60FFplabocPZ/HZ3PQR1sYOVDTxpNFMjeydz0xTQGFpxK8TgG30Q== X-Received: by 10.66.152.204 with SMTP id va12mr23346654pab.0.1454709314740; Fri, 05 Feb 2016 13:55:14 -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 v75sm26628688pfa.39.2016.02.05.13.55.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Feb 2016 13:55:14 -0800 (PST) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Subject: [PATCH net-next V2 6/8] net: fec: don't disable FEC_ENET_TS_TIMER interrupt Date: Fri, 5 Feb 2016 14:52:48 -0700 Message-Id: <1454709170-19527-7-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454709170-19527-1-git-send-email-troy.kisky@boundarydevices.com> References: <1454709170-19527-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160205_135535_710992_38FA2DEC X-CRM114-Status: GOOD ( 11.31 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabio.estevam@freescale.com, andrew@lunn.ch, linux@arm.linux.org.uk, arnd@arndb.de, Troy Kisky , laci@boundarydevices.com, johannes@sipsolutions.net, l.stach@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, tremyfr@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Only the interrupt routine processes this condition. Signed-off-by: Troy Kisky --- drivers/net/ethernet/freescale/fec.h | 1 + drivers/net/ethernet/freescale/fec_main.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index bedd28a..195122e 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -375,6 +375,7 @@ struct bufdesc_ex { #define FEC_ENET_TS_TIMER ((uint)0x00008000) #define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII | FEC_ENET_TS_TIMER) +#define FEC_NAPI_IMASK (FEC_ENET_MII | FEC_ENET_TS_TIMER) #define FEC_RX_DISABLED_IMASK (FEC_DEFAULT_IMASK & (~FEC_ENET_RXF)) /* ENET interrupt coalescing macro define */ diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 712e3bb..ca2708d 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1553,7 +1553,7 @@ fec_enet_interrupt(int irq, void *dev_id) if (napi_schedule_prep(&fep->napi)) { /* Disable the NAPI interrupts */ - writel(FEC_ENET_MII, fep->hwp + FEC_IMASK); + writel(FEC_NAPI_IMASK, fep->hwp + FEC_IMASK); __napi_schedule(&fep->napi); } }