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 1E9CD45CE3 for ; Mon, 11 Nov 2024 07:35:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11DA140E1E; Mon, 11 Nov 2024 07:35:48 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2066.outbound.protection.outlook.com [40.107.220.66]) by mails.dpdk.org (Postfix) with ESMTP id 291B840E1B for ; Mon, 11 Nov 2024 07:35:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T+ltV/MufmGzfnFnEXeQg8Sa4tsxDk1PUMJ/uOrH3vaAMqUDVEcAnFjsGhcg9eBpGwJljihtJ+HQ8QerGS3Oa36vuJevVDGXzraZT6X1gl53OhmAVTXC3uPVPbOQP2q1jqjZqZUf0B68+UkK12ZL/O119pkaJPvNttKFJ1r4zN1/Zk5EjLGUdnxa4ID87wAcDjAKpL/kf0PXJkFfLTY14oeb7Ns51MQ+vRjWY0PyRH/GwL4RecPC4VYqjhLeuW264JFzG/xbNUgOb2uYj9ujE3nzR9nKQfhW3AfSys7HaWYGkuRkuZuhmGKTZrwvBJ8HXhLe4/ld57p2v6LhDNiJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uB61UZhP45XECGdXeQsUn0m8WA9j6b3utvk51O/Bn4c=; b=ryBeNETcYmxNxvi1HlDWlE4nCNVSm+QMkj7fInqFaDklmcJsEfb2766RwIAIV85PohW+6aEx5i5/4QdtXTLCDFA9kX+SNBg78phieykz5kVrscwSjXZ0LmVxY8BUmcGVjUoYXrNxqYLdHuSGiBK8GAtlhQCqIH+v0/zI+umHeGMiO2HdNnuRv9AU79ZT8tpxSbmoC3a7G1duRMxZ3+BR4+Uj/7TSeAgtMdeYuyMkW+nAOwpdAvjtIquX9tFG2JZS1sqtQg332GU/ympg1bGQmnzLJCd3DKyQjLb/Hv/FbMXQkqAOwWsN5+zDVN0aycc9tkiLZ1mEN1eXUo6ClvZ2qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uB61UZhP45XECGdXeQsUn0m8WA9j6b3utvk51O/Bn4c=; b=rRlwpHBNEcwzN2K/w32kJ3T+7nNmcT6ItMJa5iW6DnmktZ/3/HghSoziqCK4K9d/ZPPXUnPDOo+CIkLpAbhNAvas95EyqHhG9wvBW0Qu3hoLWNcdmlghi5o23GejQbYzIgLd07YUFvcLAgpR+Hei0BzWLr3ZklTU2rlgelVzXKK44ll5h6NYHqzAEGLLMSD+kdEudyLN1nrJOSbuxyP5k70gW+D/TGit0/i0E+q+idJ/84Ak7ekAA11ewgTLW7TKvLl9EntNQtWROVNHB65101dIBO5pQoXk2Bn/qU2YTNjOdxHTZ4NoAONNNtOHH2bqgeOKIOth2REHtFYeYHofsQ== Received: from BN0PR08CA0018.namprd08.prod.outlook.com (2603:10b6:408:142::29) by PH0PR12MB7488.namprd12.prod.outlook.com (2603:10b6:510:1e9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:35:40 +0000 Received: from BN2PEPF000044A8.namprd04.prod.outlook.com (2603:10b6:408:142:cafe::f7) by BN0PR08CA0018.outlook.office365.com (2603:10b6:408:142::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 06:35:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN2PEPF000044A8.mail.protection.outlook.com (10.167.243.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:35:39 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:35:21 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:35:19 -0800 From: Xueming Li 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 23.11.3 Date: Mon, 11 Nov 2024 14:27:47 +0800 Message-ID: <20241111062847.216344-62-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A8:EE_|PH0PR12MB7488:EE_ X-MS-Office365-Filtering-Correlation-Id: 565dbab0-4435-475e-ed8d-08dd021b0f61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VcJqcZcRVx79YgI3Q+YOpmvoH4wWFlWVTNSRRmI4CfppeRcnfi/69dDi8JoW?= =?us-ascii?Q?vXym7Oy/ksRTz9rU/6SH2nl/AmX5Bsyo0SbWBbiD34m/ptUggFhy0D+32BTS?= =?us-ascii?Q?ymiYejl3nEQUYXvV84rP1h5y5VtDhbjQH1pxFR85DUORV4YC6l3Mcdj19icc?= =?us-ascii?Q?I3k94iuY76YE9GmJ1VHJTNh7turbauqUT81NdgthN57BA7e++QrVeInsPG3g?= =?us-ascii?Q?gmoGENEKxuSfuAJ/7u3dveRlLsSHXEyP7fkcY2YsHHO8Nul0uW1SF7XmQcX4?= =?us-ascii?Q?/2AxODQlJAP1vcCxAbng9wmPX9OgMshMd3aoSu2M4pIoWiL0P4qwg7ILP+tE?= =?us-ascii?Q?LNUyuN9iivH0r8tQqJS081nFyxNNKNA7gfqicx8wrXXd/4n8W1SGro1pP9zn?= =?us-ascii?Q?1cas68Yw2c8TSo+MJEuGjRjzAi7Z/la7JGW5Uxw1j2iPCOxndZSoNyPKcF3E?= =?us-ascii?Q?lm96DTz7gl25vNbRcyJsXXjdK1abMJCe8QIZXlkBD3dOgLOWsihn3hVrdJ0m?= =?us-ascii?Q?/R7S2I+bpLOiZgX05EQ1DXkQYGeLN14fZEBdt8MEtXgrPHdEJJ46uWxQ0UAW?= =?us-ascii?Q?yoZ2xrRcSjJlj95jFOhrSrF9ebD1HR1vY9hIEgT0gAGN3h3gHwPpRqMmvCxC?= =?us-ascii?Q?yZ6ZezyzPIgTN455fI+AAlrLm/XIuL74ayyBtIi14szzfOzrcYHQNpR+c3jZ?= =?us-ascii?Q?IsFjPYTesww8Sd49hvO+RuujnQic2gXRuCgr3mkD0107tG7m7J+XfXY4gn7q?= =?us-ascii?Q?MQE4bsPHF47/2N2QPBEzp+0t2wF6V8iHiqziyXVaQT4jSGijvYUB4QATMPvv?= =?us-ascii?Q?br/4YbWjXaDktgTeSHZsPJdv3m0ovv4OJQvMSlqrkjnoZJZf79jWeeCAq/EO?= =?us-ascii?Q?7enZ39M98+alktjlk7iVMLmhTXbXDe+3qAVxcHgKPUGMHlfC54iB0jxIkRUL?= =?us-ascii?Q?9SLuuWPNT/dqEtut+J/gfMiCLqS0Kd/ftU/H6cUkIANdOymKWvA1r3gJ1mHN?= =?us-ascii?Q?qe7Le4PePWHstBqNI9OAwHF0jNgcUR10MPIkB3D5giJ83vrMnkQ2zkrvumK0?= =?us-ascii?Q?r5aXXG1Tb2uiy/YHDfU7BgNt9uuqyQ2uMRz+TRGB8cYGhPuWe0Rb/M6e6htG?= =?us-ascii?Q?uB4Q5D88EBmsPaX+b9ZwUm+RsPsJvCRSusH6D0xHxRUaFYhowoY8fRV5c5Wv?= =?us-ascii?Q?+l9/Qe4hJEDLms/GAPq5Gox6T7LUHplw5kdj1PNzKIk+tlYIz6va9+6WU9Hm?= =?us-ascii?Q?6cc2xRni7FAHR6eSyEVh6awZXRr5SyaydeoClpiMcP1Mhm7o/4St7Q0dFLDs?= =?us-ascii?Q?+SLDYe0NazxNT6fb58KzntrIyyMCvmKcznTBZyenvAjL0d15x2qAugq8/O3X?= =?us-ascii?Q?hy2Q7nojEGYPuboUaVRVwthfA7p1yoOZ0CK8rKYk+t7OuJTNIA=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:35:39.9895 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 565dbab0-4435-475e-ed8d-08dd021b0f61 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A8.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7488 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 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=5ffbf6263003cc122adc4edadab31329d028c3c2 Thanks. Xueming Li --- >From 5ffbf6263003cc122adc4edadab31329d028c3c2 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 Cc: Xueming Li [ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:08.148919978 +0800 +++ 0061-net-i40e-base-fix-misleading-debug-logs-and-comments.patch 2024-11-11 14:23:05.142192839 +0800 @@ -1 +1 @@ -From 719ec1bfebde956b661d403ef73ecb1e7483d50f Mon Sep 17 00:00:00 2001 +From 5ffbf6263003cc122adc4edadab31329d028c3c2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 719ec1bfebde956b661d403ef73ecb1e7483d50f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org