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 DE7C345BB6 for ; Wed, 23 Oct 2024 23:20:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D89BE4331E; Wed, 23 Oct 2024 23:20:43 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id DB0924331E for ; Wed, 23 Oct 2024 23:20:42 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-37d538fe5f2so102388f8f.2 for ; Wed, 23 Oct 2024 14:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718442; x=1730323242; 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=wC6rx++tkrUj28FygZod5eaFJe2m8EPVzqKGrQoBYs0=; b=YbNTISKpAse+PJ/fRhHJL2Nl9NAEQCFL/V4/Xxldljk0KeU8VwOnpDHhFsXPYgptkw Ho84Br0N7rv/xw+CpUurfd8KONJwqqX6UubpzmFBeU4i3njy7tzZ2BKxMDY/qJBoW9GB TqBxYNKF/ml3PKPuWdoGLlTZ8B9LfAAjYgSV6z5Kd6h/p7LzESFvzb93h7EcWNFOwfWR tSXDW5Dw8emydmxlnV9VgSP0GO1S1yBfdxcI71xjKVtMtBkM6zn6BxNGBfNs5ZlJsLXb VF0CcYCSaVhj4GiCX0QcGkhD8ovceX4+2RFd1TQMi5QtcZnuFu0VXMkcv4yRB8g0gzER WQrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718442; x=1730323242; 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=wC6rx++tkrUj28FygZod5eaFJe2m8EPVzqKGrQoBYs0=; b=iq/vmNxnisvrOaTPLqKPOu74EQ6eTTj2tZa3OAbSlU0mu4a2gCUonMomHMJok3WkXK URUB3eHVc2jbyjW1oF3btuvZWQqB2kMSx+trO1ztkrrK14Pxq5yfLpYLsjjlmX8W0VrI ZVjrVKpeJqAw2aRCVK4Ng8+0bnchKGS8o9GQk41WKDZlq8Z4ECs4JwZBVxXDM44VsGeB dksoExDthMZIRVMz3Vxh9SbXXD+7U8CdYftYdK/M3K+YruIvE1Yqq/WWOurI0H3vFPQh TCt25GyKI2ZBBjt0P7TrmoqdaytvaW42JbkjHQR4ZI+8QJrTcX10OV9tTqZxR7yYm1cN OboA== X-Gm-Message-State: AOJu0YxP5vv1rJ6DlOYIlPBmA4TmkzAfLjRScalvkfvsxbinySgzrif0 99doW8o0qRWHutBjwd0dDkngQOIH1Hm/WXruZqoY1KVYeyRyYbM0 X-Google-Smtp-Source: AGHT+IHKPAncUbpuor/mQ762bj7bsjm38eNAq6lNfNIb7ZCOyepXvifqLDb74nxwCMlALfN6mHg7HA== X-Received: by 2002:adf:f4c2:0:b0:37d:4fe9:b6a7 with SMTP id ffacd0b85a97d-37efcf794bdmr2446724f8f.36.1729718442370; Wed, 23 Oct 2024 14:20:42 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a4ad97sm9769110f8f.41.2024.10.23.14.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:20:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Hemant Agrawal Cc: dpdk stable Subject: patch 'bus/dpaa: fix the fman details status' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:39 +0100 Message-ID: <20241023211704.1216956-59-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/9bc6a69f0ba53bfe6afdea505ed3e80dcd3cc1c6 Thanks. Luca Boccassi --- >From 9bc6a69f0ba53bfe6afdea505ed3e80dcd3cc1c6 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Tue, 1 Oct 2024 16:33:11 +0530 Subject: [PATCH] bus/dpaa: fix the fman details status [ upstream commit a87a1d0f4e7667fa3d6b818f30aa5c062e567597 ] Fix the incorrect placing of brackets to calculate stats. This corrects the "(a | b) << 32" to "a | (b << 32)" Fixes: e62a3f4183f1 ("bus/dpaa: fix statistics reading") Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/fman_hw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 24a99f7235..97e792806f 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -243,10 +243,11 @@ fman_if_stats_get_all(struct fman_if *p, uint64_t *value, int n) int i; uint64_t base_offset = offsetof(struct memac_regs, reoct_l); - for (i = 0; i < n; i++) - value[i] = (((u64)in_be32((char *)regs + base_offset + 8 * i) | - (u64)in_be32((char *)regs + base_offset + - 8 * i + 4)) << 32); + for (i = 0; i < n; i++) { + uint64_t a = in_be32((char *)regs + base_offset + 8 * i); + uint64_t b = in_be32((char *)regs + base_offset + 8 * i + 4); + value[i] = a | b << 32; + } } void -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.753258713 +0100 +++ 0059-bus-dpaa-fix-the-fman-details-status.patch 2024-10-23 22:16:40.519943519 +0100 @@ -1 +1 @@ -From a87a1d0f4e7667fa3d6b818f30aa5c062e567597 Mon Sep 17 00:00:00 2001 +From 9bc6a69f0ba53bfe6afdea505ed3e80dcd3cc1c6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a87a1d0f4e7667fa3d6b818f30aa5c062e567597 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org