From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id A03E637B0 for ; Tue, 12 Mar 2019 12:25:00 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id d17so2241039wre.10 for ; Tue, 12 Mar 2019 04:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=subject:cc:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=759dvJ7YjYUEo6DoLbq2jNx9bMGTKvC3fkdg8HnbBCI=; b=xkuB9GuAo0R48hwuaMQg/3bQdSHldonQxpLIu6JL6RjcjlpvtW1VxdDTLwtaw/vBhQ 2YCoGlPMG0BRUNbFcs3nfWA6GJj/3njyzIZIIZqI0kQNjAyJf6Fw9dvbZZIawB1w6SNZ oYws4v34r0RN3nrgo2xV3CNhm/yeJvWlMj9sRcvaP6FOb73NUaatmc1Ll+tP74z+5AY0 Vur1LwsC9F0a/pvGrYHdMrbbPpCekjhFlXf+0u6I3LfAH0aUXGz/dB/XhvZDUewHk/af +cSlHCYHafufToLcyGDDoes9fA0f1xbci+/2FaiqCiN23txXll+djC02p+d28i0F3lD8 TzQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=759dvJ7YjYUEo6DoLbq2jNx9bMGTKvC3fkdg8HnbBCI=; b=ii8+16KPbRaCEJ1zguQv1i4gMcPa7ZSViL2o/kjmF2fyC2e5jh1hODCA8Og819QwOD uo8yILrFp/ItgSp/lAd1v08XbGcwroaoNwQOoLKzlPPbWPdk9mfW1QvMo3qTgpIZJ1qW buU7OBF6/oSbk68tb6+N0hL8+pGmA4ZHab9hzaq3HiofsSMs3VvWSPm1JTEokU1nuGi1 VA5JlrjRek6OaY6QrgwMOshXzgK0WFQ0iwhj1IBS0tcX4/o4gD68J7SeXSX7WZfR9M/m fMJiMukG0IpXYHdssX5Q/zBUzbfBSpYm5KJ/zTEHS2TD319WN6EHj6tw3nzRRov7zx/6 iyqQ== X-Gm-Message-State: APjAAAUwtYpnOSC8YyV0M6y+4yYd5R710c3yiORJyRCFRNKxXY2Gw0r1 ZfrzdpyDPpMJ51l6ObV7fkM8lA== X-Google-Smtp-Source: APXvYqwEmn6QgaM+t2UQ4EP58KvV2iVDT0pO4Jy/RlwAUJ4LzxTUDmTpGS95OolfHldC+ROdmY3lKQ== X-Received: by 2002:adf:fd46:: with SMTP id h6mr23078451wrs.170.1552389900250; Tue, 12 Mar 2019 04:25:00 -0700 (PDT) Received: from [10.0.0.219] (49.188.9.51.dyn.plus.net. [51.9.188.49]) by smtp.googlemail.com with ESMTPSA id e23sm2600459wme.15.2019.03.12.04.24.59 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 04:24:59 -0700 (PDT) Cc: stable@dpdk.org, Alejandro Lucero References: <1552059647-2725-1-git-send-email-pablo.cascon@netronome.com> From: =?UTF-8?Q?Pablo_Casc=c3=b3n?= Message-ID: Date: Tue, 12 Mar 2019 11:24:58 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <1552059647-2725-1-git-send-email-pablo.cascon@netronome.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-GB Subject: Re: [dpdk-stable] [PATCH 1/1] net/nfp: fix set_mac_addr 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: Tue, 12 Mar 2019 11:25:00 -0000 On 08/03/2019 15:40, Pablo Cascón wrote: > 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") Sorry forgot to add here: "Cc: stable@dpdk.org" If needed please amend the commit message. > > Signed-off-by: Pablo Cascón > --- > 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 54c6da9..278e154 100644 > --- a/drivers/net/nfp/nfp_net.c > +++ b/drivers/net/nfp/nfp_net.c > @@ -566,7 +566,10 @@ 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"); > return -EIO;