From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80071.outbound.protection.outlook.com [40.107.8.71]) by dpdk.org (Postfix) with ESMTP id 5A16E2C54 for ; Fri, 27 Jul 2018 04:28:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OzgB1S1msk4+9XpancJqJzsYH7j7zxpkuww3dZZS7Pk=; b=EmHGSj22LUwI4y5sPdq5un+Z4f45mV6vM9A6ptNoIeK49tD1scKRjuNmWW5gKj2YwKcS8QpSYUoJI5Zsfc0pXhhPzoYwayhCvz4geRsHJliCxYCLkkKl+ZJEmmTIJK+tmKc2bHA/b+m9s4/McDI5pLIWZBV2ZwzHXGihgX48r80= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by HE1PR0501MB2043.eurprd05.prod.outlook.com (2603:10a6:3:35::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Fri, 27 Jul 2018 02:28:02 +0000 From: Yongseok Koh To: Hemant Agrawal Cc: Shreyansh Jain , dpdk stable Date: Thu, 26 Jul 2018 19:27:39 -0700 Message-Id: <20180727022746.38457-3-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180727022746.38457-1-yskoh@mellanox.com> References: <20180727022746.38457-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: DM5PR21CA0034.namprd21.prod.outlook.com (2603:10b6:3:ed::20) To HE1PR0501MB2043.eurprd05.prod.outlook.com (2603:10a6:3:35::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03c3788d-bed9-4818-361a-08d5f36894ab X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0501MB2043; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 3:qyhbsb4vEY7etmawz/3GFnN7M03+lvEXX4hvUa3oKhn3HSN8I5r9vVBOz3swaiNeQh7bsOOWSop+bk0v9+bgf/9MG9A2FkD8iXnQBNPaeeS50Qev9zd2f4C32pThWtD2Oe+QH70LVquNglwXpnuWfD8GsUc0y1zWP6c63FTNQS9bo0Poyp1A1X8Ve/EsS0o2Cqi9+D2SbI5h6LT0UoAI9fdMSFzVzB2bZKGm0vegrw5Tm/1bsrLAH10WxmcY6rlo; 25:iBD2/RDhAdZvATlLt0uJTCH6oqodEHP+aJ6+7ujdEevWbdoQ6Kb7Y1QMANq7FdsxAR4WOwhqhJoDn9BBecOlGu8U9lsqrIAqDWl2H76oa50vadBCmaC36tQ+FVrhAFZqaD+MOtX8Rgs8O1aHdEjHdTtVWjLQ6Gl8Ag2hLpGMszy3ef4BIgMfJ5WNkeC1oltOycDm4sYtbvM52a3A4pZ85N2lheGTT5NUJxV5LwBbKYEDB38aVw9MrtaJJcSR01jutZyZFDbMNHjO4Si2ALMIPuUpuUTxakBrK25BHMspSVWhMh3bQrBevCiWImsAOJQ+YN/Ca3+ZXcctgZXuEE3XXQ==; 31:f6qSaSt2saA+Yxtk/wAVmTuv8pHk+j/WKbSrhBRkbn4GQ+BTx0HZdCQO0UF7BYS9ZL6yVgv76ja+O5HR30BBeQzJCy2WhkDImecf+X2IO091TDCLi1eP2vCljalJhfnlwPhdcr4OdvGsljt42m0CmVIzfZDwg64PDIcVb7JgS4liePOIL43DfbIIUPqoNJIt1AlI25U8+nKSvUOsfbPF/NrtnTKgVzRXjKNuDqRqVyE= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2043: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 20:vnbWWyPjcExEA+Yo4vmjnVCRhveCRrzAiUseVRvsSNH+XGkWBD0n6tZJ2bpm0stmMhElaSD1vV6K50UgIoAFtq5g2LMY9j4NNXejqDP43S3ULfW9noddGo0VbL9/9RcZ6ukrwB9IaWaILJJmHiLmXjqkJcOpw1lyPEwwcy+6/ga+Pwlbl/HGuATn2EhM85LqwtQFZFq6Z3IvwmlYw33vGG01rgCmc7mHdEeJP5tPA4IFsoIW2WOskBUuTTUl4oLxzO+fuQBOxq5o8zB3lNdMma5kGoYTauEHFfucXLk816PYzIxAyt8lKItDCfSyb6rNG3ABYe9degozp5dxw0mgxI2f4fklD5UmjOhAuGEsqr/EJ8MnX2HX9ekZsWxrrfNV/hf8wvbRG1RDkGjV5yIaYL6I6L7QXho2OCWwdRjmOsOlkpVfMdgtrnNY+n8IOi1XYSjG/62eyZk1pcIappc4yPO6ovm0BAE1UnBgGkk2lr0qK+3X06Paz9jii8i7+mxF; 4:SgML6z8vN8f+PekGXVJPQc54WNTiprTACKT1j2rWC43QTa0xEOuL88ktZ1xVUSN0mG3xb8LUi4sfSOf9p7Fe0ioSq+iVjJgfkp9/5c55S1tyB7nCpI0slS/X7ax+iRs1rhsec9/9m3+Z+N5nNedDUtx1CDLvVNHT10ISfGAU6mwmEVuOh+gpJHvSn1XdhLjplVL/Ov7Y5PF3nUOhY9hoss4+iSkk1jYjou5S6WoB9/sTcO857cIbFdMnb32zkW+u4Q6gekXQ2O5zQ8RWRv+QPGLJUCiNMDjtezMXIbXmToa7qcpyPSqgqYW8kEoVzMUz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR0501MB2043; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2043; X-Forefront-PRVS: 07467C4D33 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(136003)(39850400004)(376002)(346002)(396003)(28163001)(69234005)(189003)(199004)(478600001)(16586007)(68736007)(6306002)(7736002)(316002)(1720100001)(53936002)(54906003)(47776003)(55016002)(6666003)(8676002)(966005)(4326008)(956004)(476003)(53376002)(81156014)(21086003)(2616005)(8936002)(446003)(16526019)(2906002)(86362001)(5660300001)(11346002)(106356001)(7696005)(50226002)(97736004)(66066001)(26005)(186003)(52116002)(6116002)(76176011)(486006)(50466002)(53546011)(3846002)(69596002)(6916009)(386003)(305945005)(81166006)(1076002)(51416003)(25786009)(105586002)(48376002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2043; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0501MB2043; 23:b4a5m5jctwKEasklgArrVOlsoj9zTkeY6M4yEDt?= =?us-ascii?Q?lIl6JAhILmNHXT8UiXBM2ASaLoVleEchk7gAzJbz7sse29IDd2Ih9NGCkSVn?= =?us-ascii?Q?t8CCO7edDjIuCQLNCUVGpU10kg1EHvE9NwuWntgOI9n+CbNeNBeo6LMJBshh?= =?us-ascii?Q?vCjtH6gC0kKGrHKUKnNIU1EYnbn+EZ05giolu5f6kAkIm3sLTuDK4mA1Zbku?= =?us-ascii?Q?6cGFKvebuDiSDjFK7xCxl7LYVXe0YthBv/phn51rgYsKwMvjghRBZaR8siFv?= =?us-ascii?Q?0bpAvuW4XKtKoJ5pGu04DLXbniNQ6gae/hyqwrYd8Sge2Iiyh58/2xS5372L?= =?us-ascii?Q?GDjYu3J8D0F0wz+rVA9B7nNfShAIRtJUThsLLk6Uxwwo5+8w1bMjEvuydg83?= =?us-ascii?Q?hM8s2ryQ0krg2US6v5MKrCBs6RVA9wVdQ3I6vbss6ZuCIfclKyqZQD1NR4OJ?= =?us-ascii?Q?scZhR8GQ6p8NaeniQE4LcaG43ji2KQc1YlIzC7UvPWb6N+TFCaacdXQZmFSH?= =?us-ascii?Q?DsRbr2PBFJFrRPuaUx67aHiOvjjUBErj8yprsR+kwZGdTVITkX5OW6Y/PP/q?= =?us-ascii?Q?YMVLyv+xKH5udOVEhgcJ8rFMYclIBixai1boXCtm8kufptag2jMgFatxQrky?= =?us-ascii?Q?KfXC73VCjlJlqDimY3I5N9PXzenRfFjCEs+X1xPvTOlAwp5RqHDt1P6VmH77?= =?us-ascii?Q?ev3BovHx1Mpz/9Z45K3Ze/MXFeKDZYjadzolJUtFgA1shV/HRxCzmFOBsq1y?= =?us-ascii?Q?KIc86uQtdHaski5jTiYNzbd6KzmYC7Shs1qZmdcErZANlOSihwJkOG/CrObH?= =?us-ascii?Q?1QyJjbzVHTFKZp4LkO4l2xFa/JFERBmCKWpJ5gpyP9N/EqJaMaP85cquBCNe?= =?us-ascii?Q?i+piv7SDxBAhOXR8EHBRkO59ziMdrHUiGS0vuZXvxAV3fxzNgUGKa0Ab0xcq?= =?us-ascii?Q?wmtq9OC1kZUaMMHO6CW6yClTkBlBgLK9LA/GLCDVpjzVk05gaoQSiyBK4hXT?= =?us-ascii?Q?S1P6SEktp4AWvdR3Y+ouwg0laMZhqNSsFSU9EoFqcyTCwf2jbCWbX8Fr7Ozf?= =?us-ascii?Q?YQ3pRQ/1xer+RmJp1MgeasQKIYb9NmkTwnOSEZOan5W9mZOWRwHhD+B4sifb?= =?us-ascii?Q?XQZZegYzfhgH3j1zeqrTArZsM8kObgfZ/qmhYcbG0zqkuCuR4qp/+dxaMIWx?= =?us-ascii?Q?ysX3aiSwFzsrAukHbh2Ozp5J9IelwE4Hl0lrfwtxWAZV+T2grKnV6YtB1CDU?= =?us-ascii?Q?eyAkGRfmDKQhnvzDiRm0gMgKITGS3QcrXeDK8LY2uDbyRsZQXJeAG2/EchnI?= =?us-ascii?Q?rqkSXhj+fzleThrccy/UMiBJIXnKFio3bqP5I5qwQwz5XIMRmYaBhvcxWTf+?= =?us-ascii?Q?uhIb3vxGfOFjvgarwd+im919zQV4=3D?= X-Microsoft-Antispam-Message-Info: QlQZbCKhdZUyUH5zHN+aCW7i8HMljk/FqnRYJvsxj++aBuD0wuBXwPEwkbBacPxSlIhay+AUA29QDAe+TinW7c2r9cnO2bPEY6F+wDxPX/QsA4EI4BHup7ntKULIdHHNM1RMzOOqQ69Pga822jDnpuBIbojohuuTip14wHpTVk0UBhvRTpARjIvTyHjyM6k7WfImNKOba6J1VoOTeREWGDEtA1U7aZGXAVEkyRveQZzRjkRY2ZYtgpxIww9NhlcNc1z0eIiQxh2NcOV3/y4ETKFoHi9s0X9wrj4Bp85MBR0aJtWT/DeI3mMsibwlFy60q9czIjXvyZ3g0g5atO6RjzagZxIRIneEVD9z83qJFfk= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 6:5djP0HXiF1pKQ9p1N5UTu42cGgkGeVDG12i1iBM+fctBh6hmBsd0QVgCJDjce/mdoj/7GWP/z+jXT/G0iL+FVGjbz34DplzmCR8+xwOPjAzjvGZQd4O1sS4BHhjdOj0HEO05rGydCZ+2P54b8AZT+knNyO2ia252i1Y4syltC6NXm+n/1mSZ4mLHRwg2he0svHU7rlkE7J8OJHszgPfO6MOSS0LrL9irdrVkNbzVE/pDW36kHwbmInM+tCUnsoy8i0tVRL8xZLpqcO9w1/UHfH/TIbkcRRvqZE3tsy2MnGLAj2v2PDlyznvPn3Dsd3m6hI5tJGr/RZHSev02M3ienOBEmJshdT315E4k/FxXC6jJZdn9biXN1IODa7CKTKevTRZe1uuCn8zAHEMvVJuHrekKvtXY363YygXpJVnwO8SjYH88jHUiVmFtVo2WttzYn3QkmPO+C2JQh11KXEydFA==; 5:tTB9ET8yqBv4u61i1ZsAVX/lBDY2vaBlqucOB8HT6ejUsWRVJVizpSaSD6vTOqc1j+BvWP3TtYvj4UMRGwy21HWoM2SOrYsbd0SC4xhDl5kVdJMS7Id8IC8SW1qxiK/QC9OtRzhP6H53hD13/Tw3UGovtuTVooi1ywuECnqAMdw=; 7:Hr2m2C1hf1f3dO/et+NxXDzYruUM48kQ8h1MPFk7EAv/dBy0h7nra2gyJzr/TI01MwXRWepcFBXKAcfibsh5+RPVIti4CYhQfRR8SZGWtxyLOxkPnCHg9Q6ASK+eMC9g18F4Xc7SHoHCmlFkWLZY3AP7uvU9cXMx2wKzYnx1xi3jR2nuRqdjh/rJHk94i8z45fD5Rq6BfBMA0N/qRIWqofFseDG7drkikls9Pfj/FFnC/vTrcFnFH5k7Aen+urHU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2018 02:28:02.7470 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03c3788d-bed9-4818-361a-08d5f36894ab X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2043 Subject: [dpdk-stable] patch 'bus/dpaa: fix buffer offset setting in FMAN' has been queued to LTS release 17.11.4 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: , X-List-Received-Date: Fri, 27 Jul 2018 02:28:05 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/18. So please shout if anyone has objections. Thanks. Yongseok --- >>From a709e79b168a93d9ac3d8215b49623e3688d4b35 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Fri, 6 Jul 2018 13:40:00 +0530 Subject: [PATCH] bus/dpaa: fix buffer offset setting in FMAN [ upstream commit 0975e5df8380b82fd74997997221447e565efc2b ] The buffer offset was incorrectly being set at 64, thus not honoring the packet headroom. Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations") Signed-off-by: Hemant Agrawal Acked-by: Shreyansh Jain --- drivers/bus/dpaa/base/fman/fman_hw.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 077c17c07..d66efa12a 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -39,6 +39,8 @@ #include #include +#define FMAN_SP_EXT_BUF_MARG_START_SHIFT 16 + /* Instantiate the global variable that the inline CRC64 implementation (in * ) depends on. */ @@ -445,20 +447,16 @@ fman_if_set_fc_quanta(struct fman_if *fm_if, u16 pause_quanta) int fman_if_get_fdoff(struct fman_if *fm_if) { - u32 fmbm_ricp; + u32 fmbm_rebm; int fdoff; - int iceof_mask = 0x001f0000; - int icsz_mask = 0x0000001f; struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); assert(fman_ccsr_map_fd != -1); - fmbm_ricp = - in_be32(&((struct rx_bmi_regs *)__if->bmi_map)->fmbm_ricp); - /*iceof + icsz*/ - fdoff = ((fmbm_ricp & iceof_mask) >> 16) * 16 + - (fmbm_ricp & icsz_mask) * 16; + fmbm_rebm = in_be32(&((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rebm); + + fdoff = (fmbm_rebm >> FMAN_SP_EXT_BUF_MARG_START_SHIFT) & 0x1ff; return fdoff; } @@ -525,12 +523,16 @@ fman_if_set_fdoff(struct fman_if *fm_if, uint32_t fd_offset) { struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); unsigned int *fmbm_rebm; + int val = 0; + int fmbm_mask = 0x01ff0000; + + val = fd_offset << FMAN_SP_EXT_BUF_MARG_START_SHIFT; assert(fman_ccsr_map_fd != -1); fmbm_rebm = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rebm; - out_be32(fmbm_rebm, in_be32(fmbm_rebm) | (fd_offset << 16)); + out_be32(fmbm_rebm, (in_be32(fmbm_rebm) & ~fmbm_mask) | val); } void -- 2.11.0