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 58698C282D7 for ; Wed, 30 Jan 2019 19:05:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E412218A4 for ; Wed, 30 Jan 2019 19:05:44 +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="fXgqGvbb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387497AbfA3TFn (ORCPT ); Wed, 30 Jan 2019 14:05:43 -0500 Received: from mail-qt1-f195.google.com ([209.85.160.195]:37683 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387478AbfA3TFl (ORCPT ); Wed, 30 Jan 2019 14:05:41 -0500 Received: by mail-qt1-f195.google.com with SMTP id t33so774287qtt.4 for ; Wed, 30 Jan 2019 11:05:40 -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=LvxC3Jf6kkJN0SSIC2n1wfU7W346Pg/dtwHaLzixF5s=; b=fXgqGvbb3SJOFJB9LuSGCxKo35cQpYVWNsDQEliNqDjMpVMVHMuwovQfONaUllGvB9 +oHATbWz+qbSiFngkLzUIhKgciStDbA/+7ijhSV4cv1J8dPonDfR8Nr90OZLXHdsnCxO QLydikc/yeC1fds57vV7lrR+WqJiBrrSwQv7MW6ypcJXHW2OqhBMzeFPQGWpOlDY9gPL queq5qbf6wkL/3T4sAaJB2/vxttpBX7HrVa9rv9JgPmkoNVQBakMLDStehZk6AX7P/eE qydw2K8TEF/u5A9bPzcHWuXXeDIcbrgW+lX9FFLWOzWydbazpXbgtJaGJip1fpOKVbnS 2sJQ== 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=LvxC3Jf6kkJN0SSIC2n1wfU7W346Pg/dtwHaLzixF5s=; b=lL9oYYlFZCYePsN/8Wo0KIsiJ9EO3cPXVwHB/YmRk06dvMQ8vU08it6uVx59WwHC2i bv7SEMuFKw+J76zyItAPS6SXJv/cqjx5NVSc1PcUgPv/VPwBCTSL36LgFGU2F0xwz0xa A0J8XDLMdXlHFZmTKUWsCpPeLt7UuLhsBor+Qk001K91uPPIg2xY/FRUbwPfKAV5OQOG NqluZue/wTsH+3zZ45zbKS390PYWzH01GglZHyXJYy8jilgFu1MOKsnIhmIyKCYR7AHs ddTDvFNkZZvd4OaRT5x98G3nIr6RqgjWyN3wR1N/1SeoKCpl8pKtielVFC0pEd8JBZas v4xQ== X-Gm-Message-State: AJcUukc4hVH9I7HRN/KDMdt6/p21crpWhDAwFc7RiquBsaccPErX2khw UoesgBv8BYPqk9RxzmQo1M2YLg== X-Google-Smtp-Source: ALg8bN4B462yI66CiejGqMu8SmATWvaghp+8WCcesWB4nI/lwy4rafsSleMqQ0gs9Uishkr1izCVcQ== X-Received: by 2002:a0c:f74c:: with SMTP id e12mr27679935qvo.26.1548875139709; Wed, 30 Jan 2019 11:05:39 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id d14sm1929604qkl.64.2019.01.30.11.05.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 11:05:39 -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 v2 6/7] nfp: devlink: report the running and flashed versions Date: Wed, 30 Jan 2019 11:05:12 -0800 Message-Id: <20190130190513.25718-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190130190513.25718-1-jakub.kicinski@netronome.com> References: <20190130190513.25718-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 3d553cc6693d..c678ed0cb099 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -433,6 +433,17 @@ enum devlink_param_wol_types { /* 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