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 E0CF6C282CC for ; Sat, 9 Feb 2019 03:17:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABFF421841 for ; Sat, 9 Feb 2019 03:17:01 +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="2TN/tHtK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbfBIDQ7 (ORCPT ); Fri, 8 Feb 2019 22:16:59 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:34162 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726952AbfBIDQ6 (ORCPT ); Fri, 8 Feb 2019 22:16:58 -0500 Received: by mail-qt1-f193.google.com with SMTP id b8so6356738qtj.1 for ; Fri, 08 Feb 2019 19:16:57 -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=ZWExeFb1BR48ein9UlSC4rsrZRd5Udeo9IgGwuk71BY=; b=2TN/tHtKNlgB5briJJtolynbwlkwOxBpbiqq7zm2y7oCATlmNceaA8PFFrvtxp8cYv F59cxT4g9UIjpCagmKREebTLgPzbU2/nzTIaekZpJD8JbD1zJRRBfv7sIBKJ9f1imWnh 7+FIwX3ToNM1mLhHxl5oPSHd20ZPVK30fxI+Fb54Y4m2AB/Irh64WxKDiz2yueNrd1OC GXQtP0xw71LJ2oCUl4UHLm90w/sLa6qu9RP1Fnt/DhFymQ/lVVtqrFZRI5gyPXcUnOz2 Cose8ThG2DpSFOEUmHUNnVfcQTgI/rAfTtchJJVJ5zLPiO1eXu/QABGLMWq1miiEQgmD tbzQ== 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=ZWExeFb1BR48ein9UlSC4rsrZRd5Udeo9IgGwuk71BY=; b=UiqAykINxX9zGFLV1nRpYON9uVqlmBitenIFaDX33s4v0B1vAjDN3XTDPkig3LmROs QURU8gb+u0yVot93i8xxBUW3sqV3YEGr+QXpiTcu8n9ZrPn6q9YK2xGUWoW9Ew9MX1RD txALa/qe81G8vcPLbXlOc2k/iMuACCjCLFnkkZ6awOgDbwlAENwowx6JlCDPE07zOhqT eM4BCOWCnYwl30kaGkElBfgwQXL1qVnpNHyWqvLmclObaY9qbn8dlFO2/8a6WCMl275u +g8NX7bBdzxluLLv/Yif1LNENsX+Bbh8MV4aZqZvSe1EeKl4sPrNqxmjd3mPt/CIBR25 43UQ== X-Gm-Message-State: AHQUAuYhueLtCMITxmkx0LgXVOECVkMTVJTrI6KHjehrBnNHrXdz0Ok7 C1ntJ4kQd2sABJP2/WMxWDTEuQ== X-Google-Smtp-Source: AHgI3Ib6eHwcVlRozHOb2TY/YM+Zwi+h73ZXNy7LMPpnJOtZ509FFgwZdJWNWaL6N8b4v59aZQBfPA== X-Received: by 2002:aed:384a:: with SMTP id j68mr18834229qte.171.1549682216883; Fri, 08 Feb 2019 19:16:56 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i28sm3185212qkk.41.2019.02.08.19.16.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 19:16:56 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net Cc: jiri@resnulli.us, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 4/4] nfp: devlink: include vendor/product info in serial number Date: Fri, 8 Feb 2019 19:16:11 -0800 Message-Id: <20190209031611.1102-5-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190209031611.1102-1-jakub.kicinski@netronome.com> References: <20190209031611.1102-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 6e15e216732a..5fa11a27d640 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