From patchwork Sat Mar 28 05:50:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Gynther X-Patchwork-Id: 455637 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 5144E14015A for ; Sat, 28 Mar 2015 16:57:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=aOBar85u; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751280AbbC1F53 (ORCPT ); Sat, 28 Mar 2015 01:57:29 -0400 Received: from mail-yh0-f74.google.com ([209.85.213.74]:33405 "EHLO mail-yh0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750944AbbC1F52 (ORCPT ); Sat, 28 Mar 2015 01:57:28 -0400 Received: by yhzz6 with SMTP id z6so1217988yhz.0 for ; Fri, 27 Mar 2015 22:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:message-id:date; bh=6GKM/98j+kRXWYDDjaLaDfErjy6fPq+MHQmRUeaDe1o=; b=aOBar85uqmiVvmmqaxu6erwBnjr6Eebm5E2MENuPYFgED3/t9R/EZPYtVsjcacFABQ lKK7PbjpWr093GpsYGV8OKSjEUqQ0PSnuuAl1UEE0qD7AqEaWRIi6+fXykQdMxN6+FAZ zhhkQ/1cjJYL/iIBQDHmyZxwxov88Dwwj4RSdDd0V9GwWejE+14sHLn4Yo+L+XfStQFg o34eXpRmSZxYfuRopwH/woOgyLXy/2XhtPXRrBDG4rXkQNedEj9VOIgoR11xbnWrBeFO rSjj4Xm9DGXPBZRmOrcSpjHHmIE+oU9o/lqLtUNrTFObDqomoHS9J8AQW9T/VJ809uhv 1gdA== 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:message-id:date; bh=6GKM/98j+kRXWYDDjaLaDfErjy6fPq+MHQmRUeaDe1o=; b=Eheo3S8Xha3B0pGtiuOtTmD0A3u4e2NHUwcK3H5q+70jsmgFAmxGCU4Kdb3/i4Xfy4 7nxjHPyMpx5EevMbKcDlzncoH5qg1yzmF9NDC6nO0d+EplNd6CBvM3eeDihjgpsTOadF yrxkEWHAmY8+pQdue8IZGenLUK999apekm29fyiFDA58wbuCFXJ7ypo3keTBtwxwaXJS N1cAWEnYEemNy0+pxJO1Q7/IbMb+fX0oQ6Bzdpl28Z+wxN9QKsSzpms8gQgtVyd0cZkQ jL2Q2+M5iqLk0UowzO3hug9J9Z4J/CKX3MrBALTD6WtMfz/mFW8x+LKazYrPhJv8a0ZW oobQ== X-Gm-Message-State: ALoCoQkB1kHntH8VnAtgyOE68W2VRqXi3FA1q/l5uuyWyXTG5KotoDnJe4L8fOckZ8Tf9c2W7g5q X-Received: by 10.236.228.163 with SMTP id f33mr25615294yhq.3.1427521850898; Fri, 27 Mar 2015 22:50:50 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id f61si171144yho.3.2015.03.27.22.50.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2015 22:50:50 -0700 (PDT) Received: from puck.mtv.corp.google.com ([172.27.88.166]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id RR9PSzvd.1; Fri, 27 Mar 2015 22:50:50 -0700 Received: by puck.mtv.corp.google.com (Postfix, from userid 68020) id 0CBDB220209; Fri, 27 Mar 2015 22:50:50 -0700 (PDT) From: Petri Gynther To: netdev@vger.kernel.org Cc: davem@davemloft.net, f.fainelli@gmail.com, jaedon.shin@gmail.com Subject: [PATCH net-next 1/3] net: bcmgenet: add UMAC_IRQ_RXDMA_DONE and UMAC_IRQ_TXDMA_DONE Message-Id: <20150328055050.0CBDB220209@puck.mtv.corp.google.com> Date: Fri, 27 Mar 2015 22:50:50 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add #define for UMAC_IRQ_RXDMA_DONE and UMAC_IRQ_TXDMA_DONE in order to simplify the code that handles Rx and Tx default queue interrupts. Signed-off-by: Petri Gynther --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 20 ++++++++------------ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 ++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 31e1407..620021e 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -966,15 +966,13 @@ static void bcmgenet_free_cb(struct enet_cb *cb) static inline void bcmgenet_rx_ring16_int_disable(struct bcmgenet_rx_ring *ring) { - bcmgenet_intrl2_0_writel(ring->priv, - UMAC_IRQ_RXDMA_BDONE | UMAC_IRQ_RXDMA_PDONE, + bcmgenet_intrl2_0_writel(ring->priv, UMAC_IRQ_RXDMA_DONE, INTRL2_CPU_MASK_SET); } static inline void bcmgenet_rx_ring16_int_enable(struct bcmgenet_rx_ring *ring) { - bcmgenet_intrl2_0_writel(ring->priv, - UMAC_IRQ_RXDMA_BDONE | UMAC_IRQ_RXDMA_PDONE, + bcmgenet_intrl2_0_writel(ring->priv, UMAC_IRQ_RXDMA_DONE, INTRL2_CPU_MASK_CLEAR); } @@ -994,15 +992,13 @@ static inline void bcmgenet_rx_ring_int_enable(struct bcmgenet_rx_ring *ring) static inline void bcmgenet_tx_ring16_int_disable(struct bcmgenet_tx_ring *ring) { - bcmgenet_intrl2_0_writel(ring->priv, - UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE, + bcmgenet_intrl2_0_writel(ring->priv, UMAC_IRQ_TXDMA_DONE, INTRL2_CPU_MASK_SET); } static inline void bcmgenet_tx_ring16_int_enable(struct bcmgenet_tx_ring *ring) { - bcmgenet_intrl2_0_writel(ring->priv, - UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE, + bcmgenet_intrl2_0_writel(ring->priv, UMAC_IRQ_TXDMA_DONE, INTRL2_CPU_MASK_CLEAR); } @@ -1727,10 +1723,10 @@ static int init_umac(struct bcmgenet_priv *priv) bcmgenet_intr_disable(priv); /* Enable Rx default queue 16 interrupts */ - int0_enable |= (UMAC_IRQ_RXDMA_BDONE | UMAC_IRQ_RXDMA_PDONE); + int0_enable |= UMAC_IRQ_RXDMA_DONE; /* Enable Tx default queue 16 interrupts */ - int0_enable |= (UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE); + int0_enable |= UMAC_IRQ_TXDMA_DONE; /* Monitor cable plug/unplugged event for internal PHY */ if (phy_is_internal(priv->phydev)) { @@ -2353,7 +2349,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id) netif_dbg(priv, intr, priv->dev, "IRQ=0x%x\n", priv->irq0_stat); - if (priv->irq0_stat & (UMAC_IRQ_RXDMA_BDONE | UMAC_IRQ_RXDMA_PDONE)) { + if (priv->irq0_stat & UMAC_IRQ_RXDMA_DONE) { rx_ring = &priv->rx_rings[DESC_INDEX]; if (likely(napi_schedule_prep(&rx_ring->napi))) { @@ -2362,7 +2358,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id) } } - if (priv->irq0_stat & (UMAC_IRQ_TXDMA_BDONE | UMAC_IRQ_TXDMA_PDONE)) { + if (priv->irq0_stat & UMAC_IRQ_TXDMA_DONE) { tx_ring = &priv->tx_rings[DESC_INDEX]; if (likely(napi_schedule_prep(&tx_ring->napi))) { diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index a834da1..f86d635 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -303,9 +303,13 @@ struct bcmgenet_mib_counters { #define UMAC_IRQ_RXDMA_MBDONE (1 << 13) #define UMAC_IRQ_RXDMA_PDONE (1 << 14) #define UMAC_IRQ_RXDMA_BDONE (1 << 15) +#define UMAC_IRQ_RXDMA_DONE (UMAC_IRQ_RXDMA_PDONE | \ + UMAC_IRQ_RXDMA_BDONE) #define UMAC_IRQ_TXDMA_MBDONE (1 << 16) #define UMAC_IRQ_TXDMA_PDONE (1 << 17) #define UMAC_IRQ_TXDMA_BDONE (1 << 18) +#define UMAC_IRQ_TXDMA_DONE (UMAC_IRQ_TXDMA_PDONE | \ + UMAC_IRQ_TXDMA_BDONE) /* Only valid for GENETv3+ */ #define UMAC_IRQ_MDIO_DONE (1 << 23) #define UMAC_IRQ_MDIO_ERROR (1 << 24)