From patchwork Tue Sep 19 01:29:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mody, Rasesh" X-Patchwork-Id: 28879 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09B751AEF6; Tue, 19 Sep 2017 03:31:20 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0061.outbound.protection.outlook.com [104.47.37.61]) by dpdk.org (Postfix) with ESMTP id C111325A1 for ; Tue, 19 Sep 2017 03:31:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=lizNeSO+W4zmri3XBjBJvUc07NwKFKrg/t2HCIvFcAs=; b=mWQIuSiYC/V4Ss3nQpsHle6fyayYtktbUH0k5aYC+YMGjAgP+J61xUWh1mp+ifRbWWRhwbXF6/6c6nd/hZTUQBamL0lKgBdO4dwDi6ICSxD/c/T/TYzSm4vJ/PVnR0GVTc5OfVFKM9MHqPx/grkrkk7WFsQO4/SXFRZsZycMFjg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; Received: from cavium.com (198.186.0.2) by SN4PR0701MB3838.namprd07.prod.outlook.com (2603:10b6:803:4f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Tue, 19 Sep 2017 01:31:10 +0000 From: Rasesh Mody To: dev@dpdk.org, ferruh.yigit@intel.com Cc: Rasesh Mody , Dept-EngDPDKDev@cavium.com Date: Mon, 18 Sep 2017 18:29:44 -0700 Message-Id: <1505784633-1171-5-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1505784633-1171-1-git-send-email-rasesh.mody@cavium.com> References: <1505784633-1171-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 X-Originating-IP: [198.186.0.2] X-ClientProxiedBy: SN4PR0501CA0015.namprd05.prod.outlook.com (2603:10b6:803:40::28) To SN4PR0701MB3838.namprd07.prod.outlook.com (2603:10b6:803:4f::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 397e3379-567d-41b7-f3e1-08d4fefe1be1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN4PR0701MB3838; X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 3:L4D8uJPla9kSx/ri0e7MnzDNx81xQ3JLiBmVfePR7qajT8boXyw7klblmz9OPFmCsSK/OmoYdUEjntY+eOEPGUruAhI5MBbGvD5Q/A7wGaOR8M8DUKhFkTHl8VOlOAXsS/l7d4ceBOwsVWKcRAcyV2+KdrBmiUBVwfNUd3t1vrkct6ZaR8P9l6WtaO91dFr1mAoht7QNpulUSb00lBYrFJdC2tIUiAjOn2mzMWwnmU3FImN+hK3w+IjqBM/eOOlh; 25:4xTNgdrNxRkF6sQhtuMSaSRN7ot3hI5dM30wgkyMrczM+21tqIgbbcYkizeUujIZ0fzFT6FtO/4++/p1Gn+5b5KyQIaWTCAKCDci6/0nAPOiSUk9XzgAixGuQV6GfcJeuTVpqiEAgN9D9/eoFj6VoMmGdPIXo/tZY8z9qAK8cDce5oQsA0Q11xl6RZDgDyvVPSqxnfHDwC3TIQ+DGS1vQ9uw3h5WOT1oZMmhUOrlEkm9Vd0gInc4axSyEkoNmJp7Wk7A5aGxG0Z9hA+c9khG8eUtwLzA2t4+1EjqgNuVSaFgAZquJ0AwOeVtK+xynKDzdjUOusD/yw1+x+zeeqPGRw==; 31:DQVRb0vr+RMLnV4r8T23oKDrxaTs02fe3YqnJePcySsr0SSqCybL8epOfh0gybFD/37QpOQiNVvPPtXtz+VAVDPScuFZLfnMrNUIdqZuj1RHNGPHYEvGqZOkgSYWc7X1WWNkhJNqUpw5gkvbfABFeSWdsQT7GHRJ8rsBgKEzavsoqLhURdjouIFpVE5kac6u6I45zqM+17EkyyA4K7DYgVonq2I7Z1h9V7b9bVArSTc= X-MS-TrafficTypeDiagnostic: SN4PR0701MB3838: X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 20:Jg9C+Un4YBC+fvwmHuH1hqhdjIwRH/4nK9LmojHCY25DOdtVaf52dEThjYaRV0X7tnjzKubAXamI55tEPt4mHoiE1AgCOfyGPVZYJuf93swN5JZrLE7ZHqJMXtX9fM+SjnDZFN8MAIfs9VQqEimzu6DlSdnRFUsbkWnU1wzFEb1XEjpMeq5KRcVD2+i+7JDG63/eOoTrXjWYuXyVMrArDEuovIfOoggzwJ6zoP8bW3zJzx6YvgBoxuz/KAOrfFTJVd+PmcPRgHJQLQQXoNZuQFWI2+HGRtzzMIpcTCgkBnopeJMiue7DHstrZGtkI2RJ3Kzr2AwUtVkfbVwlm44IOYmWD8enRN5vZUtcCC1OCRBwkHlwqafNmJONfEOPxkPeJVQKJnwaaZYSa/9XcU8AcLRRD0mKtwdjZ8KFUC/F7AAkkn011PoZJ8USWBNzkh+gN8+map09YdyfkIP8ELEuKxtWyLsHhOxeO5m204ZHmcrZc5l+IR1dI7jW/EKxzvE7; 4:GclbrAYy2DhT59gNoBntepVi7ORonkQ8259FWUdY8ZkKjxkySA9nYg4qO7oQrfRy4HkA+GArb34alx+OoZhnzxs+m11vNEwYVDzY5coRA0WUlFsXQvIWTaPEig9LTOSCJeagdjKGHm2S3Y/rgskZ0YqJsE6D4G3tRP3zbeUoyJgWxaV8/IZXHu+BnUGHhnOzATwh4SEUgR3B1N5otfZWpfNClrKmrAxs+UZmk9Epu5GMGt/R11/qGVfunIQh92Ge X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN4PR0701MB3838; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN4PR0701MB3838; X-Forefront-PRVS: 04359FAD81 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(199003)(189002)(48376002)(33646002)(68736007)(316002)(21086003)(16526017)(16586007)(72206003)(36756003)(478600001)(97736004)(86362001)(66066001)(25786009)(69596002)(47776003)(50986999)(81166006)(8936002)(50226002)(8676002)(5660300001)(7736002)(53936002)(305945005)(81156014)(55016002)(50466002)(76176999)(6116002)(3846002)(2950100002)(101416001)(4326008)(4720700003)(2906002)(107886003)(6666003)(189998001)(106356001)(5003940100001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN4PR0701MB3838; H:cavium.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN4PR0701MB3838; 23:Lk5KhO6cFa9izxHqB2jQ8mKGliF24gyyoMi8VGt?= cvLvO+Fwa/7FwAANzoUmSOyWLZzjmQp5nPPZGX3mmc6LGBDkxSjBxQ5ApaYzmWcD/cMPSxPTEe2rOQHwcBmzPFGAPH2QHMi2uOqDurgELl1ool5CIWU2tvKyWPeBsvluKXp7+34gSjg3dGwDTtDf8MAIqynEpIxqgHE+tOJ/yysU8S/KA5AA2wBEVMRp79HmS9EyFyC6ERs5NVRwEXD8EfkRdlZgKVloq5IgmvaAeVx8/UHF30Mfvz+20O/NMCwCVuvelaiaFoHMXDqoqYGuRVrxJh04cVZokYJVG5xSxBhdYXDkYyAik5YXAmRb8rLrgp1hp28p1/xawnpFsZHuERw6vfnE3jWPafIFdIF1qpHsDmZ/YsNXn38o/5pxUN4wg3LD3nDCr/mfa/DX+T6eOkwMLYBEz7HKP4O0jnLP652GK2dFFseCcdKS0G6YzU1c8Skc/L09mAmLox8G809cdSaLvnTgXCsArzIjFMBAFIz1c/A5NG6tSGYFjkT2UpmyfT4gZ0dGa86UMG8SvdC20jKXnh/eLZ+Kz/KpfNd9R5Qomou4aNqUlWJdBzYeLO720O84B9V51OgqRfIT53Vw7jLSwUYrPZfsSG2xRPiyunkTX2c+DGGmserv/3jL9q8axlI/5P0L7oQpTZO/DDok+kKpYs8lfixtDeQ2ckWx0CEe0eLQJHISke45lKjTpz3F3Lj4crRCTW9qgie0ozYI/7tYgZIetLNxYl3ZMFokPdo1CEcOhCv/hvYv6K0EUwXT2BVEYjlW1as7CHFit2Fe3mBcz77TNiAn8xff7tDUoecUlex9NqaQpU5vXsraUw3LIr1Dz/ADQHyfHrkK8rKGn8JgnCucOxBAUp7IAOvYk7oUvx8foaTzt9eT0fLYurbS/Xzw9y+A7GMr7rIHdtTueaxbySrA9XNeP4o8G9DWznJr2o8fliGN5RH/+uK50Q4bf3pbYImvSERkSrUQGoXrH+3VglUsOr+VXOotFH21l1vD0aoviG8eRiTQYPqbnz54zzV048fh+sFs4hmrqXMcqIAPaywcs9qpNO5fhtAnYpT/mTVmUTezNUp7C4AFKmui0HSA= X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3838; 6:R4Ivhg1L4SEpCiss0tylquv2pW49kCYcQb9f41IDs4iNcdARzk4QVkphm6YNb8OVHI8G8DQoz7haE1DqvuNtLf+EwKG0cFGvssbVtKBp7rsTH7RTTQpOStEWFwAHezt3hnA8fzUW/l59z+hrIxE3/Vhu6P6FHBHVwGzCV2wKv2Wx8tMSOrCcP/EFgH04r4FvYnYVrxZ4u7Ba8n0SrEJng/+LgJVhX0LPVgLdHYGe9sNWor3TusmLqSVXfqd1IInjosPkQrVZ2+x0QN6TylqUxRG3qQFaxlTsZc1SWvZGbSN3JzkyNoE+lMAbYMD2uN8Hq7ixc2OB+HVNZ0NUPsaOnw==; 5:AKmpYYVrjm/DQ2OFG0Kgd98qmliXXcRmpFBXhgzQyREylkehvuTA00uh2+foGQwHN5PGnttHxJ5YpgYFF6sYOo8GGshmrfGi/I2uFRKb3BDqz6XXt0J/2XuZ7oIy1s+rJyAZJcfY+08D5Mq9P6NZeQ==; 24:PjkNBTA8JR4tq6GUGZrBlGUhZh6eucLGgCFaOUQKatMB1OSumBZXGD6nLzmn9LVOXZb1HrqQdMS1uSFOH+1qXAFmhkP1MisV32n4WPJ14Z4=; 7:tjMygxVnN/f8jjo30AZEQVKGMcehAEtMRMhGc1CmiJVMbPJ0WD9RMp1Q/PDXRjJFkNuLvHXN619JkQMgcDXZUOFiYX10RCd4cD8vPGczBtDECy/8SoePuoJMaeVkKaa0POqeq2VIBbljadaQwpa6nXQI2wN1k9+dM66QPerQiJI+iXJF4hbSYdVagp/zLLWv07lGokzDWd1q81uOGtyeoBwiUnrszmiHJzRHiZmuzQU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2017 01:31:10.6367 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0701MB3838 Subject: [dpdk-dev] [PATCH 04/53] net/qede/base: allocate VF queues before PF X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Change the order by which we allocate the resources to align with management FW by first allocating the VF l2 queues and only afterwards use what's left for the PF. Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore_dev.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index 65b89b8..6e40088 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -2423,22 +2423,26 @@ static void get_function_id(struct ecore_hwfn *p_hwfn) static void ecore_hw_set_feat(struct ecore_hwfn *p_hwfn) { u32 *feat_num = p_hwfn->hw_info.feat_num; - struct ecore_sb_cnt_info sb_cnt_info; - int num_features = 1; + u32 non_l2_sbs = 0; /* L2 Queues require each: 1 status block. 1 L2 queue */ - feat_num[ECORE_PF_L2_QUE] = - OSAL_MIN_T(u32, - RESC_NUM(p_hwfn, ECORE_SB) / num_features, - RESC_NUM(p_hwfn, ECORE_L2_QUEUE)); - - OSAL_MEM_ZERO(&sb_cnt_info, sizeof(sb_cnt_info)); - ecore_int_get_num_sbs(p_hwfn, &sb_cnt_info); - feat_num[ECORE_VF_L2_QUE] = - OSAL_MIN_T(u32, - RESC_NUM(p_hwfn, ECORE_L2_QUEUE) - - FEAT_NUM(p_hwfn, ECORE_PF_L2_QUE), - sb_cnt_info.sb_iov_cnt); + if (ECORE_IS_L2_PERSONALITY(p_hwfn)) { + struct ecore_sb_cnt_info sb_cnt_info; + + OSAL_MEM_ZERO(&sb_cnt_info, sizeof(sb_cnt_info)); + ecore_int_get_num_sbs(p_hwfn, &sb_cnt_info); + + /* Start by allocating VF queues, then PF's */ + feat_num[ECORE_VF_L2_QUE] = + OSAL_MIN_T(u32, + RESC_NUM(p_hwfn, ECORE_L2_QUEUE), + sb_cnt_info.sb_iov_cnt); + feat_num[ECORE_PF_L2_QUE] = + OSAL_MIN_T(u32, + RESC_NUM(p_hwfn, ECORE_SB) - non_l2_sbs, + RESC_NUM(p_hwfn, ECORE_L2_QUEUE) - + FEAT_NUM(p_hwfn, ECORE_VF_L2_QUE)); + } feat_num[ECORE_FCOE_CQ] = OSAL_MIN_T(u32, RESC_NUM(p_hwfn, ECORE_SB), RESC_NUM(p_hwfn, ECORE_CMDQS_CQS));