From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 8E71E1B10A for ; Thu, 27 Sep 2018 10:44:15 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id q8-v6so5086936wmq.4 for ; Thu, 27 Sep 2018 01:44:15 -0700 (PDT) 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; bh=aurIveq/fSTuRyd9ZBpjV876yhEuyobRpwL/UY+YME8=; b=MGpR/DERsfRwdLXxXWnioMNEBHLNtrVSiFZp3/K7R9ygesq471gA/Ps1TfsFB2GW4L AYLUj4CSh1PGLnJo6y+QvdQ+/zsaEcyjGKv+oLfY5HNTODz+9S9Ve9jlH2R/77Pm2kQE ntc5tT6+Fhviv51rIEtROnLbKH30gmz7WWb3KQZxu1I4WaN5RWE+Dj68Hrso/hejpSnd QavvRb5y7MdrsYVBNR8dKYz5bYBFPjc7rTteA0yhjfEAP4at3Y/5JbZj0T+smM6/RUPq 9Gd94UWlWSJtu9FMDg+mk8weE3ZXlnlEqqrAvmPJRsCeJxY6hnsgemxPxEZBx3JoqZUo a+qQ== X-Gm-Message-State: ABuFfoggqqumjbuGPkA+F/btz1tFzw5kAgfXsR8VJbADh0aiZ36fSqn/ b48TMV5q54D2dycwOBw9J172QYse X-Google-Smtp-Source: ACcGV61TEALkvyW4lTQEDnmj7zSyyiKyvzpXP4jMbOKwn4nXCRP/lnwG+vwNW7P+LiMsM63Mjp2aeg== X-Received: by 2002:a1c:2bc3:: with SMTP id r186-v6mr7308797wmr.71.1538037855236; Thu, 27 Sep 2018 01:44:15 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id v6-v6sm1250002wmc.43.2018.09.27.01.44.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Sep 2018 01:44:14 -0700 (PDT) From: Luca Boccassi To: Alejandro Lucero Cc: dpdk stable Date: Thu, 27 Sep 2018 09:43:57 +0100 Message-Id: <20180927084403.19646-2-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180927084403.19646-1-bluca@debian.org> References: <20180927084403.19646-1-bluca@debian.org> Subject: [dpdk-stable] patch 'net/nfp: fix live MAC changes not supported' has been queued to LTS release 16.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2018 08:44:15 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/27/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From a29020aaa6e5ebcaab9398ea2397f59316190538 Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Fri, 24 Aug 2018 15:25:36 +0100 Subject: [PATCH] net/nfp: fix live MAC changes not supported [ upstream commit 7712a1c660661005225c3f7ccbca09a6296e2751 ] Some NFP firmwares support live changes to the MAC address, but this is not always true and the firmware advertises it accordingly. This patch checks if firmware does not support live changes and sets RTE_ETH_DEV_NOLIVE_MAC_ADDR in that case. Signed-off-by: Alejandro Lucero --- drivers/net/nfp/nfp_net.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 0f0589e061..85fd6bda05 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2450,6 +2450,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev) ether_addr_copy((struct ether_addr *)hw->mac_addr, ð_dev->data->mac_addrs[0]); + if (!(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) + eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR; + PMD_INIT_LOG(INFO, "port %d VendorID=0x%x DeviceID=0x%x " "mac=%02x:%02x:%02x:%02x:%02x:%02x", eth_dev->data->port_id, pci_dev->id.vendor_id, -- 2.18.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-09-25 13:26:56.827221937 +0100 +++ 0002-net-nfp-fix-live-MAC-changes-not-supported.patch 2018-09-25 13:26:56.771424700 +0100 @@ -1,26 +1,26 @@ -From 7712a1c660661005225c3f7ccbca09a6296e2751 Mon Sep 17 00:00:00 2001 +From a29020aaa6e5ebcaab9398ea2397f59316190538 Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Fri, 24 Aug 2018 15:25:36 +0100 Subject: [PATCH] net/nfp: fix live MAC changes not supported +[ upstream commit 7712a1c660661005225c3f7ccbca09a6296e2751 ] + Some NFP firmwares support live changes to the MAC address, but this is not always true and the firmware advertises it accordingly. This patch checks if firmware does not support live changes and sets RTE_ETH_DEV_NOLIVE_MAC_ADDR in that case. -Cc: stable@dpdk.org - Signed-off-by: Alejandro Lucero --- drivers/net/nfp/nfp_net.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c -index 6e5e305f1d..ee743e9753 100644 +index 0f0589e061..85fd6bda05 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c -@@ -2886,6 +2886,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev) +@@ -2450,6 +2450,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev) ether_addr_copy((struct ether_addr *)hw->mac_addr, ð_dev->data->mac_addrs[0]);