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 36743C169C4 for ; Thu, 31 Jan 2019 18:52:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 092C8218AF for ; Thu, 31 Jan 2019 18:52:31 +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="Y4IyrOq4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728289AbfAaSw3 (ORCPT ); Thu, 31 Jan 2019 13:52:29 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:43009 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728148AbfAaSwQ (ORCPT ); Thu, 31 Jan 2019 13:52:16 -0500 Received: by mail-pf1-f193.google.com with SMTP id w73so1876435pfk.10 for ; Thu, 31 Jan 2019 10:52:15 -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=Ri7H/uGxLaKJrB48JTTqQvjwjkmZBMqcD9NTy0OxrUo=; b=Y4IyrOq4U6iVJYZ92QxL85wguiUqX+7ms323boR55u1BoHv8Bv3BoT2m3yxCJLJL3N 5tNjg171qQLL6YfAt6q3GFTXI7vANYs6YXG3Lro9yJaihed2q/aM8702RSFY1DwChBrK Qwvg/itieGZOxzhUArnZvrXgVCsCSffrq3Aq9Dma3/xn+VNfjZOaQLSEukeTuoLKivaE erzVnbE/kpBM52v6UTiwyW/5YLaBkiiekZYxNQ5w9VDxyosRCe1OFCSVA1jrYew0OsEw FOvbyDihnXU6QWj8RrcsIjbsnB4//syzUvWaHoaMPLqSi57Kh7yDVqJP+IfBpSpwvZ+b NBAA== 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=Ri7H/uGxLaKJrB48JTTqQvjwjkmZBMqcD9NTy0OxrUo=; b=Zz0WQnWRZONZqq+eGmUlRdlWM9UCDyIF8NIDG9evZnzRj04rw2BIk6c+42ZC5tDIxn 616ZHX3FW3YbXa3ubC6t1o/yhB8mX3oV5X2qJhN3qrwFQX4wJLRCMuzVezXO0k948voE 3HDw9ktiVsl7PVfFwsX7sFMvEoxYscolmPr7+bj2L5jjXRhuojaaiw/+TlQKiDM5rg2/ SzlYUQeaAfmXvWtUpdtz4REAH7KzM5qVXBmYlbMBRtQS1+Ue7qzeSaOIKWf0WApMdERD 9zeAngxy7oqzgdhmXwFqOxhtHZbM8bjgG3rcjp1nHB9THuLacCY0SE4F7j8Srh2RWP2N i3MQ== X-Gm-Message-State: AJcUukdRJ6HRXYuN1YIxD2AuOR3psQwn0A2yOc/e/EbTAk8ALiBjOAq3 xipfVhoa9sGEzunSTOrkKVH/B+FQoS0= X-Google-Smtp-Source: ALg8bN73q+2A5MgSLT+uOs7Z4ThcJCUyWJgsiXOw9irajnihWa8g4/NCBIwtD++0uZuGRGTWhRd9UQ== X-Received: by 2002:a63:314d:: with SMTP id x74mr25778286pgx.10.1548960735413; Thu, 31 Jan 2019 10:52:15 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id o4sm7726169pgs.12.2019.01.31.10.52.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 10:52:14 -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 v4 5/8] nfp: devlink: report fixed versions Date: Thu, 31 Jan 2019 10:50:44 -0800 Message-Id: <20190131185047.27685-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190131185047.27685-1-jakub.kicinski@netronome.com> References: <20190131185047.27685-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 information about the hardware. RFCv2: - add defines for board IDs which are likely to be reusable for other drivers (Jiri). Signed-off-by: Jakub Kicinski Acked-by: Jiri Pirko --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 2ba3b3891d99..75eda34fc1b4 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -172,6 +172,40 @@ static int nfp_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, return ret; } +static const struct nfp_devlink_versions_simple { + const char *key; + const char *hwinfo; +} nfp_devlink_versions_hwinfo[] = { + { DEVLINK_INFO_VERSION_GENERIC_BOARD_ID, "assembly.partno", }, + { DEVLINK_INFO_VERSION_GENERIC_BOARD_REV, "assembly.revision", }, + { "board.vendor", /* fab */ "assembly.vendor", }, + { "board.model", /* code name */ "assembly.model", }, +}; + +static int +nfp_devlink_versions_get_hwinfo(struct nfp_pf *pf, struct devlink_info_req *req) +{ + unsigned int i; + int err; + + for (i = 0; i < ARRAY_SIZE(nfp_devlink_versions_hwinfo); i++) { + const struct nfp_devlink_versions_simple *info; + const char *val; + + info = &nfp_devlink_versions_hwinfo[i]; + + val = nfp_hwinfo_lookup(pf->hwinfo, info->hwinfo); + if (!val) + continue; + + err = devlink_info_version_fixed_put(req, info->key, val); + if (err) + return err; + } + + return 0; +} + static int nfp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, struct netlink_ext_ack *extack) @@ -191,7 +225,7 @@ nfp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, return err; } - return 0; + return nfp_devlink_versions_get_hwinfo(pf, req); } const struct devlink_ops nfp_devlink_ops = { -- 2.19.2