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 BDA5DC43381 for ; Thu, 21 Feb 2019 17:46:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E78520818 for ; Thu, 21 Feb 2019 17:46:49 +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="D1opytPX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728757AbfBURqs (ORCPT ); Thu, 21 Feb 2019 12:46:48 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:42797 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728747AbfBURqq (ORCPT ); Thu, 21 Feb 2019 12:46:46 -0500 Received: by mail-qt1-f196.google.com with SMTP id b8so32429152qtr.9 for ; Thu, 21 Feb 2019 09:46:46 -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=D1opytPXlc+S4QZK67s8FaFCjvQ9883LflSCqMqCqyvA9N1QX1kw548bIKXu1Fs0Em v4cqvy1sn2NqaJzNynJxcJWyf2ow/UYN0DxV9/8sUiKhzZVKC5bJXhkzKY2ReVcMK4vl 8/vzz4nKfQNvo9TuIw5Nxdz+CaOa/6X1hG9GecCaSxAX/viJFQXsrLyulyJMLB6t1maM ZOMCxNEzPeH2k4hi+Mj8g7L5k+ktjoMod8WHb5t4y3WDkbi8d0seBm1jMRDaRSL1hpcF 2CjCrj8AsMxBxFaqpMPlr/x2sOJcvxYgaG0ooXr2eNGA/oLdMnafze++g4IxrsZXyc0L 4HPg== 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=fku0EfP6DceGJTQ878aoyJEm26enz6pz5Zs5gVJnRbqiJqZFi4PLD8tdIe0zdvIG7Y D6cFVdNiDKYqzBCln7yCer1hBzY0lN+IJocI2IfzY45XVxALyz6SgamrPOi0Wu2z4xJD hMhvA/KkCirwfJj1ewsdsZQNbnBnkJ6QgR6blFcAJWfDhKEvMT4gRQfesltukDlkn/ay CqMfafXju4vY0K/wSdCzXG32J3Qi6y7ifLVPkME4RdRsqsg9Fk5dQCCvpjk3Kd7ExX1A J4Z1kJZ2++UhmJAc8Vh22TEiS5+15nAsRdjlGzRZh81gXKhcE9ba1b/3oOHwveA1Kh+Y 0g7w== X-Gm-Message-State: AHQUAua/92GSq4jTvwZe4zQN0qOEkxyb/1VAQrfqczG3jRYGGElkiOqe 7Wu1Q4iWr94QwgWN40765TSrkg== X-Google-Smtp-Source: AHgI3IZ51ZSDZk3DEVXq65P18h93hKZx6BKkGRViuV5/kBSzycWexArqnCh0nH4Ea5kTjp5blRWjeg== X-Received: by 2002:ac8:2c82:: with SMTP id 2mr33178940qtw.347.1550771206045; Thu, 21 Feb 2019 09:46:46 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id y17sm12976352qtc.33.2019.02.21.09.46.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 09:46:45 -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 4/5] nfp: add .ndo_get_devlink Date: Thu, 21 Feb 2019 09:46:19 -0800 Message-Id: <20190221174620.12144-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190221174620.12144-1-jakub.kicinski@netronome.com> References: <20190221174620.12144-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