Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD6CCC43381 for ; Wed, 27 Mar 2019 15:20:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D60520449 for ; Wed, 27 Mar 2019 15:20:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="ebggJmlw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731529AbfC0PUG (ORCPT ); Wed, 27 Mar 2019 11:20:06 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:33345 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731468AbfC0PUD (ORCPT ); Wed, 27 Mar 2019 11:20:03 -0400 Received: by mail-wr1-f66.google.com with SMTP id q1so19088496wrp.0 for ; Wed, 27 Mar 2019 08:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jM3TD6wvt/AxL9DVCmY46CP3+r8pnMkQnEEnVLImezY=; b=ebggJmlw8/KZYnmYPtn6esjsrLKSVBMlPNBOER35UA/Hl3fqOGtMTngq2Do+xMumEg PlkN9Bx35uEntjote7m68SFGwLhqpp7DA9bFhBlA5pf+XpFmamQh0DAM9JvSKfaM860I XYFeyFMGv+W2Ebdw+5UvBx0f3HuNpD2XeTpXoKbXkM9wd5gd/pLTbGoIFwl8rzsJsbco wdxAMna+NcKZr6WpLlQkDH9mK1KelMFtwRU3wIruMxwi6u1y6LpfAqzcloxquQc460x+ FtTb6XRyRLG2Eu0pym9nVtMeRMapV3wI+8aRXoaluaGo/65UTQ6TMJzL7/Sea7/GduDP YC+A== 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=jM3TD6wvt/AxL9DVCmY46CP3+r8pnMkQnEEnVLImezY=; b=di2hROi9ChyVETDAmKpWMrU24LQ2NuI6T8YjG4lPLOXgTJg4cx5G5Vx2TaXqzPVuqW M9nCI5E72wJOCogcnCenzJ5WPJ5MsKUG1JD0EVY32AkFPE873gvUMCGWu6THfPHm73o+ K/4uBs0vSVNhg734sXsjrb+GxDYg1ISyBnPla23sWi1duQZjyxiNHOmzFqMYIV3v0jFD FYf8e7CCsY/7w+/+AEvBJnGBjkeYarV6D1D6er/rttSEak6oFDw3kg2CfY+DlQTJatfC JN2t++bDuVyJE9x/s50RGDm81VBfwblrB8zc8t50McEM5d+c4YrJ2r5wQ35yXd5gheOo AMhw== X-Gm-Message-State: APjAAAVBwozdVfqWlb7EFx0kQC51Ag1tpJSHPD2tSAiFdQGWYkfI3Ovq Hmin94oLYq9wU0BjvC6Ppy1+V6ucccw= X-Google-Smtp-Source: APXvYqwAproplHT3CoV88Na3kOp8WltZBqX4bNtKIGq10Jb2Ym+60w5+2sjZ5Lsalrsd4el3LeIIYg== X-Received: by 2002:adf:ed8f:: with SMTP id c15mr24185522wro.144.1553700000862; Wed, 27 Mar 2019 08:20:00 -0700 (PDT) Received: from localhost (ip-94-113-223-73.net.upcbroadband.cz. [94.113.223.73]) by smtp.gmail.com with ESMTPSA id a2sm19979471wrr.60.2019.03.27.08.20.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Mar 2019 08:20:00 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com Subject: [patch net-next v3 01/12] nfp: register devlink port before netdev Date: Wed, 27 Mar 2019 16:19:47 +0100 Message-Id: <20190327151958.2649-2-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190327151958.2649-1-jiri@resnulli.us> References: <20190327151958.2649-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Change the init/fini flow and register devlink port instance before netdev. Now it is needed for correct behavior of phys_port_name generation, but in general it makes sense to register devlink port first. Signed-off-by: Jiri Pirko --- v1->v2: - new patch --- .../net/ethernet/netronome/nfp/nfp_net_main.c | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index f35278062476..986464d4a206 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -150,37 +150,39 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) nn->id = id; + if (nn->port) { + err = nfp_devlink_port_register(pf->app, nn->port); + if (err) + return err; + } + err = nfp_net_init(nn); if (err) - return err; + goto err_devlink_port_clean; nfp_net_debugfs_vnic_add(nn, pf->ddir); - if (nn->port) { - err = nfp_devlink_port_register(pf->app, nn->port); - if (err) - goto err_dfs_clean; + if (nn->port) nfp_devlink_port_type_eth_set(nn->port); - } nfp_net_info(nn); if (nfp_net_is_data_vnic(nn)) { err = nfp_app_vnic_init(pf->app, nn); if (err) - goto err_devlink_port_clean; + goto err_devlink_port_type_clean; } return 0; -err_devlink_port_clean: - if (nn->port) { +err_devlink_port_type_clean: + if (nn->port) nfp_devlink_port_type_clear(nn->port); - nfp_devlink_port_unregister(nn->port); - } -err_dfs_clean: nfp_net_debugfs_dir_clean(&nn->debugfs_dir); nfp_net_clean(nn); +err_devlink_port_clean: + if (nn->port) + nfp_devlink_port_unregister(nn->port); return err; } @@ -223,12 +225,12 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) { if (nfp_net_is_data_vnic(nn)) nfp_app_vnic_clean(pf->app, nn); - if (nn->port) { + if (nn->port) nfp_devlink_port_type_clear(nn->port); - nfp_devlink_port_unregister(nn->port); - } nfp_net_debugfs_dir_clean(&nn->debugfs_dir); nfp_net_clean(nn); + if (nn->port) + nfp_devlink_port_unregister(nn->port); } static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf) -- 2.17.2