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 EC6BB4624E for ; Mon, 17 Feb 2025 18:07:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E75BE400EF; Mon, 17 Feb 2025 18:07:49 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 1F16E400EF for ; Mon, 17 Feb 2025 18:07:49 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-38f2f391864so1892451f8f.3 for ; Mon, 17 Feb 2025 09:07:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812069; x=1740416869; 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=PdM5hUdxYQ3sZVH5IoFlyO9OZTS0vxidktw36/6f33o=; b=P1+hfSsQsRDfOv9zBeDq0enwmok4hct6vQWlWtEgOwuXBNqAzV+QbMbyY+AvRYteOa PAm7QEX4FFNDT9THqtyu+QbZlPxUhudo60Vowu48MnyM0IE+wY517CBMfPR3Hlrxj/4M JIpxgwRQTsyuvClObJa3H0K8vGkm01kSH4JGU3qibQKejqoubJPtokK7X3OfShbIv75/ vyVm1asVRxPVHTj9voc7rgHstMG+hxZnTa1wS8+n607uopWZaRUo2tYcrf+SdcwfVeC3 ZPWyUnsBiz2FWhUrCVhLO+UleRtU/YK4A6v5yVI4pmZqyzVcgtn4447tBwgl/Ba99/Zk ioaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812069; x=1740416869; 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=PdM5hUdxYQ3sZVH5IoFlyO9OZTS0vxidktw36/6f33o=; b=rUjRPLgNPpFgc/5WcfsC+7tihUsO2/ApvhgUjPSw52BUEHCIsogaetRY+72THU9vVB PUmWqyEAywmKF13TAvBd1VPve2pMh2BXIUh40dTN+neAvItqmj3Poy3qDl9g3zqE1Z7P ewMGt/lVTtzZ232/vH/qey57GCQh5M5xt/l4o1WRUoyXyFeAeezAyNnlQ0thtCCqw3rj GGnpQoUHoUZ1l7YYcpYK6K2OAcI7YKkMPQ58a1cUkdCSKrlO7oKowuzMgKfstVCUDJuJ vjjy0vzLJq5YcriA+qKuqBEKd3Vkm8sEhbQ8U+DwV9nw6LkhmZsDZOrR7lJZ6cMNqWN8 aZqw== X-Forwarded-Encrypted: i=1; AJvYcCVrPR2whmUL7LyXS7bXOFoR7q9q8cLtkBGRFCJekKV71TWsvI4aVyCHfGXAVmRsBCBxlnc3rWQ=@dpdk.org X-Gm-Message-State: AOJu0YzkhhwdBvOvWQjPwSD4fxyXGVLwrRIy8n2MJJ72/7gCr3hy7tpj +rztK1GoFYKskfTi2gbEIhV5zJV0QjyQerP4n6ESLtOao9uLOEbSvJxRxWGsccNBPg== X-Gm-Gg: ASbGncuE5SDnDixEV5C/+YKTMabWKfM+4M5zwDqjobrRukAjlr17IiNpRSscfpWDBta ZPDtCooANQBLz+jsorjJRRskdXCoH7LJaKTGxaloVLYVbyM9RzpBCFEBIztzz92GeB7+/nD0RzT jUvxPOG0WEa7TrOjDGCGLdObGivTZgMu2aJ6DAega1Xj7JZQ8if4ZAOA0Nzvf7FYoMP4yWYyKr4 saHQFeJVeTVGVQr9Lr3/jm6oRKY3xk+aAO+kvb+o+5QXStXJ+x4HqScjln81RrFufqGoIs0G4aM CvF81R+Lh4lAI3Ci6Rdvxg== X-Google-Smtp-Source: AGHT+IHmVJoeCtdWSXR3P7H4MDIgHJWPmqttdlN3gjPxqkjn2EedgayEpVbvTcgAVPjjhMDDis1pjA== X-Received: by 2002:a5d:598c:0:b0:38d:c2d4:2399 with SMTP id ffacd0b85a97d-38f33f53463mr11476515f8f.41.1739812068508; Mon, 17 Feb 2025 09:07:48 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258ccd3bsm12788650f8f.22.2025.02.17.09.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:07:47 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.8 Date: Mon, 17 Feb 2025 17:04:27 +0000 Message-ID: <20250217170456.1068278-54-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b7ebb9596fe0268b4bb72c441a0c9b649b98767e Thanks. Luca Boccassi --- >From b7ebb9596fe0268b4bb72c441a0c9b649b98767e 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 @@ -935,14 +935,14 @@ s32 e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num) DEBUGOUT("NVM Not Supported\n"); 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); if (ret_val) { DEBUGOUT("NVM Read Error\n"); return ret_val; } - *pba_num |= nvm_data; + *pba_num |= (u32)nvm_data; return E1000_SUCCESS; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.760212633 +0000 +++ 0054-net-e1000-base-fix-NVM-data-type-in-bit-shift.patch 2025-02-17 16:13:16.850441592 +0000 @@ -1 +1 @@ -From b932270c66d0179824118afbfd7cfb347ddf07d2 Mon Sep 17 00:00:00 2001 +From b7ebb9596fe0268b4bb72c441a0c9b649b98767e 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