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 203C8C43381 for ; Fri, 1 Mar 2019 16:05:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3C3A2084F for ; Fri, 1 Mar 2019 16:05:54 +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="vyqbNkjH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388967AbfCAQFy (ORCPT ); Fri, 1 Mar 2019 11:05:54 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:35654 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388951AbfCAQFw (ORCPT ); Fri, 1 Mar 2019 11:05:52 -0500 Received: by mail-wr1-f65.google.com with SMTP id t18so26458389wrx.2 for ; Fri, 01 Mar 2019 08:05:51 -0800 (PST) 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=bojisNOd4xLNfCBGw8DlkJRqnPNVdP8ht3WoNHx/1vI=; b=vyqbNkjHpJtj6kf8uCmmzm5KxRAM4ZKINXznedHCxDgOkSLBycCHi1JduU8+DbsykP WsVUUwp/iW9Wbx68/Y85NIFFfJGG4Spbc23qvwm7mX+RIwp7SgEIOvGGaZxu8wA7bjC0 BKgDgWYU3OUO5RrKZPLIeG+/2Lbuutw2GCHtC/Ygfz4HCwUd64QrrI96CgZEaY+geB+x BrhtXaUX/d+M3Np27gIUTGSElV1iejl+ygbUzZxKhpc6HNduxd7ow6Ut7Fu8GCJLNZII q4+gZNbfltDq8PERe/x4yXKhmqz5fzvo+MKkR3QVRCsUEsXdtZY5AGuq3LAKsZRvURrt 3uLg== 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=bojisNOd4xLNfCBGw8DlkJRqnPNVdP8ht3WoNHx/1vI=; b=U5djh8hzxsNWfZYMb2um+LFK95ldNlPbcIa+Xk6s0dItCIIfbXm4mlME2cBITB4q5f 66ys5jCUOKRV9MKFHK+bxtc0F98L8Ffvxf8g8TmxowCq3D5QiXmhbJsqFzqNj/7rXb9g +Lq4h2Hoq/alntiSqxKcofRukmhQWkB8v2i5OdtlDpw2oT4BDVHGJBAnUY+i4bkoNXJd UK6wWcJjHHd9zJKVDl1K2/ce5cQn/nsPqlNwkDJP95SWzg9aiA2tkmjeU6g3OBqax4iN y/SYludi5xfNx3Umy30nB8pXY15e2cLAcKN1hrQZUw1It/wHtZDe8RVanIv3rPx/rdDF LBAg== X-Gm-Message-State: APjAAAXhTjs+LrPPIFPpeOV6o1ZXY4cyfZG13OzNGKzJwgwb/8Co/TI/ 5ea63SjoOFyNft/P6WOIHCychI4iuHNZtw== X-Google-Smtp-Source: APXvYqwp2n3J+a3qUdMu9VhmscotpwE7jeBubeLYcaJNW2YAtXcAM8ca22PpAvdOIk+EYkMDYZmGVg== X-Received: by 2002:adf:8294:: with SMTP id 20mr4107520wrc.223.1551456351054; Fri, 01 Mar 2019 08:05:51 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id v6sm13933479wme.24.2019.03.01.08.05.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:05:50 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next RFC 7/8] nfp: register devlink port before netdev Date: Fri, 1 Mar 2019 17:05:41 +0100 Message-Id: <20190301160542.6474-8-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301160542.6474-1-jiri@resnulli.us> References: <20190301160542.6474-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 switch/parent id reporting, but in general it makes sense to register devlink port first. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 27 +++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index 08f5fdbd8e41..6ec680482b37 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -150,34 +150,33 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) nn->id = id; - err = nfp_net_init(nn); - if (err) - return err; - - 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; + return err; } - 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; } + err = nfp_net_init(nn); + if (err) + goto err_app_vnic_free; + + nfp_net_debugfs_vnic_add(nn, pf->ddir); + nfp_net_info(nn); + return 0; +err_app_vnic_free: + if (nfp_net_is_data_vnic(nn)) + nfp_app_vnic_clean(pf->app, nn); err_devlink_port_clean: if (nn->port) nfp_devlink_port_unregister(nn->port); -err_dfs_clean: - nfp_net_debugfs_dir_clean(&nn->debugfs_dir); - nfp_net_clean(nn); return err; } @@ -218,12 +217,12 @@ nfp_net_pf_alloc_vnics(struct nfp_pf *pf, void __iomem *ctrl_bar, static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) { + nfp_net_debugfs_dir_clean(&nn->debugfs_dir); + nfp_net_clean(nn); if (nfp_net_is_data_vnic(nn)) nfp_app_vnic_clean(pf->app, nn); if (nn->port) nfp_devlink_port_unregister(nn->port); - nfp_net_debugfs_dir_clean(&nn->debugfs_dir); - nfp_net_clean(nn); } static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf) -- 2.14.5