From patchwork Thu Jan 31 18:50:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1034440 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=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="VEx/FhQx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43r8Vc0KjMz9s9G for ; Fri, 1 Feb 2019 05:52:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728261AbfAaSwX (ORCPT ); Thu, 31 Jan 2019 13:52:23 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:44543 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728121AbfAaSwS (ORCPT ); Thu, 31 Jan 2019 13:52:18 -0500 Received: by mail-pl1-f196.google.com with SMTP id e11so1868045plt.11 for ; Thu, 31 Jan 2019 10:52:18 -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=dnRJjJ3a+Y59Mvt13HLlWO19iquzAJP6mihZVPhgviA=; b=VEx/FhQxrzVOWPW937/MmVvTtkiYjFT95QiNvz3SkqnWPKpC/6MTCnSpwsGlErgYV+ aMMDPucz7FlE8XoAjI78d4I7HHJwNz1Q3K00fK1KEWExTrPiwc7gIovJZRfjqpcqW48y wfEDHF2yBna3hmW/8LWbGDLs+gfF8zbKUYJGUtv9ZA6suZbxY/2Oh/wr9mTVwjm4pZkZ T8WWiOKlacKCYPjvH+i7W0aZPGng+a6GmPMvFE+Rsip0I3jVLtOicHcXWb6k/W3BNTOk FestU/btdKo95615AJeW3zQ0JUuJ6nxKmmuMwUfcAeZ8u6QOwZ9eBM6+H4NM3CP5g8n3 l+Fw== 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=dnRJjJ3a+Y59Mvt13HLlWO19iquzAJP6mihZVPhgviA=; b=gZl9/jrJwxdqsZRSqMfYB9xJgim4HAJgroD07RAYLFXF+eETdVjReLLnGWKvitAuVE E/JIFm/Bk9QC+tfIZkhsYTr9+KUVAV2kEXAmZjHH8sQ38Hnfc6ImoDqu74wpcgH2Gag9 tT4fvo22XzWSMqzpDCQf+yLEtglc0YzXsAfmvtgEHNN5Cf+HqbEWaK9t4UhBe/wYg6Gq EYwlPKrxFWn/WwpbOZVpCreN8sk81F+tC8nd4DCetIa7vsH9pPQ7a+8JTkBfXc/S/3vv y2/PVr1upxDhAZwGKI9MeK3wm6/Ep+XbgK/ohpq7bqlbrLwzIulVEzfv64SxKB/R8Qoh 9jEA== X-Gm-Message-State: AJcUukdUs9Yt3jpryVx20PP5uMUbHBfkQNgqzy4a4ZH5GQJ3f3wuY6iG TQR1Q7A16bxOcrReWEn2Gmly2w== X-Google-Smtp-Source: ALg8bN6enttJcrWfYXBoFz2hdytRiThSd655kBKyZEUwR5Gpqv+Da2iKoLA0PeySMJHeQZg329jPhA== X-Received: by 2002:a17:902:1101:: with SMTP id d1mr35572628pla.136.1548960738015; Thu, 31 Jan 2019 10:52:18 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 10:52:17 -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 7/8] nfp: devlink: report the running and flashed versions Date: Thu, 31 Jan 2019 10:50:46 -0800 Message-Id: <20190131185047.27685-8-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 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 Acked-by: Jiri Pirko --- .../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 = {