Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42064/?format=api
{ "id": 42064, "url": "http://patches.dpdk.org/api/patches/42064/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180702062932.1548-1-pbhagavatula@caviumnetworks.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180702062932.1548-1-pbhagavatula@caviumnetworks.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180702062932.1548-1-pbhagavatula@caviumnetworks.com", "date": "2018-07-02T06:29:32", "name": "[v2] mempool/octeontx: fix pool to aura mapping", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8ab2c896c79184d8a8285de7f4a32f81ef303be4", "submitter": { "id": 768, "url": "http://patches.dpdk.org/api/people/768/?format=api", "name": "Pavan Nikhilesh", "email": "pbhagavatula@caviumnetworks.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180702062932.1548-1-pbhagavatula@caviumnetworks.com/mbox/", "series": [ { "id": 346, "url": "http://patches.dpdk.org/api/series/346/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=346", "date": "2018-07-02T06:29:32", "name": "[v2] mempool/octeontx: fix pool to aura mapping", "version": 2, "mbox": "http://patches.dpdk.org/series/346/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42064/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/42064/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 530D7374E;\n\tMon, 2 Jul 2018 08:30:10 +0200 (CEST)", "from NAM01-SN1-obe.outbound.protection.outlook.com\n\t(mail-sn1nam01on0040.outbound.protection.outlook.com [104.47.32.40])\n\tby dpdk.org (Postfix) with ESMTP id 95ECD1C01;\n\tMon, 2 Jul 2018 08:30:08 +0200 (CEST)", "from localhost.localdomain (111.93.218.67) by\n\tCY4PR07MB3462.namprd07.prod.outlook.com (2603:10b6:910:75::15) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.906.24; Mon, 2 Jul 2018 06:30:05 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=X72ww/BbY9nqdbFOHIo3fn/9reefxZcJQPgpViEeblU=;\n\tb=eVg8NF19PHfc6+oQ6eP6AoFmQSZBFBpQndwEL8Mjv23RnK/iX1cq4g8wGsYgHmH4Doe76iubLANpsjckv9aaKwzsUhE1/XUnPOq4sIkJZ04X/poJFL/vSM/OoJDKQURrmQjP0O+vQcyy5qQFaMVrDKR2VLmGQQt7Ll3wYmC038Y=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=Pavan.Bhagavatula@cavium.com; ", "From": "Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>", "To": "jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com,\n\tolivier.matz@6wind.com", "Cc": "dev@dpdk.org, stable@dpdk.org,\n\tPavan Nikhilesh <pbhagavatula@caviumnetworks.com>", "Date": "Mon, 2 Jul 2018 11:59:32 +0530", "Message-Id": "<20180702062932.1548-1-pbhagavatula@caviumnetworks.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<20180627114736.29484-1-pbhagavatula@caviumnetworks.com>", "References": "<20180627114736.29484-1-pbhagavatula@caviumnetworks.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[111.93.218.67]", "X-ClientProxiedBy": "MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:a00:1::27) To CY4PR07MB3462.namprd07.prod.outlook.com\n\t(2603:10b6:910:75::15)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "e9cfc7d8-7339-4ab9-0eb9-08d5dfe540cd", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989117)(5600053)(711020)(2017052603328)(7153060)(7193020);\n\tSRVR:CY4PR07MB3462; ", "X-Microsoft-Exchange-Diagnostics": [ "1; CY4PR07MB3462;\n\t3:D7UI9bomRbebSA+7XqXjV1yDwyqgVTXf16ro4mD5hU1FbJJ7xK/xcUBG6IhmQlE+d3JY5bOU3m/XHcLG8Idu+I59mqW6/gpWHbJGZ1lra1cOXGrIDQQYzmmMvFDpoNyEbPbk/jNy4PAmjTqQdPQSuU+yqFvDlz+srtUdcCjvpjlLXM+bmsfasaMsi/QPBFN0IGMSW9XNAVjcJDsPH/ByZYqtVoRKzwD8bcpIMBZa19CwFT8tvz9zRBZBWfn7iQgk;\n\t25:YbQwKIbG+RvXVHDBlIyRD97d22G2GsoY66loqn0MaF5/ef+KNCj0wcOo3/LyS8EJBw5PxTOKyadqmU9yRgR1nhEYDhVNGYWOKHEolPtY0dKM0V1O29C3it/u4Z6fJhGTLxQBnaQoqMrY3xKygnAjpu1SbU9Dm9X+MWxWH38c4XhRtT3yPc5XFPEc/lU3fVA66V39z1BgH9LeOLNxRXJF+HAGq6r2CZVuQYEuvGclxYa/nxTezb4cipFk8TDymOQ9o3Ob6r6v2uKGcMqNSUof5Wl4eqr4YyPU/lLZn8TOYBE5/xPQNlmektAaGEVxR8+CsJxlWWl4jPmaVSGNdzDOBg==;\n\t31:GZtRcVxTxARyiQnK6/NY3hkquNDw9R4kchdkxDphNm7y2xDuNUOlkWJY7fsErPtAYl6/CVdvBEoqvTFQTsii2Zpb7yZJ27pXlD5uhW4QcaLsWlCyrcfBYXm/CQkEb+n1qhk73nn7It357z1kCCSezqYohxKLBSQj4jeQa1z0PX54GcbN5LP13AjuH6P193Tv2rtWrT+pE8/rCBmJv5XuP4Eq7CfDo1tWhH41ZZeO5BM=", "1; CY4PR07MB3462;\n\t20:Qsg+tuMdFhh6iKLwk7aTiVcYbGEoYNLoCJ9XmvVtOg8isM3kdaJ1ZCVnemULImOzJRoen2PFxwRujqi5EUK/wC9vb4R2Jve3hrr6HwcE5GesD3YqEuRQxSqh0a+J21sX49b7/Moi8zNoPeREDuHEPVYbVMr4QjuhKjobXCtbOlGYMXi0KGV2Z/6jrlY9ug+QDbWFgV3E5x/ilMp95jkeNOvRw6GVmTdGO/i3V6kqD9KnL7kNqGKW2GfNuR3e4/yfZoqQ+IpDytGXw8jPJjQoAL4k2TCLutFuYGbWM8uuEhizV3+p9C+OFHnp4r6Lyf9lfkWjJKIQaee9tXV4a2DlQU+PfyHBnFL+CQheRi+9DfHgXcwzQx2F7H/Y2G+Q80wXZITr/gdlROJsPLBLuKaXN/qh7RpHka2fumjntPapVnUzH936Jcpz711VDfSHeR9WaqW8oJzvZ+sSc+wnwE6eByqgXQhlyWA8wMZf/XpF7ye1mmhSHfN8uKRIIJB512C7YwSFv4fp+bujPQivKYWf11hb4H/sXCMc9dRE5mLKuBfJoLS3q31LhJbqaIssu6CZfBVSkwls4AoHJLmQ/ucDSkWISxczToqYstHqbDCO1BU=;\n\t4:OykN99yu0rgcbBbVZzSwCDAGXV3LYgzhGNHRFfFuhCyrh+3ysknW2sfXlqUX1XhUZoYKBFV+7GmraL1FZbSbxz+vtIID9SvLVVygKFXqywUbAP8YWmyT94JdzzqMU2YVtDauiqFDw/yiZc6A2J27RC/t9J1OZGfsJFWRgbC8u1WE16tjqFXcvvMXZKAcqCih4VdQ4hRKtcpJ6isa7a8MHhihS5OA2N+/Y3codtH90ECLIB9Qt7hTQ2YbIrPcq7Jo8Kyno2Kp1GbiPRtJ6wVhsg==", "=?us-ascii?Q?1; CY4PR07MB3462;\n\t23:Lh9W8xZeSav33zy8NrcBd9q8vDuWwVGwvRyPJoxB3?=\n\tReKyiUS6szRqdL8ioQX/NvugLMtHwOIiOuCiykKH0Ydf8hdJY7R0NY8kV3po1r9o0+Gk4AQq3hiYo/svaAv/SW2bkSqkmBc/qKTB/h4vN7v2P7jNnnHfIMnjylULGhM1XcDRCuVj/MA+6ICfnfqvXBnJGgDonRskd7O9s7TDWvQby4Zb65dGa5HvooJsD1JPm6yrXdQmjzV0IYugVcgO4eTw82D2+VUQjZiqZ04PrBtRe/ymx8I8RMRek7Uw5QBG9Ln/LdPjSzYM1eVMrHzgaFgJW507dRUzgf42KeEW6F3QLRh2V5m14qVmE8QnVjqnhdb8Gqs3HE4M23EEht++Aj24LUhZvTwtkP+I5L3cFl+mElgbghmMSMLx0erP0V9JDBsHGYMc4xa1tDThNy8R5nyeuMRfxgGGyBFvlTdnXcJcb3S+Ytpnin9mvEeeDE+Rp928h2zKQaaGa/6B9Gz5fkhCEpMl84aa8PaRRs+jSr8beiwwoDMbP73/Z2d03ObJANWyayWGNeXAU6vDB+uuNlei0GuIFwgOgqlYrawr6JYtpoBoEEeoxsL0i07/u8Wd1jxrJN++AiOJKcq8vaUumhxoOhhekKPhuQ6nhPTnIsmUtYY2Lqc4UEyThq9fzgO9Fk6tmNa2ylDnkTU3kGjdkQXTFhIsF3dNRFs9lSZYdwhTIigJzNGEPZikGa3h4D8BxFkhnnWvBsWKFk517pAtB+cC5o42F9A64Zvn+W5Q59ch03fR7OJTdYTDqdrW37lBSDRvNaLyrWxGhSiLsFuIFpEZSDYGlQ+ojBMa5UpBK3gteKN0tBgzQSqLBy5JmTU4MLiCTGk7ZvRHwfQCHws8e+KpBJt/W3V9DFQQOAk6dUo8c9H/G8gC49m1dyKyUNw2CvouMo5JcHZqo89bNW0ESwpqaKyOPyPndReOOEwyPNgU1M0xGXTkq/UHOnbiJX7X43UxkoqlVbHVXx4VMbrGL+5aDgVnHNTWV3aYcYGMTU5+XWWEh32lRyErJ0ux2yFqLkiXdcJamDXLBDGMJl30vBTcekdXuoBacnlMfAT7cSJpraN3JC3LbO/EzI6w6UP/hbnF8YFOL/14XZlvV47dpYNCkdjToqCo+0OewgLxMEK3jEnIUnfEcxHCnCmLsMixrhCPsodvTeOWQGhwp2r6UBdA4klHF/1HE+N7X9T38alhVsRjZYwHSyy+uBVd+SouZMuartLVezRnmb0FAUYMdx6VScx/P3BiL3Jq5Y697u7TCCG86svDdBvGviI6kvuLYrqOThr+Rbbxakd6a5MoG75", "1; CY4PR07MB3462;\n\t6:j9uCCvUPXRjtfjprAUeZRRPMRwMaChUqyLjnYt9KnYOtajLLaceWX3T+NWxXm1WjtJZ8nXhNhB7dg+ZbExMgaZq4+WiJszDwaApYbAM48NErLDAi+LLpzLMDa/VQimwHYyz1tBQwvfXzfhQUZFq1i/qneKmkHl+q69ca0+kpe+keh51fHnPAnvY3R8R9L26QuY+54e36Bipr72GxfUXKCRactjuTzwtzpKu06nQdCkOFZmy2Ym2pF3Sf7ArtbAG+MmI/yuHlckh11vA9qZqVz6ejNVorZiIjpOzVfAPxJZCCKIh7RWlAP9ODBDXjdxxwrl47ZGfnmtnC7fiPhMgsV6yKFatp+oJEzH2Stg8tl10H3Hnn2FreAOB5cQQmhtDtHFwuvJBZ2Yp28k9OsRE1kJPHOQCwC0xChQcviWfCp/vdNbwgK5nXKo22bbIOwh6+Vv78Tf8z3Y5RQNuoTKCGXg==;\n\t5:pkrlvx6WOy5QBy0fDl+bjtIeJQcFl4UiYb6Ihtb8NBSdfHQToOgQRtJlnU/R2VKZ/M7+x6fIzV0fBprFvoOCWpe3z4sYUn8inDHS1JuMpGLvOHchfFlNfNo8uJ7C2zSAfB3o+N6vUB9soV3/CULoVHEQSscBphGyoxQfHjyahDU=;\n\t24:925/7k0keYMpXic+MgZjHyHgJ/mGZBpwmgMvVJz464ba9rpiaH29Y8/IvA9ln7uY5sXhTQ58dMqzF8T7mEdOjY261MCVPQTnOurpvE1cMow=", "1; CY4PR07MB3462;\n\t7:Au3fegjGf6KIN4qVwozLwT5nP9uzy9xDxsoUX1++q9MblofvP8T4CfnV7v3dapwJUwRtofx+UgiA7omSG8IZKiAA2jYBYYiyP9NtXDQpnTDvVGtRqWobLvhqUjB0nzFkBBMGk87HCjXJdKarnQDQ+FozNgM0eFbqzQLkyyUXQ2cBqWPSkEeRoV58bu06s1gKGyXZMD2nTQE1xYe9fBmU2J2qtanpBqhDxGRxB/HarPTwrIi78WE60VMcj8DGRVAu" ], "X-MS-TrafficTypeDiagnostic": "CY4PR07MB3462:", "X-Microsoft-Antispam-PRVS": "<CY4PR07MB34623C8A2FFA79EABFC9F36180430@CY4PR07MB3462.namprd07.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:;", "X-MS-Exchange-SenderADCheck": "1", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016);\n\tSRVR:CY4PR07MB3462; BCL:0; PCL:0; RULEID:; SRVR:CY4PR07MB3462; ", "X-Forefront-PRVS": "07215D0470", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(6069001)(376002)(366004)(346002)(136003)(39850400004)(396003)(189003)(199004)(316002)(6486002)(36756003)(16586007)(106356001)(6666003)(14444005)(42882007)(5024004)(53936002)(107886003)(105586002)(4326008)(2906002)(1857600001)(16526019)(6512007)(5660300001)(97736004)(305945005)(48376002)(50466002)(8936002)(72206003)(8676002)(7736002)(476003)(486006)(956004)(2616005)(446003)(11346002)(50226002)(47776003)(66066001)(6116002)(3846002)(81156014)(1076002)(81166006)(76176011)(52116002)(51416003)(6506007)(386003)(26005)(25786009)(68736007)(478600001)(5009440100003)(42262002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3462; H:localhost.localdomain;\n\tFPR:; \n\tSPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; ", "Received-SPF": "None (protection.outlook.com: cavium.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "S4rmP/JhxCgDrz9MlDWBU1VRg+CMEgSXguArRkoBai1XSlPB+MUt6gAWQ8S8ogmG87/uxxacUex7W3SzrW+P77jgt4HwSqduCrbmtJ4vWW0o60dSg9s73xxuaKdktZohD6abnFETpJlNphLVi5ms3ASuRc6xRRlWVn3vcGrhXTfJaphxiKXKYiQXEaJ7/EqiBGS7pgdfEY1GLFrSZMwXzQnQPe210FtHt9GssBtL6HH0eTCk1Rr/mKrcoV9ovHt+MfHdNs6z+mNvFqVE45lLVbiPVCyK2lFsiqTNQfzWSX5JHdvigFJa9bGO+6Hr2UBoIhrUu4djZsnYFDHXazcxzooAF0rcC0z9NU4UD0S+Nj8=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "caviumnetworks.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "02 Jul 2018 06:30:05.0134\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "e9cfc7d8-7339-4ab9-0eb9-08d5dfe540cd", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "711e4ccf-2e9b-4bcf-a551-4094005b6194", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CY4PR07MB3462", "Subject": "[dpdk-dev] [PATCH v2] mempool/octeontx: fix pool to aura mapping", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "HW needs each pool to be mapped to an aura set of 16 auras.\nPreviously, pool to aura mapping was considered to be 1:1.\n\nFixes: 02fd6c744350 (\"mempool/octeontx: support allocation\")\nCc: stable@dpdk.org\n\nSigned-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>\nAcked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>\n---\n v2 Changes:\n - use macro to avoid code duplication (Santosh).\n - use uint16_t for gaura id.\n\n drivers/event/octeontx/timvf_evdev.c | 2 +-\n drivers/mempool/octeontx/octeontx_fpavf.c | 45 ++++++++++++++---------\n drivers/mempool/octeontx/octeontx_fpavf.h | 9 +++++\n drivers/net/octeontx/octeontx_ethdev.c | 6 +--\n drivers/net/octeontx/octeontx_rxtx.c | 2 +-\n 5 files changed, 42 insertions(+), 22 deletions(-)\n\n--\n2.18.0", "diff": "diff --git a/drivers/event/octeontx/timvf_evdev.c b/drivers/event/octeontx/timvf_evdev.c\nindex c4fbd2d86..8a045c250 100644\n--- a/drivers/event/octeontx/timvf_evdev.c\n+++ b/drivers/event/octeontx/timvf_evdev.c\n@@ -174,7 +174,7 @@ timvf_ring_start(const struct rte_event_timer_adapter *adptr)\n \tif (use_fpa) {\n \t\tpool = (uintptr_t)((struct rte_mempool *)\n \t\t\t\ttimr->chunk_pool)->pool_id;\n-\t\tret = octeontx_fpa_bufpool_gpool(pool);\n+\t\tret = octeontx_fpa_bufpool_gaura(pool);\n \t\tif (ret < 0) {\n \t\t\ttimvf_log_dbg(\"Unable to get gaura id\");\n \t\t\tret = -ENOMEM;\ndiff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c\nindex 7aecaa85d..e5918c866 100644\n--- a/drivers/mempool/octeontx/octeontx_fpavf.c\n+++ b/drivers/mempool/octeontx/octeontx_fpavf.c\n@@ -243,7 +243,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,\n \t\tPOOL_LTYPE(0x2) | POOL_STYPE(0) | POOL_SET_NAT_ALIGN |\n \t\tPOOL_ENA;\n\n-\tcfg.aid = 0;\n+\tcfg.aid = FPA_AURA_IDX(gpool);\n \tcfg.pool_cfg = reg;\n \tcfg.pool_stack_base = phys_addr;\n \tcfg.pool_stack_end = phys_addr + memsz;\n@@ -327,7 +327,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)\n \thdr.vfid = gpool_index;\n \thdr.res_code = 0;\n \tmemset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg));\n-\tcfg.aid = gpool_index; /* gpool is guara */\n+\tcfg.aid = gpool_index << FPA_GAURA_SHIFT;\n\n \tret = octeontx_mbox_send(&hdr, &cfg,\n \t\t\t\t\tsizeof(struct octeontx_mbox_fpa_cfg),\n@@ -335,7 +335,8 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)\n \tif (ret < 0) {\n \t\tfpavf_log_err(\"Could not attach fpa \");\n \t\tfpavf_log_err(\"aura %d to pool %d. Err=%d. FuncErr=%d\\n\",\n-\t\t\t gpool_index, gpool_index, ret, hdr.res_code);\n+\t\t\t gpool_index << FPA_GAURA_SHIFT, gpool_index, ret,\n+\t\t\t hdr.res_code);\n \t\tret = -EACCES;\n \t\tgoto err;\n \t}\n@@ -355,14 +356,15 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)\n \t\tgoto err;\n \t}\n\n-\tcfg.aid = gpool_index; /* gpool is gaura */\n+\tcfg.aid = gpool_index << FPA_GAURA_SHIFT;\n \thdr.coproc = FPA_COPROC;\n \thdr.msg = FPA_DETACHAURA;\n \thdr.vfid = gpool_index;\n \tret = octeontx_mbox_send(&hdr, &cfg, sizeof(cfg), NULL, 0);\n \tif (ret < 0) {\n \t\tfpavf_log_err(\"Couldn't detach FPA aura %d Err=%d FuncErr=%d\\n\",\n-\t\t\t gpool_index, ret, hdr.res_code);\n+\t\t\t gpool_index << FPA_GAURA_SHIFT, ret,\n+\t\t\t hdr.res_code);\n \t\tret = -EINVAL;\n \t}\n\n@@ -469,6 +471,7 @@ octeontx_fpa_bufpool_free_count(uintptr_t handle)\n {\n \tuint64_t cnt, limit, avail;\n \tuint8_t gpool;\n+\tuint16_t gaura;\n \tuintptr_t pool_bar;\n\n \tif (unlikely(!octeontx_fpa_handle_valid(handle)))\n@@ -476,14 +479,16 @@ octeontx_fpa_bufpool_free_count(uintptr_t handle)\n\n \t/* get the gpool */\n \tgpool = octeontx_fpa_bufpool_gpool(handle);\n+\t/* get the aura */\n+\tgaura = octeontx_fpa_bufpool_gaura(handle);\n\n \t/* Get pool bar address from handle */\n \tpool_bar = handle & ~(uint64_t)FPA_GPOOL_MASK;\n\n \tcnt = fpavf_read64((void *)((uintptr_t)pool_bar +\n-\t\t\t\tFPA_VF_VHAURA_CNT(gpool)));\n+\t\t\t\tFPA_VF_VHAURA_CNT(gaura)));\n \tlimit = fpavf_read64((void *)((uintptr_t)pool_bar +\n-\t\t\t\tFPA_VF_VHAURA_CNT_LIMIT(gpool)));\n+\t\t\t\tFPA_VF_VHAURA_CNT_LIMIT(gaura)));\n\n \tavail = fpavf_read64((void *)((uintptr_t)pool_bar +\n \t\t\t\tFPA_VF_VHPOOL_AVAILABLE(gpool)));\n@@ -496,6 +501,7 @@ octeontx_fpa_bufpool_create(unsigned int object_size, unsigned int object_count,\n \t\t\t\tunsigned int buf_offset, int node_id)\n {\n \tunsigned int gpool;\n+\tunsigned int gaura;\n \tuintptr_t gpool_handle;\n \tuintptr_t pool_bar;\n \tint res;\n@@ -545,16 +551,18 @@ octeontx_fpa_bufpool_create(unsigned int object_size, unsigned int object_count,\n \t\tgoto error_pool_destroy;\n \t}\n\n+\tgaura = FPA_AURA_IDX(gpool);\n+\n \t/* Release lock */\n \trte_spinlock_unlock(&fpadev.lock);\n\n \t/* populate AURA registers */\n \tfpavf_write64(object_count, (void *)((uintptr_t)pool_bar +\n-\t\t\t FPA_VF_VHAURA_CNT(gpool)));\n+\t\t\t FPA_VF_VHAURA_CNT(gaura)));\n \tfpavf_write64(object_count, (void *)((uintptr_t)pool_bar +\n-\t\t\t FPA_VF_VHAURA_CNT_LIMIT(gpool)));\n+\t\t\t FPA_VF_VHAURA_CNT_LIMIT(gaura)));\n \tfpavf_write64(object_count + 1, (void *)((uintptr_t)pool_bar +\n-\t\t\t FPA_VF_VHAURA_CNT_THRESHOLD(gpool)));\n+\t\t\t FPA_VF_VHAURA_CNT_THRESHOLD(gaura)));\n\n \tocteontx_fpapf_start_count(gpool);\n\n@@ -581,6 +589,7 @@ octeontx_fpa_bufpool_destroy(uintptr_t handle, int node_id)\n \tuint64_t sz;\n \tuint64_t cnt, avail;\n \tuint8_t gpool;\n+\tuint16_t gaura;\n \tuintptr_t pool_bar;\n \tint ret;\n\n@@ -594,13 +603,15 @@ octeontx_fpa_bufpool_destroy(uintptr_t handle, int node_id)\n\n \t/* get the pool */\n \tgpool = octeontx_fpa_bufpool_gpool(handle);\n+\t/* get the aura */\n+\tgaura = octeontx_fpa_bufpool_gaura(handle);\n\n \t/* Get pool bar address from handle */\n \tpool_bar = handle & ~(uint64_t)FPA_GPOOL_MASK;\n\n \t /* Check for no outstanding buffers */\n \tcnt = fpavf_read64((void *)((uintptr_t)pool_bar +\n-\t\t\t\t\tFPA_VF_VHAURA_CNT(gpool)));\n+\t\t\t\t\tFPA_VF_VHAURA_CNT(gaura)));\n \tif (cnt) {\n \t\tfpavf_log_dbg(\"buffer exist in pool cnt %\" PRId64 \"\\n\", cnt);\n \t\treturn -EBUSY;\n@@ -613,9 +624,9 @@ octeontx_fpa_bufpool_destroy(uintptr_t handle, int node_id)\n\n \t/* Prepare to empty the entire POOL */\n \tfpavf_write64(avail, (void *)((uintptr_t)pool_bar +\n-\t\t\t FPA_VF_VHAURA_CNT_LIMIT(gpool)));\n+\t\t\t FPA_VF_VHAURA_CNT_LIMIT(gaura)));\n \tfpavf_write64(avail + 1, (void *)((uintptr_t)pool_bar +\n-\t\t\t FPA_VF_VHAURA_CNT_THRESHOLD(gpool)));\n+\t\t\t FPA_VF_VHAURA_CNT_THRESHOLD(gaura)));\n\n \t/* Empty the pool */\n \t/* Invalidate the POOL */\n@@ -627,11 +638,11 @@ octeontx_fpa_bufpool_destroy(uintptr_t handle, int node_id)\n \t\t/* Yank a buffer from the pool */\n \t\tnode = (void *)(uintptr_t)\n \t\t\tfpavf_read64((void *)\n-\t\t\t\t (pool_bar + FPA_VF_VHAURA_OP_ALLOC(gpool)));\n+\t\t\t\t (pool_bar + FPA_VF_VHAURA_OP_ALLOC(gaura)));\n\n \t\tif (node == NULL) {\n \t\t\tfpavf_log_err(\"GAURA[%u] missing %\" PRIx64 \" buf\\n\",\n-\t\t\t\t gpool, avail);\n+\t\t\t\t gaura, avail);\n \t\t\tbreak;\n \t\t}\n\n@@ -665,9 +676,9 @@ octeontx_fpa_bufpool_destroy(uintptr_t handle, int node_id)\n\n \t/* Deactivate the AURA */\n \tfpavf_write64(0, (void *)((uintptr_t)pool_bar +\n-\t\t\tFPA_VF_VHAURA_CNT_LIMIT(gpool)));\n+\t\t\tFPA_VF_VHAURA_CNT_LIMIT(gaura)));\n \tfpavf_write64(0, (void *)((uintptr_t)pool_bar +\n-\t\t\tFPA_VF_VHAURA_CNT_THRESHOLD(gpool)));\n+\t\t\tFPA_VF_VHAURA_CNT_THRESHOLD(gaura)));\n\n \tret = octeontx_fpapf_aura_detach(gpool);\n \tif (ret) {\ndiff --git a/drivers/mempool/octeontx/octeontx_fpavf.h b/drivers/mempool/octeontx/octeontx_fpavf.h\nindex b76f40e75..b00be137a 100644\n--- a/drivers/mempool/octeontx/octeontx_fpavf.h\n+++ b/drivers/mempool/octeontx/octeontx_fpavf.h\n@@ -14,6 +14,7 @@\n\n #define\tFPA_VF_MAX\t\t\t32\n #define FPA_GPOOL_MASK\t\t\t(FPA_VF_MAX-1)\n+#define FPA_GAURA_SHIFT\t\t\t4\n\n /* FPA VF register offsets */\n #define FPA_VF_INT(x)\t\t\t(0x200ULL | ((x) << 22))\n@@ -36,6 +37,7 @@\n #define FPA_VF_FREE_ADDRS_S(x, y, z)\t\\\n \t((x) | (((y) & 0x1ff) << 3) | ((((z) & 1)) << 14))\n\n+#define FPA_AURA_IDX(gpool)\t\t\t(gpool << FPA_GAURA_SHIFT)\n /* FPA VF register offsets from VF_BAR4, size 2 MByte */\n #define\tFPA_VF_MSIX_VEC_ADDR\t\t0x00000\n #define\tFPA_VF_MSIX_VEC_CTL\t\t0x00008\n@@ -102,4 +104,11 @@ octeontx_fpa_bufpool_gpool(uintptr_t handle)\n {\n \treturn (uint8_t)handle & FPA_GPOOL_MASK;\n }\n+\n+static __rte_always_inline uint16_t\n+octeontx_fpa_bufpool_gaura(uintptr_t handle)\n+{\n+\treturn octeontx_fpa_bufpool_gpool(handle) << FPA_GAURA_SHIFT;\n+}\n+\n #endif\t/* __OCTEONTX_FPAVF_H__ */\ndiff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c\nindex 1eb453b21..705378186 100644\n--- a/drivers/net/octeontx/octeontx_ethdev.c\n+++ b/drivers/net/octeontx/octeontx_ethdev.c\n@@ -787,7 +787,7 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,\n \tpki_qos_cfg_t pki_qos;\n \tuintptr_t pool;\n \tint ret, port;\n-\tuint8_t gaura;\n+\tuint16_t gaura;\n \tunsigned int ev_queues = (nic->ev_queues * nic->port_id) + qidx;\n \tunsigned int ev_ports = (nic->ev_ports * nic->port_id) + qidx;\n\n@@ -898,8 +898,8 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,\n\n \t\tpool = (uintptr_t)mb_pool->pool_id;\n\n-\t\t/* Get the gpool Id */\n-\t\tgaura = octeontx_fpa_bufpool_gpool(pool);\n+\t\t/* Get the gaura Id */\n+\t\tgaura = octeontx_fpa_bufpool_gaura(pool);\n\n \t\tpki_qos.qpg_qos = PKI_QPG_QOS_NONE;\n \t\tpki_qos.num_entry = 1;\ndiff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c\nindex 2502d90e9..a9149b4e1 100644\n--- a/drivers/net/octeontx/octeontx_rxtx.c\n+++ b/drivers/net/octeontx/octeontx_rxtx.c\n@@ -31,7 +31,7 @@ __octeontx_xmit_pkts(void *lmtline_va, void *ioreg_va, int64_t *fc_status_va,\n \t\treturn -ENOSPC;\n\n \t/* Get the gaura Id */\n-\tgaura_id = octeontx_fpa_bufpool_gpool((uintptr_t)tx_pkt->pool->pool_id);\n+\tgaura_id = octeontx_fpa_bufpool_gaura((uintptr_t)tx_pkt->pool->pool_id);\n\n \t/* Setup PKO_SEND_HDR_S */\n \tcmd_buf[0] = tx_pkt->data_len & 0xffff;\n", "prefixes": [ "v2" ] }