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 CE9FAC282D7 for ; Wed, 30 Jan 2019 23:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84606218D2 for ; Wed, 30 Jan 2019 23:42:12 +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="LAnVaAs1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729904AbfA3XmL (ORCPT ); Wed, 30 Jan 2019 18:42:11 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:35339 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729716AbfA3XmJ (ORCPT ); Wed, 30 Jan 2019 18:42:09 -0500 Received: by mail-qk1-f194.google.com with SMTP id w204so885202qka.2 for ; Wed, 30 Jan 2019 15:42:09 -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=E0qo6+rmSNi1Q0V4TDdZ4pBPkJTzn7gfq5M+ye0dOME=; b=LAnVaAs19Nboa3omcc13Drlr/s/TFSRm1EQCz7EAeYGvWT8+8Miv9G6xhM5AHcCZLP vpH8w7UiX7UZP20/AkQckP62kW/uU4ErdKjMTVRD+5kXCl4epWJiR9W49jj6q82uc4/P tCFJd544q7c1FjJWZ/WS11tro1qh37iav0MWRKr+rbgFbLVprGS9jfk9nU7qvlpkiW4m c0WczqbrfliNQNswuhJIZJ9l66NHTZpRj9JAlsP5X9/wEv+69ei+iMZHHmrGBrt0ZaRa h38x2+1icvvlmPvwWAs/3+lNifEsldu7xSMsfI1RWFhM+dg+Ps5VEsD6+M1g9sFbmALp k+aw== 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=E0qo6+rmSNi1Q0V4TDdZ4pBPkJTzn7gfq5M+ye0dOME=; b=Epz6eak6SUcq5hm1Y8SKKnA8Wo44+E7gbbW543/8zz2ail9023vftd7llwCa74Y2u0 dU2ew4gI3GRZqS1t7u1LSwwmM06qa+zoqtUZYerdqj65BEUazHizAtOknE6eGRIQPOE0 Mc7QGsYKMpQLsWnmL7ZcR/RHJGpUfw0spRwtfg1V3i6FZ2apvlF6tlZZhzqs449UwhxB XquypvSmFadh5kXa6PACZvhx7Cnx9VdC4+Vx5N4GSah0Ces+6omQjkyhHa+68GJoVHxO sf1GfX17F3z8Sg4DXS11spdkprW3ZOegkL6clYP+Mhp8bnT6WHt+QwFCjsFN66pIRkiz Y3GA== X-Gm-Message-State: AJcUukfEJ1H0u4Bz75ynYbyneQR2h/2UMkSdLZtrl7Ke1uAWWebNC2Ep waXHjUV6elCH0rQYmlR+YQ/DHw== X-Google-Smtp-Source: ALg8bN5fPx881XxwkCO2JZR5q9WI08RG7UHPTpxEouERYnk4m6GIR+0QiG4jbGzt0HIESEQVpR9hsA== X-Received: by 2002:a37:360a:: with SMTP id d10mr29423567qka.40.1548891728582; Wed, 30 Jan 2019 15:42:08 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id q21sm4009163qtk.79.2019.01.30.15.42.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 15:42:08 -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 v3 5/8] nfp: devlink: report fixed versions Date: Wed, 30 Jan 2019 15:41:30 -0800 Message-Id: <20190130234133.4298-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190130234133.4298-1-jakub.kicinski@netronome.com> References: <20190130234133.4298-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 --- .../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