From patchwork Tue Jun 6 00:01:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 771529 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 3whX1T1tl0z9s7f for ; Tue, 6 Jun 2017 10:02:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="Zxy1GFjL"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751274AbdFFACU (ORCPT ); Mon, 5 Jun 2017 20:02:20 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:33913 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266AbdFFACS (ORCPT ); Mon, 5 Jun 2017 20:02:18 -0400 Received: by mail-pg0-f51.google.com with SMTP id v18so17453454pgb.1 for ; Mon, 05 Jun 2017 17:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FAb25U/4XujPYK/WLWbJXnw02Qh120jCsBXWwgQTgLg=; b=Zxy1GFjLub8/T2TnxsCiS3KUUvIIMnnj/Fpx0BhRJ0Jdx3ewCXRXAurS3caqGsWfs1 v+AP6pgiSef5P2+u1PFvAg89Qqaj2KJGg+GuiMs1e+cojhr167/aIga584fA2pCmlHsR tc7RGzMU7O5XFq6xvhdRb4GxzOJ+OmV1q4IjU0yiUu2ee5RHAj6v+Olc9KJ7+YfGe9x+ BXQ0+CWtnjPUC1F7ser6kOs7ZCSRsdx1ryRIxzxPBVquE0/DL16NE2A3Jej+NXiIUtKw VTYKsTXfH3nyywkCm/AVqQseeFVz21fo524J9WCt9vNNlsqH0u3bsC1VCXpxojSb+X6m /fWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FAb25U/4XujPYK/WLWbJXnw02Qh120jCsBXWwgQTgLg=; b=lTgcSbmT9mbfqTaFK3BYIk2gfQU/QLAIhG2gL2HHuo2c1pFtDl6Ac/2frwWSC2gy3p +uRHuKvEMmCSga9dOV6NL1rsRRugSesVgWqIMEkNvEi9WqOL0e8NiFiXNUm5CoHZzvht YDhqccc1goscXe3jPJdRVQh0bt8z/eNVOKTgi3nudh6vRLXCAvnjjTpNaauYZUoOG2LW V6GEzFzjZAixW9ec8SWk5lTOXzAmPM7R76oKFnrdkftpEVfiO3hn127lB6gDdskS/TZN i89483eMzBLd62OqjMkDrg/peru2DGDAqUCLAFFmdxRbi4iAxsAaCjlxOLXhDLvfp0mQ 41tw== X-Gm-Message-State: AODbwcDokI1/+j5mTRLM381GywVRJ1fINRElSGzR3sOiqa1swu5o7eqk X6IyBNNtXfFYh+nadCk= X-Received: by 10.99.125.12 with SMTP id y12mr23760268pgc.5.1496707337756; Mon, 05 Jun 2017 17:02:17 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id e76sm58274519pfb.92.2017.06.05.17.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Jun 2017 17:02:17 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 04/16] nfp: move nfp_net_vecs_init() Date: Mon, 5 Jun 2017 17:01:45 -0700 Message-Id: <20170606000157.17556-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170606000157.17556-1-jakub.kicinski@netronome.com> References: <20170606000157.17556-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move nfp_net_vecs_init() after all datapath functions. We will need to init poll() callbacks from this function soon. No functional changes. Signed-off-by: Jakub Kicinski --- .../net/ethernet/netronome/nfp/nfp_net_common.c | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 23419883cfd4..f8dba793a8fe 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -504,33 +504,6 @@ nfp_net_rx_ring_init(struct nfp_net_rx_ring *rx_ring, } /** - * nfp_net_vecs_init() - Assign IRQs and setup rvecs. - * @nn: NFP Network structure - */ -static void nfp_net_vecs_init(struct nfp_net *nn) -{ - struct nfp_net_r_vector *r_vec; - int r; - - nn->lsc_handler = nfp_net_irq_lsc; - nn->exn_handler = nfp_net_irq_exn; - - for (r = 0; r < nn->max_r_vecs; r++) { - struct msix_entry *entry; - - entry = &nn->irq_entries[NFP_NET_NON_Q_VECTORS + r]; - - r_vec = &nn->r_vecs[r]; - r_vec->nfp_net = nn; - r_vec->handler = nfp_net_irq_rxtx; - r_vec->irq_entry = entry->entry; - r_vec->irq_vector = entry->vector; - - cpumask_set_cpu(r, &r_vec->affinity_mask); - } -} - -/** * nfp_net_aux_irq_request() - Request an auxiliary interrupt (LSC or EXN) * @nn: NFP Network structure * @ctrl_offset: Control BAR offset where IRQ configuration should be written @@ -1773,6 +1746,33 @@ static int nfp_net_poll(struct napi_struct *napi, int budget) */ /** + * nfp_net_vecs_init() - Assign IRQs and setup rvecs. + * @nn: NFP Network structure + */ +static void nfp_net_vecs_init(struct nfp_net *nn) +{ + struct nfp_net_r_vector *r_vec; + int r; + + nn->lsc_handler = nfp_net_irq_lsc; + nn->exn_handler = nfp_net_irq_exn; + + for (r = 0; r < nn->max_r_vecs; r++) { + struct msix_entry *entry; + + entry = &nn->irq_entries[NFP_NET_NON_Q_VECTORS + r]; + + r_vec = &nn->r_vecs[r]; + r_vec->nfp_net = nn; + r_vec->handler = nfp_net_irq_rxtx; + r_vec->irq_entry = entry->entry; + r_vec->irq_vector = entry->vector; + + cpumask_set_cpu(r, &r_vec->affinity_mask); + } +} + +/** * nfp_net_tx_ring_free() - Free resources allocated to a TX ring * @tx_ring: TX ring to free */