From patchwork Thu Jan 28 21:25:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 8153981 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 BBE3ABEEE5 for ; Thu, 28 Jan 2016 21:31:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFC1B20211 for ; Thu, 28 Jan 2016 21:31:01 +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 179402013A for ; Thu, 28 Jan 2016 21:31:01 +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 1aOu8D-0006OA-32; Thu, 28 Jan 2016 21:29:33 +0000 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aOu7L-0005rC-Go for linux-arm-kernel@lists.infradead.org; Thu, 28 Jan 2016 21:28:42 +0000 Received: by mail-pf0-x231.google.com with SMTP id x125so29971057pfb.0 for ; Thu, 28 Jan 2016 13:28:19 -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=lkczMTjOpO3sRONBYCpkqpliZIYInkjq5dghTYUNAzg=; b=uZ9j+Lw5jEMDqJBaRijjsXve5UZNQWkjMalqtB0eff+X8Um8zChewcypCEACqlt9FE 4upm6frOeBccyO4zfLJgaz1oyJmaSDW8i8MsNPpgaYerH+9l8zwukWsPIR6GYuXZWzFa ldHilQnvi6Pke7dRPVhGLc+kKwlxLtnytle+A8RnHfAZFzlRbKbke2CL5BBwLqWeYwAc DjEtXeczNMKlZs+Wzu1HXUtdOCIL73GunnGEOceOZ3DvScMH67gzOnn5P0K6zMwpu5a8 lprizFSFm+oRB/FommUrQNe0BGvnyUWSM5VNdDfUCRjf02yrX4PijggFklkrUlSdxmWM 89EA== 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=lkczMTjOpO3sRONBYCpkqpliZIYInkjq5dghTYUNAzg=; b=K1jdOjb9ouFE9Ecw94oM3SSwcScb5Q9lgM4a25TLbdCKCTiaMZZSFQUyLceH1uQjer tt+pqK65ZloVM22XJAjmuotmtxXrixjdY/PcZnNHRhCJX6CqXZe69OK11Zlrb7vquWpM dbwx9ONygfQtJywPAgLqSCWOcdjCyFpTGVKyJhXBhb2QRUNjaeS4ejsu9jynDzD0tkTj DsTPng5VPv2W+ktDkJr/pXgMkLY1Hjb6zfACV8kIwlpV1y0I5abQN5Z+sJt0DO5J40fh jx5x3xYeKy4NHmXpiAKBBeB9M1k8OPAAhRPfQ4Q4dGZ3TxYT+shGSeguV/7eKD/SGcvP d2ZA== X-Gm-Message-State: AG10YOTC504PeIijzMyny/wGtzz+pjsO0h+Mje1SEa2c+k4j1JCLxom8D988GyCnJqyn9g== X-Received: by 10.98.73.29 with SMTP id w29mr7935261pfa.106.1454016498915; Thu, 28 Jan 2016 13:28:18 -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 c90sm18583190pfd.31.2016.01.28.13.28.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jan 2016 13:28:18 -0800 (PST) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Subject: [PATCH net-next 06/40] net: fec: don't disable FEC_ENET_TS_TIMER interrupt Date: Thu, 28 Jan 2016 14:25:30 -0700 Message-Id: <1454016364-30985-7-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454016364-30985-1-git-send-email-troy.kisky@boundarydevices.com> References: <1454016364-30985-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160128_132839_891978_9B36B5BD X-CRM114-Status: GOOD ( 11.55 ) X-Spam-Score: -2.6 (--) 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, Troy Kisky , laci@boundarydevices.com, 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.1 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 f8d7fdb..684fe91f 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -359,6 +359,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 0e8c8b6..e8f35fb 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1545,7 +1545,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); } }