From patchwork Wed Feb 6 22:43:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Chopra X-Patchwork-Id: 1037781 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=marvell.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43vxPd5yCdz9sLw for ; Thu, 7 Feb 2019 09:46:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726655AbfBFWqM (ORCPT ); Wed, 6 Feb 2019 17:46:12 -0500 Received: from mail-eopbgr810079.outbound.protection.outlook.com ([40.107.81.79]:50880 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726448AbfBFWqL (ORCPT ); Wed, 6 Feb 2019 17:46:11 -0500 Received: from DM5PR07CA0107.namprd07.prod.outlook.com (2603:10b6:4:ae::36) by BY1PR0701MB1925.namprd07.prod.outlook.com (2a01:111:e400:51ab::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.19; Wed, 6 Feb 2019 22:46:10 +0000 Received: from CO1NAM05FT045.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::200) by DM5PR07CA0107.outlook.office365.com (2603:10b6:4:ae::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1601.19 via Frontend Transport; Wed, 6 Feb 2019 22:46:09 +0000 Authentication-Results: spf=fail (sender IP is 199.233.58.38) smtp.mailfrom=marvell.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=marvell.com; Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by CO1NAM05FT045.mail.protection.outlook.com (10.152.96.159) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1580.2 via Frontend Transport; Wed, 6 Feb 2019 22:46:09 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 6 Feb 2019 14:43:58 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id x16MhwJd017111; Wed, 6 Feb 2019 14:43:58 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x16MhwYw017102; Wed, 6 Feb 2019 14:43:58 -0800 From: Manish Chopra To: CC: , , , Sudarsana Reddy Kalluru Subject: [PATCH net 3/6] qed: Consider TX tcs while deriving the max num_queues for PF. Date: Wed, 6 Feb 2019 14:43:44 -0800 Message-ID: <20190206224347.17054-4-manishc@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190206224347.17054-1-manishc@marvell.com> References: <20190206224347.17054-1-manishc@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131939667694376584; (abac79dc-c90b-41ba-8033-08d666125e47); (abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(376002)(39860400002)(346002)(396003)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(69596002)(26005)(76176011)(53936002)(16586007)(80596001)(105606002)(336012)(107886003)(11346002)(85426001)(106466001)(486006)(2906002)(126002)(6862004)(446003)(476003)(51416003)(2616005)(2351001)(356004)(50226002)(6666004)(26826003)(47776003)(36756003)(97736004)(498600001)(87636003)(50466002)(8936002)(54906003)(4326008)(81166006)(1076003)(8676002)(81156014)(305945005)(42186006)(86362001)(316002)(68736007)(48376002)(36906005); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1925; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM05FT045; 1:kYQ9nHzzFRVbSnucIydjVX2kfcUJNHtWrSpGeV+LfR1bOtZa/VOwjKqUG+ECUFaVn/TeRwR5oySDi6n/PmC5MpJEB5DI68LEhbkjHjifvc4nSTOhrZFnO8JhFwv/eY0evjwV3rM1Rxw7SFFi183qLw== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9dba3947-fea4-48a4-7b7c-08d68c84e31d X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(5600110)(711020)(4605077)(2017052603328); SRVR:BY1PR0701MB1925; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1925; 3:3aDpFqmqdCaBDEiQlAG07J+ezERQdlRlxRhA0OPXWxVqMNAV0KibBh6ewYi3mpUrDLmI74jQ7m8qZlINqFoR6vE13Haw+fn74tRyfsGgJcTWDEf4KFEQQhaQTW93qldMR3IORinpf2Mya+C8KZeDozemDhZ6xvcimr6yrHBjQH0Wy4bWCNYTJO0Tp4zkRTandGzb1JiYjTEHJiT7I0vJtdZZulyw748bokNlCz+jLs50DxhVQYJM/hhiD4/04UpLLZI8M4nJ6eVsVd+YHxw1EEm/c0XCGWwEqtXgrfdWKS3wV2abOa9dukDJRm0eT4O/fqKnLO2AeV+CDwUMHBP8xmOnY2vXBltLjCLNwSA0UbhxYVYxefOdP3Tg2cQxrpiq; 25:F29U5Pb1h5eF6tVdHgbSnHapN0ZebYWEu/lak3ER6bZ4996D4Q5CO5j1gaGQ7goiNMlQjIAGClR8dRD6LxOnlPfnoyfyFTse09RzLOB+a+0kIZtHJe/YI6GflGQ0QKv0jaXQBZJd2Z+DeA9Qx8hifbermXQw/4sdwFkjGxVLWATsvZjctSa6PmDlUnFEzpTDDUTYG2LEglJa4/PhnIlGw2bncGsw3mL7v4vIk2/YKs1z8j/dNvMP0Bne4pYIWAcfpIvdSFfpfHFi/Qk5nov1denTlxEUOMiCMBYjC4xc/e0DOcElSVpEFUyt1odHJgHYrXdmDrpOdhxxAU+lU7uXBA== X-MS-TrafficTypeDiagnostic: BY1PR0701MB1925: X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1925; 31:Oa27WEKZNBoTs2oYCYFxPXWvTW1W9Hrl0/a+Qf/vP+asFnRaXsgB4LhwFh79fAxAeZC4c0/xfKWF4VMRYcTWWlR0ScFq3GnnSC1EIBL6fVsu5GwHovkODWj9pKlDQvTO5M/VvFMkjluejLDNTF0RRvZIGAdWQin7vLP7yZI5VhRnMiVIHIzxItdbZqQUYMNAuyXYFVEWr0NzL0v0TgbFi31YEVj4qSIWHGTt9lKXKgg=; 4:BY2BuagTHrd7K089CxUwibWm/vOiIWpQOzhaqUZH7+EaRzEIsb7JVg2HQ9ukuBKNyMZ0eLNqd3xmfc+jJztgaRKpMGKWueWvCnmM/tXwLt2qKv22Atj6nWO+GFSIPUx3NT0diwxJZZBd8ZufslBkV0MHIUb43vR4GH5HLGDw8wa2TjR9q0v6qs3b/HmLHQTdREoI19r11pcKP0RunA3cvss8Kbaa2v+QfqLzgUlj5ru39tCaKKeN7EkXYjgBldEknke/oKN0qLXh0Yo9yuZJ3n2I3oI6zufLoeq+rf7gChb8+gWYwlZXkGpwHiqvdKMU X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0940A19703 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1925; 23:IV+mSkMVKSaGknnfO46VaLvtT1eJ9CQSBUox6Zw2JsR/QI5pRNwCGJ+lJzBllAVJ6hTRdKRU6+7bcobL+22+5TuNZzlple4oEDSFIU9asZjas1mk4HOQtVGa8W42WmY+37kg6gClgQs9qLXzxJduIO67JQZXrqkuk8oawZcAjjqvuzoQG0K1HHwacmb5MOqgLtNPKJ2KakmVQTrxhvFJxzyfWMn+WeK5AoDeTWZtmUXFxjufgZdyLwSCeTCJ8phqCiRI5YeG5f1YQfbK4+2h9C9yvt025aKBWt2O333BwF8un28tgxzHGSy9ieVtqEb5eSnRRXcN+b+edfMEPx6z8MZLYiC1RJVvAX6D6vUfOaaWGHN1Iw2nEJq0GrovAU0Y97rgJyGffggsEWcQygVwLYaLOfMd4g95BG89ITJxiarTVKMwAPFOehPe9ullGMv9bE1iVKAW1cwCqXFLqqejFYKcxg31nLpciTqrw/OiXCzlvA3etZ3m/onNQVwOiLP4SJHnt5YcLHJ6NEMkfOlww1fI7rquMXjElBauHIF/rgX1TGPeQwMM53Cq7InC6Ml2SNjggv397vPvY8UuT8YzbXpR2m6T+eJmjdA+9l+Vg6j3ntZvC7RtjyoeeWILKU4pXkuHWvzNvdrB6w9SzUS9094hkgHEJ9G7C7DaMEYYPu24tOCJX3ol15cgI+xI/qQsutKwOMX4uoxDC/x5eGstKr7PlHPhK1xZ9jShd1xBSUyh7LKt4dCjBuqwRujoyfysA2h9A9XolqAkUV+Y7gFZMVSrhymJNQtC4ez5XmACaykBtt7sjvQqNqMjws4R1uaDa94wi+Tvjt8WjP7yZdKXP3YhQP0JMlAorYr7hWn+42D+e8UU3pfYliys6Nh88uX1Z4f54ZefF9jITcVcR+cxujK1XRyO7U+uI/43TUiWTYpEXIpKjyY/TA7ZBTv/rwmIB3AWqHe35w5n95VC957kHK3GfBBbgIX6stb+DsvR4fBS2VMN3VSAY5BI8eJoN8TMJ2nR6mQ2i9Gm5/n4necmgqjMFBg8GZ8aYmLomtnv+TbtbBn2O05AeOx06t0mw6eh7i1qfPIfG4CSHTiI0yBofDK5nH8kCVvcUr5MCnIOmRWVOrQvUmPNTW4rkX8NQlFi4tEBJARNaEDuyy/Yi+MndckJ2BYla8E8gUAWCTkQVe/sRzNOfP8H2TNVkHXqPPmEmQ7ctKJfjZnb7P6lz7b7ccwptYJzVuPpUtDXT6F3aVQ= X-Microsoft-Antispam-Message-Info: pVP/WmjA9j+iWGDV5lXLdkiodQnlqa2dPNX56NWdMfCilf7+SExCNyPUinAB/QZK9W2pahcLAoGSGnMhEL9Yuvxy+Uc2s8kW6MElWTe46Od8771rv3zCAGVEzYX++z/yLKEzoXH4so4Ut+JFbXKJ/5NrG9wZAf1k3pLyAo9KZ8yAl/XfcwB6nGCLQb6y8OgrBUZWzuSkGUPygsiPbONOcB7vxUBTGxJRWjQBk1uceeAwkHvxoxl4AioCRlBnuFCdgLtL1hOb7uPn7q0Gkt3YvKluSu+ImkIzq5XsKXiqC9r/KZwZAyucLy9w5OufUAD2fcAhnoJsv0vuirmO3AYg3H05CEISyz7bt8RS96hK5A5Jd3XiWP+VUUSEeb2t6/MKmPd8eEH9KjQ85XvXBPj6tnnXP9h5WRmV7VPXrTAMtJk= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1925; 6:uXiAd7Y1OfhyJC0ev3tm71O/g2ON+WUcjYZJOhNcc00fbJJ5UaHypPZKyjzixQgEn1flMTrY4NQku39z+wjt7TBua6xvFO9YL17qRAZK99HHfqbj1JgqNO/s9S9JIrbEIQRe+ciDMqR1C5GaJpoEivgB+EggXJ1+sR16T4/rM/DtCDcIMEth2SMYSj9VtoEjJ+QMvwvgmn68jmYsDjs+m0IYWlQp3bHZRoZhqE5eDtM+iT48kEx67EWnVOKMPdd1tqcHWubbgSbf845xPJQ4WAAux5rfTZWbndAqXAAsP/pvZMGvuj+JFGR7j5o/Xl45dHxfG5YS2IJZrU4J9AEoJpWEGFtN1ivQfHjzPSUZrI0Qp//B8mMnursh4vADLAnk13eByNSp2tw3xCDJWsxkXysYrCXwrzysAbBj2aNAFMuQpg6X1cZ4Uev9T9cAngcFsFoGvs9nqqlWT7ETegZtlw==; 5:zahvExTVZ+/5FcccvLmW/k45ojIRKFsmFxZvlPHWDrtz/6Ft6LC4glzWxdc7pByXVYGfyBCOwf7BU9an+ZizIFDExeXYW+vHNQfwoeDuIGGfMWGlCSg2m64pFc/GuR1vzL7SKFvqCmXpK2dgao77K3OsI3qKvQqgE+tjnTnBh+/nuZzvuZCc3hi9N7T02ItWomaA2Tl4US9jtcUSdQfPfA==; 7:Oi+P1aE/yvkJwDFTFpkPy615IOeEVHvCkAxMtGZt2WtG1dxXqvshirN4LNywxow/GrJIoGRdoi6+ceV9kCYAYTRRKg6hIm6WA3IBsWeyR/Lfm9tVq82/TmqV8TaVPe7DB414Qyvrlnnr8Bt595NyhA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2019 22:46:09.0823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dba3947-fea4-48a4-7b7c-08d68c84e31d X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[199.233.58.38]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1925 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sudarsana Reddy Kalluru Max supported queues is derived incorrectly in the case of multi-CoS. Need to consider TCs while calculating num_queues for PF. Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior --- drivers/net/ethernet/qlogic/qed/qed_l2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_l2.c b/drivers/net/ethernet/qlogic/qed/qed_l2.c index e68ca83..64ac95c 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_l2.c +++ b/drivers/net/ethernet/qlogic/qed/qed_l2.c @@ -2216,7 +2216,7 @@ static int qed_fill_eth_dev_info(struct qed_dev *cdev, u16 num_queues = 0; /* Since the feature controls only queue-zones, - * make sure we have the contexts [rx, tx, xdp] to + * make sure we have the contexts [rx, xdp, tcs] to * match. */ for_each_hwfn(cdev, i) { @@ -2226,7 +2226,8 @@ static int qed_fill_eth_dev_info(struct qed_dev *cdev, u16 cids; cids = hwfn->pf_params.eth_pf_params.num_cons; - num_queues += min_t(u16, l2_queues, cids / 3); + cids /= (2 + info->num_tc); + num_queues += min_t(u16, l2_queues, cids); } /* queues might theoretically be >256, but interrupts'