From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B4DB4A056A for ; Wed, 18 Mar 2020 04:00:20 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 81B7C1C067; Wed, 18 Mar 2020 04:00:20 +0100 (CET) Received: from mail-m973.mail.163.com (mail-m973.mail.163.com [123.126.97.3]) by dpdk.org (Postfix) with ESMTP id 0F57B1C067 for ; Wed, 18 Mar 2020 04:00:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=tIJOAfYLXKFPhTZGaf T+GqiFBBr+sfzRFRIzc0qOT8o=; b=G+3cbLc53S90tXkH2lAX7sCZKhDFcWdcSu Im+9Q5jyike2tHecCur/MrLcBiXyvJF6ndgZIQsSInx5rgEMJ2CnwjEOu8oNR24v yiZ79kxq7glPRLIW6e4mpTv6FuXub+mFCqnMu57uPBr9WrNSxOVze37nKbAIRCtx mD58XoA9U= Received: from localhost.360buyad.local (unknown [111.202.148.43]) by smtp3 (Coremail) with SMTP id G9xpCgAHqmmzjnFe9HyoAQ--.208S2; Wed, 18 Mar 2020 11:00:13 +0800 (CST) From: Zhike Wang To: wangzhike@jd.com Cc: stable@dpdk.org Date: Wed, 18 Mar 2020 11:00:00 +0800 Message-Id: <1584500400-9255-1-git-send-email-wangzhike@jd.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: G9xpCgAHqmmzjnFe9HyoAQ--.208S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4fXF4Utw4kKF17ZF4fKrg_yoWktrc_Gr n7ur9xAr4DAF1v9r1UCrs5ur9Yk34qqr1vkFy2934kG34DZr1rZr10vr9xtr47Wa12gwnr Aw1Sqw1a9ry2kjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU07fHUUUUUU== X-Originating-IP: [111.202.148.43] X-CM-SenderInfo: pzdqw6bntsiqqrwthudrp/1tbipRPqulUMXLdmugABsJ Subject: [dpdk-stable] [PATCH v2] net/i40e: fix disabling X722 adminq operation 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" X722 does not support adminq operation. Previously SFP type is used to judge whether it is X722. However X722 SFPs have different flavors, eg I40E_DEV_ID_SFP_X722 /I40E_DEV_ID_SFP_I_X722, so instead we use mac.type to judge whether it is X722 or not. Fixes: 9efa8d28b4da ("net/i40e: fix SFP X722 with FW4.16") Cc: stable@dpdk.org Signed-off-by: Zhike Wang --- drivers/net/i40e/i40e_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 9fbda1c..2abad45 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1446,8 +1446,8 @@ static inline void i40e_config_automask(struct i40e_pf *pf) PMD_INIT_LOG(ERR, "Failed to init adminq: %d", ret); return -EIO; } - /* Firmware of SFP x722 does not support adminq option */ - if (hw->device_id == I40E_DEV_ID_SFP_X722) + /* Firmware of x722 does not support adminq option */ + if (hw->mac.type == I40E_MAC_X722) hw->flags &= ~I40E_HW_FLAG_802_1AD_CAPABLE; PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d eetrack %04x", -- 1.8.3.1