From patchwork Thu Mar 22 10:55:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 889309 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="G7RM3XzM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406NrD5gDFz9s1X for ; Thu, 22 Mar 2018 21:55:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754265AbeCVKzy (ORCPT ); Thu, 22 Mar 2018 06:55:54 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52709 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754549AbeCVKzf (ORCPT ); Thu, 22 Mar 2018 06:55:35 -0400 Received: by mail-wm0-f67.google.com with SMTP id l9so15114893wmh.2 for ; Thu, 22 Mar 2018 03:55:34 -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=hworZYet0kNdmKw87M5bh6oxa/zcm26MkWcwQdd6LhI=; b=G7RM3XzM4ncW5qEmF5oq3XjOXMRtlV9xCP9z5GQlzWheHaUv3j2rY9NuK7+682jc9a 7z4aU82Y4WfD/Zbv6VNnXa6OjaB32X+VcCNl2StSg58EK+mV9t5/cy6HpDSBXU6+IRl0 NHq+QQHpS8T8iKxDwc2twJY3D1+6PxH9mcbYVydGFFRd9OCnVEDwfxjHrRMN+97B9ZuM wwi+mHqiPJ3icvENZpOmHtQ7YHz3XXU7cLHHg4mlRSZNWbeJ84wJ4xufgKZtW7fQFOF5 8saoiKlbD+p5lJQG9ekMcLBfIwdyiv3u4D8mAJcJKfvXg3+vOshWRHTw6+8mY0pvtdNW M2lg== 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=hworZYet0kNdmKw87M5bh6oxa/zcm26MkWcwQdd6LhI=; b=dQlaZYH2OduObPEApRJjMiVEg8R8bwVuRBHyRfWp3rVdx2myJ3PflTPoJLRYDz2t+u 7b+QMNZigLjfT53tCd1T9f/pYPS/tGtZmeCtH5pjsvrUx9tGUA0JquKG0sym054fmxrc nh5m3+lEZtHVjUSwR3TbHKnf5WfyEN65LEjoyDOrDipZpNuj3B901rMAKCW6clVAY+Ew BL6oAlCZaUWQjAc5q2BbW6IVAzg5cqHzVV5qn14+YTqAYf6or6Q06rEZQwKsYUwW+6FY xUEkXwAuSAZ/w6/veqJqI3T3Ge50yIx/2pEWu2agcOgGUWOXS0GXc8QL74r1j8KCIv7E yH4Q== X-Gm-Message-State: AElRT7FQO9mMNaUsTGk0Dp7zYpdsFC0OskyurfVvt+qfCecDDVonRiYI zW5w+gW3w77nqjQ5bB28Eay3EWKF X-Google-Smtp-Source: AG47ELv7TC4dJb71sXSsKoThk5Sg4a/KY5tfZQtwXjpd6buSYSCNfaSCj+L3e7ZbtWhDDTAGRMpHtw== X-Received: by 10.28.92.200 with SMTP id q191mr4868581wmb.11.1521716133851; Thu, 22 Mar 2018 03:55:33 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id j6sm8127725wmg.14.2018.03.22.03.55.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Mar 2018 03:55:33 -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 Subject: [patch net-next RFC 11/12] nfp: use devlink helper to generate physical port name Date: Thu, 22 Mar 2018 11:55:21 +0100 Message-Id: <20180322105522.8186-12-jiri@resnulli.us> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180322105522.8186-1-jiri@resnulli.us> References: <20180322105522.8186-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/netronome/nfp/nfp_port.c | 30 ++------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_port.c b/drivers/net/ethernet/netronome/nfp/nfp_port.c index 7bd8be5c833b..01dac8533ef6 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_port.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_port.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "nfpcore/nfp_cpp.h" #include "nfpcore/nfp_nsp.h" @@ -160,40 +161,13 @@ struct nfp_eth_table_port *nfp_port_get_eth_port(struct nfp_port *port) int nfp_port_get_phys_port_name(struct net_device *netdev, char *name, size_t len) { - struct nfp_eth_table_port *eth_port; struct nfp_port *port; - int n; port = nfp_port_from_netdev(netdev); if (!port) return -EOPNOTSUPP; - switch (port->type) { - case NFP_PORT_PHYS_PORT: - eth_port = __nfp_port_get_eth_port(port); - if (!eth_port) - return -EOPNOTSUPP; - - if (!eth_port->is_split) - n = snprintf(name, len, "p%d", eth_port->label_port); - else - n = snprintf(name, len, "p%ds%d", eth_port->label_port, - eth_port->label_subport); - break; - case NFP_PORT_PF_PORT: - n = snprintf(name, len, "pf%d", port->pf_id); - break; - case NFP_PORT_VF_PORT: - n = snprintf(name, len, "pf%dvf%d", port->pf_id, port->vf_id); - break; - default: - return -EOPNOTSUPP; - } - - if (n >= len) - return -EINVAL; - - return 0; + return devlink_port_get_phys_port_name(&port->dl_port, name, len); } /**