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,URIBL_BLOCKED,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 169BFC282D8 for ; Wed, 30 Jan 2019 23:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1DDA218D3 for ; Wed, 30 Jan 2019 23:42:15 +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="lyy8ER8f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730588AbfA3XmO (ORCPT ); Wed, 30 Jan 2019 18:42:14 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:32862 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729262AbfA3XmN (ORCPT ); Wed, 30 Jan 2019 18:42:13 -0500 Received: by mail-qk1-f194.google.com with SMTP id d15so893941qkj.0 for ; Wed, 30 Jan 2019 15:42:12 -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=+en46xyWxV4yUNTwKC+75dV80jhJf9QuhJVy0i8umYo=; b=lyy8ER8fhzwpmvpcz8mCrT44PYcPzB4IX8y+JskUilCF9AIymaKTuwXDgMlSLZ0WQt Mw7HHcCaX6OQkqwupP9UfjH9U0s+/z9e2KK21Kt2xcj9p9RxlYHWgmydvoN87UqZI/af 8vIrCV98s30/06kLW0JRotdOvYBSamZ3r3alzJRP1VnRqWIW9tbwIjqMsDk3jqupP+vo z3gollxRcMRGfx3Y0bRna0y0Z3adTkagTYhjvB5CPaNVKJ/QqtmCrCKu10Oo9IBtF6Mf XwfeRjT1DZ/o63U8ckxY73YXfqiK+WbWHqr9RnTnJ4Od7lylx7rM9qL/yAslFu5D2MO5 7/AQ== 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=+en46xyWxV4yUNTwKC+75dV80jhJf9QuhJVy0i8umYo=; b=balHvQKlPQl04DQduxw6TvIwaWa8A+svBGSHmwvpBBgGL/B27C8/kK4dPEqPQZH6CZ YmXajFgbS7sVVJF1gC5lDSWK8ROs71xt0o+gG/D4HujtlVU4Q7iK8Qf8g4ujqmC2Xean y6jIO668tnDTVOx83Gs2n0+iFfLeGkOS0hOanun8GzsALQrpMhsoP9MRHaj5+11d9Qkx bUx1zY3K8KHUGKhCskre8aXCaZK9pweK2lc1xrdqoEFnOFGnw1nU876l2lJ3GWaniMSk AzDvZVNWh3ML9gJBuZC4S4q8jrd2TR9zHq4y42ghQVM8M2kHaU0Qxo8DSlQYuRU4xkzz u0pw== X-Gm-Message-State: AJcUukf4lBH6KGaJhUEUevSJkMIkaeHEP7JpVkqiKjiWhlMEkoU0S9B4 9xlopUwhQiZekPcLUDoCkB0l8Q== X-Google-Smtp-Source: ALg8bN6+H2XHl73IctJN5AHXU/oKjrDJ/WjujGnmhFbHw0P7P16y6VrYvZ6IYOn5+O0MNfzCoJGrBg== X-Received: by 2002:a37:5cc6:: with SMTP id q189mr29910093qkb.235.1548891732183; Wed, 30 Jan 2019 15:42:12 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 15:42:11 -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 7/8] nfp: devlink: report the running and flashed versions Date: Wed, 30 Jan 2019 15:41:32 -0800 Message-Id: <20190130234133.4298-8-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 versions of firmware components using the new NSP command. Signed-off-by: Jakub Kicinski --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 75eda34fc1b4..dddbb0575be9 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -206,11 +206,60 @@ nfp_devlink_versions_get_hwinfo(struct nfp_pf *pf, struct devlink_info_req *req) return 0; } +static const struct nfp_devlink_versions { + enum nfp_nsp_versions id; + const char *key; +} nfp_devlink_versions_nsp[] = { + { NFP_VERSIONS_BUNDLE, "fw.bundle_id", }, + { NFP_VERSIONS_BSP, DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, }, + { NFP_VERSIONS_CPLD, "fw.cpld", }, + { NFP_VERSIONS_APP, DEVLINK_INFO_VERSION_GENERIC_FW_APP, }, + { NFP_VERSIONS_UNDI, DEVLINK_INFO_VERSION_GENERIC_FW_UNDI, }, + { NFP_VERSIONS_NCSI, DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, }, + { NFP_VERSIONS_CFGR, "chip.init", }, +}; + +static int +nfp_devlink_versions_get_nsp(struct devlink_info_req *req, bool flash, + const u8 *buf, unsigned int size) +{ + unsigned int i; + int err; + + for (i = 0; i < ARRAY_SIZE(nfp_devlink_versions_nsp); i++) { + const struct nfp_devlink_versions *info; + const char *version; + + info = &nfp_devlink_versions_nsp[i]; + + version = nfp_nsp_versions_get(info->id, flash, buf, size); + if (IS_ERR(version)) { + if (PTR_ERR(version) == -ENOENT) + continue; + else + return PTR_ERR(version); + } + + if (flash) + err = devlink_info_version_stored_put(req, info->key, + version); + else + err = devlink_info_version_running_put(req, info->key, + version); + 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) { struct nfp_pf *pf = devlink_priv(devlink); + struct nfp_nsp *nsp; + char *buf = NULL; const char *sn; int err; @@ -225,7 +274,45 @@ nfp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, return err; } + nsp = nfp_nsp_open(pf->cpp); + if (IS_ERR(nsp)) { + NL_SET_ERR_MSG_MOD(extack, "can't access NSP"); + return PTR_ERR(nsp); + } + + if (nfp_nsp_has_versions(nsp)) { + buf = kzalloc(NFP_NSP_VERSION_BUFSZ, GFP_KERNEL); + if (!buf) { + err = -ENOMEM; + goto err_close_nsp; + } + + err = nfp_nsp_versions(nsp, buf, NFP_NSP_VERSION_BUFSZ); + if (err) + goto err_free_buf; + + err = nfp_devlink_versions_get_nsp(req, false, + buf, NFP_NSP_VERSION_BUFSZ); + if (err) + goto err_free_buf; + + err = nfp_devlink_versions_get_nsp(req, true, + buf, NFP_NSP_VERSION_BUFSZ); + if (err) + goto err_free_buf; + + kfree(buf); + } + + nfp_nsp_close(nsp); + return nfp_devlink_versions_get_hwinfo(pf, req); + +err_free_buf: + kfree(buf); +err_close_nsp: + nfp_nsp_close(nsp); + return err; } const struct devlink_ops nfp_devlink_ops = { -- 2.19.2