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 05213C43381 for ; Fri, 1 Mar 2019 16:05:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4C582084F for ; Fri, 1 Mar 2019 16:05:52 +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="YvGdiPj4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388953AbfCAQFw (ORCPT ); Fri, 1 Mar 2019 11:05:52 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44026 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731937AbfCAQFu (ORCPT ); Fri, 1 Mar 2019 11:05:50 -0500 Received: by mail-wr1-f68.google.com with SMTP id d17so26388861wre.10 for ; Fri, 01 Mar 2019 08:05:48 -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=VH81Y2vTVQ6RtQ3XGjOkrrvOeqCWf25jCYnL/7FoNXs=; b=YvGdiPj4/NhmzUQND60LH40Qnf0uCsbv7UqcrN23UzkHiGuEWeUXJ8fFWbHPw/Dfvb 25vAU37xoXle1mp72Ajdhj3hLZaeh3sOHMr6JdJ8B+L0oUMaQLPu+WYPxjO4PU7wXgDS 2j5nNTy0IbKIRdJlNq0EGwZfULyW6kXM7/s82qMZBMqpaE9/y5JDAcbdZ3MjDviAAs7c WEUmPiWOUZMQFnMw48nXTgfMwqRx8e3cZLipl3k8ODor29YgBrxuYw/dV0YxPNWyz4Nh Egl2HJWGfeb/mIAeZhrNanTzYcUCP4fsBjQyNr1pEqQPy4yeGCY+NQkwmvtqGtVd1BjT a7Vw== 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=VH81Y2vTVQ6RtQ3XGjOkrrvOeqCWf25jCYnL/7FoNXs=; b=oSiC45hANCUn+WCp0tJQOOFhR1DMSgbtq2IRjVBcYSTVsTovzmfssXPswIMnufcW8R CnPkxsakP94zIs/EovEe2d5vCfGDTVoejplyZh6lCwyl/aCWuTy9+/JlaQD/gAfpEvJC jZidb6z7C7I2dcLEarFesQNAQQIGTi8pkL8LVgrCpd6BohHdbj55tLbjOJZErDA6yO2P HQZJ8G+fqIK3YRAVgSbKM5P+ldz1ulfjgVPAE0atwERAwvcAAlTO/7usjl/wT529OHcw UicxDk/CaFqHXOS/tGTVqbDTNlidbVbzXEMK5lRgbeTYMl7pGx4ptm1CAJYeoiMQnHKm xYyw== X-Gm-Message-State: APjAAAX+WD4gqr05UkMLaWP4bsU4nYHJAMyGi7/htnY/qPbfob6bRegs sbvf2/IJLKRaTXtWkb2fkAGyFsOLGzPbDg== X-Google-Smtp-Source: APXvYqy0cO6LpZFfVsRJLSCh1DtAjzV/gJMvmxZwprH4jxa22l9ptvqnV25mJR/nc/IVORqtcaRXvw== X-Received: by 2002:adf:cc83:: with SMTP id p3mr3935351wrj.292.1551456348151; Fri, 01 Mar 2019 08:05:48 -0800 (PST) Received: from localhost (ip-89-177-134-16.net.upcbroadband.cz. [89.177.134.16]) by smtp.gmail.com with ESMTPSA id f126sm8428807wmf.6.2019.03.01.08.05.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 08:05:47 -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 RFC 4/8] mlxsw: Pass switch ID through devlink_port_attrs_set() Date: Fri, 1 Mar 2019 17:05:38 +0100 Message-Id: <20190301160542.6474-5-jiri@resnulli.us> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20190301160542.6474-1-jiri@resnulli.us> References: <20190301160542.6474-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Pass the switch ID down the to devlink through devlink_port_attrs_set() so it can be used by devlink_compat_switch_id_get(). Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/core.c | 6 ++++-- drivers/net/ethernet/mellanox/mlxsw/core.h | 4 +++- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +++- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index a2fecfdec2a1..b770fa711c40 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1748,7 +1748,9 @@ EXPORT_SYMBOL(mlxsw_core_port_fini); void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port, void *port_driver_priv, struct net_device *dev, u32 port_number, bool split, - u32 split_port_subnumber) + u32 split_port_subnumber, + const unsigned char *switch_id, + unsigned char switch_id_len) { struct mlxsw_core_port *mlxsw_core_port = &mlxsw_core->ports[local_port]; @@ -1757,7 +1759,7 @@ void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port, mlxsw_core_port->port_driver_priv = port_driver_priv; devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, port_number, split, split_port_subnumber, - NULL, 0); + switch_id, switch_id_len); devlink_port_type_eth_set(devlink_port, dev); } EXPORT_SYMBOL(mlxsw_core_port_eth_set); diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h index 60b017a07cea..af28b6e894f4 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.h +++ b/drivers/net/ethernet/mellanox/mlxsw/core.h @@ -169,7 +169,9 @@ void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port); void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port, void *port_driver_priv, struct net_device *dev, u32 port_number, bool split, - u32 split_port_subnumber); + u32 split_port_subnumber, + const unsigned char *switch_id, + unsigned char switch_id_len); void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port, void *port_driver_priv); void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port, diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 5d0adec84858..75c5b8f65912 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -3670,7 +3670,9 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, mlxsw_core_port_eth_set(mlxsw_sp->core, mlxsw_sp_port->local_port, mlxsw_sp_port, dev, module + 1, - mlxsw_sp_port->split, lane / width); + mlxsw_sp_port->split, lane / width, + mlxsw_sp->base_mac, + sizeof(mlxsw_sp->base_mac)); mlxsw_core_schedule_dw(&mlxsw_sp_port->periodic_hw_stats.update_dw, 0); return 0; diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c index 9999d866f394..e6c7bf78f245 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c +++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c @@ -1091,7 +1091,8 @@ static int __mlxsw_sx_port_eth_create(struct mlxsw_sx *mlxsw_sx, u8 local_port, } mlxsw_core_port_eth_set(mlxsw_sx->core, mlxsw_sx_port->local_port, - mlxsw_sx_port, dev, module + 1, false, 0); + mlxsw_sx_port, dev, module + 1, false, 0, + mlxsw_sx->hw_id, sizeof(mlxsw_sx->hw_id)); mlxsw_sx->ports[local_port] = mlxsw_sx_port; return 0; -- 2.14.5