From patchwork Fri May 18 07:29:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 916052 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="sdzlmjDI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40nKYd3nH9z9s0q for ; Fri, 18 May 2018 17:29:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752226AbeERH3W (ORCPT ); Fri, 18 May 2018 03:29:22 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38968 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752014AbeERH3Q (ORCPT ); Fri, 18 May 2018 03:29:16 -0400 Received: by mail-wr0-f193.google.com with SMTP id w18-v6so4331610wrn.6 for ; Fri, 18 May 2018 00:29:16 -0700 (PDT) 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=TYNzRqdQTu5D/sdp3rCzGHNPyTtxarqLC/E0fms/EqE=; b=sdzlmjDIPQ/L5gl6P1epE0taG2yTNPH3HDdfeZK0MUuV0IVE64FxRvA9+rlTanZ9vy ZlttyRJWYeKlIy5dP0B05TH8b5MoBxLBDaD/Gomf9B9pMZlYypD+WtBR8lhclZK6aAyD 9s3vxIrMBPayqSHjEeIUdtlPjnY26RSmIE02vvY1fZKcm60trXafVNEWKk8aMfy3MzBW qUSMsWNGDrLndG90gt7MBjZe39x0qkKwI+bHR2oXSs6jt5TrvSuk0Gj9VyhlyTCaum3o gJYc14YYst2TRieTVrWBQeI3H65Yz+kiv+jJis0ezQhdZBfYHlVLuR9wY/HMsRcqiMpB gU2Q== 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=TYNzRqdQTu5D/sdp3rCzGHNPyTtxarqLC/E0fms/EqE=; b=cJZ/JEAtjT1RDotPJPM/bmzAXfVrFMRf93zHIOipopjRs93/tA7fFbJ/mWN9NKAahO VQerd1C8BNmYGgIAQJ9/kNuHQDe75Mns9+rDIHGsBOrg2MIoa0ImSjqFZ5AwpR7L/Xuu DXyDDey6oVU1Id1EWjpOqtshzZK1qxtBXtHaRc5vFlVCWvXHwBZWjui/KzdlFsbffiFm plbu2aQHZdltEAnUAq3b0iRme7o8tT1AogzA+Cy7Z5KvuOSY3r6lMtMaVyvQr/AK4Piu iVdFo/16JCzgxNxFfmub1abb96woZZoFiPNGBUdwhOZTnEZtJUWIuNlFZ5J0bMrmw2+b NC+A== X-Gm-Message-State: ALKqPwdMlNJhESsboW1nntJlLvJsApApYo6XbvoYl5Ey++UsdaVE5m/R QoOP+OjDdDHHklO7p9NsWihNEWO4 X-Google-Smtp-Source: AB8JxZqHdmUhl7J3a13T2ZiZg+RkZDYOJUhIGXa+a+CmYqYW7H5z3g5XXiLg7AX/MEM59ZzJ9DC6OA== X-Received: by 2002:adf:e447:: with SMTP id t7-v6mr6620153wrm.143.1526628555193; Fri, 18 May 2018 00:29:15 -0700 (PDT) Received: from localhost (ip-94-113-127-8.net.upcbroadband.cz. [94.113.127.8]) by smtp.gmail.com with ESMTPSA id u35-v6sm8914900wrc.29.2018.05.18.00.29.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 00:29:14 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, jakub.kicinski@netronome.com, mlxsw@mellanox.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, michael.chan@broadcom.com, ganeshgr@chelsio.com, saeedm@mellanox.com, simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com, john.hurley@netronome.com, dirk.vandermerwe@netronome.com, alexander.h.duyck@intel.com, ogerlitz@mellanox.com, dsahern@gmail.com, vijaya.guvva@cavium.com, satananda.burla@cavium.com, raghu.vatsavayi@cavium.com, felix.manlunas@cavium.com, gospo@broadcom.com, sathya.perla@broadcom.com, vasundhara-v.volam@broadcom.com, tariqt@mellanox.com, eranbe@mellanox.com, jeffrey.t.kirsher@intel.com, roopa@cumulusnetworks.com Subject: [patch net-next 5/5] mlxsw: use devlink helper to generate physical port name Date: Fri, 18 May 2018 09:29:04 +0200 Message-Id: <20180518072904.29523-6-jiri@resnulli.us> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180518072904.29523-1-jiri@resnulli.us> References: <20180518072904.29523-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Since devlink knows the info needed to generate the physical port name in a generic way for all devlink users, use the helper to do the job. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/core.c | 11 +++++++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 2 ++ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 17 +++-------------- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 9 +++------ 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index a720aa11bcc0..a38faec45b30 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1763,6 +1763,17 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, } EXPORT_SYMBOL(mlxsw_core_port_type_get); +int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, + u8 local_port, char *name, size_t len) +{ + 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_get_phys_port_name(devlink_port, name, len); +} +EXPORT_SYMBOL(mlxsw_core_port_get_phys_port_name); + 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 e65287c15afd..4eac7fbd07d5 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.h +++ b/drivers/net/ethernet/mellanox/mlxsw/core.h @@ -209,6 +209,8 @@ void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port, void *port_driver_priv); 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); 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 96f6d8af1fd8..bb252b36994d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1238,21 +1238,10 @@ static int mlxsw_sp_port_get_phys_port_name(struct net_device *dev, char *name, size_t len) { struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev); - u8 module = mlxsw_sp_port->mapping.module; - u8 width = mlxsw_sp_port->mapping.width; - u8 lane = mlxsw_sp_port->mapping.lane; - int err; - - if (!mlxsw_sp_port->split) - err = snprintf(name, len, "p%d", module + 1); - else - err = snprintf(name, len, "p%ds%d", module + 1, - lane / width); - if (err >= len) - return -EINVAL; - - return 0; + return mlxsw_core_port_get_phys_port_name(mlxsw_sp_port->mlxsw_sp->core, + mlxsw_sp_port->local_port, + name, len); } static struct mlxsw_sp_port_mall_tc_entry * diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c index 551e05067b1e..3922c1cfe5f5 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c +++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c @@ -417,13 +417,10 @@ static int mlxsw_sx_port_get_phys_port_name(struct net_device *dev, char *name, size_t len) { struct mlxsw_sx_port *mlxsw_sx_port = netdev_priv(dev); - int err; - - err = snprintf(name, len, "p%d", mlxsw_sx_port->mapping.module + 1); - if (err >= len) - return -EINVAL; - return 0; + return mlxsw_core_port_get_phys_port_name(mlxsw_sx_port->mlxsw_sx->core, + mlxsw_sx_port->local_port, + name, len); } static const struct net_device_ops mlxsw_sx_port_netdev_ops = {