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 DA605C10F00 for ; Tue, 26 Feb 2019 03:34:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9CB9206B8 for ; Tue, 26 Feb 2019 03:34:23 +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="iJFtmXW8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726469AbfBZDeW (ORCPT ); Mon, 25 Feb 2019 22:34:22 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:37039 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726428AbfBZDeU (ORCPT ); Mon, 25 Feb 2019 22:34:20 -0500 Received: by mail-qk1-f195.google.com with SMTP id m9so6781031qkl.4 for ; Mon, 25 Feb 2019 19:34:20 -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=KH+h3nGM9GYH0Hc9eNgCZF4eCEt2hQWPcNpWbuJE74U=; b=iJFtmXW82radaZzKm5Ur15O7R/kzCNSK12OeZQ2KlQ5SMSqW4t2KX+I4Lv7Hx1hANz yBs0beg8D4qmTcOhirHq6kCJ2oAebSb0rGIsOmQcXbemNVj7bh5N6vLzcwcfxE1Gc0Tm 42v+n3I4c2JioXcGVxgjhDd3/+rOm6HgrYzP0vmBOwUpaYBP72acTNN7v9cC/9U9eeZM hgks8gHmWMKAVJY7TTpiz9xIC+OT++pMZpooBM3NPFIiAEdkua/QSaBpEZ/8LioK6ZT+ t7XLU8+ESlKX19T+6oOwQ7c4FB5H9Kab7dgkqvhH0Ry97s4xayPKl1C/qAx/M/1DNC2D 5mhw== 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=KH+h3nGM9GYH0Hc9eNgCZF4eCEt2hQWPcNpWbuJE74U=; b=WbDlSjEIEsqTBlko4xfExrB+w1vCGQU/K8cIPDGUwnUuny3XnF0sFghk2uwO/YEXnn TT3MmLuLeH+NV5JIRgPVPcAzUjw4zaf47AoFd9Ac/vFVa+h8YxpC3bdieIHaaI7muuVv Tz1Yya+6WWP2qcJ5N0QErwB2YvpFYJLgPvga52sCS+yqP1MDSJIy84Du5qQLYyy234Te YqWVDYghSUGQtqqiFx+E0W2h4b2Udyx59oRwsq4FkdrZMkSNya91TNkMQnm/fcvObZa+ CamGyRcICKoZQqVTY+1v0eZgaCDS2rTfwgp2CZub/3GndxK+ThDP0LG10rGGFUV9aIrP i4mw== X-Gm-Message-State: AHQUAuYCgIDWqdp9xAjsAQ/0CTX8ARI6VjFbjR3VF5rWeQg5FmvR6mUi seFecregSekK+l9V56tvl1SmMg== X-Google-Smtp-Source: AHgI3IZ/GLqmVO4D2nkQ2uw+65MgK2IWtJONo9Omeb2Byq8pjfr0CMmgZrYNqOK911BkIp7VZleIcQ== X-Received: by 2002:a37:96c4:: with SMTP id y187mr14749537qkd.149.1551152059638; Mon, 25 Feb 2019 19:34:19 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i20sm8120317qta.19.2019.02.25.19.34.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 19:34:19 -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 v4 3/6] nfp: add .ndo_get_devlink Date: Mon, 25 Feb 2019 19:34:04 -0800 Message-Id: <20190226033407.32625-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190226033407.32625-1-jakub.kicinski@netronome.com> References: <20190226033407.32625-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 Acked-by: Jiri Pirko Reviewed-by: Florian Fainelli --- 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