Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965430AbaGRKOF (ORCPT ); Fri, 18 Jul 2014 06:14:05 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:35580 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965378AbaGRKNg (ORCPT ); Fri, 18 Jul 2014 06:13:36 -0400 Message-ID: <53C8F34D.9090503@gmail.com> Date: Fri, 18 Jul 2014 12:13:33 +0200 From: Neil Armstrong User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Varka Bhadram , Nicolas Ferre , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] net: macb: Separate rx and tx ring init function References: <53C8EE60.8020707@gmail.com> <53C8F280.9040507@gmail.com> In-Reply-To: <53C8F280.9040507@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 18/07/2014 12:10, Varka Bhadram a ?crit : > On 07/18/2014 03:22 PM, Neil Armstrong wrote: >> A single method is called to initialize the TX and RX >> rings. Separate the methods into distinct ones for >> MACB and GEM context. >> >> Signed-off-by: Neil Armstrong >> --- >> drivers/net/ethernet/cadence/macb.c | 33 ++++++++++++++++++++++++--------- >> drivers/net/ethernet/cadence/macb.h | 3 ++- >> 2 files changed, 26 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c >> index e9daa07..20ad483 100644 >> --- a/drivers/net/ethernet/cadence/macb.c >> +++ b/drivers/net/ethernet/cadence/macb.c >> @@ -1219,7 +1219,14 @@ out_err: >> return -ENOMEM; >> } >> >> -static void gem_init_rings(struct macb *bp) >> +static void gem_init_rx_rings(struct macb *bp) >> +{ >> + bp->rx_tail = bp->rx_prepared_head = 0; >> + >> + gem_rx_refill(bp); >> +} >> + >> +static void gem_init_tx_rings(struct macb *bp) >> { >> int i; >> >> @@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp) >> } >> bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP); >> >> - bp->rx_tail = bp->rx_prepared_head = bp->tx_head = bp->tx_tail = 0; >> - >> - gem_rx_refill(bp); >> + bp->tx_head = bp->tx_tail = 0; > > This is not the preferred way of doing it.... > > multiple assignments should be avoided Should I change it ? I only moved the lines, the logic hasn't changed. > >> } >> >> -static void macb_init_rings(struct macb *bp) >> +static void macb_init_rx_rings(struct macb *bp) >> { >> int i; >> dma_addr_t addr; >> @@ -1247,13 +1252,20 @@ static void macb_init_rings(struct macb *bp) >> } >> bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP); >> >> + bp->rx_tail = 0; >> +} >> + >> +static void macb_init_tx_rings(struct macb *bp) >> +{ >> + int i; >> + >> for (i = 0; i < TX_RING_SIZE; i++) { >> bp->tx_ring[i].addr = 0; >> bp->tx_ring[i].ctrl = MACB_BIT(TX_USED); >> } >> bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP); >> >> - bp->rx_tail = bp->tx_head = bp->tx_tail = 0; >> + bp->tx_head = bp->tx_tail = 0; > > Dto... Idem, it was like this before. > >> } >> >> static void macb_reset_hw(struct macb *bp) >> @@ -1554,7 +1566,8 @@ static int macb_open(struct net_device *dev) >> >> napi_enable(&bp->napi); >> >> - bp->macbgem_ops.mog_init_rings(bp); >> + bp->macbgem_ops.mog_init_rx_rings(bp); >> + bp->macbgem_ops.mog_init_tx_rings(bp); >> macb_init_hw(bp); >> >> /* schedule a link state check */ >> @@ -1901,12 +1914,14 @@ static int __init macb_probe(struct platform_device *pdev) >> if (macb_is_gem(bp)) { >> bp->macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers; >> bp->macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers; >> - bp->macbgem_ops.mog_init_rings = gem_init_rings; >> + bp->macbgem_ops.mog_init_rx_rings = gem_init_rx_rings; >> + bp->macbgem_ops.mog_init_tx_rings = gem_init_tx_rings; >> bp->macbgem_ops.mog_rx = gem_rx; >> } else { >> bp->macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers; >> bp->macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers; >> - bp->macbgem_ops.mog_init_rings = macb_init_rings; >> + bp->macbgem_ops.mog_init_rx_rings = macb_init_rx_rings; >> + bp->macbgem_ops.mog_init_tx_rings = macb_init_tx_rings; >> bp->macbgem_ops.mog_rx = macb_rx; >> } >> >> diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h >> index 51c0244..8016d08 100644 >> --- a/drivers/net/ethernet/cadence/macb.h >> +++ b/drivers/net/ethernet/cadence/macb.h >> @@ -550,7 +550,8 @@ struct macb; >> struct macb_or_gem_ops { >> int (*mog_alloc_rx_buffers)(struct macb *bp); >> void (*mog_free_rx_buffers)(struct macb *bp); >> - void (*mog_init_rings)(struct macb *bp); >> + void (*mog_init_rx_rings)(struct macb *bp); >> + void (*mog_init_tx_rings)(struct macb *bp); >> int (*mog_rx)(struct macb *bp, int budget); >> }; >> > > Do I need to make a corrective patch for multiple assignments before ? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/