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=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 0EE9FC4360F for ; Thu, 28 Mar 2019 12:56:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFD32204EC for ; Thu, 28 Mar 2019 12:56:52 +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="Yv7BL+ab" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726234AbfC1M4v (ORCPT ); Thu, 28 Mar 2019 08:56:51 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46465 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725948AbfC1M4u (ORCPT ); Thu, 28 Mar 2019 08:56:50 -0400 Received: by mail-wr1-f68.google.com with SMTP id t17so2018998wrw.13 for ; Thu, 28 Mar 2019 05:56:49 -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=/go/TV9BNmRS9RqfmgRqP4MVDAh6t1uVp5UnZWLeAEU=; b=Yv7BL+ab71yxhCKDPvkFOKbVt2ueIrDw6f7IDLWtYP0LAl3Qo30LYCJv8oFuHLPg4u WT9mD3u3TGQfbQ8s/wPLCywcqZRNQ4t+hnhta3wC5VK834gllAhOH+jBnLl7KzF+cs81 K7PQU+iUVyHq44Tahx1B8HM/2ly2DQibpE7hA3aw27/yTyLnC9TQ6Q/pahBjIek8vfOM iRn4R5WgNxFYl7Kpve5PZwh0dabGS6IIiCRw6VTyFJxXDr0yxEefY/zMA4WeVEioGXwB hDAS1PQAdovmwWC6fiUWj+20QDv3uD68O611rxzmPhMNHKTIPlY6jdhg8IpEkkSS/xlp 8kMA== 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=/go/TV9BNmRS9RqfmgRqP4MVDAh6t1uVp5UnZWLeAEU=; b=S2uB8pbul+WAufok8gY2hqpaPTF6oPz09tQTTBaZq9ceap+BrOVirHnsPfD+w9SFsv q/CNK+2Ym1fgbYiGBG31ba9I/xuMO/K5BvtOz4d2NXJzWP2stpB0Iwy/64u8CPpofSP9 it/SM6iYThEyLIhqN0wBM/K3j5O5abZI9jBvTg3vBiAsb2W/LGzGwq2O70g/GSkjb2Ch 1oRxTYyo11K7mM1A1xFPybSEQUjGpeBu2RbUzX04n/K4bpZo7A1rK+XN+L+IMU8fQvGR 48RVTR+hQMjOv6JmypsrPFPGCtmEB3LWLdV9FpGcv2zX/5E3QmuWAnmlTs8aRXHmuUf2 lMsQ== X-Gm-Message-State: APjAAAVMoQcRLf5ZpKcMayKGFjMsUsoClRhOdpo6ofaSYfZXronHsIqf r/peAMbP9D5Qjnsjh/CXv2n5bWvvmOo= X-Google-Smtp-Source: APXvYqzMn2H6WEtidCmqSaolI+I+U6d3FCb3dzLQIq/dJtcFgm9W85DY1jUydv0rdAXqcaKNWMeVFg== X-Received: by 2002:a05:6000:1292:: with SMTP id f18mr27926458wrx.115.1553777808365; Thu, 28 Mar 2019 05:56:48 -0700 (PDT) Received: from localhost (ip-94-113-223-73.net.upcbroadband.cz. [94.113.223.73]) by smtp.gmail.com with ESMTPSA id b8sm9605827wrr.64.2019.03.28.05.56.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Mar 2019 05:56:48 -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 v4 01/12] nfp: register devlink port before netdev Date: Thu, 28 Mar 2019 13:56:35 +0100 Message-Id: <20190328125646.872-2-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190328125646.872-1-jiri@resnulli.us> References: <20190328125646.872-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 Reviewed-by: Jakub Kicinski --- 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