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 E032446BAE for ; Fri, 18 Jul 2025 21:35:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7F3D40611; Fri, 18 Jul 2025 21:35:24 +0200 (CEST) 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 7B08C40B8F for ; Fri, 18 Jul 2025 21:35:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867323; 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=R3KQ9GZgcZpL5DgYY95gDt5qn8xnWn7dBfJNzvCtUcs=; b=XhOXIX9l2heaiPd6SWHj33GcthGvy2Mo0RH7T1egQezfGm3v5BYLx6urMWvv3OQ8lOmgFb +UEALoGwXHMMM5sBtv6gnPHrvx2JTfRz8wf3JjIT3X8Gqn1j5MmT7Pml/REpeC77YjGRmF Xx1l9aKxS0a8l5/gYYRoNzPmrOKN/BY= Received: from mx-prod-mc-02.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-639-ZtS9b3hnOp2caYEb0tyc8w-1; Fri, 18 Jul 2025 15:35:20 -0400 X-MC-Unique: ZtS9b3hnOp2caYEb0tyc8w-1 X-Mimecast-MFC-AGG-ID: ZtS9b3hnOp2caYEb0tyc8w_1752867319 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 26BE6195608F; Fri, 18 Jul 2025 19:35:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CDE4B18003FC; Fri, 18 Jul 2025 19:35:17 +0000 (UTC) From: Kevin Traynor To: Nawal Kishor Cc: dpdk stable Subject: patch 'common/cnxk: fix aura offset' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:03 +0100 Message-ID: <20250718193247.1008129-69-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-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: sMYZyD8jYImtuQUzwopxuciUobC2toAOVWOjRxFq2SU_1752867319 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.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 07/23/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/6cfc6ca79203f7e9fb61d0b111450b2ae9c8bf9a Thanks. Kevin --- >From 6cfc6ca79203f7e9fb61d0b111450b2ae9c8bf9a Mon Sep 17 00:00:00 2001 From: Nawal Kishor Date: Mon, 24 Mar 2025 12:05:25 +0530 Subject: [PATCH] common/cnxk: fix aura offset [ upstream commit 270cd2d12d55eb1dc7677344160dac44aca3030c ] Aura field width has reduced from 20 bits in cn10k/cn9k to 17 bits in cn20k. Adjust the setting of aura offset in NPA_LF_POOL_OP_INT register accordingly based on the platform. Fixes: 620fc02bf7eb ("common/cnxk: accommodate change in aura field width") Signed-off-by: Nawal Kishor --- drivers/common/cnxk/roc_npa_irq.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_npa_irq.c b/drivers/common/cnxk/roc_npa_irq.c index 0a19319ebf..3142a40c8c 100644 --- a/drivers/common/cnxk/roc_npa_irq.c +++ b/drivers/common/cnxk/roc_npa_irq.c @@ -105,12 +105,13 @@ npa_q_irq_get_and_clear(struct npa_lf *lf, uint32_t q, uint32_t off, uint64_t mask) { - uint64_t reg, wdata; + uint64_t reg, wdata, shift; uint8_t qint; - wdata = (uint64_t)q << 44; + shift = roc_model_is_cn20k() ? 47 : 44; + wdata = (uint64_t)q << shift; reg = roc_atomic64_add_nosync(wdata, (int64_t *)(lf->base + off)); if (reg & BIT_ULL(42) /* OP_ERR */) { - plt_err("Failed execute irq get off=0x%x", off); + plt_err("Failed execute irq get off=0x%x reg=0x%" PRIu64, off, reg); return 0; } -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.450970423 +0100 +++ 0069-common-cnxk-fix-aura-offset.patch 2025-07-18 20:29:10.968907447 +0100 @@ -1 +1 @@ -From 270cd2d12d55eb1dc7677344160dac44aca3030c Mon Sep 17 00:00:00 2001 +From 6cfc6ca79203f7e9fb61d0b111450b2ae9c8bf9a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 270cd2d12d55eb1dc7677344160dac44aca3030c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org