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 5462CC282C7 for ; Tue, 29 Jan 2019 03:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F748214DA for ; Tue, 29 Jan 2019 03:34:52 +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="SDAp+yy2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727565AbfA2Deu (ORCPT ); Mon, 28 Jan 2019 22:34:50 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:43213 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727524AbfA2Det (ORCPT ); Mon, 28 Jan 2019 22:34:49 -0500 Received: by mail-qk1-f193.google.com with SMTP id z18so10734335qkj.10 for ; Mon, 28 Jan 2019 19:34:48 -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=OMullfYhVtl1ZGbZ6MCu2QbQKjoGc19XBGIWNw6thA4=; b=SDAp+yy2IQq7OygGBG/XHnz6l1eHFEqnGnfME9wPJJ44HtGBZz/Y+NJiAb47gD1Q2u okoi27QJwHZds4R5jpNpjBTi1YGWVR99dBuUgagSeQH+mfobJgYsTbXcWg1/15iz0l7g TS7dZZwE8Jd8HDpivAWNlLejNn2kfQS0ikDJd8F3jsHzRBCbAGCgRyCcHOYWIEGIb5jD IKtokcWejh4WlSy4pZXDebUnltM5TFWIkiLxGBgA2lCT4l1z7DeJM9/PZlkS4Gu9JhcM VBr8zT5X2gpDVs5+DEco3x1Oeql4ymWgbfO8jS3eo9yTKPYndaEHxoxIqZZChvRRQHCp RaJw== 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=OMullfYhVtl1ZGbZ6MCu2QbQKjoGc19XBGIWNw6thA4=; b=kwEBeHljWxAd/CbWIfFn1GC0xQLE2QDqPXL2O27B1l1yC7y9692tm9GdvtAvf26Xow wrH3YlP0WgXYCpE1+KtpAW1/30Zb9Rf6DAqg4Pjfgzvc1Jit184lYWprcVCOOBRD4cpj /bwOkhqWxPsMEKG5I3By+Q9OW9ORruDdKGR5hO/ds/K7mJiIV+q+ikK0wiRVNtrELB0t cqqbTw+ec/hCEAx1ugzFCDUH69hsSC+Pahw++3Gm5q0nWVykDC/h7fxS50z/iYiTuGuS kTXevzqvezv+m7zcl12pCdr+np7BOobVhykLcv2D920EhQBGffEFa9tH2aMEQm13J7nm e6SA== X-Gm-Message-State: AJcUukda4YXiWKRXsYr3WS5LXUowbGkMd7ERZ0B0Moma8l9YGpfhs+Y8 vuI/q5jKY3Wx8QkHjcGeh/2YVQ== X-Google-Smtp-Source: ALg8bN41Vnd4pWmVZNymrGjAlEqotlH8AnjQO3anIttWhzu+CgJR/fYl+CwcpN2RVfBAjaMh/QnZSw== X-Received: by 2002:a37:a44e:: with SMTP id n75mr22573736qke.26.1548732888343; Mon, 28 Jan 2019 19:34:48 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 19:34:47 -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 6/7] nfp: devlink: report the running and flashed versions Date: Mon, 28 Jan 2019 19:34:19 -0800 Message-Id: <20190129033420.27235-7-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 versions of firmware components using the new NSP command. Signed-off-by: Jakub Kicinski --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 86 +++++++++++++++++++ include/net/devlink.h | 11 +++ 2 files changed, 97 insertions(+) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 9857fa663adf..fade37d2b796 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -207,11 +207,59 @@ 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_VERSION_GENERIC_FW_MGMT, }, + { NFP_VERSIONS_CPLD, "fw.cpld", }, + { NFP_VERSIONS_APP, DEVLINK_VERSION_GENERIC_FW_APP, }, + { NFP_VERSIONS_UNDI, DEVLINK_VERSION_GENERIC_FW_UNDI, }, + { NFP_VERSIONS_NCSI, DEVLINK_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) +{ + enum devlink_version_type type; + unsigned int i; + int err; + + type = flash ? DEVLINK_VERSION_STORED : DEVLINK_VERSION_RUNNING; + + 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); + } + + err = devlink_info_report_version(req, type, + 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; @@ -226,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 = { diff --git a/include/net/devlink.h b/include/net/devlink.h index dc08301028a9..14da3632e8fc 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -424,6 +424,17 @@ enum devlink_param_generic_id { /* Revision of board design */ #define DEVLINK_VERSION_GENERIC_BOARD_REV "board.rev" +/* Control processor FW version, FW is responsible for house keeping tasks, + * PHY control etc. + */ +#define DEVLINK_VERSION_GENERIC_FW_MGMT "fw.mgmt" +/* Data path microcode controlling high-speed packet processing */ +#define DEVLINK_VERSION_GENERIC_FW_APP "fw.app" +/* UNDI software version */ +#define DEVLINK_VERSION_GENERIC_FW_UNDI "fw.undi" +/* NCSI support/handler version */ +#define DEVLINK_VERSION_GENERIC_FW_NCSI "fw.ncsi" + enum devlink_version_type { DEVLINK_VERSION_FIXED, DEVLINK_VERSION_STORED, -- 2.19.2