From mboxrd@z Thu Jan 1 00:00:00 1970 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 7EEBBC43381 for ; Fri, 22 Mar 2019 16:57:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DE0521916 for ; Fri, 22 Mar 2019 16:57:01 +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="uhnHw/F6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728744AbfCVQ5A (ORCPT ); Fri, 22 Mar 2019 12:57:00 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33606 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728706AbfCVQ47 (ORCPT ); Fri, 22 Mar 2019 12:56:59 -0400 Received: by mail-wr1-f68.google.com with SMTP id q1so3150740wrp.0 for ; Fri, 22 Mar 2019 09:56:58 -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=wSWb9/7y93IBsrVh9e/HQBZVd5RkWMNjzSCLldJqYWo=; b=uhnHw/F6eoL8Qo3Gh1qtc/IPv4t2Nb7J90/fZzuFiVZVojcAwWwfPVNMC2qqT5sADb M2HvmRF5JYNRxQPvK8sThKY+T8NIswciD2NMaY4z07s/zsVA9GL/BXlyCB2KxpTL7zM8 PMzTKopVLmQ3N1cEHGqzirbtt2xI1i8bgFBl6pY5Arn8U/fM7ljJQ2U2qQmq7TdryUKt g3GyhmbbRVwYv6oiQIBeG8t6xDyrzIh0NBtikcn11MdMtjqDrC+iw2+nEnXaE9IQnK7j QBJfkd44iF0d2y+Nv4tXIVM0vLNaJdKduJVG71FQy+kXbM6HZ3ZwPS0AzfohXBl68NiJ KQJA== 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=wSWb9/7y93IBsrVh9e/HQBZVd5RkWMNjzSCLldJqYWo=; b=MVJ2QQYC/hYSYi9d5CB2APaaL1CgLoFVo9XepeVB1/rdYsL8ig3+fNt5v81Pg5jmsY CrryR7/yuBu9P1ykt4TSam1WIkp86yrv+yEDkNch6Lw9vQaBqYwy/mK0Dl0QrQZQLIX0 WjsDvsc37nqQ6jyuYk2rTXUxByfoWFiTeqc+uYbK4Lud4vp6jsuETHkxCcqT12pSB5qb fecrVtoPS5MeB2wZHPVeCdY39sG7ezQZ3MCVjR5NiOgoFZxZBp9qRCtB4xW9a6zqpk9I eWFDKaP2jQo++LA+taqIXQBZPY9ExraMv8x27zSEH440OD+RZ4jjd/xvjTaUNjog6UTP 2PRA== X-Gm-Message-State: APjAAAVEXiGEowlElNIMCS4Yl+U9sHlhri7npeqUBri60ocPIpbRMEe4 oPXuNCqLpNfW2Vjo4EveaqBqKHy58TQ= X-Google-Smtp-Source: APXvYqxFtKp058lvmFsqaGHfxra/7yf5dlRujY5svSgnh7b/wNM/DszYPgfT6B7d6f2LgeMf+O5+XQ== X-Received: by 2002:a5d:530f:: with SMTP id e15mr7087911wrv.19.1553273817280; Fri, 22 Mar 2019 09:56:57 -0700 (PDT) Received: from localhost ([195.39.71.253]) by smtp.gmail.com with ESMTPSA id u19sm10476471wmc.7.2019.03.22.09.56.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Mar 2019 09:56:56 -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 v2 11/15] nfp: move devlink port type set after netdev registration Date: Fri, 22 Mar 2019 17:56:32 +0100 Message-Id: <20190322165636.1725-12-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190322165636.1725-1-jiri@resnulli.us> References: <20190322165636.1725-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 --- v1->v2: - new patch --- drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 11 ++++++++++- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 ++++ drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) 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..e29744f2af02 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -169,6 +169,8 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) if (err) goto err_devlink_port_clean; } + if (nn->port) + nfp_devlink_port_type_eth_set(nn->port); return 0; @@ -218,6 +220,8 @@ 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) { + if (nn->port) + nfp_devlink_port_type_clear(nn->port); if (nfp_net_is_data_vnic(nn)) nfp_app_vnic_clean(pf->app, nn); if (nn->port) 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