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,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 D73D7C43381 for ; Fri, 1 Mar 2019 18:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A805B20857 for ; Fri, 1 Mar 2019 18:05:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="cEsCGM20" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733137AbfCASFK (ORCPT ); Fri, 1 Mar 2019 13:05:10 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:35028 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727492AbfCASFJ (ORCPT ); Fri, 1 Mar 2019 13:05:09 -0500 Received: by mail-qt1-f193.google.com with SMTP id p48so28806479qtk.2 for ; Fri, 01 Mar 2019 10:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LwyaoMTc0583VDcl6/eRBBSG+wKQpUsn8AvrJrTaxgc=; b=cEsCGM20xaKZAzMmhcKR2M/O8abrpx1otgk35s3NvFTegee/S+RNuyuDYcsh2Nq3Zm VKTv6TCCCyunfBsaaEcXTMGx2ccwZvaiJ8gXoxh+ULcm6jocy4eAWZYcHBWXzeLGbxY0 OqHpu2jKJaYi8T2pVvExfWPfhKn2N84qRMHls/A7nu2D3bFo0Fr+pvhogPZu6Mt+bKES qA2PZ73Js+JN+dCY7S6I2QnWb9PRDVbgPQc5jkjaBz0M9HyssR3vIqo24In+6AMxsJoi ul3IkuRfo4ZoYDXf2v6BNTQeZHXpiuUBdsw2jP9qME/L9tTi8aXvIlymHTFNvPKFYHf4 Q8yw== 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:mime-version:content-transfer-encoding; bh=LwyaoMTc0583VDcl6/eRBBSG+wKQpUsn8AvrJrTaxgc=; b=DjREyLfQ4tvmnCujaMtzovADlfms89HsEAxkNiU0Cc+q+RsCCPXzaAHMGLFef89KP1 Sy0yowM7UB75aeE9ZwxFgqQpQpQLj9TNNO4baTbyndbZlIpm/Ks7g7UD9DM3zHvbjS+y HyHwMJp1VRbogH2KNw+RF5VR00j2y5ykSm4gN/bL2P0U0Wy5dNaYQTkjIGJwvEoE9czm neyZTB8g2uzilj0DFf7tsnQf3T0Z/L9v7kq9Gix5qBqjaTjW9mW0q+2VkInmaRaCAMbJ RwxFJtOBxMf6Tu8p/gZM2ypJHIhUUJlH24EZTtdyB6eI1noKwRepHt1DI7Wcx/0ryr0S cIKg== X-Gm-Message-State: APjAAAV4awWb1iJnsyaW1SDAq4iwWp7C2WsPvIrkbsTMjLiM56ZziGUC 3NIbsF3cXxLQIZyAgUr/4P1Ilg== X-Google-Smtp-Source: APXvYqzDZ1csjl5WwVul5RLwXOB9/Qq0As1Yt01gw15TxMMxZwhqokzymq7bPBBxAyc/tZwsXZXJ2A== X-Received: by 2002:ac8:372b:: with SMTP id o40mr4978561qtb.73.1551463508055; Fri, 01 Mar 2019 10:05:08 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id a13sm16785792qtb.6.2019.03.01.10.05.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 10:05:07 -0800 (PST) From: Jakub Kicinski To: jiri@resnulli.us, davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 1/7] nfp: split devlink port init from registration Date: Fri, 1 Mar 2019 10:04:47 -0800 Message-Id: <20190301180453.17778-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190301180453.17778-1-jakub.kicinski@netronome.com> References: <20190301180453.17778-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the future we want to switch to using the devlink_port_get_phys_port_name() helper for .ndo_phys_port_name. This requires that we initialize the devlink ports before the netdevs are registered. Split the registration from init. Signed-off-by: Jakub Kicinski --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 13 ++++++++++--- .../net/ethernet/netronome/nfp/nfp_net_main.c | 17 ++++++++++++++--- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index e9eca99cf493..9af3cb1f2f17 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -350,10 +350,9 @@ const struct devlink_ops nfp_devlink_ops = { .flash_update = nfp_devlink_flash_update, }; -int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) +int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) { struct nfp_eth_table_port eth_port; - struct devlink *devlink; int ret; rtnl_lock(); @@ -366,8 +365,16 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) devlink_port_attrs_set(&port->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, eth_port.label_port, eth_port.is_split, eth_port.label_subport); + return 0; +} + +void nfp_devlink_port_clean(struct nfp_port *port) +{ +} - devlink = priv_to_devlink(app->pf); +int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) +{ + struct devlink *devlink = priv_to_devlink(app->pf); return devlink_port_register(devlink, &port->dl_port, port->eth_id); } diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index 08f5fdbd8e41..39e87bb73ebf 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -150,9 +150,15 @@ 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_init(pf->app, nn->port); + if (err) + return err; + } + err = nfp_net_init(nn); if (err) - return err; + goto err_port_clean; nfp_net_debugfs_vnic_add(nn, pf->ddir); @@ -167,17 +173,20 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) if (nfp_net_is_data_vnic(nn)) { err = nfp_app_vnic_init(pf->app, nn); if (err) - goto err_devlink_port_clean; + goto err_port_unreg; } return 0; -err_devlink_port_clean: +err_port_unreg: if (nn->port) nfp_devlink_port_unregister(nn->port); err_dfs_clean: nfp_net_debugfs_dir_clean(&nn->debugfs_dir); nfp_net_clean(nn); +err_port_clean: + if (nn->port) + nfp_devlink_port_clean(nn->port); return err; } @@ -224,6 +233,8 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) nfp_devlink_port_unregister(nn->port); nfp_net_debugfs_dir_clean(&nn->debugfs_dir); nfp_net_clean(nn); + if (nn->port) + nfp_devlink_port_clean(nn->port); } static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h index 90ae053f5c07..09c55ca2371a 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h @@ -129,6 +129,8 @@ int nfp_net_refresh_eth_port(struct nfp_port *port); void nfp_net_refresh_port_table(struct nfp_port *port); int nfp_net_refresh_port_table_sync(struct nfp_pf *pf); +int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port); +void nfp_devlink_port_clean(struct nfp_port *port); int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port); void nfp_devlink_port_unregister(struct nfp_port *port); -- 2.19.2