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 64C7145DB9 for ; Wed, 27 Nov 2024 18:21:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 611144066C; Wed, 27 Nov 2024 18:21:30 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7D24F402DE for ; Wed, 27 Nov 2024 18:21:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728087; 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=fHDWNoiAbvVoYnRIhbMoUkZR+Se75JWcRi/7Bx+N7ro=; b=fzo+wcuq6GMne2HUZkERbeomveR9mwa9OU+G261ES8kaJUA5xx/Tz5kWrYT7IA+nWOa5jq w4hfLsQUVTmCVOXSYM5zjdvIv5ej0iGhnZf7YZIXfz23E5yvU+V4VwZd10PDXHWY3PllMg NgANwE8/44vsuPjDptJov7fsw2rTZWI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-4zClNhOaPTCOiWnwtekVjw-1; Wed, 27 Nov 2024 12:21:23 -0500 X-MC-Unique: 4zClNhOaPTCOiWnwtekVjw-1 X-Mimecast-MFC-AGG-ID: 4zClNhOaPTCOiWnwtekVjw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DF1AF1955F3C; Wed, 27 Nov 2024 17:21:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A0C61300019E; Wed, 27 Nov 2024 17:21:21 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: dpdk stable Subject: patch 'bus/dpaa: fix the fman details status' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:59 +0000 Message-ID: <20241127171916.690404-52-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YzZu5LgoDlIgGPlGaYy0q_GMWQvBSSSwSExWFMHJIao_1732728083 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e1428e750e8cdc9401ce4c2cdac5c9e52d73ee9b Thanks. Kevin --- >From e1428e750e8cdc9401ce4c2cdac5c9e52d73ee9b 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 af9bac76c2..1559d3c4a2 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -244,8 +244,9 @@ fman_if_stats_get_all(struct fman_if *p, uint64_t *value, int n) 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; + } } -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.909127518 +0000 +++ 0052-bus-dpaa-fix-the-fman-details-status.patch 2024-11-27 17:17:38.226269378 +0000 @@ -1 +1 @@ -From a87a1d0f4e7667fa3d6b818f30aa5c062e567597 Mon Sep 17 00:00:00 2001 +From e1428e750e8cdc9401ce4c2cdac5c9e52d73ee9b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a87a1d0f4e7667fa3d6b818f30aa5c062e567597 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 24a99f7235..97e792806f 100644 +index af9bac76c2..1559d3c4a2 100644