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 EB149C43381 for ; Fri, 1 Mar 2019 18:05:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5F4A20842 for ; Fri, 1 Mar 2019 18:05:25 +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="OW4sVh+i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388900AbfCASFY (ORCPT ); Fri, 1 Mar 2019 13:05:24 -0500 Received: from mail-qt1-f195.google.com ([209.85.160.195]:36510 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727492AbfCASFM (ORCPT ); Fri, 1 Mar 2019 13:05:12 -0500 Received: by mail-qt1-f195.google.com with SMTP id p25so28805329qtb.3 for ; Fri, 01 Mar 2019 10:05:11 -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=NjwyXG2XAyk0TtIYpiQ8WnRY5fjnrDmJOhK41BFxtwY=; b=OW4sVh+i3gXDMQ1+Fz6gvWydKBQJT9UebiFwqTWxb6xGSgfRbLJI8nJpy/oUbjI5iM c3Dphpi4UWcxKg6gp73KbY633yP7WN7Jr4VsYJCGpEyI2JYM+ApZM+vhqMenc1Kgfcps HiXKi04GAycd8zHNSSnIT0eFwrreLVVud4iQrw3mq+29VSFzJhWeLKUZcOauIsdRlfIB 6JU17dBJ/T17Okmz6NbLF8uPqNr8z9h/XnAqO77/QJDlcBrXt0G7QskjRuxfqgypXztS Qk0khm4uNbrpO2eW+XK/NDPizmwjtFSnuJLd9yaKygwp7xucs3MuP0powHDYcwxnv6jH 8/8w== 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=NjwyXG2XAyk0TtIYpiQ8WnRY5fjnrDmJOhK41BFxtwY=; b=iSnk3ERiaiI2Eb4qn+omHe6mNRzQHNEtROxnptd+IoTaejnEcAAZZoySs71zZzkvgS Er/O8ZvBErB5uqBpRa8tqqfTNSadOYr4wZF3m907o+KWh0H+BRLIubk03Y3CWzHkty8D cWY6t2phFJMApd42stU19Dfc7PlZBX6UXtKd6vMuhWR6NZkQcpgpHIcQBr18sBHWz/6g Afwq63pbAzU6vLlz6scvtPbUlW2KLLY0mmu11PzimhZAV/Mkt1rKpRr4gvSDftXyB/9w Yy5c9zIKLSdG/kRZnClQ6pV2dU5rncMG4HqTTzsqAVgNp8YMsuwyVS7qCV9NWnt0O3Eh Woeg== X-Gm-Message-State: APjAAAV5X5hOKq+Mx6kGZ/BlA7S3qHMMv5E+sfBW//IvJ5oK5oUJJQa3 JwtOVAI+B5wgfZTeJQ7gMc4R8Q== X-Google-Smtp-Source: APXvYqwhoNUHtMDeXzxHWpwi705ivRCHOs5iUSAVc3a4KKZvECgy0R8BaPsme1gcwJ9lr/DsVECcMQ== X-Received: by 2002:aed:2206:: with SMTP id n6mr5175072qtc.28.1551463510854; Fri, 01 Mar 2019 10:05:10 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 10:05:10 -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 3/7] nfp: register devlink ports of all reprs Date: Fri, 1 Mar 2019 10:04:49 -0800 Message-Id: <20190301180453.17778-4-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 Register all representors as devlink ports. The port_index is slightly tricky to figure out, we use a bit of arbitrary math to create unique IDs for PCI ports. Signed-off-by: Jakub Kicinski --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 40 ++++++++++++++++++- .../net/ethernet/netronome/nfp/nfp_net_repr.c | 16 +++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 9af3cb1f2f17..bf7fd9614152 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -350,7 +350,8 @@ const struct devlink_ops nfp_devlink_ops = { .flash_update = nfp_devlink_flash_update, }; -int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) +static int +nfp_devlink_port_init_phys(struct devlink *devlink, struct nfp_port *port) { struct nfp_eth_table_port eth_port; int ret; @@ -368,6 +369,27 @@ int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) return 0; } +int nfp_devlink_port_init(struct nfp_app *app, struct nfp_port *port) +{ + struct devlink *devlink = priv_to_devlink(app->pf); + + switch (port->type) { + case NFP_PORT_PHYS_PORT: + return nfp_devlink_port_init_phys(devlink, port); + case NFP_PORT_PF_PORT: + devlink_port_type_eth_set(&port->dl_port, port->netdev); + devlink_port_attrs_pci_pf_set(&port->dl_port, port->pf_id); + return 0; + case NFP_PORT_VF_PORT: + devlink_port_type_eth_set(&port->dl_port, port->netdev); + devlink_port_attrs_pci_vf_set(&port->dl_port, port->pf_id, + port->vf_id); + return 0; + default: + return -EINVAL; + } +} + void nfp_devlink_port_clean(struct nfp_port *port) { } @@ -376,7 +398,21 @@ 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); + switch (port->type) { + case NFP_PORT_PHYS_PORT: + return devlink_port_register(devlink, &port->dl_port, + port->eth_id); + case NFP_PORT_PF_PORT: + return devlink_port_register(devlink, &port->dl_port, + (port->pf_id + 1) * 10000 + + port->pf_split_id * 1000); + case NFP_PORT_VF_PORT: + return devlink_port_register(devlink, &port->dl_port, + (port->pf_id + 1) * 10000 + + port->vf_id + 1); + default: + return -EINVAL; + } } void nfp_devlink_port_unregister(struct nfp_port *port) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c index d2c803bb4e56..869d22760a6e 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c @@ -292,7 +292,9 @@ nfp_repr_transfer_features(struct net_device *netdev, struct net_device *lower) static void nfp_repr_clean(struct nfp_repr *repr) { + nfp_devlink_port_unregister(repr->port); unregister_netdev(repr->netdev); + nfp_devlink_port_clean(repr->port); nfp_app_repr_clean(repr->app, repr->netdev); dst_release((struct dst_entry *)repr->dst); nfp_port_free(repr->port); @@ -395,12 +397,24 @@ int nfp_repr_init(struct nfp_app *app, struct net_device *netdev, if (err) goto err_clean; - err = register_netdev(netdev); + err = nfp_devlink_port_init(app, repr->port); if (err) goto err_repr_clean; + err = register_netdev(netdev); + if (err) + goto err_port_clean; + + err = nfp_devlink_port_register(app, repr->port); + if (err) + goto err_unreg_netdev; + return 0; +err_unreg_netdev: + unregister_netdev(repr->netdev); +err_port_clean: + nfp_devlink_port_clean(repr->port); err_repr_clean: nfp_app_repr_clean(app, netdev); err_clean: -- 2.19.2