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 C2A8745BB6 for ; Wed, 23 Oct 2024 23:19:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBF2540261; Wed, 23 Oct 2024 23:19:27 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id ECCD0432CC for ; Wed, 23 Oct 2024 23:19:26 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43162cf1eaaso2996835e9.0 for ; Wed, 23 Oct 2024 14:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718366; x=1730323166; 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=bTrLGvx8D3lNO8wOOEM3XHunZ//EuLL5Nqi9mCbg2bM=; b=juiSAytCow05C/LoNhkbH9PWXGhHIOnKESvikFpR4ASi/J63/UNre3HcIa2Q4mtMfu 0P3x/c0QDM8UCM+RheVZTrJtRo6uWQZqyt27VYC6Fubem6D2LHgBUapcwEKrtow5UibM oru+p0RPmW6E1kq9oIV+faeURVXPcSgy3RtJVP35Qsrg0pw9M/hjXg6qwA0ZAwNM74Cj SmM5hr/HiJZMKJK9ZDL0HsG0WhkM9wEJWZGGiMlurB290YNsvJtcJDYnaISvA13WYsTM Ukc7RX/V5TKHiWXiLg2nw3Fh0ApF5j0jODCksvXZVg8BP/6AbVL5MVbdW7M4RHZDVUgL kYWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718366; x=1730323166; 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=bTrLGvx8D3lNO8wOOEM3XHunZ//EuLL5Nqi9mCbg2bM=; b=duDxl8N0DgWB79G3lNRvb/f8rBumnye2YbXb2miT79erMGqKelr9bLxxBvxatpYM0A +Sj24jrJyUyNpT75Gev1tjS1OV6K/7/O5zBoX1HeY1ypD7/uEOmAzPtBjLV6LvK3dQCc dhTsow6c2qeO4cYVhpkn4PDZDFsFE0f7XwL/a5XJS8rLF3oIZGDvZ4CK6FKuziPpaJZG zki0LcA41jVbwqN/nH4WfnQBZu2cnm2SFTrvcY4Wx+sVN7+mKpJ/tVtWycmXStNiOLR9 mjhwdBvUREvzhuKgy/uxHPcHLxdSiTHxDCKn6G3jlk2q92wSRKT8oM0IiyYUtW3+zF1z 3ujw== X-Forwarded-Encrypted: i=1; AJvYcCVVLhFr7AHXf5/NY5Y4Rar6gJFJpB1+Wds7ElpbBeLj753DJnA87UwyIphXd2ekBVbFaE1BPho=@dpdk.org X-Gm-Message-State: AOJu0YxTMnsl3XcTVPjDGZkCYJfrIlazGS6taMthPNGsp76Sp+7dOxRf e2SYKhk1Xm5gOoEoxWlnaVy98XmgrMKUjTneGnbZypDCE1BESLquKCpBOA== X-Google-Smtp-Source: AGHT+IFdY5A6HZyO7lUXTpqXQoJx+iq/RxlOttqMcclFScaTtF0CD3Ers9xVkBezaXGa5MlSH5DxeQ== X-Received: by 2002:a05:600c:5250:b0:431:4f29:9539 with SMTP id 5b1f17b1804b1-4318424f1a4mr47557315e9.32.1729718366450; Wed, 23 Oct 2024 14:19:26 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186c001c7sm26813705e9.29.2024.10.23.14.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:19:26 -0700 (PDT) From: luca.boccassi@gmail.com To: Aleksandr Loktionov Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/i40e/base: fix misleading debug logs and comments' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:19 +0100 Message-ID: <20241023211704.1216956-39-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/aea7ea7acb1e32d2c546ab93e9450fe35f7469b1 Thanks. Luca Boccassi --- >From aea7ea7acb1e32d2c546ab93e9450fe35f7469b1 Mon Sep 17 00:00:00 2001 From: Aleksandr Loktionov Date: Mon, 2 Sep 2024 10:54:18 +0100 Subject: [PATCH] net/i40e/base: fix misleading debug logs and comments [ upstream commit 719ec1bfebde956b661d403ef73ecb1e7483d50f ] Both comments and debug logs for i40e_read_nvm_aq refer to writing, when in actuality it's a read function. Fix both comments and debug logs. Fixes: a8ac0bae54ae ("i40e/base: update shadow RAM read/write") Signed-off-by: Aleksandr Loktionov Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/i40e/base/i40e_nvm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c index f385042601..05816a4b79 100644 --- a/drivers/net/i40e/base/i40e_nvm.c +++ b/drivers/net/i40e/base/i40e_nvm.c @@ -223,11 +223,11 @@ read_nvm_exit: * @hw: pointer to the HW structure. * @module_pointer: module pointer location in words from the NVM beginning * @offset: offset in words from module start - * @words: number of words to write - * @data: buffer with words to write to the Shadow RAM + * @words: number of words to read + * @data: buffer with words to read from the Shadow RAM * @last_command: tells the AdminQ that this is the last command * - * Writes a 16 bit words buffer to the Shadow RAM using the admin command. + * Reads a 16 bit words buffer to the Shadow RAM using the admin command. **/ STATIC enum i40e_status_code i40e_read_nvm_aq(struct i40e_hw *hw, u8 module_pointer, u32 offset, @@ -249,18 +249,18 @@ STATIC enum i40e_status_code i40e_read_nvm_aq(struct i40e_hw *hw, */ if ((offset + words) > hw->nvm.sr_size) i40e_debug(hw, I40E_DEBUG_NVM, - "NVM write error: offset %d beyond Shadow RAM limit %d\n", + "NVM read error: offset %d beyond Shadow RAM limit %d\n", (offset + words), hw->nvm.sr_size); else if (words > I40E_SR_SECTOR_SIZE_IN_WORDS) - /* We can write only up to 4KB (one sector), in one AQ write */ + /* We can read only up to 4KB (one sector), in one AQ read */ i40e_debug(hw, I40E_DEBUG_NVM, - "NVM write fail error: tried to write %d words, limit is %d.\n", + "NVM read fail error: tried to read %d words, limit is %d.\n", words, I40E_SR_SECTOR_SIZE_IN_WORDS); else if (((offset + (words - 1)) / I40E_SR_SECTOR_SIZE_IN_WORDS) != (offset / I40E_SR_SECTOR_SIZE_IN_WORDS)) - /* A single write cannot spread over two sectors */ + /* A single read cannot spread over two sectors */ i40e_debug(hw, I40E_DEBUG_NVM, - "NVM write error: cannot spread over two sectors in a single write offset=%d words=%d\n", + "NVM read error: cannot spread over two sectors in a single read offset=%d words=%d\n", offset, words); else ret_code = i40e_aq_read_nvm(hw, module_pointer, -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.005174318 +0100 +++ 0039-net-i40e-base-fix-misleading-debug-logs-and-comments.patch 2024-10-23 22:16:40.479941963 +0100 @@ -1 +1 @@ -From 719ec1bfebde956b661d403ef73ecb1e7483d50f Mon Sep 17 00:00:00 2001 +From aea7ea7acb1e32d2c546ab93e9450fe35f7469b1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 719ec1bfebde956b661d403ef73ecb1e7483d50f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org