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 06067C169C4 for ; Mon, 11 Feb 2019 03:37:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C76F821479 for ; Mon, 11 Feb 2019 03:37:41 +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="FxhLY8oo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726860AbfBKDhk (ORCPT ); Sun, 10 Feb 2019 22:37:40 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:40129 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726792AbfBKDhi (ORCPT ); Sun, 10 Feb 2019 22:37:38 -0500 Received: by mail-qt1-f196.google.com with SMTP id j36so10665176qta.7 for ; Sun, 10 Feb 2019 19:37:38 -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=+piN4bXjkDy8un16YdNpQHPVlfSJppgnv/2+gKTjKvs=; b=FxhLY8ooOvrXlAkjHsDdV42ZwajWS6SMVthKnsXsMoMJvPtM4DzlUNoUDZOfq7/PNT 12U1+byAOi508Ugc3EZ+apGr481JVhmKAMHCCQfx3uMxn22VyRPbo2o/C/bj1IIgkO9A GNjwDSd8YxYYIRbHxNY2qNJ2r+h418fKVzgjLpbSbNIVe+HIMVvi6mZxTi5z9UZx3uy6 1RFQNEN1/b2CTbapzMhg6Z2cv9i3DZvw5DUAjXmKaXDqL+SzRRt0GIVefBFWRggulsKe 7Yb8EXqniNeIj9vj0hHpdohG2gDdhUwlaxykOQY87Fw/dJuM9d0VNR6+FW11k/M9mxWZ gYuQ== 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=+piN4bXjkDy8un16YdNpQHPVlfSJppgnv/2+gKTjKvs=; b=o6C3+A33S894ijB69rDGU3uNoWOLiw+/8lhB3s1ryDgtFQYzTECb6BmW0J0RBK7eAB dEd1xWdzfVzYHxKaiRMQDEdZ3trm1iNb3BVckKHpbFwZHZJ4mk1Ywg7ghaX1RU1r7TYU PAOwlnKYP/bO407mn1RRYaMO6nZakz9gmO5vUC28qSR92C/FirBHEkoKnZEIRKCNlGP1 eqqmR0Qd+WfhHyItyYiz/MVPpqCL7Z3k2KRspxHvrSUTVFaK1GYA3SpevcmAX1oTSpiL H0ocOVKWF+RvgQIx+D2GddFIMWSwANo5+sTWXpX4+J8KrwxO7+RwqJ8LaBUKEF/L4BVy iRDA== X-Gm-Message-State: AHQUAubRfNoTEKmn34x23EIgpUbIc2XQKs2JrnCIwD7MD2ww8EUeIl7Q wd0FCGBAX+M6PzKjaLjAhtHhkw== X-Google-Smtp-Source: AHgI3IY15vLRiqC5qJu2jBe3DCDx9TkzLn03jjdKZS4kLBvBwcwua9TTjxf/c6+BO90s305hERVUZg== X-Received: by 2002:aed:20a3:: with SMTP id 32mr25897023qtb.9.1549856258159; Sun, 10 Feb 2019 19:37:38 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id d63sm24689266qka.22.2019.02.10.19.37.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 19:37:37 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v2 5/5] nfp: devlink: include vendor/product info in serial number Date: Sun, 10 Feb 2019 19:35:31 -0800 Message-Id: <20190211033531.12928-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190211033531.12928-1-jakub.kicinski@netronome.com> References: <20190211033531.12928-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 The manufacturing team requests we include vendor and product in the serial number field, as the serial number itself is not unique across manufacturing facilities and products. Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe --- .../net/ethernet/netronome/nfp/nfp_devlink.c | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index bf4e124dbdd2..080a301f379e 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -258,18 +258,33 @@ nfp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, struct netlink_ext_ack *extack) { struct nfp_pf *pf = devlink_priv(devlink); + const char *sn, *vendor, *part; struct nfp_nsp *nsp; char *buf = NULL; - const char *sn; int err; err = devlink_info_driver_name_put(req, "nfp"); if (err) return err; + vendor = nfp_hwinfo_lookup(pf->hwinfo, "assembly.vendor"); + part = nfp_hwinfo_lookup(pf->hwinfo, "assembly.partno"); sn = nfp_hwinfo_lookup(pf->hwinfo, "assembly.serial"); - if (sn) { - err = devlink_info_serial_number_put(req, sn); + if (vendor && part && sn) { + char *buf; + + buf = kmalloc(strlen(vendor) + strlen(part) + strlen(sn) + 1, + GFP_KERNEL); + if (!buf) + return -ENOMEM; + + buf[0] = '\0'; + strcat(buf, vendor); + strcat(buf, part); + strcat(buf, sn); + + err = devlink_info_serial_number_put(req, buf); + kfree(buf); if (err) return err; } -- 2.19.2