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 1BF4BA04DD for ; Wed, 28 Oct 2020 11:50:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1460EC9C0; Wed, 28 Oct 2020 11:50:33 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id B182A2C2A for ; Wed, 28 Oct 2020 11:50:30 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id n6so5108419wrm.13 for ; Wed, 28 Oct 2020 03:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Eh0FjgHn9YEFbQkwTe0aJFa2HjBq5O/UMgeM0dLXvxI=; b=qemDWJqdzjv8U6jWDksqMdaR4PvF/Rx2+Wer5U69NQVnSfaE9L8ZeFcuBARnzwX+Ip 5eX5X+Y1IFy5KjiaZJjpq7/uCI9Kav47TE9Eh3re5bY9J35EclP5XBGiciZaNt1TT4g1 IgC+s9dCc5Eoj2Nrt86m8k3bslZV3bpsUW5lSwPsHdui7TUQ+OSrZkVS5Z/6xDvQl2g2 ZwbJVr5EtUdO++bZJMDcrH/J45h7og+TZnJEvYdrqW+QcGyYou5pj4ZoGHydH+/bhcI2 1aE2Yx7hFTlUZ91oMD0h+oclQbqNhVb99UnZYIuhFf9cMr0uIkKniRoyNYBvkET3pJ/Q ouNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Eh0FjgHn9YEFbQkwTe0aJFa2HjBq5O/UMgeM0dLXvxI=; b=cE0ueSm+sqEC8ZAO9ZTk2yYYTkHB+W25ZnSfi5aIvk/PHa62vpgNHqEcPH8Cc9ZJwN yEx9IPGT+2JgBDfFQJwGtindhW62jvHtbIXIdto7ONLKfTnW29nvoaiOOlXJ0s6kMRlZ vo9dyn1w3sHLbotaXynnyfL3lsg7jQPNbCWRdp2Sk/VZ2rlL0K45wz+B+xYRX2XnckVp feOq2f9OR2MGE05OCkjAeMc/VOPvFUpVS33eIWl27aHQs6XayIDtNq6KIOG23gmj+7hq ioWbqfGzmyNQYbz8fvWJWFRcxdFMOYhYcVulbOZO2S0X8oCXUSv5pcVXKu7W4deuDgY9 lQbQ== X-Gm-Message-State: AOAM530+wjDykHayPV6vQsKcS/IN2BgblIlLuNP5gKlKJXxRkHo4gzu5 LmoBt7IhbNzkpv1MzcdqHEQ= X-Google-Smtp-Source: ABdhPJySj9mXPbAUM7bTK9QFBTFwl48+2hpVfKFfstA4RnXCjysZ/R+uNXBwP/cKW1kNiNiyZ9GxLQ== X-Received: by 2002:adf:f482:: with SMTP id l2mr8080170wro.26.1603882230411; Wed, 28 Oct 2020 03:50:30 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u5sm7408009wru.63.2020.10.28.03.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:50:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Pavan Nikhilesh Cc: Jerin Jacob , dpdk stable Date: Wed, 28 Oct 2020 10:44:01 +0000 Message-Id: <20201028104606.3504127-82-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mempool/octeontx: fix aura to pool mapping' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 655f346a13320cfce7054b944f3a3efcea0c6c96 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 63f8fb3b50..e37b844842 100644 --- a/drivers/mempool/octeontx/octeontx_fpavf.c +++ b/drivers/mempool/octeontx/octeontx_fpavf.c @@ -267,7 +267,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, POOL_LTYPE(0x2) | POOL_STYPE(0) | POOL_SET_NAT_ALIGN | POOL_ENA; - cfg.aid = FPA_AURA_IDX(gpool); + cfg.aid = 0; cfg.pool_cfg = reg; cfg.pool_stack_base = phys_addr; cfg.pool_stack_end = phys_addr + memsz; @@ -353,7 +353,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) hdr.vfid = 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, sizeof(struct octeontx_mbox_fpa_cfg), @@ -382,7 +382,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index) goto err; } - cfg.aid = FPA_AURA_IDX(gpool_index); + cfg.aid = 0; hdr.coproc = FPA_COPROC; hdr.msg = FPA_DETACHAURA; hdr.vfid = gpool_index; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.320245699 +0000 +++ 0082-mempool-octeontx-fix-aura-to-pool-mapping.patch 2020-10-28 10:35:11.596831378 +0000 @@ -1,15 +1,16 @@ -From e1712291b1fe834612403a086bbe6078e96748fb Mon Sep 17 00:00:00 2001 +From 655f346a13320cfce7054b944f3a3efcea0c6c96 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") -Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh Acked-by: Jerin Jacob @@ -18,10 +19,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c -index 339da7824f..94dc5cd815 100644 +index 63f8fb3b50..e37b844842 100644 --- a/drivers/mempool/octeontx/octeontx_fpavf.c +++ b/drivers/mempool/octeontx/octeontx_fpavf.c -@@ -259,7 +259,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, +@@ -267,7 +267,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, POOL_LTYPE(0x2) | POOL_STYPE(0) | POOL_SET_NAT_ALIGN | POOL_ENA; @@ -30,7 +31,7 @@ cfg.pool_cfg = reg; cfg.pool_stack_base = phys_addr; cfg.pool_stack_end = phys_addr + memsz; -@@ -345,7 +345,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) +@@ -353,7 +353,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) hdr.vfid = gpool_index; hdr.res_code = 0; memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg)); @@ -39,7 +40,7 @@ ret = octeontx_mbox_send(&hdr, &cfg, sizeof(struct octeontx_mbox_fpa_cfg), -@@ -374,7 +374,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index) +@@ -382,7 +382,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index) goto err; }