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 36DC8C282C7 for ; Tue, 29 Jan 2019 03:34:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF0ED214DA for ; Tue, 29 Jan 2019 03:34:46 +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="xmdTn6g6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727498AbfA2Deq (ORCPT ); Mon, 28 Jan 2019 22:34:46 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:34604 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727041AbfA2Den (ORCPT ); Mon, 28 Jan 2019 22:34:43 -0500 Received: by mail-qt1-f194.google.com with SMTP id r14so20905351qtp.1 for ; Mon, 28 Jan 2019 19:34:42 -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=vOblOBw53pGUlZlDbyb36XspUwstEz7O8SLV0BkBliY=; b=xmdTn6g6pJGrT7Usp6Uay6zn/j4Bkk8RcpGsQShU4PJ2PsNwYhlAWZJ0A62yQdbuDn 3EsXetqHcalS8NCgPa1r/w/aaUJUaQ/KM2atsmcJmigc/QdAfTFKEXUVsfXcV01Dc5Rj asoGkH/vPHWBoVx8vrj4R0W2jylGI1cDUtcEXWU/q+lnk3fpz/9K0UkkZkwQrc52Pw2M DfZ5xqf5/pIKJbj9daVHpj+sGu2YtvnH1mZObs+IUAkdNJN03gzdFDSntVSwuwBnSZWa MSIdOuYMwf6gWuCflDbChcSfJ9jhfvYx7WaBEx+wcF+5lfPPllJp/OXdxymzWUs+fwtJ rPIA== 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=vOblOBw53pGUlZlDbyb36XspUwstEz7O8SLV0BkBliY=; b=NG1rAz3MR/zF6A/mOF5GyVG6UDU+6cR4jmM/XHyBcUl+vBzUOvkTKyAAWIT1ZB9N4q vD0uDxtJ7TJalAMffrpv7ZlQ5c36H0teZ9iTi95lX7gMjXfv4vqVS+kAj7km5RhRbd6C 3BbZA/dF27eFH3irApvYscBptbc6Ga/GV5H/5ApXFCTVmFJmjMXVc9sWIcnkF4PJ64b7 Iibg9Ut2hNaiiXRrMPAakM0Nv4ZeKAOYNnTS8TjfYFQGMy2WHFS2vgHrfthkw1xGVtZd ZDRPxIX7TtinaE3r2Wu6+rRKqEOOBOSjnbhVHuTcsnDR+aSuXJSSkPwio95hiMA5jCLP 3gkQ== X-Gm-Message-State: AJcUukft9kVEDyE8f0QR5FisAqk0+ynF6jUYIMCtdenEkXRhoqVg1/AX vnjiP6sdaz3zmMVx/rA1f3lS0w== X-Google-Smtp-Source: ALg8bN7O4H5iH0uSMIBmpbJlAOSkDd6ckvDXCcjUswNQn9pMgZENR5txyewoPaA1D/KDpSV0nEYyvA== X-Received: by 2002:a0c:98a1:: with SMTP id f30mr22275706qvd.224.1548732882169; Mon, 28 Jan 2019 19:34:42 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id z18sm70505153qkz.96.2019.01.28.19.34.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 19:34:41 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, jiri@resnulli.us, andrew@lunn.ch, f.fainelli@gmail.com, mkubecek@suse.cz, eugenem@fb.com, jonathan.lemon@gmail.com, Jakub Kicinski Subject: [PATCH net-next 3/7] nfp: devlink: report driver name and serial number Date: Mon, 28 Jan 2019 19:34:16 -0800 Message-Id: <20190129033420.27235-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190129033420.27235-1-jakub.kicinski@netronome.com> References: <20190129033420.27235-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 Report the basic info through new devlink info API. RFCv2: - add driver name; - align serial to core changes. Signed-off-by: Jakub Kicinski --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 808647ec3573..cb3ef7e46614 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -4,6 +4,7 @@ #include #include +#include "nfpcore/nfp.h" #include "nfpcore/nfp_nsp.h" #include "nfp_app.h" #include "nfp_main.h" @@ -171,6 +172,28 @@ static int nfp_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, return ret; } +static int +nfp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, + struct netlink_ext_ack *extack) +{ + struct nfp_pf *pf = devlink_priv(devlink); + const char *sn; + int err; + + err = devlink_info_report_driver_name(req, "nfp"); + if (err) + return err; + + sn = nfp_hwinfo_lookup(pf->hwinfo, "assembly.serial"); + if (sn) { + err = devlink_info_report_serial_number(req, sn); + if (err) + return err; + } + + return 0; +} + const struct devlink_ops nfp_devlink_ops = { .port_split = nfp_devlink_port_split, .port_unsplit = nfp_devlink_port_unsplit, @@ -178,6 +201,7 @@ const struct devlink_ops nfp_devlink_ops = { .sb_pool_set = nfp_devlink_sb_pool_set, .eswitch_mode_get = nfp_devlink_eswitch_mode_get, .eswitch_mode_set = nfp_devlink_eswitch_mode_set, + .info_get = nfp_devlink_info_get, }; int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) -- 2.19.2