From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE2B2C7618F for ; Fri, 19 Jul 2019 00:57:04 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 5083420665 for ; Fri, 19 Jul 2019 00:57:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5083420665 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B60A2C2B; Fri, 19 Jul 2019 02:57:03 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 2566D28EE for ; Fri, 19 Jul 2019 02:57:00 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jul 2019 17:57:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,280,1559545200"; d="scan'208";a="319813229" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga004.jf.intel.com with ESMTP; 18 Jul 2019 17:56:58 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 18 Jul 2019 17:56:59 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 18 Jul 2019 17:56:59 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 18 Jul 2019 17:56:59 -0700 Received: from shsmsx105.ccr.corp.intel.com ([169.254.11.232]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.134]) with mapi id 14.03.0439.000; Fri, 19 Jul 2019 08:56:57 +0800 From: "Zhang, Qi Z" To: "Zhang, Xiao" , "dev@dpdk.org" CC: "Xing, Beilei" , "Wang, Haiyue" Thread-Topic: [v2] net/i40e: fix SFP X722 not work with FW4.16 Thread-Index: AQHVPXCohZcS7iRg+E+dFqR+1lbbbabRHdhA Date: Fri, 19 Jul 2019 00:56:57 +0000 Message-ID: <039ED4275CED7440929022BC67E7061153D69617@SHSMSX105.ccr.corp.intel.com> References: <1563470021-16325-1-git-send-email-xiao.zhang@intel.com> <1563490319-53151-1-git-send-email-xiao.zhang@intel.com> In-Reply-To: <1563490319-53151-1-git-send-email-xiao.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNmZjZGI1MTItODVlZS00YWVlLThlMDItOTkxNjI3YmNkMGRiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNVhGaHpEUWFabDNQUUhxTnNVZlwvZGtKbFFic2hScHUxdkl4V3h2b2hUQXRRemdqcWdybUl1MkxHeTkxbzd6K3QifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [v2] net/i40e: fix SFP X722 not work with FW4.16 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Zhang, Xiao > Sent: Friday, July 19, 2019 6:52 AM > To: dev@dpdk.org > Cc: Xing, Beilei ; Wang, Haiyue > ; Zhang, Qi Z ; Zhang, Xiao > > Subject: [v2] net/i40e: fix SFP X722 not work with FW4.16 Please add fix line and Cc stable. Fixes: 73cd7d6dc8e1 ("net/i40e: use set switch AQ instead of register setti= ng") >=20 > FW4.16 of SFP X722 does not support setting TPID by set_switch_config > adminq operation, for firmware version less than 4.16 TPID is set by regi= ster > instead. For device SFP X722, disable adminq flag to follow the same path= with > old firmware version to make it work. >=20 > Signed-off-by: Xiao Zhang > --- > v2 > Unset adminq flag instead of only checking device id when set TPID. > v1 > Check device id when setting TPID, use adminq if not SFP X722, else use > register. > --- > drivers/net/i40e/i40e_ethdev.c | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.c > index 2b9fc45..2b2c877 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -1358,6 +1358,10 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void > *init_params __rte_unused) > 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 =3D=3D I40E_DEV_ID_SFP_X722) > + hw->flags &=3D ~I40E_HW_FLAG_802_1AD_CAPABLE; > + > PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d > eetrack %04x", > hw->aq.fw_maj_ver, hw->aq.fw_min_ver, > hw->aq.api_maj_ver, hw->aq.api_min_ver, > -- > 2.7.4