From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id CD1B13250 for ; Sun, 6 May 2018 08:38:01 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 7C15F213A3; Sun, 6 May 2018 02:38:01 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 06 May 2018 02:38:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=co6CLfT/xdjqcl1ZP gXJ3ixSRAlX5wTaQQNKQCvjmVk=; b=GNOJyRcV8AkWf2CFt8ulY8o1lqRt6xO58 uV0S2Hpy1dlIn6qUa/H72CT5wWLnu4Qz4USy1Hgt/oP5LNiK6xeU/Ikpw5HgPQ/0 YV3G2p23iWDZ3iFVO6/gdmSaGp5Icm61UQh+nsGYrebqVttmOuWhVJDmX/LaHG4s H8FnIItEvd9rOK0j/eQ1d67FgzV2lBU+m/ygv61rfEUw9Kjc2BbrZjVJk0FRk/lC jVj4ku1JFjISICjCD00jPkLNBOKsYXflKiaD1SyTHV2MMw6Zz4T5tdz6uYAGrwRb oJC51LrA2FYXZ71LzSNw4YccnHuyUz6Xyg0ThrpGJJBsWhTXD4Fbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=co6CLfT/xdjqcl1ZPgXJ3ixSRAlX5wTaQQNKQCvjmVk=; b=bbHoob4X HDkrZ6ZluJ1EHMe7JeLKPgU9ZvhjmApWNKTCGwij2CldicrET2E/hG2/ypiDiy5g CkLIOcpQrxqBdTME9s1OcL0Ij/FfvT/h0etXnRU/1YEqpn2d/MDIoe3O3b6VOrYt 3ezeb/hg27Tsl/pR1SsWfPYs6wvnO92RrKbX9QyPQfeM4DuE7au894lBum9RqyMX mmi6mI+Oefir4FiwcDQJTlXJ13jxMZzruhPs0is3bH/wcpYFUIAhDnrg/Ou8RpM2 g33iNbS/oQuxoeCQQlrcZmePYOZQxA1zeiIu2xfkD3AKu5GcuaGZqSp/pRuXvPel eRHv+ITwT6K67g== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.102]) by mail.messagingengine.com (Postfix) with ESMTPA id E2C1010253; Sun, 6 May 2018 02:37:59 -0400 (EDT) From: Yuanhan Liu To: Ajit Khaparde Cc: dpdk stable Date: Sun, 6 May 2018 14:36:33 +0800 Message-Id: <20180506063639.23196-20-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180506063639.23196-1-yliu@fridaylinux.org> References: <20180506063639.23196-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/bnxt: avoid invalid vnic id in set L2 Rx mask' has been queued to LTS release 17.11.3 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: Sun, 06 May 2018 06:38:02 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/09/18. So please shout if anyone has objections. Thanks. --yliu --- >>From f18d545e659b0ad798f4e9784bedf473bbed2ccb Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 20 Apr 2018 07:22:01 -0700 Subject: [PATCH] net/bnxt: avoid invalid vnic id in set L2 Rx mask [ upstream commit 1b533790f44ee160bae86bdcc5307d7b52225726 ] In some cases bnxt_hwrm_cfa_l2_set_rx_mask is being called before VNICs are allocated. The FW returns an error in such cases. Move bnxt_init_nic to bnxt_dev_init such that the ids are initialized to an invalid id. Prevent sending the command to the FW only with a valid vnic id. Fixes: 244bc98b0da7 ("net/bnxt: set L2 Rx mask") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 7 ++----- drivers/net/bnxt/bnxt_hwrm.c | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 049afd0bf..b011f437f 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -400,10 +400,6 @@ static int bnxt_init_nic(struct bnxt *bp) bnxt_init_vnics(bp); bnxt_init_filters(bp); - rc = bnxt_init_chip(bp); - if (rc) - return rc; - return 0; } @@ -573,7 +569,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) } bp->dev_stopped = 0; - rc = bnxt_init_nic(bp); + rc = bnxt_init_chip(bp); if (rc) goto error; @@ -3058,6 +3054,7 @@ skip_init: goto error_free_int; bnxt_enable_int(bp); + bnxt_init_nic(bp); return 0; diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 120043d2f..5018d3511 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -252,6 +252,9 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct hwrm_cfa_l2_set_rx_mask_output *resp = bp->hwrm_cmd_resp_addr; uint32_t mask = 0; + if (vnic->fw_vnic_id == INVALID_HW_RING_ID) + return rc; + HWRM_PREP(req, CFA_L2_SET_RX_MASK); req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id); -- 2.11.0