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 2C67BC282D7 for ; Wed, 30 Jan 2019 19:05:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 010FC2087F for ; Wed, 30 Jan 2019 19:05:39 +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="sq4gb1vg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387477AbfA3TFi (ORCPT ); Wed, 30 Jan 2019 14:05:38 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:34487 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387469AbfA3TFg (ORCPT ); Wed, 30 Jan 2019 14:05:36 -0500 Received: by mail-qt1-f193.google.com with SMTP id r14so804509qtp.1 for ; Wed, 30 Jan 2019 11:05:35 -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=PqTpztRdZ1EPoIi+vSbtRuW7tRBKIIWlpUi4Qii38+o=; b=sq4gb1vg31aM49FxhuSlmOazvd8pN7mNtcVHHUXprHvVA4VG8RN7XglUSD8CYcKgYX cih3fuEiyew9e3PPTl7DrQHwVsSQppV9OObFU2eH+ldvh8s7F6XkKlBPH7iqWD6gRQZ9 oDqaCKv1OSm+y1fRc4vsgaAnchPvZgySawl6Q+KHqLNUBjHXhFbtbd6bWDr0/nFlg+yO 0bCDNkfOCq1deuP1ZOZtV1eopGXkJE+1D+DLbF4qD72OTmeZfLoJnRqOQ0XPlbgfBNDj Q2+xJfHxY9RvCfSvOCyqKkFPkBn3UqeMUCaJyMc175u99RK233ztZ9LQd5RYuNm7G3E3 OKrg== 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=PqTpztRdZ1EPoIi+vSbtRuW7tRBKIIWlpUi4Qii38+o=; b=ad0b98yrduc/RHt5jNC/N3LJgw9TxlOk5QHT0N5mWLfSBf0YRImsN625HmzP8cG5uN 3FAwM6ohoPokEyEPOfAq/8A5vGffOFBB73bt4vfc4ouJzl3prCq8jONmVeYcff2GsQD/ HAtXPcOuijPCU+keEZhf9qJM0+ySOvtAD84cgcigZrcZVRESfdYI6f+QpFBraskwNjrt K8smBBSU76e6QT0BXiUE1yH5xKNc0v7mGd+8KCtEHXGdlfzS+Y8lLbcRZUhaCKFCyuh5 wQGh06RcI4qa27SyjKhVnEOyKiZ7PZTChEglVsA4jZ5AINw0J6shvIayzDT7S6kf5zhL ctPA== X-Gm-Message-State: AJcUuke2BoAUJwAV0UESdjYqs5HW/zFwrlUXaQfFY9iUFwejnv+tyt5Y vPzFglTRrviS9eZMk9UqWmXB0w== X-Google-Smtp-Source: ALg8bN519v9iqiyOBYZgLlsdv8aFfzse6z2HRuiCvLAnxX9HrBGNilylYyI06bJr26uPsdw76FjX6A== X-Received: by 2002:ac8:67da:: with SMTP id r26mr31440136qtp.350.1548875135531; Wed, 30 Jan 2019 11:05:35 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 11:05:34 -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 4/7] nfp: devlink: report fixed versions Date: Wed, 30 Jan 2019 11:05:10 -0800 Message-Id: <20190130190513.25718-5-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 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 | 37 ++++++++++++++++++- include/net/devlink.h | 5 +++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index cb3ef7e46614..9857fa663adf 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -172,6 +172,41 @@ 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_VERSION_GENERIC_BOARD_ID, "assembly.partno", }, + { DEVLINK_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_report_version(req, DEVLINK_VERSION_FIXED, + 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 +226,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 = { diff --git a/include/net/devlink.h b/include/net/devlink.h index ec72638aa47f..3d553cc6693d 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -428,6 +428,11 @@ enum devlink_param_wol_types { .validate = _validate, \ } +/* Part number, identifier of board design */ +#define DEVLINK_VERSION_GENERIC_BOARD_ID "board.id" +/* Revision of board design */ +#define DEVLINK_VERSION_GENERIC_BOARD_REV "board.rev" + enum devlink_version_type { DEVLINK_VERSION_FIXED, DEVLINK_VERSION_STORED, -- 2.19.2