From patchwork Sat Feb 9 03:16:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1039098 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="1aC1qCsV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43xHKJ2Ptcz9sMx for ; Sat, 9 Feb 2019 14:17:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726914AbfBIDQy (ORCPT ); Fri, 8 Feb 2019 22:16:54 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:38105 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726663AbfBIDQx (ORCPT ); Fri, 8 Feb 2019 22:16:53 -0500 Received: by mail-qt1-f193.google.com with SMTP id 2so6324120qtb.5 for ; Fri, 08 Feb 2019 19:16:52 -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=7NYu9dC3XG7Tp8dq9pFMZG0XPF1Hh/lOk0/6ZSpy2pw=; b=1aC1qCsVqRnuwziyqSTjjAyQxN+kzetaUSgFn/zc52i4YFr5taPZqaWgQ1kO6ZOeH7 LiqH+hnJGMfrsk7xxj7s/3ar3gfqvXgltT7HppE2dweKNvXvOAnPzkSat6BGt4a9hVhj iIKRlVf7Qd+5XPvMuwsvEjNfqloWVgCadQO/QmXOWomxZGKwtkD53IoInT8BS2VGeQE/ WeTypGTdCIbrGvyVXgHkB139ndoZyxCwNm0zd03eIIOcjgZ9jsrmJqOnZ5GO5r3gA28B 0vywIQ3SV4ZQWJSwdhDWQwqd9CDRKO6VS/ua55ZElP/IXs+VLR4WVfuSKGodTdViyl+Z 5gCg== 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=7NYu9dC3XG7Tp8dq9pFMZG0XPF1Hh/lOk0/6ZSpy2pw=; b=TMwuRF4dTBUBBonVkkwzFi4hEV0KmOnebexWETwBivGlZ7H+oi3GM7LDCB/9yxvX8X qAkvDBKuQQVc4iSM7Sss5Gh6FFALWBsUH57qWxGj37lRgkMbFrISOBwpMFnb6DbhCz88 Kp5K+YGW+eo6MLMxq1CEbxn6E7ejtWl3mBfEzPFeSOATuMv3p+JXxy+jjjx0dsbfvjZC 9fFMp8ofxp1YoFUHBgc70LZSKQlNcLjE8YHY+v+qrl63bbbvJFmiEd7BVwBfcES2EjjO sqgWWkL5C1yYnhIEWRRqzEZn0VOsH66/oyYjBnbX47pcfFywGXzAmQaqDsBl/Dlu1QGr AKkQ== X-Gm-Message-State: AHQUAuac4MHhbMpBByARwytWstbYWtD11/qRv95xwvZT3ayiqZA5gc6w BbvN8ZKYOy17jK/xVVrLMHyQDhNDpVA= X-Google-Smtp-Source: AHgI3Ib65nhMF6tN/xFY9BiaqAPaGZq6AcTpRcjfyFSSLT7wxKhWGTnoaQQGZqsk0MyvELDpSAW2pA== X-Received: by 2002:ac8:110f:: with SMTP id c15mr19106702qtj.355.1549682212496; Fri, 08 Feb 2019 19:16:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 19:16:52 -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 1/4] devlink: fix condition for compat device info Date: Fri, 8 Feb 2019 19:16:08 -0800 Message-Id: <20190209031611.1102-2-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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need the port to be both ethernet and have the rigth netdev, not one or the other. Fixes: ddb6e99e2db1 ("ethtool: add compat for devlink info") Signed-off-by: Jakub Kicinski Acked-by: Jiri Pirko --- net/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index e6a015b8ac9b..cf0f511bc56c 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6385,7 +6385,7 @@ void devlink_compat_running_version(struct net_device *dev, list_for_each_entry(devlink, &devlink_list, list) { mutex_lock(&devlink->lock); list_for_each_entry(devlink_port, &devlink->port_list, list) { - if (devlink_port->type == DEVLINK_PORT_TYPE_ETH || + if (devlink_port->type == DEVLINK_PORT_TYPE_ETH && devlink_port->type_dev == dev) { __devlink_compat_running_version(devlink, buf, len); From patchwork Sat Feb 9 03:16:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1039099 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="Er7cAoke"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43xHKK09ylz9sMp for ; Sat, 9 Feb 2019 14:17:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726944AbfBIDQz (ORCPT ); Fri, 8 Feb 2019 22:16:55 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:45377 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726894AbfBIDQy (ORCPT ); Fri, 8 Feb 2019 22:16:54 -0500 Received: by mail-qt1-f196.google.com with SMTP id e5so6255857qtr.12 for ; Fri, 08 Feb 2019 19:16:54 -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=5mD5WLp4nfL2TNKIoso7eimIu5xpCfLnttH5DhLkqa0=; b=Er7cAokemIvp5QkJpmq6mMpXVmfTkvnX2j4ORc227CWV5pfo5Z6bb2NyAGCegFl2fd mssrgy+mTXaBxQ3g4XZ7yoXftG9vKfU+dCTtlPJWDW7vzFlR9gheVYY3fDP0s06iWFfW mu9f9Ue+PQAzgR/esHWASBcxwTciVm9GP3LMXra/JGvJgNpxdOUwzKZY3VgiYl8RoU3Y 8M8qwf1u7YjDsM+rJWNuWuUvcBGyDv8MJ07xXkPzyS0nu9sOd1W62lFU09ja4qzoMw/q 0C4FKvqjiGomMmrbvitxr9rO05KVUp7/plXLJdG/QY1EWVbPPsk9seKQ17A1wIYKhYKt dyfA== 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=5mD5WLp4nfL2TNKIoso7eimIu5xpCfLnttH5DhLkqa0=; b=M3PktdSJMRaa7HU4OdnXkOdNxBJ1sCMOJ+omvjy4KGa7o8HRQwH3CrgAhlpAcwKIlX lOLcIX7WCFvXpshhDdsXKMxoAB9JXQsfV8+gM4W4e871p8DfFd3vsZ5gnXkVZwsOGIXM zRS1wix2GGhAAhLBP2Tr6bOE76u5y4pp3ivGgeqpiUnt0mZo0IiNurCDGN0uzg7kckL/ k14K7Pv4uHYs746aAn8UuJ3nGI+fr+LcMiSQ+dvoZWIBmaMbFpA3Np8tCiQv6MWLHc5D kc8V3X6lpE4CjOFYqdIaZyiR4ZvG91tnAr74LSPFtvOHdG8JgblU93brfil0Fog0YgE5 KlGQ== X-Gm-Message-State: AHQUAuasljCRVMdWmmHf/GarR1TsDE6PPA08DcB1r8jbNN3Xr8SW1I8s u3wmCJ/cKRq/4c+FbwPGMR1xKg== X-Google-Smtp-Source: AHgI3IbWF/XzShSWKNN7DeQE98CGQ4/ZxdInV2U9JI4cNB2ujri36phkrACbCt+NsWjQcLeYYq0FCw== X-Received: by 2002:aed:3bb3:: with SMTP id r48mr1573905qte.278.1549682213770; Fri, 08 Feb 2019 19:16:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 19:16:53 -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 2/4] devlink: don't allocate attrs on the stack Date: Fri, 8 Feb 2019 19:16:09 -0800 Message-Id: <20190209031611.1102-3-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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Number of devlink attributes has grown over 128, causing the following warning: ../net/core/devlink.c: In function ‘devlink_nl_cmd_region_read_dumpit’: ../net/core/devlink.c:3740:1: warning: the frame size of 1064 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ Since the number of attributes is only going to grow allocate the array dynamically. Signed-off-by: Jakub Kicinski Acked-by: Jiri Pirko --- net/core/devlink.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index cf0f511bc56c..46c468a1f3dc 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -3629,26 +3629,30 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, struct netlink_callback *cb) { u64 ret_offset, start_offset, end_offset = 0; - struct nlattr *attrs[DEVLINK_ATTR_MAX + 1]; const struct genl_ops *ops = cb->data; struct devlink_region *region; struct nlattr *chunks_attr; const char *region_name; struct devlink *devlink; + struct nlattr **attrs; bool dump = true; void *hdr; int err; start_offset = *((u64 *)&cb->args[0]); + attrs = kmalloc_array(DEVLINK_ATTR_MAX + 1, sizeof(*attrs), GFP_KERNEL); + if (!attrs) + return -ENOMEM; + err = nlmsg_parse(cb->nlh, GENL_HDRLEN + devlink_nl_family.hdrsize, attrs, DEVLINK_ATTR_MAX, ops->policy, cb->extack); if (err) - goto out; + goto out_free; devlink = devlink_get_from_attrs(sock_net(cb->skb->sk), attrs); if (IS_ERR(devlink)) - goto out; + goto out_free; mutex_lock(&devlink_mutex); mutex_lock(&devlink->lock); @@ -3710,6 +3714,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, genlmsg_end(skb, hdr); mutex_unlock(&devlink->lock); mutex_unlock(&devlink_mutex); + kfree(attrs); return skb->len; @@ -3718,7 +3723,8 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, out_unlock: mutex_unlock(&devlink->lock); mutex_unlock(&devlink_mutex); -out: +out_free: + kfree(attrs); return 0; } From patchwork Sat Feb 9 03:16:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1039100 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="dNHCYXXH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43xHKK5DPjz9sMx for ; Sat, 9 Feb 2019 14:17:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726975AbfBIDQ6 (ORCPT ); Fri, 8 Feb 2019 22:16:58 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:36523 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726894AbfBIDQ4 (ORCPT ); Fri, 8 Feb 2019 22:16:56 -0500 Received: by mail-qt1-f193.google.com with SMTP id r9so6328553qtt.3 for ; Fri, 08 Feb 2019 19:16:56 -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=kIe+GpSgiC4DJKh78p7+T1tygl4eZpvDTfZyQgn9uTo=; b=dNHCYXXHc4D8GzWKCIx1Xj1giCq07VDN6H2a71Mh+81ZAZiGBjwXGwNf4BxgPB9qwY /V2tYhqNMkFgsKAtNSCaezjom9vlWnZGATocv2nmTBPWyUSGGOsaMHPejZVxHp9kVf2W WD1AgbYjKA5FqvAHhzGFsgX2E3xWFSHCVe+qE0t7cMTkAC4nz9bi7ZM3HchK5NfWzjKk M0hnztO+f19dT0L+HghAuCgD/YG7OF/Joe7pQOM3jaRDIkUGV2UJdvwY7msLuBfQ+gGN DwgwPtoqA2TRCKgurOkKGsG/7IoaKKNL5+RKmuD4oMeobZc1ZtY1cKOJxgHssaIAH4Ti 0qRw== 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=kIe+GpSgiC4DJKh78p7+T1tygl4eZpvDTfZyQgn9uTo=; b=bmS/r+vJrI878sJM2lQmRmHWGBKosBZ/ihqXAZxbAoVT4ZuC3BTtljGFIhTze2m/vt v9vk3N5JUVitO/bSG4PLIBSbk4GlUFIGNU2kfbxNjZ0Ejop2ymSVJS4uH66XBbatUs9Y 0RysChUrCWyxa7t9tRd+xwhWPqDmm5zIl8cJWdKlpRModIlCbXudRadJGE6mekpXLVun Spac2VYI3mITZ19Rlb/JeKbpWCqonobm/eJijQeO7/iREr4qcaN+SHVOw9pMm5rKZaIm mal+fOuFKUTXZuqMnYSpKePb7GLKRN7jSxH7GH3U/fStAmCrBNMmoPS6wLCcl7vqaaip aRTg== X-Gm-Message-State: AHQUAuYEq5fS7qiU5ftCUlwd+1Hn95POXR36kqkMhhf/SHtT8fIO/uq8 LHq2Lo7Uqd97exPRLH3lHaln6hI2gMs= X-Google-Smtp-Source: AHgI3IY5paeyzcSb6FxEtn9PfPMHUgp2xIhiR7Tc4bFnALXEGGv8PS2S2snW9vh4/c9x8Fzmol6Chw== X-Received: by 2002:ac8:2fda:: with SMTP id m26mr879830qta.312.1549682215621; Fri, 08 Feb 2019 19:16:55 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 19:16:55 -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 3/4] nfp: devlink: rename vendor to manufacture Date: Fri, 8 Feb 2019 19:16:10 -0800 Message-Id: <20190209031611.1102-4-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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Vendor may sound ambiguous, let's rename the fab string to "board.manufacture". Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe --- drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index dddbb0575be9..6e15e216732a 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -178,7 +178,7 @@ static const struct nfp_devlink_versions_simple { } nfp_devlink_versions_hwinfo[] = { { DEVLINK_INFO_VERSION_GENERIC_BOARD_ID, "assembly.partno", }, { DEVLINK_INFO_VERSION_GENERIC_BOARD_REV, "assembly.revision", }, - { "board.vendor", /* fab */ "assembly.vendor", }, + { "board.manufacture", "assembly.vendor", }, { "board.model", /* code name */ "assembly.model", }, }; From patchwork Sat Feb 9 03:16:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1039101 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="2TN/tHtK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43xHKL3H6mz9sMp for ; Sat, 9 Feb 2019 14:17:10 +1100 (AEDT) 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 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; }