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 8377BA0350 for ; Mon, 21 Feb 2022 16:39:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7AD51410E0; Mon, 21 Feb 2022 16:39:20 +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 9A4B040E5A for ; Mon, 21 Feb 2022 16:39:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457958; 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=b/b8o6Khtqf/ayZ7Vzkkmj62+hWbnH3Agckj+9YMpIw=; b=GgcrxgBRuJ6/iImOS5NPp4F3kV5snElLz/AnjX/KEgfAmdLnHAQXRnQxWM7FtujVxtXG6v D2Cw5Uds+W75tFWfS9vgqGCwsHBmPr2W5JcBQ4cFzdJW3Vy9yqd3FYCC8Jt4vmQGK3q2yt eIXPL2kDqQnuSCETqoI+mpWQh9fpB6o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-wQhtGY3zOcOHNW6KTzKxSA-1; Mon, 21 Feb 2022 10:39:14 -0500 X-MC-Unique: wQhtGY3zOcOHNW6KTzKxSA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0D1C8143EA; Mon, 21 Feb 2022 15:39:13 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC37478DDE; Mon, 21 Feb 2022 15:39:12 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Satha Rao , dpdk stable Subject: patch 'common/cnxk: fix shift offset for TL3 length disable' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:31 +0000 Message-Id: <20220221153625.152324-82-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/26/22. 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/5deff57b9dcc77f043ef1b784be3b0d5b83de954 Thanks. Kevin --- >From 5deff57b9dcc77f043ef1b784be3b0d5b83de954 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Fri, 21 Jan 2022 17:34:15 +0530 Subject: [PATCH] common/cnxk: fix shift offset for TL3 length disable [ upstream commit 132dac7536e9bb2be9d9edabc1752dca7b25279a ] Fix shift offset for length disable flag in NIXX_AF_TL3X_SHAPE register to be 24 instead of zero similar to other level SHAPE registers. Also mask unused bits in adjust value. Fixes: 0885429c3028 ("common/cnxk: add NIX TM hierarchy enable/disable") Signed-off-by: Nithin Dabilpuram Signed-off-by: Satha Rao --- drivers/common/cnxk/roc_nix_tm_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_nix_tm_utils.c b/drivers/common/cnxk/roc_nix_tm_utils.c index 543adf9e56..9e80c2a5fe 100644 --- a/drivers/common/cnxk/roc_nix_tm_utils.c +++ b/drivers/common/cnxk/roc_nix_tm_utils.c @@ -643,4 +643,5 @@ nix_tm_shaper_reg_prep(struct nix_tm_node *node, adjust = profile->pkt_len_adj; + adjust &= 0x1FF; plt_tm_dbg("Shaper config node %s(%u) lvl %u id %u, " "pir %" PRIu64 "(%" PRIu64 "B)," @@ -709,5 +710,5 @@ nix_tm_shaper_reg_prep(struct nix_tm_node *node, reg[k] = NIX_AF_TL3X_SHAPE(schq); regval[k] = (adjust | (uint64_t)node->red_algo << 9 | - (uint64_t)node->pkt_mode); + (uint64_t)node->pkt_mode << 24); k++; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.417349619 +0000 +++ 0082-common-cnxk-fix-shift-offset-for-TL3-length-disable.patch 2022-02-21 15:22:44.173704310 +0000 @@ -1 +1 @@ -From 132dac7536e9bb2be9d9edabc1752dca7b25279a Mon Sep 17 00:00:00 2001 +From 5deff57b9dcc77f043ef1b784be3b0d5b83de954 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 132dac7536e9bb2be9d9edabc1752dca7b25279a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org