From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 75D14A05D3 for ; Tue, 23 Apr 2019 12:24:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2FD2B1B486; Tue, 23 Apr 2019 12:24:16 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 2AE601B486 for ; Tue, 23 Apr 2019 12:24:14 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id a3so9865517wrx.0 for ; Tue, 23 Apr 2019 03:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=LENF2UqjwFGCtHE5Q946hod1ZIISSYdbhRoNCm86kcE=; b=zN4o0Rrfxw0DLeMQcMyxXl9jfjH5sV5SVBcotZizBmxeYQeUc0igf1uQQYdVLEy1JP iqleng51JM8GbzUX9PPSqoPDm1AMHbs5aaKzyz6IW2OkgC6wWo7XVpfzAA9txFXtBUh9 d7ZiSk/n7nTitngoww6peFrIt5ZxWtznn1sJP4eyu3TwBB0dN61i6SxArr2UuweW+dF+ ndu/xR4G/PwK30TS2mneX6HAOddgN/ek70H3P+Megf7sZ7XqVx4DJSg+xXd1nYVFcQtJ L7HhRzjmO9Zi3HTiLAz1Fxc6jctAMzJ/G4LtaR96xDt2e0Gx+NAnL6Ao5c7RafOc9J++ pPNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=LENF2UqjwFGCtHE5Q946hod1ZIISSYdbhRoNCm86kcE=; b=jF7yjWGGHH+JBp6LzimkFj4EBYAbWLPdEYs+Tlizzd8u4og0eeVuNfFNbnBj9IFGUi DYN13fLHU5hhY6bwNIv5jg+lG6+y4fgdHLx6oQWbj+XbW3GB24NC9KlHbzI4opuhbDDz +m3tVCdJpBWe88QR/hm07d9NlJB2yyBFt4vjb6aIu4111zmsUy5QuFZxoGWrr0NzC/ST 1bhNvW7OY2LmbdoyWEMcGQ8GmlK2jo+XthTiktEj0MAzAlHGAtvnRcG8bKS32D+MBF0R aH/WatioXeROlI087lhWrIE5iKcZn3b0uA/S/qPcmqCaCnVwhifBlhLHk9zUQQNr/jcT XOEA== X-Gm-Message-State: APjAAAVNCekd7+jrK8Kg7M2nkTqX05XWDX/7DgQA3dWS5GBheOpKEL3b I6hSeJuihDMYl2BIovjv2NRL2usqjJ0= X-Google-Smtp-Source: APXvYqxrO35m9BGqGwMsqDrUFiB+WxXqFzPcKI7fcKAiP2dyKvEWNGVgPeKFFzmbiKgXPK4cmTpohQ== X-Received: by 2002:adf:ee8b:: with SMTP id b11mr5625435wro.123.1556015053328; Tue, 23 Apr 2019 03:24:13 -0700 (PDT) Received: from [172.20.1.40] ([217.38.71.146]) by smtp.googlemail.com with ESMTPSA id g17sm4368469wrw.43.2019.04.23.03.24.12 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 03:24:12 -0700 (PDT) To: Kevin Traynor Cc: Alejandro Lucero , dpdk stable References: <20190416143719.21601-1-ktraynor@redhat.com> <20190416143719.21601-7-ktraynor@redhat.com> From: =?UTF-8?Q?Pablo_Casc=c3=b3n?= Message-ID: <6188fc4d-eccb-d461-8df1-1f60a6e68849@netronome.com> Date: Tue, 23 Apr 2019 11:24:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190416143719.21601-7-ktraynor@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-GB Subject: Re: [dpdk-stable] patch 'net/nfp: fix setting MAC address' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, thanks for the reply and explaining the process. Unfortunately the diff at the end of your commit doesn't match what I was expecting. Have tried to generate it here and could only get changes related to the rebase (metada diffs) but no code changes. And your diff seems to imply code changes, not 100% sure. Could you double check the stable patch and diff please. Happy to send a patch of what I would like to land into stable For clarity this is what I tried, perhaps incorrectly, please let me know: 1) generate patch from dpdk upstream commit:     dpdk⟫ git format-patch -o /tmp/ -n -1 027412f 2) import it into stable     dpdk-stable⟫ git am /tmp/0001-net-nfp-fix-setting-MAC-address.patch 3) generate patch of just imported one:     dpdk-stable⟫ git format-patch -o /tmp/stable/ -n -1 HEAD 4) diff the checking there are only rebase related changes: dpdk-stable⟫ diff /tmp/0001-net-nfp-fix-setting-MAC-address.patch /tmp/stable/0001-net-nfp-fix-setting-MAC-address.patch 1c1 < From 027412fe949c763fd4d536b13dcb4432f2df5534 Mon Sep 17 00:00:00 2001 --- > From 3e5c4cd12ff01df228124d92905e4e7d563b652e Mon Sep 17 00:00:00 2001 30c30 < index a791e95..1b7b6c2 100644 --- > index 54c6da9..278e154 100644 33c33 < @@ -575,7 +575,10 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct ether_addr *mac_addr) --- > @@ -566,7 +566,10 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct ether_addr *mac_addr) Thanks, Pablo On 16/04/2019 15:36, Kevin Traynor wrote: > Hi, > > FYI, your patch has been queued to LTS release 18.11.2 > > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 04/24/19. 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. This will indicate if there was any rebasing > needed to apply to the stable branch. If there were code changes for rebasing > (ie: not only metadata diffs), please double check that the rebase was > correctly done. > > Thanks. > > Kevin Traynor > > --- > From 8fb7943ea804d437fc5b7153d7c073c79eeb3837 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Pablo=20Casc=C3=B3n?= > Date: Fri, 8 Mar 2019 15:40:47 +0000 > Subject: [PATCH] net/nfp: fix setting MAC address > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > [ upstream commit 027412fe949c763fd4d536b13dcb4432f2df5534 ] > > Some firmwares, mostly for VFs, do not advertise the feature / > capability of changing the MAC address while the interface is up. With > such firmware a request to change the MAC address that at the same > time also tries to enable the not available feature will be denied by > the firmware resulting in an error message like: > > nfp_net_reconfig(): Error nfp_net reconfig for ctrl: 80000000 update: 800 > > Fix set_mac_addr by not trying to enable a feature if it is not > advertised by the firmware. > > Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change") > > Signed-off-by: Pablo Cascón > Acked-by: Alejandro Lucero > --- > drivers/net/nfp/nfp_net.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > index 54c6da924..278e154cd 100644 > --- a/drivers/net/nfp/nfp_net.c > +++ b/drivers/net/nfp/nfp_net.c > @@ -567,5 +567,8 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct ether_addr *mac_addr) > /* Signal the NIC about the change */ > update = NFP_NET_CFG_UPDATE_MACADDR; > - ctrl = hw->ctrl | NFP_NET_CFG_CTRL_LIVE_ADDR; > + ctrl = hw->ctrl; > + if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && > + (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) > + ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR; > if (nfp_net_reconfig(hw, ctrl, update) < 0) { > PMD_INIT_LOG(INFO, "MAC address update failed");