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 C27FEC4360F for ; Tue, 26 Feb 2019 18:25:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91130217F5 for ; Tue, 26 Feb 2019 18:25:02 +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="Z6ug3O7+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729184AbfBZSZB (ORCPT ); Tue, 26 Feb 2019 13:25:01 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:36045 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729149AbfBZSY7 (ORCPT ); Tue, 26 Feb 2019 13:24:59 -0500 Received: by mail-qt1-f196.google.com with SMTP id p25so16073205qtb.3 for ; Tue, 26 Feb 2019 10:24:58 -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=iWBygLXmx5eoWNwsH8J7W3L4slD1R63Evf/auP/m4X0=; b=Z6ug3O7+JMs8IPlXiPqfXg88TKmEWAhCBpMfgBjm3gNxM9CG0q0pxhVvDs8GdcEbr/ lEV0dMNONWSVRN3hdF6hRo4FH1dZcJlve4h26yYFpm7IKGxTOD9HGbEwBrRlhlddf1Fq f3g7s/8KomKNOPwMcxL0SvPSdrWby9qALZbEVWNHk71yCB+P1goe8y3DGNaP//2ZpPWm mHubCnBpx8e4ySUWshhZVolll5+GDCDcydysaHgvxpMOvyPL4TfiR9WNw4Am9T8iwU0r TRZ/psvkSzJhlXy+dTUSKIN9vkAPF5R/wmvEdlgh4NcHazQmy0HNEOq0Qg+WrBtWNcXr pyQQ== 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=iWBygLXmx5eoWNwsH8J7W3L4slD1R63Evf/auP/m4X0=; b=OM/aSGk1hcAZg0NC4QaVsHz43FRE1mJ4UcSY6rqK3Bbz4/FSTo7jD0mHYZdmqfctrh Bnnq12C3p3zSt/5GoXjDdNGZM/B1Td0O9XSpXsVZEyK6KmWPh97bALkx3LhpTdaI64sA 2fMit3gnyiMev9qkfgSogpPkWAk4DAjvVb03YeW6R7cal4QPLf+mPjApPJnEwFWIWAsN 1Q24Lo+ceQDFgxlpJjlwKAERAgFDSXNEN59BUiOh6weK9Gha1WAUYF1ogRqeo3OHn8jA ZUlM/+k2pd60I+n/pX2mwaQbcvr2EeGmv9xtCoGIkNvBdMDDC+DGCleNa8fib5YGNULn VDBQ== X-Gm-Message-State: AHQUAuYGYRJh6cdoZchV2GdQTRnMcTeYKVMhW+DSCgjXU8Ur3TExkDja GpMjUbWkpyvfn0JM8c1+mrxCylx1VuU= X-Google-Smtp-Source: AHgI3IZpWjo1OF7tZir6jqMxVbWpynhEQDzmv4o1WEs84+Vh26ggTancctKMgwi4+V2WBrG8qrRosw== X-Received: by 2002:a0c:d4cc:: with SMTP id y12mr19039037qvh.37.1551205497739; Tue, 26 Feb 2019 10:24:57 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id u31sm9733892qth.15.2019.02.26.10.24.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 10:24:57 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next 7/8] nfp: expose PF peer netdevs Date: Tue, 26 Feb 2019 10:24:35 -0800 Message-Id: <20190226182436.23811-8-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190226182436.23811-1-jakub.kicinski@netronome.com> References: <20190226182436.23811-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 Expose PF netdevs as devlink port's peers. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/abm/main.c | 1 + drivers/net/ethernet/netronome/nfp/flower/main.c | 1 + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 3 ++- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/abm/main.c b/drivers/net/ethernet/netronome/nfp/abm/main.c index 4d4ff5844c47..8d7ff1200fd4 100644 --- a/drivers/net/ethernet/netronome/nfp/abm/main.c +++ b/drivers/net/ethernet/netronome/nfp/abm/main.c @@ -113,6 +113,7 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink, port->pf_id = alink->abm->pf_id; port->pf_split = app->pf->max_data_vnics > 1; port->pf_split_id = alink->id; + port->peer = alink->vnic->dp.netdev; port->vnic = alink->vnic->dp.ctrl_bar; } diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c index 408089133599..13aa21923bf7 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/main.c +++ b/drivers/net/ethernet/netronome/nfp/flower/main.c @@ -300,6 +300,7 @@ nfp_flower_spawn_vnic_reprs(struct nfp_app *app, if (repr_type == NFP_REPR_TYPE_PF) { port->pf_id = i; port->vnic = priv->nn->dp.ctrl_bar; + port->peer = priv->nn->dp.netdev; } else { port->pf_id = 0; port->vf_id = i; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index bb07be4117a3..3d59a57eda0c 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -373,7 +373,8 @@ static int nfp_devlink_port_init_pci(struct devlink *devlink, struct nfp_port *port, u32 flavour) { - devlink_port_type_eth_set(&port->dl_port, port->netdev); + devlink_port_type_eth_set_peer(&port->dl_port, port->netdev, + port->peer); devlink_port_attrs_pci_set(&port->dl_port, flavour, port->pf_id, port->vf_id, port->pf_split, port->pf_split_id); diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.h b/drivers/net/ethernet/netronome/nfp/nfp_port.h index 09c55ca2371a..c75a25cc5cea 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.h @@ -51,6 +51,7 @@ enum nfp_port_flags { * @eth_forced: for %NFP_PORT_PHYS_PORT port is forced UP or DOWN, don't change * @eth_port: for %NFP_PORT_PHYS_PORT translated ETH Table port entry * @eth_stats: for %NFP_PORT_PHYS_PORT MAC stats if available + * @peer: for %NFP_PORT_PF_PORT netdev of the actual vNIC, if reachable * @pf_id: for %NFP_PORT_PF_PORT, %NFP_PORT_VF_PORT ID of the PCI PF (0-3) * @vf_id: for %NFP_PORT_VF_PORT ID of the PCI VF within @pf_id * @pf_split: for %NFP_PORT_PF_PORT %true if PCI PF has more than one vNIC @@ -79,6 +80,7 @@ struct nfp_port { }; /* NFP_PORT_PF_PORT, NFP_PORT_VF_PORT */ struct { + struct net_device *peer; unsigned int pf_id; unsigned int vf_id; bool pf_split; -- 2.19.2