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 DFB85C4360F for ; Fri, 1 Mar 2019 08:14:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B228E2186A for ; Fri, 1 Mar 2019 08:14:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="cDOd78yc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733264AbfCAIOK (ORCPT ); Fri, 1 Mar 2019 03:14:10 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46632 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733224AbfCAIOJ (ORCPT ); Fri, 1 Mar 2019 03:14:09 -0500 Received: by mail-wr1-f65.google.com with SMTP id i16so24769333wrs.13 for ; Fri, 01 Mar 2019 00:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SFwiKwXixzpqoEUVSNqcJRxiIQKmssbd8FJBWT0CEQQ=; b=cDOd78ycYBYLsK3h+z4+Sy2OAqzZoYi6F8kr9VY+PRgOX7RlnsVjDL85ylJTMAAno0 R+yQszHarVuImUpDV5ZcG36vuWP1pkwVQo7uzw5/uOGUqAH+yc+Hc1SAN+UEXzwRxYfv GGWMa48jvqijhkWCSIIbq3oVl2qA9/10adsD/faefi71pKyxo+T8LSIoay7Tr//oDYxt VLK9lUHqT55Z4jtyzdWUmJ+ZbvPr2ijTKFqx+XSjWL1j05U499flYowP1hJj/Cyqq6rX y+XLKohjHE+QPCmXjoH4RmXKRKYc1cVZHNU7B5sQpVwuzRqPg2dX8lVmM4jPv1ptrSBc SL8g== 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; bh=SFwiKwXixzpqoEUVSNqcJRxiIQKmssbd8FJBWT0CEQQ=; b=ab7yeZoP/djXUmSc3ar2p1zYBWghSVIxFco2xyxSES1GF/+IBtlAGzk0Wd3TKMqY0a JONK+pqNmvSFzSyT4lW6aDcgLMETKp8dhdzE+vLdof2Bp0rWsXfBCh4Mr/oirvWw55jA N1vvUC6j0TgnXZUCKzJ0VEntwkHA52hZY0A0OFrMEWumlmtS9F67ThMcMpr0mUswvi5S XuHx1tOZ/s2TmDdqRA4zFriKIgfBG6VjCmxZFrJ3985Kc3AGRen8YC1yaOj29GzutHbG T2dgah+b9+/HId0r95DWMR4OY/Lk9xrT02kDSJFi2itlEYsabGqH/kb9ia7KTCSU0d4J f7Mw== X-Gm-Message-State: APjAAAXD8ZYKTVNgu5iDPQh4CZGMnWZwq5f0lGhSA0G8LthIMLpRv/3U jdcarQ2XRPVexmm//7qtUPH6rnyTbfx8Ww== X-Google-Smtp-Source: APXvYqzXGHml6DBbn4CjxLeraqtQy2d+GGZC42fKFQDapyc7iXD4CQTBXeOZN8KzfTg5wQvuvTR8uw== X-Received: by 2002:adf:b211:: with SMTP id u17mr2597078wra.322.1551428046885; Fri, 01 Mar 2019 00:14:06 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id b4sm4682889wmj.3.2019.03.01.00.14.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 00:14:06 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, dirk.vandermerwe@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next 3/5] mlxsw: spectrum: Implement ndo_get_devlink_port Date: Fri, 1 Mar 2019 09:14:00 +0100 Message-Id: <20190301081402.6074-4-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301081402.6074-1-jiri@resnulli.us> References: <20190301081402.6074-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko In order for devlink compat functions to work, implement ndo_get_devlink_port. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/core.c | 12 ++++++++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 3 +++ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 11 +++++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index b505d3858235..5d656310434d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1807,6 +1807,18 @@ int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, } EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name); +struct devlink_port * +mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, + u8 local_port) +{ + struct mlxsw_core_port *mlxsw_core_port = + &mlxsw_core->ports[local_port]; + struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port; + + return devlink_port; +} +EXPORT_SYMBOL(mlxsw_core_port_devlink_port_get); + static void mlxsw_core_buf_dump_dbg(struct mlxsw_core *mlxsw_core, const char *buf, size_t size) { diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h index cd0c6aa0dff9..0592cd724ec3 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.h +++ b/drivers/net/ethernet/mellanox/mlxsw/core.h @@ -178,6 +178,9 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, u8 local_port); int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, u8 local_port, char *name, size_t len); +struct devlink_port * +mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, + u8 local_port); int mlxsw_core_schedule_dw(struct delayed_work *dwork, unsigned long delay); bool mlxsw_core_schedule_work(struct work_struct *work); diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 6c797e322be8..7995e7b042a2 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1725,6 +1725,16 @@ static int mlxsw_sp_port_get_port_parent_id(struct net_device *dev, return 0; } +static struct devlink_port * +mlxsw_sp_port_get_devlink_port(struct net_device *dev) +{ + struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev); + struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; + + return mlxsw_core_port_devlink_port_get(mlxsw_sp->core, + mlxsw_sp_port->local_port); +} + static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_open = mlxsw_sp_port_open, .ndo_stop = mlxsw_sp_port_stop, @@ -1741,6 +1751,7 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_get_phys_port_name = mlxsw_sp_port_get_phys_port_name, .ndo_set_features = mlxsw_sp_set_features, .ndo_get_port_parent_id = mlxsw_sp_port_get_port_parent_id, + .ndo_get_devlink_port = mlxsw_sp_port_get_devlink_port, }; static void mlxsw_sp_port_get_drvinfo(struct net_device *dev, -- 2.14.5