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 9BB8445BB6 for ; Wed, 23 Oct 2024 23:19:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 966C140261; Wed, 23 Oct 2024 23:19:25 +0200 (CEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 1233640261 for ; Wed, 23 Oct 2024 23:19:25 +0200 (CEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43163667f0eso2229855e9.0 for ; Wed, 23 Oct 2024 14:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718365; x=1730323165; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LOZWGK8AatBibirObfPFUJUFjKYVNggJUibjbiPf+00=; b=QKttoafLdmJPWbPhkVJYzaI8kJTlak0cdTZM24a2b0xzUyYa6hK7A+Mi/oWXqdEo0H rlmq7HI0u2/esO4FzsGRy2ZeuHaUFOSuHmN8jqWpCFSqDn237vL/+fcicBdiJsaChaCh m1xxi1cPHxznRQW0lHx70nYpQ3e8Ww00ks+peWN/X+XG0DzVwqv4xnGFs2AW3OvKGQzD ABrpx/7lVEiZV0BwV/25keOfMEedVzh3nlwE0G0WZpK3m9tXHWyoM04uOXa+nya5ubdr qQRG08xm2YFQyuD0lhPypBOD9DyMCLgU/QZtdD2nBuBEoBTNpyAWF00uytH3YBVOb0Je DMoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718365; x=1730323165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LOZWGK8AatBibirObfPFUJUFjKYVNggJUibjbiPf+00=; b=IkA+credTRzMGmHZz/+ZfhNMQD/iou1w+h66bIsiLIPqrdiClTRSwIkbTSFwJibaAm n5aqurWONyCX/j9K2r03jwzdyGCmyR4VuFcLvksYOFL3eapfmBqaI2/H0BM+R5zt5tf0 kPXZ9jeRdZoFpiGJ2SvjJRImH4UHnNNc0s72yEO7LNfaS04FvZrTDQWRHeF+44LUnWN2 gH7a1ycWdyv1+A9H9/IbXC6p3PZoIkjptis2kD2rlv/Q8brT0S2W67PedqcuVoSjh/Lw 8L5ESHcejSypABrLVroFtVcuM+ZUMvE9XHjdOFmrUY/SLMx7eiT2emWRKsZaT2hXAx4C dZCw== X-Forwarded-Encrypted: i=1; AJvYcCXmN81Ui3yWq/NMPC2R8wg81zGVmfqA7IHMRJc01CrlcqLc3ZNByc/3eIQzx7YGP25And7cupk=@dpdk.org X-Gm-Message-State: AOJu0YxOwngu2wJfU6aXQy0COq6JydwhlJaykf4ybGKoKHdeOjl6n4CS ifoZF0mrmO8scRl/WWWJSuBzdOc2PQRZGaMW86vhaTEuoORhWs9i X-Google-Smtp-Source: AGHT+IF0DIltvQYJ004UyHwbzpJxXecvRXltYBKXFQhqv2YQfE9yfzwqFUdxt0ggrcGP8b+jUmwhjg== X-Received: by 2002:a05:600c:4ecd:b0:431:612f:189b with SMTP id 5b1f17b1804b1-431841fdademr36522115e9.12.1729718364528; Wed, 23 Oct 2024 14:19:24 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a583edsm9732489f8f.49.2024.10.23.14.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:19:23 -0700 (PDT) From: luca.boccassi@gmail.com To: Anatoly Burakov Cc: Bruce Richardson , dpdk stable Subject: patch 'net/i40e/base: fix setting flags in init function' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:18 +0100 Message-ID: <20241023211704.1216956-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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/b2571f3563f5bf8b8c84d9da47b443f625e5a42e Thanks. Luca Boccassi --- >From b2571f3563f5bf8b8c84d9da47b443f625e5a42e Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 2 Sep 2024 10:54:17 +0100 Subject: [PATCH] net/i40e/base: fix setting flags in init function [ upstream commit deb7c447d088903d06a76e2c719a8207c94a576e ] The functionality to set i40e_hw's flags was moved to its own function in AQ a while ago. However, the setting of hw->flags for X722 was not removed, even though it has become unnecessary. Fixes: 37b091c75b13 ("net/i40e/base: extend PHY access AQ command") Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/i40e/base/i40e_common.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 9eee104063..4d8167692d 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1017,9 +1017,6 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) else hw->pf_id = (u8)(func_rid & 0x7); - if (hw->mac.type == I40E_MAC_X722) - hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE | - I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK; /* NVMUpdate features structure initialization */ hw->nvmupd_features.major = I40E_NVMUPD_FEATURES_API_VER_MAJOR; hw->nvmupd_features.minor = I40E_NVMUPD_FEATURES_API_VER_MINOR; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:41.963169539 +0100 +++ 0038-net-i40e-base-fix-setting-flags-in-init-function.patch 2024-10-23 22:16:40.479941963 +0100 @@ -1 +1 @@ -From deb7c447d088903d06a76e2c719a8207c94a576e Mon Sep 17 00:00:00 2001 +From b2571f3563f5bf8b8c84d9da47b443f625e5a42e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit deb7c447d088903d06a76e2c719a8207c94a576e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e4de508aea..451cc2c1c7 100644 +index 9eee104063..4d8167692d 100644 @@ -23 +24 @@ -@@ -980,9 +980,6 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) +@@ -1017,9 +1017,6 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw)