From patchwork Fri Mar 27 15:34:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 6108581 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 02994BF90F for ; Fri, 27 Mar 2015 15:37:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2734C2041F for ; Fri, 27 Mar 2015 15:37:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48A002035E for ; Fri, 27 Mar 2015 15:37:51 +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 1YbWHt-0000T5-A4; Fri, 27 Mar 2015 15:35:09 +0000 Received: from eusmtp01.atmel.com ([212.144.249.243]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbWHU-0000CJ-HX for linux-arm-kernel@lists.infradead.org; Fri, 27 Mar 2015 15:34:45 +0000 Received: from tenerife.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.2.347.0; Fri, 27 Mar 2015 16:34:15 +0100 From: Nicolas Ferre To: , Subject: [PATCH 1/4] net/macb: only probe queues once and use stored values Date: Fri, 27 Mar 2015 16:34:09 +0100 Message-ID: <09960ba7389058e026b73409018fe1ee61d6dc57.1427469791.git.nicolas.ferre@atmel.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150327_083444_982262_330A9AA8 X-CRM114-Status: GOOD ( 11.24 ) X-Spam-Score: -2.3 (--) Cc: Boris BREZILLON , monstr@monstr.eu, Nicolas Ferre , michal.simek@xilinx.com, linux-kernel@vger.kernel.org, punnaia@xilinx.com, Cyrille Pitchen , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 When merging at91_ether and macb driver during 421d9df0628b (net/macb: merge at91_ether driver into macb driver) the probe function has been split. The code dealing with initialization of queues is now moved in macb_init() which needs information computed in the parent macb_probe() function. So, add the queue_mask information to the private structure and use it when needed in macb_init(). Signed-off-by: Nicolas Ferre Cc: Cyrille Pitchen Cc: Boris Brezillon Acked-by: Boris Brezillon --- drivers/net/ethernet/cadence/macb.c | 9 ++++----- drivers/net/ethernet/cadence/macb.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index a0a04b3638e6..b710768172d9 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2180,7 +2180,7 @@ static void macb_probe_queues(void __iomem *mem, static int macb_init(struct platform_device *pdev) { struct net_device *dev = platform_get_drvdata(pdev); - unsigned int hw_q, queue_mask, q, num_queues; + unsigned int hw_q, q; struct macb *bp = netdev_priv(dev); struct macb_queue *queue; int err; @@ -2226,10 +2226,8 @@ static int macb_init(struct platform_device *pdev) * register mapping but we don't want to test the queue index then * compute the corresponding register offset at run time. */ - macb_probe_queues(bp->regs, &queue_mask, &num_queues); - - for (hw_q = 0, q = 0; hw_q < MACB_MAX_QUEUES; ++hw_q) { - if (!(queue_mask & (1 << hw_q))) + for (hw_q = 0, q = 0; hw_q < bp->num_queues; ++hw_q) { + if (!(bp->queue_mask & (1 << hw_q))) continue; queue = &bp->queues[q]; @@ -2715,6 +2713,7 @@ static int macb_probe(struct platform_device *pdev) bp->dev = dev; bp->regs = mem; bp->num_queues = num_queues; + bp->queue_mask = queue_mask; spin_lock_init(&bp->lock); platform_set_drvdata(pdev, dev); diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index bc6e35c40822..0b6afac91bfe 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -785,6 +785,7 @@ struct macb { size_t rx_buffer_size; unsigned int num_queues; + unsigned int queue_mask; struct macb_queue queues[MACB_MAX_QUEUES]; spinlock_t lock;