From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86050A04B1 for ; Thu, 5 Nov 2020 13:41:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BA49C818; Thu, 5 Nov 2020 13:41:25 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id BFD06C31B for ; Thu, 5 Nov 2020 13:41:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580083; 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=tAQcMrVN2ucC4Zt8Xe7PST4Yl7OrtjRtIKBRaua7bYk=; b=M2gDZdJ+mtejb4RkSpYxxYAy96+gArOsBtFzBYMjseWO3pGqlhLc7tlTaKhuAvXzRFP0qp yM8Jl7lwIvSUC+mwFzgOWZSgCQ5PGd2yrRoaQkptKojEZiFz/uMNbZX5R/13wWOxZ+cAjf R2bWevJfPK9OPxLGwSM2dCTk10hKJTE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-ZOJh-KW7OdmFZw21__OKXw-1; Thu, 05 Nov 2020 07:41:20 -0500 X-MC-Unique: ZOJh-KW7OdmFZw21__OKXw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 17E08186DD2F; Thu, 5 Nov 2020 12:41:19 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C8C95C3E1; Thu, 5 Nov 2020 12:41:17 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: Jerin Jacob , dpdk stable Date: Thu, 5 Nov 2020 12:39:35 +0000 Message-Id: <20201105124015.306404-28-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a5017329fdc4d0caea9eebdddb252c101d649405 Thanks. Kevin. --- >From a5017329fdc4d0caea9eebdddb252c101d649405 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Wed, 29 Jul 2020 00:13:45 +0530 Subject: [PATCH] mempool/octeontx: fix aura to pool mapping [ upstream commit e1712291b1fe834612403a086bbe6078e96748fb ] When sending commands to Kernel FPA PF driver, it expects the aura to be in the range of 0 to 16 for a given FPA pool. In OCTEON TX we map a pool,aura pair as single mempool handle, always set the aura id to 0 for a given FPA pool. Fixes: 179c7e893f64 ("mempool/octeontx: fix pool to aura mapping") Signed-off-by: Pavan Nikhilesh Acked-by: Jerin Jacob --- drivers/mempool/octeontx/octeontx_fpavf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c index 4cf387e8fb..435e173429 100644 --- a/drivers/mempool/octeontx/octeontx_fpavf.c +++ b/drivers/mempool/octeontx/octeontx_fpavf.c @@ -242,5 +242,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, POOL_ENA; - cfg.aid = FPA_AURA_IDX(gpool); + cfg.aid = 0; cfg.pool_cfg = reg; cfg.pool_stack_base = phys_addr; @@ -326,5 +326,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) hdr.res_code = 0; memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg)); - cfg.aid = FPA_AURA_IDX(gpool_index); + cfg.aid = 0; ret = octeontx_mbox_send(&hdr, &cfg, @@ -355,5 +355,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index) } - cfg.aid = FPA_AURA_IDX(gpool_index); + cfg.aid = 0; hdr.coproc = FPA_COPROC; hdr.msg = FPA_DETACHAURA; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.788657899 +0000 +++ 0028-mempool-octeontx-fix-aura-to-pool-mapping.patch 2020-11-05 12:38:54.208895995 +0000 @@ -1 +1 @@ -From e1712291b1fe834612403a086bbe6078e96748fb Mon Sep 17 00:00:00 2001 +From a5017329fdc4d0caea9eebdddb252c101d649405 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e1712291b1fe834612403a086bbe6078e96748fb ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 339da7824f..94dc5cd815 100644 +index 4cf387e8fb..435e173429 100644 @@ -24 +25 @@ -@@ -260,5 +260,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, +@@ -242,5 +242,5 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, @@ -31 +32 @@ -@@ -346,5 +346,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) +@@ -326,5 +326,5 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) @@ -38 +39 @@ -@@ -375,5 +375,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index) +@@ -355,5 +355,5 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)