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 0357346211 for ; Thu, 13 Feb 2025 11:03:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE90A42F37; Thu, 13 Feb 2025 11:03:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1DFA142F5D for ; Thu, 13 Feb 2025 11:03:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dg1nSIduo044b1uGGRB8uR7HWjbgzzVsnhM6Er+de+U=; b=DX7NF/Pt9aK+thvon0+AJ4rLOx3YqWzLg3V0iCFYBjFiBfRpdaSBM98r3KNoQeNytT+MbF jw6oSaHa3nHIiSw2zWrpQBOy1Onk3H4hCQgBGQis/xciRWG/ZNXbpXGRfuKBt4m7Ra6KVW DhcRy2ID3Eh7oaC4zndJuQ5NK0bwVaE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-vV8M529kPK-alXKNJYdjGg-1; Thu, 13 Feb 2025 05:03:29 -0500 X-MC-Unique: vV8M529kPK-alXKNJYdjGg-1 X-Mimecast-MFC-AGG-ID: vV8M529kPK-alXKNJYdjGg_1739441008 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5236E1800877; Thu, 13 Feb 2025 10:03:28 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 752D31800365; Thu, 13 Feb 2025 10:03:26 +0000 (UTC) From: Kevin Traynor To: Przemyslaw Ciesielski Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: fix NVM data type in bit shift' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:03 +0000 Message-ID: <20250213095933.362078-96-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VAXEm3V6ymPBf4ZCmmg-Ax1G0NyQJ7A8xtKhW0ROhQg_1739441008 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 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/17/25. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3f1f64c71325981d0e1d622bb62e5b2a74b684dc Thanks. Kevin --- >From 3f1f64c71325981d0e1d622bb62e5b2a74b684dc Mon Sep 17 00:00:00 2001 From: Przemyslaw Ciesielski Date: Thu, 6 Feb 2025 16:08:44 +0000 Subject: [PATCH] net/e1000/base: fix NVM data type in bit shift [ upstream commit b932270c66d0179824118afbfd7cfb347ddf07d2 ] There is a static analysis warning due to wrong data types being used for NVM read data shifts. Fix it via explicit type cast. Fixes: 38db3f7f50bd ("e1000: update base driver") Signed-off-by: Przemyslaw Ciesielski Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_nvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_nvm.c b/drivers/net/e1000/base/e1000_nvm.c index 430fecaf6d..d171bea649 100644 --- a/drivers/net/e1000/base/e1000_nvm.c +++ b/drivers/net/e1000/base/e1000_nvm.c @@ -936,5 +936,5 @@ s32 e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num) return -E1000_NOT_IMPLEMENTED; } - *pba_num = (u32)(nvm_data << 16); + *pba_num = ((u32)nvm_data << 16); ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_1, 1, &nvm_data); @@ -943,5 +943,5 @@ s32 e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num) return ret_val; } - *pba_num |= nvm_data; + *pba_num |= (u32)nvm_data; return E1000_SUCCESS; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:44.785573533 +0000 +++ 0096-net-e1000-base-fix-NVM-data-type-in-bit-shift.patch 2025-02-12 17:29:34.575947272 +0000 @@ -1 +1 @@ -From b932270c66d0179824118afbfd7cfb347ddf07d2 Mon Sep 17 00:00:00 2001 +From 3f1f64c71325981d0e1d622bb62e5b2a74b684dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b932270c66d0179824118afbfd7cfb347ddf07d2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/intel/e1000/base/e1000_nvm.c | 4 ++-- + drivers/net/e1000/base/e1000_nvm.c | 4 ++-- @@ -19 +20 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_nvm.c b/drivers/net/intel/e1000/base/e1000_nvm.c +diff --git a/drivers/net/e1000/base/e1000_nvm.c b/drivers/net/e1000/base/e1000_nvm.c @@ -21,2 +22,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_nvm.c -+++ b/drivers/net/intel/e1000/base/e1000_nvm.c +--- a/drivers/net/e1000/base/e1000_nvm.c ++++ b/drivers/net/e1000/base/e1000_nvm.c