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,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 40FA0C43381 for ; Sun, 24 Mar 2019 10:15:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DA67222A7 for ; Sun, 24 Mar 2019 10:15:05 +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="pMMIkHvV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728794AbfCXKPD (ORCPT ); Sun, 24 Mar 2019 06:15:03 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:34754 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728710AbfCXKOv (ORCPT ); Sun, 24 Mar 2019 06:14:51 -0400 Received: by mail-wm1-f68.google.com with SMTP id o10so7396699wmc.1 for ; Sun, 24 Mar 2019 03:14:50 -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=AlUVyGEoOtEFjreZbfXWk2jPl3jNhPJOLukeyNFrsRY=; b=pMMIkHvVAHfj53A+xTeLEsvChfFZiM3ay2YPldnxAedO8PfdIjeAqEcv/JIFYGVsEi 2cTM78hrDWDD+XRort0Tmaq2H2+Sz6zzBqfieluicoX13S4Yna55PBThPwT0OSqBp33A 9waJhL5esr1+UbualtjDnDFA85mOGRUEQ8hP40sPzHYeSOl8ceLiEPmgEkY2c5JeXKe8 HD/ozYeBNTX5jnCavNZSfBFi7uXz4qWMCKIvi11A4KWg5KldDrR6Q26ucMFqLgk81KOX bWoiL+jkgfpU2aYTweJZuChvIQtXivYtDpiHSar+Lr7nadr3UrlrgnDdY0y/5pGD2/KI 0+UQ== 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=AlUVyGEoOtEFjreZbfXWk2jPl3jNhPJOLukeyNFrsRY=; b=kyPTIsfoimKeq9APceORFtJJH0CbdyBkmR7vifiXosq2YqmYiNzSZL9vdfzG9tGkCW dcB76WHbyehrBiY1r7Gtv6weu6UlAhzsrUzxamG9fRbxyiKeKXM1wL27Sa2ShrxG6g7W Z8JFXPxLXvzsSc//siSPAdH/ZFMQ2nyRNdDhD78h2z3afA/yrZXcnEJpqqtEcJpbi+gU 3T5MwfbrqCb89w2EnHQ4E76IyExOIwWy+1v6hKthTNBbwKPsnHI4sf9lskCYbFCM7tZe Mu7frtGGmXeGj8+ooWoi0e5FOpgdTZomhVeSbvqYy+juhenmIupILddhrqWjPnMB5elC 3zDw== X-Gm-Message-State: APjAAAXa7wnjazHZ27s4EpQfqbamA3yYtAGZ/LAVxRdY/7pyzaJX/pXF gAvFAmZNd9iFlfH/CvBjguaQTDwM3vE= X-Google-Smtp-Source: APXvYqyJLQgM+zYEr/VfHcs3Mk1MWVZxyauPVza9HxUHRzByAf+mEoJUOEWL/ULD8I3HiwkhDQ822w== X-Received: by 2002:a1c:40d6:: with SMTP id n205mr2206415wma.140.1553422490156; Sun, 24 Mar 2019 03:14:50 -0700 (PDT) Received: from localhost (ip-94-113-125-71.net.upcbroadband.cz. [94.113.125.71]) by smtp.gmail.com with ESMTPSA id u2sm22729225wmc.45.2019.03.24.03.14.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Mar 2019 03:14:49 -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 Subject: [patch net-next v3 11/15] nfp: move devlink port type set after netdev registration Date: Sun, 24 Mar 2019 11:14:34 +0100 Message-Id: <20190324101438.6376-12-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190324101438.6376-1-jiri@resnulli.us> References: <20190324101438.6376-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Similar to other driver, move the port type set after netdev registration is done. Along with that, clear the type before unregistration. Signed-off-by: Jiri Pirko --- v2->v3: - move type set to be called before nfp_app_vnic_init() v1->v2: - new patch --- drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 11 ++++++++++- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 9 +++++++-- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index e9eca99cf493..cb59a18ec6a6 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -362,7 +362,6 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) if (ret) return ret; - devlink_port_type_eth_set(&port->dl_port, port->netdev); devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, eth_port.label_port, eth_port.is_split, eth_port.label_subport); @@ -377,6 +376,16 @@ void nfp_devlink_port_unregister(struct nfp_port *port) devlink_port_unregister(&port->dl_port); } +void nfp_devlink_port_type_eth_set(struct nfp_port *port) +{ + devlink_port_type_eth_set(&port->dl_port, port->netdev); +} + +void nfp_devlink_port_type_clear(struct nfp_port *port) +{ + devlink_port_type_clear(&port->dl_port); +} + struct devlink *nfp_devlink_get_devlink(struct net_device *netdev) { struct nfp_app *app; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index 08f5fdbd8e41..f35278062476 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -160,6 +160,7 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) err = nfp_devlink_port_register(pf->app, nn->port); if (err) goto err_dfs_clean; + nfp_devlink_port_type_eth_set(nn->port); } nfp_net_info(nn); @@ -173,8 +174,10 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) return 0; err_devlink_port_clean: - if (nn->port) + 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); @@ -220,8 +223,10 @@ 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); } diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h index 90ae053f5c07..d7fd203bb180 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h @@ -131,6 +131,8 @@ int nfp_net_refresh_port_table_sync(struct nfp_pf *pf); int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port); void nfp_devlink_port_unregister(struct nfp_port *port); +void nfp_devlink_port_type_eth_set(struct nfp_port *port); +void nfp_devlink_port_type_clear(struct nfp_port *port); /** * Mac stats (0x0000 - 0x0200) -- 2.17.2