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 82A85C10F00 for ; Fri, 22 Feb 2019 22:15:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E57420675 for ; Fri, 22 Feb 2019 22:15:03 +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="OAI2M2w/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726455AbfBVWPC (ORCPT ); Fri, 22 Feb 2019 17:15:02 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:33362 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726387AbfBVWPB (ORCPT ); Fri, 22 Feb 2019 17:15:01 -0500 Received: by mail-qt1-f194.google.com with SMTP id z39so4375187qtz.0 for ; Fri, 22 Feb 2019 14:15:00 -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=46Bkh9g8Za9KDBwiZKxAy7D4WEXVaZo60slylBvX2DM=; b=OAI2M2w/UX/JBnHE7FEuSyZadNwDqPmgonG5rUxJfe5bYKA3T5TeEwYTwumM6A0jgE zZf5Ko+S/Rl8dBqxEbX9p5TCO8gH+csnFsAnKbwBV5H76bCZW7p2hAhxo9SFN7th7Xzc 1B25agXVrlrjclcqvU67yiLFc2DUfMwMNLOK+BwyMzp2CCuG4AKHNlBjjO6PMRgRCXb/ RKYib9FGN6DlLs2MKw+GjBNuwHwsnDatDKeS2jYlrbgDCm3bm7j355RNcTJXKQmc7cch J37LmDuz25mUsWcGXkS/ajwjYQRQdiiULRWntGZigxqchCXFhd7cskvetfyeMpm20dee 4EjA== 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=46Bkh9g8Za9KDBwiZKxAy7D4WEXVaZo60slylBvX2DM=; b=ivT0J1slX05o7S9h3neUHyqnhWRUugkfFr60SrLJU1yKsCKonJXikhkoRfGZwf8H3B F8f0tKk6p6Y7ggmVpYFi/edsfoA3lB2yTo9P2/EY1XhCkFA5gqrL770c6xqE1BwSbNPu WFo0ovmw2CT/tWX668w49x+XB9zohyeLkxLeATNI4qgtXchoyfALxj+dE1LizMvvkqhf vRn5aX74BgeTf4Ze1QFjE9hlIy/vNNZsdfVNUVzA+wvy1Vyy2YjSRZwIdsPj/bRsGucK 8LeqFaAIb+RAiHktZdHV31Uw9ckCIlqW5Psy/IFZlp22JHBHkJQoNf4K5rIilMe910OP Tkyw== X-Gm-Message-State: AHQUAuZ2Q1XE99YCV06bcC97r5wqFCR6IiWMUH/Meukt7j8g+a2SVBNi n1y7/Al6BOcXfnVtplsVpIdLwQ== X-Google-Smtp-Source: AHgI3IaMKg59iXjH8D0lob3nIxbh31Ig/3hhZhNnODgRI/x0XdscciJZlACtU6PFBREBs3B4IgM7Fg== X-Received: by 2002:a0c:8698:: with SMTP id 24mr4992252qvf.188.1550873700468; Fri, 22 Feb 2019 14:15:00 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id j66sm2707211qkj.27.2019.02.22.14.14.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 14:14:59 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: mkubecek@suse.cz, andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v3 3/6] nfp: add .ndo_get_devlink Date: Fri, 22 Feb 2019 14:07:54 -0800 Message-Id: <20190222220758.7117-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190222220758.7117-1-jakub.kicinski@netronome.com> References: <20190222220758.7117-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 Support getting devlink instance from a new NDO. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_app.h | 2 ++ drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 11 +++++++++++ drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 1 + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 1 + 4 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.h b/drivers/net/ethernet/netronome/nfp/nfp_app.h index d578d856a009..f8d422713705 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_app.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_app.h @@ -433,4 +433,6 @@ int nfp_app_nic_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, int nfp_app_nic_vnic_init_phy_port(struct nfp_pf *pf, struct nfp_app *app, struct nfp_net *nn, unsigned int id); +struct devlink *nfp_devlink_get_devlink(struct net_device *netdev); + #endif diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index db2da99f6aa7..e9eca99cf493 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -376,3 +376,14 @@ void nfp_devlink_port_unregister(struct nfp_port *port) { devlink_port_unregister(&port->dl_port); } + +struct devlink *nfp_devlink_get_devlink(struct net_device *netdev) +{ + struct nfp_app *app; + + app = nfp_app_from_netdev(netdev); + if (!app) + return NULL; + + return priv_to_devlink(app->pf); +} diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 776f6c07701b..6d1b8816552e 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3531,6 +3531,7 @@ const struct net_device_ops nfp_net_netdev_ops = { .ndo_udp_tunnel_del = nfp_net_del_vxlan_port, .ndo_bpf = nfp_net_xdp, .ndo_get_port_parent_id = nfp_port_get_port_parent_id, + .ndo_get_devlink = nfp_devlink_get_devlink, }; /** diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c index 62839807e21e..d2c803bb4e56 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c @@ -273,6 +273,7 @@ const struct net_device_ops nfp_repr_netdev_ops = { .ndo_set_features = nfp_port_set_features, .ndo_set_mac_address = eth_mac_addr, .ndo_get_port_parent_id = nfp_port_get_port_parent_id, + .ndo_get_devlink = nfp_devlink_get_devlink, }; void -- 2.19.2