Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42135/?format=api
{ "id": 42135, "url": "http://patchwork.dpdk.org/api/patches/42135/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20180703045041.28981-1-pbhagavatula@caviumnetworks.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20180703045041.28981-1-pbhagavatula@caviumnetworks.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180703045041.28981-1-pbhagavatula@caviumnetworks.com", "date": "2018-07-03T04:50:41", "name": "[v3] mempool/octeontx: fix pool to aura mapping", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "58dd0892e32aa64c350403646f801ddeb69a42e4", "submitter": { "id": 768, "url": "http://patchwork.dpdk.org/api/people/768/?format=api", "name": "Pavan Nikhilesh", "email": "pbhagavatula@caviumnetworks.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20180703045041.28981-1-pbhagavatula@caviumnetworks.com/mbox/", "series": [ { "id": 367, "url": "http://patchwork.dpdk.org/api/series/367/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=367", "date": "2018-07-03T04:50:41", "name": "[v3] mempool/octeontx: fix pool to aura mapping", "version": 3, "mbox": "http://patchwork.dpdk.org/series/367/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/42135/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/42135/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 B3D651BE70;\n\tTue, 3 Jul 2018 06:51:23 +0200 (CEST)", "from NAM04-BN3-obe.outbound.protection.outlook.com\n\t(mail-eopbgr680044.outbound.protection.outlook.com [40.107.68.44])\n\tby dpdk.org (Postfix) with ESMTP id 90A221BE59;\n\tTue, 3 Jul 2018 06:51:21 +0200 (CEST)", "from localhost.localdomain (117.203.48.187) by\n\tCY4PR07MB3463.namprd07.prod.outlook.com (2603:10b6:910:75::16) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.906.25; Tue, 3 Jul 2018 04:51:16 +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=Y/3eOwjixLVxKIQUDvc2ZYcnyRFPi9FBaa5clKQ+di4=;\n\tb=iYKK60fN8L5v2iAMS+g2znNNLo/3n5gD4yy+3HlPSBmLgM1ACKK/i9OsDuALU2VeasWJUAmQvsXUARFJD/fl0nikWCO/ohicKahfOr1eeWWuGXbJzzpa9WLLCUmzN75szbHC7gxdlODC4AWvceSPs/BonKCC5blcJ3FkyneAoR8=", "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": "Tue, 3 Jul 2018 10:20:41 +0530", "Message-Id": "<20180703045041.28981-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": "[117.203.48.187]", "X-ClientProxiedBy": "MA1PR0101CA0058.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:a00:20::20) To CY4PR07MB3463.namprd07.prod.outlook.com\n\t(2603:10b6:910:75::16)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "886e5df2-4de1-4040-a65b-08d5e0a09d91", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989117)(5600053)(711020)(2017052603328)(7153060)(7193020);\n\tSRVR:CY4PR07MB3463; ", "X-Microsoft-Exchange-Diagnostics": [ "1; CY4PR07MB3463;\n\t3:JuDTppj8doX7cQzmcDOhIFxFlUUkzvCcLq+ZsfgRgYFxqvYIBnSvQGtflE0vgYpq9eWTaL9+zJ3XlxmIq7JNA8fUQHKijGIAengNMyu3mO8ff0EIpeteGvM8A7GJ7hgfZ0BMOH2ae1cvjbcFigU6HlhA+RJHOI4Mc8EW9Z2ifXlHAJq+JZfATEN8F22+Wa0DW6LYNhND+vC89APJZcpnkx8RY8Wc/XoZ92xouJ2BFWnOm9XAuN4SMyctKylbRJbk;\n\t25:SIiTDl6j0VSjriLwMGgYrJ0dqaP3n/wNdMLSRk14ZWaCrbCcMNINHbu6gGTmNBAuAWslx34qKfyRhN/Vfuio4UATOluRbEGfPXmc4u9vEVKwd+mtl7XNdrPnXo7T+nmjMbMuagYPXt4he1O1Mqpfh0YGBPIvrIZwp9JCaeVoaDyTsC7WNLIfa+68Ij2bDDyuHge+GiCehmn7K5ruSzLVeCmOYzCLoTUhphwm/NFvovVhCSWyU6uuRMMRD0a81bKkmdRdbUpaqTNqPwOyfqQQJleQpBxUHf6c6x3jKt44nifTwac713GSMWbgBYEgjKWdp0euyOwcTa8JUh1MUtoJcg==;\n\t31:A5B/Pfpcy1FtfVRDUuDLcrPQIAPQjAx5jCxqbSxCuT6cKQjcfhpxXD6Wm+M3uv38nFWiO7YgoKdJWy14jDh4DZtWc5MxL0+CZtuwaYtgo4EvGVNLrUFQgyj6nvyUTVvsOFnwUd9eNsDAvIkxLUj/Ya4Qg0mbJ/+O6300joT92hKhm3ot7m3KbbYSFYBysBFIir0SNNkGBEpgmnEdelAxoWPze7UvRoxIi9aOXQ2va2Q=", "1; CY4PR07MB3463;\n\t20:LSuaF+2DBSZQn8CHuf/3KFILsBqkOJnUpauKsALLciidrJaS81QokS8tp221/l+yfhLCWaDoFbtKlv37FoBUlSMxDqzrRCr0IUCWpsymoxjawBhRnpxxvPTlgyDgFGRCNzewGI8nTl73sR+sKh+VCHU5Bf8YEvPJoGxg66yP5uPvIW9Aq3+2tdo/m1mU/FtrVkRlu6MPP47tzWX2gA1dKEprTAi6TKA9WKDzJDZvzkqEJqHK7r8ZtDEFVWc4mn/GhkQaJA+Y9Bpt/c7oyOze6WI5ATZ3L9FuUzYqvwHFOIcYLzjNZd2gGXNO8OYvN32qyZh7VKt6tDNhv/ZuMfdiUYWs7L1xskOwjHCG6DIcgsL1i+frQwhJo+KAI8SQ01kfM6+DWm6W964H+KZ8JP0qy9GJRgyAFrWnVlb35Djdune6ve+zwEdVgBkP4KSQHgpAKzkenBOekBm4s5DW69m8FGC6XFsxsofArrIzvN7WOe/ent/VVdcciEIYJtWigAR/mYy5Ub0AfAhsD8dDrxjFZLfLT6g99Wy7skG6SDPFlOF8F9KlNSqukeV2wsVU6s0CBz9SyxeSBjTmjLJd9xXTtEXBNQv792WD34x0rHwbNAo=;\n\t4:CmPvpiov2SVB39t4+jR81F2cxIUCQvl/R1jSPDK9HUC9fapgoIgs/NWidlr8fPq0pz3I6ybkrPsH9/FlHjcGwnLf+Y0a3EV8f5UZR01rse94jqz4YtriMLoy/7+nvrMp7+c7iol/Aw5ucGjWdit0UUdTswTeRDm61i44C75w5JwwdaHuVbSo7LbfowRQg8XLsZhEk0P4I4Jf1ILQYoKM8YpF6VXWotJS0lYMYT8vfgAF3lNzV+Yi0Z/lOZBYLJKDWP6gD4q7nttUvj6pGkVAMw==", "=?us-ascii?Q?1; CY4PR07MB3463;\n\t23:vKWpOYDdWEQqYE//AIwDdkMqLmkU273yRMXarRlvb?=\n\tA+yXmbUxP+cZY+7wvnv8OtXw/hBUQA0e4YxYQmfL5xuqWlpNgyZXvmUgKQmeMfm2jKqaJATsjnBRFB6Exmsm4fCw9U+H6Z2jraUm1rv1zxrQY4xHKTATQyUoS706tJ5PuF7+OYuDFYB5MdS+gp+ybdasgs6WU/BywLtmGeMvaIjhWKndxYFh4PLP/d0DJRYafQFrvpS1lTFfPnWUeAEQPvhWqtbFUX6fytGxdxKTu2JA+TgCp42mNF9kV1fQbQaF5Mhj9FcMcKJEvbLYqElvH20boUcJUzga9USdnTzLlnKHxsn2D3B6tGZ5dDHJkf8knwjrM/8roJfJtk4x0gaG65BrAAwM6fcmMRMPiY6mlsX8oesmW3903FMp8DpLFbrQ5q5ITWptigHjI+qxqGxn05e6x/5NiqqQcq00MCeuRJExlavPDcarL0K7KtasuebgqTamPJB2Tv2e2FywVUbpjI8Omxd4NZL1oxu4QC6JABevnPDByq5GFRBOE6eFQs+DFet594FvDEWyXe0rV+ZdtXZpjrG22gp57e1YhP7j+kU12jpEIr3qRC7PahZyaYAph6IlLvvJsiV3Ket8P9sK49JmHcG7SHvQWfT1DamB5KK6wQ+Nlb4EJSgjMWBsVcyw1uDtS3irUWFEi2HYist6beFFaNzPCWFsxXtnvPDrouIAj8r330BwV442NZa4rB5+WgU4zvByZoNcxEKwtG5qUX/CREygCqsiNFi+DTa+fZdwYNVnTn4PsOCIPTxk+it9Gv0E8XmMPYhN/idzSN1w85a93OgRCvGTWQPcdVVPHEnLJSmFAZtSZom90AeRn+kqSFeEW8Pmlr7PeX4rlMgZxkMM34zANLiFWxa8JXra0KSVAVgYKyNMOtuYLOomIhOmYcX7MUCsjhXZzwFLIcU3Wg7xiF+GyOiNX3Fp1SadZ+n0B17C6Xo4yJzXvwaQtlpryWqvS7GulLNd0RdtKNO7trbMGlrBEFSVgLEqAD/AfnQM8tz/Kgljjme/K5R1hclZ8nESParBDQ02M2YMzSRQkX/KsUWEh0PJpaLJn1GLwY9VGSCVKh1pK1K7voNZVAXkrp9EHSN3+48qlX7BFbupJHB9sBvZY0+A0l9QztjZ2Zj7G6wOdqm5CEnDdPU33XIa/6lsOF8e/02Tyn3qdlAZ2ZEL6bWe4nLXLq3tqcjExWi4P0TFLHyk62byiCgIbJB7hPE14W49N+XtkMgZ/4Rj/LxIpw26ERbjZiLQmgrHr1bpw==", "1; CY4PR07MB3463;\n\t6:ubqDSuvjIK1CCSRcBAHvwn7Psf2ld4RfIZjAZ8m7rW8K/vjVcoYZHTD3955iTeHvrexXOM1VpuBUVISAvvRffSs/fTgCluRAFYCaYDcU0iNUq2AHBEmuqplD03NPu8LKTGAF78D5DFbriKfAAsYZP8hyrl0i5udDh4WBrpvUIlpEX2Bqgix8SHqNBjObHhz92rkwT1761V1upgyqU2BEcGUjCR8yb/RYkWRlD3ECUowrXUmWhqm2K3YR3JJzH99oaj79xsF4P0DKo5a+uLHZtVqc34TcU6T2CPYBi4Zugy4BT1ulW9QmmqppH+OQhAEE6qJ1JzDs67Bo1PRBr9/be9HvB8j/LuS1NbklOztFM0Ic8QOVpdtk77JuKacUpUcPeTHr47U14df6PXxj4VoRff7VlOuour9PA5+MsIQQgQumOMyoggWC3c4v3gnQsj57nYSBK54yRH4Vj5DT6NXjyA==;\n\t5:BLqYSFqppsGpD15AI/nOC0GZdQExM8x3ivCEnphY/oUUmy34R1GGIEMNNQ+IYoTUhpo1Bw3zBLxVbE9Md1suDEn4uiSiUaekdEYtL7arePmEJYSLJtAtqscadj7TPdyR/JzZk9TBHaYwesv5BHk4h/YngLOuDBpoa/8okBXhF4w=;\n\t24:qbBYhJJtBISpYUDxFny5TsJ6rWAKeIU9Xp6SZh7Gz8LtK5sqYuV9x0xnNJp32ken553a940wV+O0CPoo1vQn66JvJlOi7MD6NoT9asodJcs=", "1; CY4PR07MB3463;\n\t7:PviUcmZsnnP3YCMZ89861XJh6lk7z8MX2U100XRst+XJrzfkBtHxvj6L3Qao8pzyzBZdnno7fbzFNHX2IFkHQhWSZKioWfuz7TrSieHNW50jgXMtPAXgKUhs5u/jfdQ9tUOR3oQVlK5c4R/+uVgElE5/At2gzsVw/+2Pdj0bodUdiVyjhI7qAzvu20+QjfSmj3wakCXVr7cP0WTwz/O810uT9LNaGC8VGWyoTSVm6tGk8Ofg3Aj8PIT6mzqRCGsE" ], "X-MS-TrafficTypeDiagnostic": "CY4PR07MB3463:", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=Pavan.Bhagavatula@cavium.com; ", "X-Microsoft-Antispam-PRVS": "<CY4PR07MB3463A5C87633C9CD5DBDCFEF80420@CY4PR07MB3463.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)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016);\n\tSRVR:CY4PR07MB3463; BCL:0; PCL:0; RULEID:; SRVR:CY4PR07MB3463; ", "X-Forefront-PRVS": "0722981D2A", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(6069001)(136003)(376002)(346002)(366004)(396003)(39860400002)(199004)(189003)(47776003)(6666003)(476003)(42882007)(316002)(8936002)(478600001)(97736004)(5660300001)(2906002)(446003)(107886003)(11346002)(8676002)(486006)(956004)(53936002)(2616005)(81156014)(16586007)(72206003)(81166006)(66066001)(6116002)(3846002)(68736007)(6512007)(50466002)(4326008)(48376002)(1076002)(25786009)(26005)(16526019)(76176011)(6506007)(36756003)(386003)(1857600001)(305945005)(7736002)(51416003)(52116002)(50226002)(5024004)(14444005)(105586002)(106356001)(6486002)(42262002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3463; H:localhost.localdomain;\n\tFPR:; \n\tSPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; ", "Received-SPF": "None (protection.outlook.com: cavium.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "vrLBCqQQRO3pE/WcjX+0HGb2SHcbgsxofAlzLWWWL7l+LqihmajGZ06yoC0CwAcRaS90gR9ldr9XvSLPiXqsehXmwtuaHATMaj8GT391j5GJn2lBa8BR4+ImC6j6fU9CT6WRSWHe3TAPmRJuF5IEmHLRzC6QcvT8vQfyz7A5PVrL5plaK5KjZbyvPkHccNbi1rOSXlBYgHlfXAbsvn8XMW2RU3tUphappnv5RAN9Cwn0RYl7Kh3QZ3aZF/cVBBqeBylL41dDasmIau4irykAX5Z691Ok1WmP0wv/DzGzjmnXnTLhnyZqNQZkSzX3OkPZopOf23WUK/j4EWPws5goqz+lIoibHyxLSE2DJwSQB4k=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "caviumnetworks.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "03 Jul 2018 04:51:16.1686\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "886e5df2-4de1-4040-a65b-08d5e0a09d91", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "711e4ccf-2e9b-4bcf-a551-4094005b6194", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CY4PR07MB3463", "Subject": "[dpdk-dev] [PATCH v3] 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>\nAcked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>\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..c287dd799 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 = FPA_AURA_IDX(gpool_index);\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 FPA_AURA_IDX(gpool_index), 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 = FPA_AURA_IDX(gpool_index);\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 FPA_AURA_IDX(gpool_index), 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": [ "v3" ] }