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 8E200A0032 for ; Fri, 24 Jun 2022 17:02:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8888240E2D; Fri, 24 Jun 2022 17:02:31 +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 31A2A4069D for ; Fri, 24 Jun 2022 17:02:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082948; 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=CMAnalb92Y6oMicJ5sPz50z87wpKurS/Tvb+JqYGvu4=; b=Y4ARKhM4wPAwRkxsNUr6MHiydgqPrhtYG1FDS4uDWw0f8rswN1Q1gWoDy+bA94aEIcaAYH 1jxUwOm7/T+iHipV3bHSTbyOkn66+TDbwEy80kbCn3O5Dz+y67+Pl9FoNOeJOT6NSIkdea GWRJ7nz/mSOAjHJgF04Ht/6GWu/ob/Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-39-T1T0QtzzMpSU8raHq1ptQQ-1; Fri, 24 Jun 2022 11:02:25 -0400 X-MC-Unique: T1T0QtzzMpSU8raHq1ptQQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 63A75811E75; Fri, 24 Jun 2022 15:02:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4EC110725; Fri, 24 Jun 2022 15:02:24 +0000 (UTC) From: Kevin Traynor To: Shijith Thotton Cc: dpdk stable Subject: patch 'event/cnxk: fix QoS parameter handling' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:28 +0100 Message-Id: <20220624150148.1855580-20-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/93b1138ccde149c0bfab0b0bbb806cd7b416cb08 Thanks. Kevin --- >From 93b1138ccde149c0bfab0b0bbb806cd7b416cb08 Mon Sep 17 00:00:00 2001 From: Shijith Thotton Date: Fri, 20 May 2022 12:41:05 +0530 Subject: [PATCH] event/cnxk: fix QoS parameter handling [ upstream commit 448e2400fa8a2dd6169b6cb40a98b18d4e28fca9 ] Fixed QoS parameters getting over written and IAQ/TAQ threshold calculation. Fixes: 910da32c53a9 ("event/cnxk: add device start") Signed-off-by: Shijith Thotton --- drivers/common/cnxk/roc_sso.c | 4 ++-- drivers/event/cnxk/cnxk_eventdev.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/common/cnxk/roc_sso.c b/drivers/common/cnxk/roc_sso.c index 45ff16ca0e..ede0a8a3bb 100644 --- a/drivers/common/cnxk/roc_sso.c +++ b/drivers/common/cnxk/roc_sso.c @@ -379,8 +379,8 @@ roc_sso_hwgrp_qos_config(struct roc_sso *roc_sso, struct roc_sso_hwgrp_qos *qos, req->grp = qos[i].hwgrp; req->xaq_limit = (nb_xaq * (xaq_prcnt ? xaq_prcnt : 100)) / 100; - req->taq_thr = (SSO_HWGRP_IAQ_MAX_THR_MASK * + req->iaq_thr = (SSO_HWGRP_IAQ_MAX_THR_MASK * (iaq_prcnt ? iaq_prcnt : 100)) / 100; - req->iaq_thr = (SSO_HWGRP_TAQ_MAX_THR_MASK * + req->taq_thr = (SSO_HWGRP_TAQ_MAX_THR_MASK * (taq_prcnt ? taq_prcnt : 100)) / 100; diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 6ad4e23e2b..46a788ef4e 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -418,8 +418,8 @@ cnxk_sso_start(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn, plt_sso_dbg(); for (i = 0; i < dev->qos_queue_cnt; i++) { - qos->hwgrp = dev->qos_parse_data[i].queue; - qos->iaq_prcnt = dev->qos_parse_data[i].iaq_prcnt; - qos->taq_prcnt = dev->qos_parse_data[i].taq_prcnt; - qos->xaq_prcnt = dev->qos_parse_data[i].xaq_prcnt; + qos[i].hwgrp = dev->qos_parse_data[i].queue; + qos[i].iaq_prcnt = dev->qos_parse_data[i].iaq_prcnt; + qos[i].taq_prcnt = dev->qos_parse_data[i].taq_prcnt; + qos[i].xaq_prcnt = dev->qos_parse_data[i].xaq_prcnt; } rc = roc_sso_hwgrp_qos_config(&dev->sso, qos, dev->qos_queue_cnt, -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.626865145 +0100 +++ 0025-event-cnxk-fix-QoS-parameter-handling.patch 2022-06-24 15:51:08.892984138 +0100 @@ -1 +1 @@ -From 448e2400fa8a2dd6169b6cb40a98b18d4e28fca9 Mon Sep 17 00:00:00 2001 +From 93b1138ccde149c0bfab0b0bbb806cd7b416cb08 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 448e2400fa8a2dd6169b6cb40a98b18d4e28fca9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d986abe573..7c86474809 100644 +index 45ff16ca0e..ede0a8a3bb 100644 @@ -22 +23 @@ -@@ -407,8 +407,8 @@ roc_sso_hwgrp_qos_config(struct roc_sso *roc_sso, struct roc_sso_hwgrp_qos *qos, +@@ -379,8 +379,8 @@ roc_sso_hwgrp_qos_config(struct roc_sso *roc_sso, struct roc_sso_hwgrp_qos *qos, @@ -34 +35 @@ -index a9e4201ed8..97dcf7b66e 100644 +index 6ad4e23e2b..46a788ef4e 100644 @@ -37 +38 @@ -@@ -541,8 +541,8 @@ cnxk_sso_start(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn, +@@ -418,8 +418,8 @@ cnxk_sso_start(struct rte_eventdev *event_dev, cnxk_sso_hws_reset_t reset_fn,