From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2E2BDA0524 for ; Fri, 5 Feb 2021 12:32:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26B7940682; Fri, 5 Feb 2021 12:32:09 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 4E77740682 for ; Fri, 5 Feb 2021 12:32:08 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id w4so5737289wmi.4 for ; Fri, 05 Feb 2021 03:32:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M+9Jq+MOEEU5323bFzffCjeLmrQweWsz+IwpCvYbMSg=; b=KDXi2AZTxkkbaG93Gmoxq1x/Ox7IWQ50sNenFOgvo63yNiZGSXoFkaqlJMoJkvG+SN 9/TmCmZJG3VaJBlgLUbZaSM8E3v3z94fFmaiTXSTex34dPqZQ33pAJoVkUD+q0xqPLMF 6EEa8qA5qgj1hmiKtpt3ZmNukMaWa14x+r176/fNdGzeSLlhbuh/EMym3TPVDz9LkGyG wb3LwxUsPury+coaoZxwAd7eU0iwci/QEJxUIJrxBl3YHAHN00KcQvcntCg+qTtsOHb8 Y+V5RGLGSMPu3qjESCepEpSVDZqvqVG9Jq6ILGHS4gzMSmMPvlgL/5q6COsxtth1iJhv Ybkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M+9Jq+MOEEU5323bFzffCjeLmrQweWsz+IwpCvYbMSg=; b=lNZxcO2+rr1n1raDbw//lZPLWJp7x34kQSH2Afg6Mbp3bXShunMqGz3lTya5N+JNOn cA4ZlNu0VF88mzrRf5txqEfx8w7raA6YwPBV0wFXCYmBbtkL0ncpgDunv9R4SpXEQWEc Ds3WybiNUOczY1gOCDnadKZexmxCJv8Un+gueuPLFIHQ0tL9iaQuKnVZc9MBolAnB6we nGv2aP7Vw7hNitfFvK9IxKZSAX+LzBTDQdkdp2K+0ujfqavw46Y+Uo6DuuYUxNGM0A/X O46j6xhpL9BVzzE2R/P496Wejq7ESP67L9EE2xXPChs6u/gwiecPByVRd/IA12AGByca pFuA== X-Gm-Message-State: AOAM530WXp/EvRJLuueM5KZg99be3WOzk3l01W+WdZ5x3GTHVYUF98l7 GDimbNIxblRq6B+6sg0f06tvpGSeBZq+XkCb X-Google-Smtp-Source: ABdhPJxv7DiTLU2SV96aIp7k64POcFM03QhtF2eu7Oij5wcyNVchtVn/qBncWmyRhVBSyFMCcNVj5A== X-Received: by 2002:a1c:ac86:: with SMTP id v128mr3180614wme.76.1612524728096; Fri, 05 Feb 2021 03:32:08 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d13sm11546760wrx.93.2021.02.05.03.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:32:07 -0800 (PST) From: luca.boccassi@gmail.com To: Weifeng Li Cc: Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:16:57 +0000 Message-Id: <20210205111920.1272063-131-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix X722 for 802.1ad frames ability' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cf0957a9178c4f569401e5a57141228fc38eee35 Thanks. Luca Boccassi --- >From cf0957a9178c4f569401e5a57141228fc38eee35 Mon Sep 17 00:00:00 2001 From: Weifeng Li Date: Sun, 10 Jan 2021 16:34:17 +0800 Subject: [PATCH] net/i40e: fix X722 for 802.1ad frames ability [ upstream commit 591bd5e4ae8c0256614417ee5f2645edf6d0f61c ] I40E_DEV_ID_SFP_I_X722 does not support 802.1ad frames ability, so I40E_HW_FLAG_802_1AD_CAPABLE should not be set. The patch also correct the comment for I40E_HW_FLAG_802_1AD_CAPABLE configure. Fixes: 9efa8d28b4da ("net/i40e: fix SFP X722 with FW4.16") Signed-off-by: Weifeng Li Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 5984e52abd..213fb99ca9 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1549,8 +1549,9 @@ 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 == I40E_DEV_ID_SFP_X722) + /* Firmware of SFP x722 does not support 802.1ad frames ability */ + if (hw->device_id == I40E_DEV_ID_SFP_X722 || + hw->device_id == I40E_DEV_ID_SFP_I_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", -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:35.034910020 +0000 +++ 0131-net-i40e-fix-X722-for-802.1ad-frames-ability.patch 2021-02-05 11:18:29.010694996 +0000 @@ -1 +1 @@ -From 591bd5e4ae8c0256614417ee5f2645edf6d0f61c Mon Sep 17 00:00:00 2001 +From cf0957a9178c4f569401e5a57141228fc38eee35 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 591bd5e4ae8c0256614417ee5f2645edf6d0f61c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ba1abc584f..acf7a0f010 100644 +index 5984e52abd..213fb99ca9 100644 @@ -24 +25 @@ -@@ -1550,8 +1550,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) +@@ -1549,8 +1549,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)