From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0043.outbound.protection.outlook.com [104.47.36.43]) by dpdk.org (Postfix) with ESMTP id AF4F069F7; Tue, 25 Apr 2017 09:29:47 +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=wQS2xoED4/DBUJ9uePFuR4MSkZlNvVrZIiq2qYN9JJQ=; b=dMfjTcoyWsIhQEO0O4J736mZXtnKcrrGwM6SYPgw062qjWuJqaeSOFWHz9iF1IzjXs2TqizggNnvVYt7trjWrujB/R3ay2ynFfY3nSV9gLrbvYx+2Q1sCgT/qqZy/DsoQmaojcKGMTwRpHl7prmWYsIcXEdhyhNwYg6lLKejJZY= Received: from SN1PR0701CA0075.namprd07.prod.outlook.com (10.163.126.43) by CO2PR07MB2517.namprd07.prod.outlook.com (10.166.200.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Tue, 25 Apr 2017 07:29:45 +0000 Received: from BN1BFFO11FD023.protection.gbl (2a01:111:f400:7c10::1:197) by SN1PR0701CA0075.outlook.office365.com (2a01:111:e400:52fd::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Tue, 25 Apr 2017 07:29:44 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1BFFO11FD023.mail.protection.outlook.com (10.58.144.86) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1047.9 via Frontend Transport; Tue, 25 Apr 2017 07:29:44 +0000 Received: from avsmtprelay01.qlc.com (10.1.112.194) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.309.2; Tue, 25 Apr 2017 00:29:31 -0700 Received: from avluser05.qlc.com (avluser05.qlc.com [10.1.113.115]) by avsmtprelay01.qlc.com (Postfix) with ESMTP id 745AB8BF770A6; Tue, 25 Apr 2017 00:29:26 -0700 (PDT) Received: (from rmody@localhost) by avluser05.qlc.com (8.14.4/8.14.4/Submit) id v3P7TQxk032103; Tue, 25 Apr 2017 00:29:26 -0700 X-Authentication-Warning: avluser05.qlc.com: rmody set sender to rasesh.mody@cavium.com using -f From: Rasesh Mody To: CC: Rasesh Mody , , Date: Tue, 25 Apr 2017 00:28:43 -0700 Message-ID: <1493105326-31984-8-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1493105326-31984-1-git-send-email-rasesh.mody@cavium.com> References: <1493105326-31984-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39450400003)(39410400002)(39400400002)(39840400002)(2980300002)(428002)(199003)(189002)(9170700003)(87636002)(2351001)(38730400002)(81166006)(6666003)(8676002)(5660300001)(106466001)(4720700003)(305945005)(450100002)(6916009)(2950100002)(4326008)(5003940100001)(36756003)(76176999)(54906002)(47776003)(86362001)(575784001)(101416001)(50466002)(42186005)(2906002)(189998001)(356003)(50226002)(110136004)(105586002)(8936002)(48376002)(50986999)(33646002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR07MB2517; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD023; 1:LoOZV9W/E1eTjpgnn77+sH9VStwyJGGymPexYApi1L7MWo7s+FLQShSgWJUFwcViVvjsy4e2OJLxlE3OSAho0/NdIz9j0MZoNPy7VWL4XFubc9816/zY2iqtxeSJ9UnBLE2xWCcuKEWI7MgAtsUk5IRpT/Cglab3e1n+NJUR9qify8VFxqGZZcxgTSQ8OmOLwdwvBxMJpVF+1sAMXZPO93gHpuFoKf1cJAn7Q1YfqMvNukt55e5scpXT/krOLxfHAtplU8bBsIOD40Dy33j4GafIMgV7abH/sTYrOhRHgpNRxaJf52SISuWvyGOYH8ISqoMDUlUQSwjyIfH+WjuCV58cFs/tIFNC0VuNbCozm7KUfQMOeCzmJD65jsUFYnYCvp7nn/b+lYFTA/u4fcXRSVUlPMIE2+P+lCHGfSx8Lhvu6T9mM3Ju9TtlXRsb23H2KldgRY5AvGftWaEyV8DcOIUr5DVJ5k9WT5i2/Qm/aF22SmDAztpqiUtUtYROwaqyz3Fk871cW3iweCRdLKiCow== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d0a2734-ca85-4360-375f-08d48bacd858 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:CO2PR07MB2517; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2517; 3:FCRkXpgpXblOQPvOWIUT4iJG/rSW+NnTaoT3x3HPsr42tYDmzVVG2WezzgvU20+oDA0DS7E3tQmTG0JB6kzojC39F30tYslWYIqjap/qCvJA05a2c2XvFsUtzprykFOdQqrL5OfHmerYDF9A3HM6ds88lzusb4zn36fF4zisRicBmh+cqx+FPtPX8mG84DA34EnWcVicPDTWysxDL+GfrCxAr0rnhbvydbiOajVMNc1ePAemiERYgs1eRxRO5qNK2E1Tkx0QnwauGhIAOhwZjWNX82YpwrKSo641MpnsyMvoRvUVS4lVoAI5IGXGqnvYB2juauTD0tSyoatiD+LpukZJlPOQtvK3ih0Ix4GZ6VwR2Yv8I0QtIq0YO8qLlXVCeDmCi4S55eXFa5UAz/7ky2D/gkQhnUXl04wFdqiaZeSxJtUbxnNMGVzIiJ4YG3dlUNoCsZzshj/AU5FuXVdVwg==; 25:nIn211PTlucpwm1rxD3hOXw/yFzx40yi8PYzE0Gf8Zk3odXxirmSoahLd4Bk2QGUBufV8cwyEun7dAWouk/PLmnSqTmuHy1SJk+xkdYXPIrV3hbRLJuqmtHwXr6K7tNpAzFG4tU//5rsEIbGDkNKixdIhCXXheztqirZk8SYTmXlZsOZEZGaVKfaYTvJcACxeL1B/KuSrSFzlActapsOml/MwKfaUnJkG20+hqmn6a7UQ1JqPvF1hAmbJQeLqHmbvbxY9bKCBWUAuLsi6LGgLy8hzBHUYwC2J87xGhoBC6oOgY2Ct/1TJD8n7c1VkaSCpz+jWmdxC5miH1CZZqJNe1N7XEYdT2loneJkl1F9r9sGqnFy4Ar0lraUSB9FjoFMRn8oPWAB4a7hnHQH7nAEjs0nOeXX8sYK3PcPa2c1AEWb8m6JguAfjMkn8czmj0157O3L89411NbhgeN0bBz0CQ== X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2517; 31:ifJ1dLLEby4F4fsAk3QffEHuuNSRbtLeQLIN6WJ6hOH7Ms/pTCEOsjVXAPysIXkfmNmP+l3qk+Cg4pshtYlicx7wqqELPpsdhH+1lrv7KXF886Hvy99LClOwqTQmGbdxfo+NTzMZlj6YvmSe+0/DDN+n+C+f+0PpMdYjgPI5zdKc0hXMZAYHxbbyOpqL4X/skb1qbRH8WdzQbBGgyMJSVcyy7R8p5BqSsRmL9x5e2TOqE4mEIFte1d+AP/6yFAZDYLuvc2YodZmYbY81svzl6h+jG7LeS8t8gXPQAaloxRI=; 20:5lnCMl0cMDZ3r3tjsqJHK4dxpHElgkKbg7KPhxwO87Jlq0QPSPWqGbzodBWX6k7timl6TmnVHb165A2IRpm/NVml3ISK/NHQKeGlxrC062fVXKX33rl/ESkDdQlLEA38vk+uwnvCfD10YcENpNoBeDvvdCgTLiyEXba96I2IVj7avBwxh36AVtgaogypkTFvHaYSk+MFIY6k6FzLfqupGGk9uGrRJnubZdroW0JUAw43xXsglj3VOmr17GMwAocO+eMN2VblT4ERD8JXRc7VX/I2p0iQwaWoco2HiV2623dMAWwRP1Sn3C7OZ6Qki7ytK16+xKwiJTaFN3Oc0oeOWIvneBFka2muuCVWMXT5UJZoZr/3rIMlSfnZipOKm7Krh1Eg6cWQ51PrTfRyhL054Uj6nkNoe82pMkU70bfx28BwuQBqp0Hr6b20sJz4TbKsyyRVb/poQCI707ut7Au9ZHQwtewT/Sm8td+4QYHorKTTa8FJwlMxf1WAeIjx/YlE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13017025)(13015025)(8121501046)(5005006)(13024025)(13023025)(13018025)(10201501046)(93006095)(93001095)(3002001)(6041248)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:CO2PR07MB2517; BCL:0; PCL:0; RULEID:; SRVR:CO2PR07MB2517; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2517; 4:I4PMCaYPbniDECQaol1hhW3swmmrl3PC0o2JG8/w7uSLX9gIaIAR6tKI9PcQYFntz2BB0nMhp5efQJAbIHmDj2J1fz4xAnvJs02zY5GPF9bC/+996Al1X7SNaBD1sHsy8DXt+Ky8CM3564yIWMiw/tCBRQdoP4TJRDSmzRXCdrq7JHZZryJQi8+K6itNlYLGxQw3PBdsOULveI60QNJ7KEkCq0auV6kaqwp2LqyJ/SnAq3RRUDnBvAsvFPBqiqk0GVVUYIzpwE8W3tIArb9pU5pBkbNqFgK1Y3WMJrRF/6AuJUVqgS1JTXZCqWC3e316uTuwJ3txyZVxpO1c/HjNVBDgX+Sc+bkRpeZEIxiAMnHctKSTyyuRAZecH5Noa0QMLusb5hQlK2sPKnuaxJ2H5QeOjAL8MGaMzwAaHGhFOTBB8XaMeVDOEHHddX58xeEldpFws5l07/BA5bpD0GHya8IktvMdw78EVfPf0R2kXejY7w2rlG3kGXmZeJQFJiOSLcTKCH9wX/NVNty3rlDs9lMwG/TYmgcb8UurfFhhp+dYHYCGC4Nvg6GTLLWYkSnI/wJni8mgXWbOOi/ZYcdURqUKJ52ogQgG3i/z+EDzJdJQTJ4eQBpGY2q4lIIheTi2AzYY5B2tT47VqXsoDmpdIxj+88A0IjLEPr1/Mk3lzZXy78IbqkkQY+mHyqYW0BqOwfafcg4nicwkvZTtSZOYigSEn8F2hvIZ3f373U4+SS85UDoT98T7NfpVaeHN6LuzdK6a3Gpv6B4AHLqpC/tk4SUbJ1SGAIJIVSK0ulxHeH0UNJN6+wrdlkzn6HRNmTKM X-Forefront-PRVS: 0288CD37D9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR07MB2517; 23:Vs48YOi84ZPhet89tjq2svu1NeNFDuQFem0lxIRS4?= =?us-ascii?Q?0MghzWVW0hsm3FRbfqRCXS1aQZbHI86L0ttkZoT1OTB+wPW2Ft8Y9fx1TZGu?= =?us-ascii?Q?SFuqb584nmjtKCsN1qNNx1r3ZnjIGGHkscS3IW8AHYdyKMUHin799fiYkKwj?= =?us-ascii?Q?1SSg0b/SJpaIcOPvP7RK6HyZ+2/bRz7XPLvUVprgXuQ9wEHZGD5q2Rzo+Cr2?= =?us-ascii?Q?VyAWogdw4sIACfrG/7x8jpNdsl9aYm2PzlhewQUm2g95n0C0+XvtNJgdo0rg?= =?us-ascii?Q?RM3vI6aeXPVynsD4Inlg0QkndnUWzlGncApv9hI3r7SyNwvK2yhskI+fQDZo?= =?us-ascii?Q?guELQff9bGrNVl7PEWdKMblRu2CMrxr18T9xGxhcXli/dSjckx6pVXACFg8b?= =?us-ascii?Q?nBVftJW8dH0VuMq+ZbuY0FeFdxvyVj4/ju45vi6W1LyUJVfFXRiO/YWQVgl5?= =?us-ascii?Q?SjCPSrv2MfMiqec4B9hC133fAcHrRJcZvKmbUUBUVrcqNbIGBvegYxeIk1pq?= =?us-ascii?Q?oLWXpWLko609FQOwXzAnbg9HQXSO2x89sbakWVpC3f//kuB9FUo2QzGbmSgh?= =?us-ascii?Q?596Brle5ndcHpV4lzUYkYHtRSpe232nRrsDbrjw9QKuOdqoYfwJajJJjaFbW?= =?us-ascii?Q?aNO0gJN4NblJII/CQV1HgwHDgirRrqmzC2VkfDPpaG36mZ1vT8pFm8wt7Vln?= =?us-ascii?Q?qmElwGXjsMwIkJ+07z2XOdslMyzt+hih98QI6M4GG0JxaewYF9DU3EuPSgNI?= =?us-ascii?Q?o7oEk3F0zqkt3XCGsvTU5IOhoDMEmaYS+bMoA59wTP7He0gwREjaxgKGpp32?= =?us-ascii?Q?o0SIquRRUhzp/xu/wdKZJJDWQTuQHOXUAPac8JKEgEL0oFGVqJk022iBz2qi?= =?us-ascii?Q?llBmE/lNywCXUnJlcoCzUSHZk+0pf92TYqEUyUnQzUVu5GdRLWTrFYMt9AEE?= =?us-ascii?Q?bLo7CP9jmTOzzXecU+zw8XKVEitlvel297A7lFKv+RRrt2wjagOTofyaMq2M?= =?us-ascii?Q?xFgGkfRU5SJ/VjmO9UjfQkqtDcKs3fRb1xgVhle0U42SIzXlRwgB9Zf9kKCk?= =?us-ascii?Q?Z9PyxgqFE0+CyGlMoF/XneAUp8gKW8QWJ/SY3mS8U56OnWo0q43t/f+mv9ss?= =?us-ascii?Q?0PSxzhlRXizZigr40nADtqSt4yOWxas?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2517; 6:jK1x8z/onxVvf92y6q5b7jHUYKLdt2wbqh9mSTBAh90n1F20hJ5+WyGhAi5C7TvBvn7HTmVQptKcBM7KFWuJHMPZfv9xP4e71cYYrXHQz4KmUmLocU07Pk41qyojXREzEtvsClJiv0CFnPE+VLqNDDT5vbIRikgk3vFxrdvNTi+Kcc/KOdF6zM6GPTS7u7sieUs5i9WvNsvgcLwmgSlfv6vTwbSruRstv448X9im6mglJq1wZ+rie0VGdNij3E7gnMq3PggliSbaE8k85aa+HFx0jGdAp9B2vfIsQTiPyeibjtENraeF7dHFFz+Bh0lyzAXvjqdmutJ7mDm+t6fiiYdWzWlOmL3sxw0pG2qQVH/CCt+wHsEPK1qpBWbT3saU15PMi7NB3q3JRTVrTlvsHlVEdvPsGBQfKykzhRTlrEwDBTHQdlG9olyopUJ9WM6jGZXrdgZAlEsf5FnHqa/ULBBxD2IRh1Fw7fjyH4zLzmAGhT6Z8GxOhCYr/U2bxcHCkfEVOEBPf1s7trMSJKd/Ng==; 5:w+MHLwddlBqlumCUnPzHSCp6+rdIrZZVh0dPe54JOdHGFWsVHkaLp//dbCgK7z45FsrlOtMZAKpmeXJQW2vuCw8Ce+vdo0oa2iWpBoeFWOW3zD24gLCHoZ8rh9FWmayeqYjypRX0VQgIWQRcq+tv6Q==; 24:mTrRzMoPxRERzGvXGiNURxVd02AqzVXYCyEZdTVyDEAowshl0ee94iZNeG/AIE2eNlDJg6cW0DG4JO3vPNODTWwA52XRA7n8znZov5EGjOM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2517; 7:EPH1yHX4k+IOdvAfsJh0LckLEYD2HvOLQMmMR129S5HBzREJibYweU4eFxI9AZrxczGPB5HlHA9PjwgJwM7RgjGUAYL9gdwJTN3H/N5Ul9IMZeOPIyOoR8RQrZQF/CLtLHkMNOVl1O/uY8HKIFxPLACmV2Ps/y1oAanFPoB7Khpik6XtwdQaI6p+bhpj0ZgbUcbG0tBlPzbgCI5HgRlbLHa8HnWZUc0nmbx0WFGOVHmmMedUqIz8OpP5+KGNfhZOCsWG0SMbo1R5qCI8jc09mZcax4b1nsSMj9vuZrURl4db8Uzy9KPhz9ejKmW3+gJUsFLgMsaSNz+4YuY3shgiiw== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2017 07:29:44.2946 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB2517 Subject: [dpdk-dev] [PATCH 08/11] net/qede/base: fix coverity issues 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: , X-List-Received-Date: Tue, 25 Apr 2017 07:29:48 -0000 Remove unused code to address coverity issues and address a code flow issue. Coverity issue: 1379468 Coverity issue: 1379521 Coverity issue: 1379522 Coverity issue: 1379523 Coverity issue: 1423918 Fixes: 86a2265e59d7 ("qede: add SRIOV support") Fixes: ec94dbc57362 ("qede: add base driver") Fixes: 2ea6f76aff40 ("qede: add core driver") Fixes: 29540be7efce ("net/qede: support LRO/TSO offloads") Cc: stable@dpdk.org Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore_cxt.c | 90 --------------------------------- drivers/net/qede/base/ecore_cxt.h | 4 -- drivers/net/qede/base/ecore_cxt_api.h | 11 ---- drivers/net/qede/base/ecore_iov_api.h | 11 ---- drivers/net/qede/base/ecore_sriov.c | 24 --------- drivers/net/qede/qede_main.c | 10 +++- drivers/net/qede/qede_rxtx.c | 1 - 7 files changed, 8 insertions(+), 143 deletions(-) diff --git a/drivers/net/qede/base/ecore_cxt.c b/drivers/net/qede/base/ecore_cxt.c index 80ad102..688118b 100644 --- a/drivers/net/qede/base/ecore_cxt.c +++ b/drivers/net/qede/base/ecore_cxt.c @@ -2014,47 +2014,6 @@ enum _ecore_status_t ecore_cxt_set_pf_params(struct ecore_hwfn *p_hwfn) return ECORE_SUCCESS; } -enum _ecore_status_t ecore_cxt_get_tid_mem_info(struct ecore_hwfn *p_hwfn, - struct ecore_tid_mem *p_info) -{ - struct ecore_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr; - u32 proto, seg, total_lines, i, shadow_line; - struct ecore_ilt_client_cfg *p_cli; - struct ecore_ilt_cli_blk *p_fl_seg; - struct ecore_tid_seg *p_seg_info; - - /* Verify the personality */ - switch (p_hwfn->hw_info.personality) { - default: - return ECORE_INVAL; - } - - p_cli = &p_mngr->clients[ILT_CLI_CDUT]; - if (!p_cli->active) - return ECORE_INVAL; - - p_seg_info = &p_mngr->conn_cfg[proto].tid_seg[seg]; - if (!p_seg_info->has_fl_mem) - return ECORE_INVAL; - - p_fl_seg = &p_cli->pf_blks[CDUT_FL_SEG_BLK(seg, PF)]; - total_lines = DIV_ROUND_UP(p_fl_seg->total_size, - p_fl_seg->real_size_in_page); - - for (i = 0; i < total_lines; i++) { - shadow_line = i + p_fl_seg->start_line - - p_hwfn->p_cxt_mngr->pf_start_line; - p_info->blocks[i] = p_mngr->ilt_shadow[shadow_line].p_virt; - } - p_info->waste = ILT_PAGE_IN_BYTES(p_cli->p_size.val) - - p_fl_seg->real_size_in_page; - p_info->tid_size = p_mngr->task_type_size[p_seg_info->type]; - p_info->num_tids_per_block = p_fl_seg->real_size_in_page / - p_info->tid_size; - - return ECORE_SUCCESS; -} - /* This function is very RoCE oriented, if another protocol in the future * will want this feature we'll need to modify the function to be more generic */ @@ -2292,52 +2251,3 @@ enum _ecore_status_t ecore_cxt_free_proto_ilt(struct ecore_hwfn *p_hwfn, return rc; } - -enum _ecore_status_t ecore_cxt_get_task_ctx(struct ecore_hwfn *p_hwfn, - u32 tid, - u8 ctx_type, void **pp_task_ctx) -{ - struct ecore_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr; - struct ecore_ilt_client_cfg *p_cli; - struct ecore_ilt_cli_blk *p_seg; - struct ecore_tid_seg *p_seg_info; - u32 proto, seg; - u32 total_lines; - u32 tid_size, ilt_idx; - u32 num_tids_per_block; - - /* Verify the personality */ - switch (p_hwfn->hw_info.personality) { - default: - return ECORE_INVAL; - } - - p_cli = &p_mngr->clients[ILT_CLI_CDUT]; - if (!p_cli->active) - return ECORE_INVAL; - - p_seg_info = &p_mngr->conn_cfg[proto].tid_seg[seg]; - - if (ctx_type == ECORE_CTX_WORKING_MEM) { - p_seg = &p_cli->pf_blks[CDUT_SEG_BLK(seg)]; - } else if (ctx_type == ECORE_CTX_FL_MEM) { - if (!p_seg_info->has_fl_mem) - return ECORE_INVAL; - p_seg = &p_cli->pf_blks[CDUT_FL_SEG_BLK(seg, PF)]; - } else { - return ECORE_INVAL; - } - total_lines = DIV_ROUND_UP(p_seg->total_size, p_seg->real_size_in_page); - tid_size = p_mngr->task_type_size[p_seg_info->type]; - num_tids_per_block = p_seg->real_size_in_page / tid_size; - - if (total_lines < tid / num_tids_per_block) - return ECORE_INVAL; - - ilt_idx = tid / num_tids_per_block + p_seg->start_line - - p_mngr->pf_start_line; - *pp_task_ctx = (u8 *)p_mngr->ilt_shadow[ilt_idx].p_virt + - (tid % num_tids_per_block) * tid_size; - - return ECORE_SUCCESS; -} diff --git a/drivers/net/qede/base/ecore_cxt.h b/drivers/net/qede/base/ecore_cxt.h index e678118..6ff823a 100644 --- a/drivers/net/qede/base/ecore_cxt.h +++ b/drivers/net/qede/base/ecore_cxt.h @@ -197,9 +197,5 @@ enum _ecore_status_t ecore_cxt_free_proto_ilt(struct ecore_hwfn *p_hwfn, #define ECORE_CTX_WORKING_MEM 0 #define ECORE_CTX_FL_MEM 1 -enum _ecore_status_t ecore_cxt_get_task_ctx(struct ecore_hwfn *p_hwfn, - u32 tid, - u8 ctx_type, - void **task_ctx); #endif /* _ECORE_CID_ */ diff --git a/drivers/net/qede/base/ecore_cxt_api.h b/drivers/net/qede/base/ecore_cxt_api.h index f154e0d..6d87620 100644 --- a/drivers/net/qede/base/ecore_cxt_api.h +++ b/drivers/net/qede/base/ecore_cxt_api.h @@ -37,15 +37,4 @@ struct ecore_tid_mem { enum _ecore_status_t ecore_cxt_get_cid_info(struct ecore_hwfn *p_hwfn, struct ecore_cxt_info *p_info); -/** -* @brief ecore_cxt_get_tid_mem_info -* -* @param p_hwfn -* @param p_info -* -* @return enum _ecore_status_t -*/ -enum _ecore_status_t ecore_cxt_get_tid_mem_info(struct ecore_hwfn *p_hwfn, - struct ecore_tid_mem *p_info); - #endif diff --git a/drivers/net/qede/base/ecore_iov_api.h b/drivers/net/qede/base/ecore_iov_api.h index 870c57e..50cb3f2 100644 --- a/drivers/net/qede/base/ecore_iov_api.h +++ b/drivers/net/qede/base/ecore_iov_api.h @@ -693,17 +693,6 @@ bool ecore_iov_is_vf_started(struct ecore_hwfn *p_hwfn, * @return - rate in Mbps */ int ecore_iov_get_vf_min_rate(struct ecore_hwfn *p_hwfn, int vfid); - -/** - * @brief - Configure min rate for VF's vport. - * @param p_dev - * @param vfid - * @param - rate in Mbps - * - * @return - */ -enum _ecore_status_t ecore_iov_configure_min_tx_rate(struct ecore_dev *p_dev, - int vfid, u32 rate); #endif /** diff --git a/drivers/net/qede/base/ecore_sriov.c b/drivers/net/qede/base/ecore_sriov.c index 39d3e88..db2873e 100644 --- a/drivers/net/qede/base/ecore_sriov.c +++ b/drivers/net/qede/base/ecore_sriov.c @@ -4386,30 +4386,6 @@ enum _ecore_status_t ecore_iov_configure_tx_rate(struct ecore_hwfn *p_hwfn, return ecore_init_vport_rl(p_hwfn, p_ptt, abs_vp_id, (u32)val); } -enum _ecore_status_t ecore_iov_configure_min_tx_rate(struct ecore_dev *p_dev, - int vfid, u32 rate) -{ - struct ecore_vf_info *vf; - u8 vport_id; - int i; - - for_each_hwfn(p_dev, i) { - struct ecore_hwfn *p_hwfn = &p_dev->hwfns[i]; - - if (!ecore_iov_pf_sanity_check(p_hwfn, vfid)) { - DP_NOTICE(p_hwfn, true, - "SR-IOV sanity check failed," - " can't set min rate\n"); - return ECORE_INVAL; - } - } - - vf = ecore_iov_get_vf_info(ECORE_LEADING_HWFN(p_dev), (u16)vfid, true); - vport_id = vf->vport_id; - - return ecore_configure_vport_wfq(p_dev, vport_id, rate); -} - enum _ecore_status_t ecore_iov_get_vf_stats(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, int vfid, diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c index d7847d1..009dbb4 100644 --- a/drivers/net/qede/qede_main.c +++ b/drivers/net/qede/qede_main.c @@ -265,7 +265,7 @@ static int qed_slowpath_start(struct ecore_dev *edev, if (rc) { DP_NOTICE(edev, true, "Failed to allocate stream memory\n"); - goto err2; + goto err1; } } @@ -306,7 +306,7 @@ static int qed_slowpath_start(struct ecore_dev *edev, if (rc) { DP_NOTICE(edev, true, "Failed sending drv version command\n"); - return rc; + goto err3; } } @@ -314,8 +314,14 @@ static int qed_slowpath_start(struct ecore_dev *edev, return 0; +err3: ecore_hw_stop(edev); err2: + qed_stop_iov_task(edev); +#ifdef CONFIG_ECORE_ZIPPED_FW + qed_free_stream_mem(edev); +err1: +#endif ecore_resc_free(edev); err: #ifdef CONFIG_ECORE_BINARY_FW diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 191d8af..47ebba7 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1501,7 +1501,6 @@ static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags) /* Fill the entry in the SW ring and the BDs in the FW ring */ idx = TX_PROD(txq); - *tx_pkts++; txq->sw_tx_ring[idx].mbuf = mbuf; /* BD1 */ -- 1.7.10.3