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=-8.5 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_MUTT 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 EBC75C282D7 for ; Wed, 30 Jan 2019 23:06:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E87E20881 for ; Wed, 30 Jan 2019 23:06:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="PCNhT9OW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727619AbfA3XGW (ORCPT ); Wed, 30 Jan 2019 18:06:22 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53946 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725535AbfA3XGW (ORCPT ); Wed, 30 Jan 2019 18:06:22 -0500 Received: by mail-wm1-f68.google.com with SMTP id d15so563747wmb.3 for ; Wed, 30 Jan 2019 15:06:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=4C0xcMZykv7oan6h51Z0k4vENnsve1eUVavaCSz9fjo=; b=PCNhT9OW4+i7bTIjpifi/OVGsQDvfrN4/WlG6AuV1DOeCW7PsQayyQHQtN9eV2FCG6 i0f93IIKiIiVtdQkj8yipr/kPgDN8z887rvJmtEtJC68SKySS6UljrQUvAngMyq+jPiY +FzoDqbEqpJ+jeN3de4vi8DwW+p9+BEI0QCREqeRBOXAnlioyMAB/vBeWp1+P8Kcqmac 7mrqXjyzlkrLjKic0p4fCenNaYerqNem24mAh5PU+fZ5Ke6rBwzveCMkmOWmmIntOrOc kH1TZ+VghH1WqHa3bFPF3Z3phV0C0ttiKWrkqop+qZyqgvKf+xPCFG0VVE4gDla6iK7x CvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=4C0xcMZykv7oan6h51Z0k4vENnsve1eUVavaCSz9fjo=; b=edYJ1thhbIS/TUPauHPhqcAiCo8D+q80t3519wgzzMD4IEqpHWQTm1qYCvE7+sT1x2 Jsu5DCLkYPaQtZepZ8WSHpRlJFams6Bi/0j4AzE+hsyVqg+Ec7zfwYFUTqYIR0EHtntO zHV5jLE7vXmTgxOHCTHQDpi2bEDSnhnPwWh8V+pdenm89Vjxa1qeRmd96ifEnlbt0Bi6 uXPOx84pXzeLn/JthjbG0LW0DkOXA4tDysyIOlR86NxXQL4LJ+FDgGTuXdaEH/unKMft 0lq66u+Mu+VDbX23lDDdoy89jshfxXajL/x5CVBugXh3fqpU1x54nLGMM+H3vQjTdkm6 iD/A== X-Gm-Message-State: AJcUukdmr4RbBfAxk8REZ0LEKWiZi4jlLFr24USsMinHsYveaiJeYbpx YSPTwrsl7PzhBbuaq7TvRi2Fxm+2GpY= X-Google-Smtp-Source: ALg8bN6nPKkmdLea+1tNRQ8VaoRJ1FJ0lrzvvUL1giTeexsoS2NHqe7Anzh0+gFKXyRDjqsFA+52aw== X-Received: by 2002:a1c:9a0d:: with SMTP id c13mr27756428wme.41.1548885939159; Wed, 30 Jan 2019 14:05:39 -0800 (PST) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id e27sm2873814wra.67.2019.01.30.14.05.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jan 2019 14:05:38 -0800 (PST) Date: Wed, 30 Jan 2019 22:56:37 +0100 From: Jiri Pirko To: Jakub Kicinski Cc: davem@davemloft.net, netdev@vger.kernel.org, oss-drivers@netronome.com, andrew@lunn.ch, f.fainelli@gmail.com, mkubecek@suse.cz, eugenem@fb.com, jonathan.lemon@gmail.com Subject: Re: [PATCH net-next v2 4/7] nfp: devlink: report fixed versions Message-ID: <20190130215637.GC349@nanopsycho.orion> References: <20190130190513.25718-1-jakub.kicinski@netronome.com> <20190130190513.25718-5-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190130190513.25718-5-jakub.kicinski@netronome.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Wed, Jan 30, 2019 at 08:05:10PM CET, jakub.kicinski@netronome.com wrote: >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" Please have this as a separate patch, not part of "nfp". >+ > enum devlink_version_type { > DEVLINK_VERSION_FIXED, > DEVLINK_VERSION_STORED, >-- >2.19.2 >