From patchwork Thu Jun 1 12:29:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mintz, Yuval" X-Patchwork-Id: 769679 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wdmsc6VCjz9s7f for ; Thu, 1 Jun 2017 22:31:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="E5elp7QF"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242AbdFAMa7 (ORCPT ); Thu, 1 Jun 2017 08:30:59 -0400 Received: from mail-by2nam01on0067.outbound.protection.outlook.com ([104.47.34.67]:54640 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751108AbdFAMaz (ORCPT ); Thu, 1 Jun 2017 08:30:55 -0400 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=FGIVEq4Dr0iUUX1p3L13Fnc/0whCGyyK0fQ1WCXr+YU=; b=E5elp7QFN2v6nBqzqjvo/tABJn96WSXm53doyKITxaDIDdvnpiw34ejlaA5I2IuXDIAJkPZguV/5s1+deVn/f+rCzjSdahNs/OOY1+LzqtI7wJhK0x1a5hPWQkw4HsIMbJiiBXAzqKZM3ETv05HNqQho9sBQjA95umqntafXIsU= Received: from MWHPR07CA0042.namprd07.prod.outlook.com (2603:10b6:300:1c::28) by DM2PR07MB432.namprd07.prod.outlook.com (2a01:111:e400:243a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Thu, 1 Jun 2017 12:30:49 +0000 Received: from BN1BFFO11FD016.protection.gbl (2a01:111:f400:7c10::1:175) by MWHPR07CA0042.outlook.office365.com (2603:10b6:300:1c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Thu, 1 Jun 2017 12:30:48 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.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 BN1BFFO11FD016.mail.protection.outlook.com (10.58.144.79) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1101.12 via Frontend Transport; Thu, 1 Jun 2017 12:30:47 +0000 Received: from lb-tlvb-yuvalmin.qlc.com (10.185.6.94) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Thu, 1 Jun 2017 05:30:44 -0700 From: Yuval Mintz To: , CC: Yuval Mintz Subject: [PATCH net-next 11/11] qed: No need to reset SBs on IOV init Date: Thu, 1 Jun 2017 15:29:11 +0300 Message-ID: <20170601122911.22493-12-Yuval.Mintz@cavium.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170601122911.22493-1-Yuval.Mintz@cavium.com> References: <20170601122911.22493-1-Yuval.Mintz@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39410400002)(39400400002)(39840400002)(39450400003)(2980300002)(428002)(189002)(199003)(9170700003)(47776003)(305945005)(2950100002)(81166006)(76176999)(50986999)(86362001)(4326008)(6666003)(53416004)(105586002)(106466001)(36756003)(478600001)(1076002)(8936002)(356003)(5660300001)(104016004)(2906002)(5003940100001)(48376002)(77096006)(50226002)(101416001)(50466002)(107886003)(8676002)(72206003)(189998001)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR07MB432; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD016; 1:1UiEa76WcnPi313NAdtnpZ6Vaez6aGHpNbfcTng2mknPGT9VrLLQvomrVvKU7c+V/8fYRK5iJqnGWiVDE8w74upH2reNnWNeFtAdgCLfF/tiOOAAWI6hE2cJGnetXnVafzpVNrAfMr7DCD7BwI4gvIthgulu+6QSeOFPI5fghxmP3Kzw+x6zqAvQBdbjEQky3C8hsVeJFMTMeu7zL/1iSOhP4Zxk11BGK2dj23WNJOXTz19N62EO62yphy4jj/80CgoHjHzE95/pD7vrU9NbGc4OtdG/F/jyIYr2uPBM0PafnRnU6vrbvB3tAFR4eEn6rPvQfyrKIies2YJf+W3241QBINmNKTcAFkfUVd2upOC4lLaP0kiweHL4O0E7TFgV/vYsXMVPE/168hTlIHif4fOW9bARcBd1yvmErSJHpiuSFrBQJgP3RxR12NkJFmYAC3CNXq++RHKVNxLTQiJf/g8ajuyEhatazow9FyPDfZnGwm1vHP8+PXlO1M6pfcTgw0+TKR6aMvuOVrJhNRdfog== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM2PR07MB432: X-MS-Office365-Filtering-Correlation-Id: 390e002d-7e0e-4071-2a8c-08d4a8ea0847 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:DM2PR07MB432; X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 3:bKlCU+aOs0sHsTEklG1XAxbHp/1IoAG1w0FkqI4EYWFwRUEszdN/6rFWT2BSa9D+ZTbCUEwtHSVnuVGuIT743h0bsYUWo9uCpJ+cqAh8rSKm5WpwQJDo5NwJLUJjteuC/41zSntrFPcC5r9of3xXUVkTxqi0R/oz6SrBVO/y0R7XgN23YkR6S2xHhRaeby43OnPGprWfKFs4GvVXt6lgY/NToDo38GuxImdUPJfY4CtHDEP8/esPowAGMeIHpxWBTpO654427e84+FicOxWHabjVD60PngVVG+ej/Ktce1Ek7KH/T40k3FSSawXPxi1YPi6D3YyYUTToBw6a4G7yO82z2He09nC+HN/1Vhv3k2+4rMsAr70pMclN0EmZsnA1J9cykzz/ltGvoPP0PgT1eeC5ygmny8ZATrKHhEirVYZpILuf3UGUtQYKL7RM+a0rwcQH9nBVSJKT/6wvKE1sZ+OlF6HwN4pSnZfEq25LRJcGcXAaacGpNiNgs8s0kdMb X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 25:QIcWPDYhOfa2tibwLoB09ifCUHQP3zLGwgLT/kJmNw2yFyCTWXl0m/zjF3Y56TUfOlrR7ONP0UH75+OYjWOcatJcd112rVlLdgFgIImSsraoKCZbVB3g0LgWRVfOHbt1Lo/aRl0DcfQLrSMiz7EjlPG54ui01Pd6QfoJKKuzn8BM7s5G9xMh68G3739+yPaw+7/TS00KlBT2NQW82g2gJ2VxJtR5HFfjCDtH1a/xe6nloWwStIonIGaatIVvTmY6ybZt0Jln375O8THKgfSHvcqzhZFByMgtJJ/Xx1bv/a9SKW+KOJGFDvz5k9NcuyXXKSkuNMVMJx6Zxcm9TwUAqcRhPVTGCOFkvWLJKU5Ao8+TqYRs5XAys6LWCrxYIpygpcOiYFG1pMwD1qujJJbXVWi4Aar6SLevGwQjrrhDyglHdnfZ8cUN9RB1fsFQN2VK72BPbLRp3XBhE1u6WKEbRVWa/GHFehd1YEj5RjBv/ZQ=; 31:oxX172XWro7wu4KMQm5VM/tMImUBwW5Uvo0agAQFryASoGrAaTpRvm5Yo6btw62vtEMJ1LrVUS16GjwJCBm2VRXxjGrWjcmOkt7xrIvy+ZW7GssZ6/B5N0EfHum9NKsvnd6hBDwhRK2aMnCPKGKdVF1mR1Ie9a+QbGMr3sc5Q3jLpoE1COv/dP8uTDgSRSt8bVJ420hy6gDLdpU3lkRo+b5O6GqryxTEDp+vvKFiJZzF5CTKlbB38mvudEPLr4t9wH8bKK22LCRUsstS9uWr2A== X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 20:fp1i4MIq66b3L2/xgOPFtZ5ith17n07SX25mkdcr47gtneWFoUrjmTGKvLgde5VMs+ds7hMXqdd4cp3d+qEUT8lLrLmFRVACRoWCEHp1SzbxX9+CNL/RIlbw2Rykm7+EwkNr/6sK4YZkqf64d/2TOTz4Wa9BWCRrnb58Iy0P5rY5TPiOswASSLFR4CRSnkxRbX+0v5fm+EgPKnCkyfJDhzpw52f0VigkvIExpTTGVQFH6er1GV6EY+6/1dSfXoaR4l7SDQio3+0oqwvdL8ebifTpcoc6gTFNlx2jVUQKGJqR8Q4d/zXIrmCTtzZGdHlvy+yPsxJuhVSGEnqZHgrJVKMXc09xCXHmR1R8k2tx/iVDXg0PqQlT7Y2N8+AMymuDUffF+7uWpf2LfvEKATTAVDxycTdZZQgxJlJ5XuwPsdjQFFvvhERCuQHVR5Xx8PgNBWYJhpqXjuMkWhiL/CdcI48/LquCie+uLR/ikKnJtxrz5wyBKA0AUNRWtapAOUrH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700096)(100105000095)(100000701096)(100105300095)(100000702096)(100105100095)(6040450)(601004)(2401047)(5005006)(13018025)(8121501046)(13016025)(93006095)(93001095)(100000703096)(100105400095)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(100000704096)(100105200095)(100000705096)(100105500095); SRVR:DM2PR07MB432; BCL:0; PCL:0; RULEID:(100000800096)(100110000095)(100000801096)(100110300095)(100000802096)(100110100095)(100000803096)(100110400095)(100000804096)(100110200095); SRVR:DM2PR07MB432; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR07MB432; 4:F4gSDcEEh2FDrjTjAiS6kUbeaHNqCpR/TSY7Gi6LXTH?= =?us-ascii?Q?oTO1SQuUTv9hKy2t47V3kkW/WOCajNM8LLmrWZjdLTs2onIzUEt7w0MYB7rr?= =?us-ascii?Q?ktwfIFETf0IOXPJ+G4w2YoinbnCxM7npTaKvkYZ9U9P3lkSeRVbCbMiLdvVk?= =?us-ascii?Q?aG1Jkx0f4CLlL2dvWce3HFVULrCV8R2+vrzb6Sps4hFcAkXLYCoDra3o+vl6?= =?us-ascii?Q?e90ZFg58xvdMpyZcB5fJ0DybN/0WtQxBCkmvIgu5SulYFP5Y7Qf1iIzD4Y1d?= =?us-ascii?Q?rR7MEXSyvwwm5PQ0r0lkzLnE4tngB4ifrADcPdANzJ6uDvG8asb+qcPq7VWi?= =?us-ascii?Q?+UHrIIo4JWGUEwbgsfZGHWQj+I8rh0OWj7GmZ943l4QePyHLq+mbmbDDaazJ?= =?us-ascii?Q?bi+qVZy+x/MmiA4owmkEqyJlr76wy4K+FvVJ8LjXrtz4KYgcNVtPTWxG0wfh?= =?us-ascii?Q?qcjWqnYGO5e8P9ifFnClZIgNySA28pGgAmcfRacVv/alPJ+OTtwIHX5FzJMy?= =?us-ascii?Q?VaRXMY99XlrZsmA3vcoDcqEobRC+4VrASN7+u+Ela+niqRBErVpJY3ehMS9Y?= =?us-ascii?Q?glpa64kwY6G9e+/UU2Jbwk2dmmAfuI1rEBTU+hOIUYEcUatT5NDwE0fBmj6C?= =?us-ascii?Q?aDn3fS9Hi/uaBEACNrxCJNGgxB9Thvc9Z/i7wj5OfgqEcQgRwfPbo1WimFqO?= =?us-ascii?Q?FZYBMd4b37udEOtege6+dH7f++mp5r1u/D3VyS/3wFGHxvjJB93EjyEZxdkU?= =?us-ascii?Q?WHIWLaaVUM49cPytpWRizlWb/NlkTG/F7Dji6kaH4gGeUunSJJY9E5WtjBMe?= =?us-ascii?Q?S212n4o47i4TdgoQm4LbeYZUoBke5m/INBrfEJM/e3U7yZOQbNqf45b3hARk?= =?us-ascii?Q?DzU6niWbTxEFglzu7YHVPvWyI3aZP+UBwqGxgmDWJLCJJTEPe/Xj4UemRbjH?= =?us-ascii?Q?e/ax7IEMo53OHtkeLQ6H0PpaJLxC/jHoxX6oory3MUOFgMILsGrzpfRiEENk?= =?us-ascii?Q?YGCrFghCVIj+VELxx1byr4nGClGzniqD2TEkQfBqWdF7XBwWwEkv5Q2c0WEk?= =?us-ascii?Q?sNxgA+A6e2gX8FVQURCUfij8ewl38n5Yli63hIcFyUT9JUEfRY5vKgDPavck?= =?us-ascii?Q?YP+hKOUWfkOr5ckUrYBCA0NeDm/53efQXDVjaFDNfQoI4LdzQbybAKH6WYrf?= =?us-ascii?Q?JMiUU+Sjyxak=3D?= X-Forefront-PRVS: 0325F6C77B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR07MB432; 23:SisvPhJPqqcmK8P31VrFMTkmQtjg/YK8WmddI64Z5U?= =?us-ascii?Q?/JeVTN2o2Hl4pOzfjvpi61zRpMdxYLEvgTAWsBSrm6jSXKnUsqDrKiRrFDSu?= =?us-ascii?Q?qUeJtEy3/Rt57gq9n16lBcLZWiUR57iJNFjMo27AXCEoreBDj5Ona9r82rQM?= =?us-ascii?Q?UsC5CFgdSltpBC4QzPXbKIA0g0eLAZ0pSIF4NMeEDO2d+dMbND2LKZU5XRKq?= =?us-ascii?Q?cnp+KHkA2upvQ6EktUbI1kWxqdcOukrDCDqRMQFMk/KkSmDagUEN/JfxL6Lw?= =?us-ascii?Q?irSNMKEvtdqdApKglV97NbaIyiOF1OUs6FSebHCaFDeePS0WgQG77XCcDwDM?= =?us-ascii?Q?ZfF9Meqj5U1TY4jGcjbcZIjP2uWpk7VVVRGAFDGMs5z2a6aBMY0l1wx3m6W4?= =?us-ascii?Q?Neg3dMxDRBRYoHMIH57mnj+nc7NNFhm5cTYWGQ2421FFtTsVCXNkUD15jgrw?= =?us-ascii?Q?ga18b4x1U/U93pttOJELyPX7lyKBI69GylIB7UGuc11WvpHmbmsbDZXf4jcX?= =?us-ascii?Q?ezj95h3t6irfbJWRqzu6XCasLSfss+/3fdz+nQCYTuN96kryc7iq00msN6Y3?= =?us-ascii?Q?uQzTKPAoWt2g+hEPB/5XObKuUUPupJWJCq1laUNLdfK5iyqf/bIFGQnFNKRv?= =?us-ascii?Q?OuCkxpwNhrvso13bPNH20yZzDOGqYgbAmoJl6Biwb7X9kSLhgVU4/USwOaDt?= =?us-ascii?Q?p2veP8Q7x8GB4CSZEBGK4TQ9G9rXb5dNAAXv0XETVNoIFmcAsot6KlSlExnc?= =?us-ascii?Q?awJ2LVg6sJ3ll4AMiVEYizcr6j/g+jXkg9g65wkfr9aKEKJDQOK77do3PYOW?= =?us-ascii?Q?4wJRrMxRLB8UXbUoIGwsIiO9QG5JYR9cvHRkzsuA/hP1gyeiHFzXgeCQtd/i?= =?us-ascii?Q?YHdKH4/bcD/yca8+5QaCKdTdMp4q5mkvMLJHEONF4iczC6s4YmFskWDirO9V?= =?us-ascii?Q?BqGOg2iq+yXk8/TnaqqltW6KZtXGXkqDwLQ81tOgEVMuqZf6IJ6QrruopdAu?= =?us-ascii?Q?J2/VNhtJYzR7NBnEukF8YpzApZYQ3qxbhS2zf5N0l0QeUqKvanrsmC81sNCN?= =?us-ascii?Q?BOmUY=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 6:GaCY0Rad947jGTodzi53pX7U0Y5Y9bR6ksSmxU6xsFO5l+kty4Ixbn9WaZyWcwYAjzIHxZINbky+xQf5Nx/i91CFUI2bpPpQl53aawT8tpd7MRcdZLE5Nf0qqEOzvvcTAzoU0EM7L+xoI8qj+Dm4bAXJduqw4yuKZ4r8NQ7O2E47h/fhAToBYln2jNn9Tuhxgm+bzee7cgbHtfRHaL19mh8NWMh16g4rcfNNk2zUExe5f7txPV4AoZmA93xWjsfPM5jJtOMoaRo+TzcgKaPjqaSMOp7MHKWsF7nw54fgH8zOjTWFugpLLYdyBfIUXYFWmMLacAgVtmdQylIkw4C0zqS+WcmPVKPFoiBBH4oS2MbH3x2rVUHe0yodP/5y6I8ViVKPyWGb7NAejrgjOC6TPAUjSSt/2ncqX9nc0bpbAPVmt2iRoQsgw8eN8xvAx/e8QRNkVlnLNPlgbbOOAy0Wbma/xQfiJNXGZ/g65HemHsijTY+7OKryYriEIZ2OcSJeUeu+GliIx9AmX4vIWBBmIA== X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB432; 5:PXupoi0o//eG4LniIOKQ7VVfIg9owVd4EMXXM1E5hxgYFnYBdEC1loLCPz5Sdt+9Nm+WUau6IbUt55yyLYiBK5zhBVeMVvBf35laKMx1EoRQiYQYcziTMqNSqLlPVXPBICxhFzFvOcZ8UYl1FyskRvTbdE70DJWOKoJQE2aRzd6obKSRsu4Q40317oDnsKkZh7vOqncSfw2/rWXQKTW6+pBzmQ5sKk87j0yjHEDupsuF/sNbOaJfVgdQMLzD+HbT0Wu3rn6G0VZBnG7bJOKRLOv6VowateysSlBSist6+zsd8OZGChMR0G5df9zfFJvdAIoN7KiCqwgbcoeoettXZgP+vYzhtH6YdUGA5lEyWFSC/Op+kQp0ZwN338LVFRrsoJ/kSYAxWSwlEpZ+pkM8+xNPA5fJ/eUnzo5qQVz9Ksmj1F+oxdXVQkie/YE4ffEVxovqmHqxZY4AwgKKE23sow==; 24:GbASV1zA/cSevh6qeLccs6yjt/QCzCaYi/ZeFtRnU3sXt/GT4iIONH/wjm1J8Ac91D4fJjy9Kw+hLik08ovL8v0q2tz/6c8E8kGYfA78PGg=; 7:rwBFu9hcXFz8r/Qh+X6a6Kv/Wbii0t8QkWYilGtxuwzMK1tpokvzOKbOfimMamzy8fbhhAoQiT+zMdkAznN1tK910nSdzdoPWIExldX4gqQMtVyHCnkYe4E0X485KVOYyH5S0Q9uZiugurnNYxBhAyQKHsMdndbnjcAixnagKUeRZuuQaWpVP6lx+PPJwh5TvPRRG23bQ1kDzetXs8fFAFUNASJYQ+tAZqA91IYqyUP/3cOYqZ3ThmT9MBCp6+DIHgSAXofhkTWes46j2LnyomabUB5XPMKjw7+iIpSr3qrIXsaXym9BqTamXOkz0WLgm1fr/5PzQRCGaGWbtoCiNA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2017 12:30:47.7189 (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: DM2PR07MB432 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since we're resetting the IGU CAM each time we initialize the PF device, there's no need to reset the VF SBs again when initializing IOV. Signed-off-by: Yuval Mintz --- drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 30 +---------------------------- drivers/net/ethernet/qlogic/qed/qed_sriov.h | 5 ++--- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 939e85c..7649f35 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -1030,7 +1030,7 @@ void qed_resc_setup(struct qed_dev *cdev) qed_int_setup(p_hwfn, p_hwfn->p_main_ptt); - qed_iov_setup(p_hwfn, p_hwfn->p_main_ptt); + qed_iov_setup(p_hwfn); #ifdef CONFIG_QED_LL2 if (p_hwfn->using_ll2) qed_ll2_setup(p_hwfn); diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c index b7dda60..6ca2892 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c +++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c @@ -378,33 +378,6 @@ static int qed_iov_pci_cfg_info(struct qed_dev *cdev) return 0; } -static void qed_iov_clear_vf_igu_blocks(struct qed_hwfn *p_hwfn, - struct qed_ptt *p_ptt) -{ - struct qed_igu_block *p_sb; - u16 sb_id; - u32 val; - - if (!p_hwfn->hw_info.p_igu_info) { - DP_ERR(p_hwfn, - "qed_iov_clear_vf_igu_blocks IGU Info not initialized\n"); - return; - } - - for (sb_id = 0; sb_id < QED_MAPPING_MEMORY_SIZE(p_hwfn->cdev); - sb_id++) { - p_sb = &p_hwfn->hw_info.p_igu_info->entry[sb_id]; - if ((p_sb->status & QED_IGU_STATUS_FREE) && - !(p_sb->status & QED_IGU_STATUS_PF)) { - val = qed_rd(p_hwfn, p_ptt, - IGU_REG_MAPPING_MEMORY + sb_id * 4); - SET_FIELD(val, IGU_MAPPING_LINE_VALID, 0); - qed_wr(p_hwfn, p_ptt, - IGU_REG_MAPPING_MEMORY + 4 * sb_id, val); - } - } -} - static void qed_iov_setup_vfdb(struct qed_hwfn *p_hwfn) { struct qed_hw_sriov_info *p_iov = p_hwfn->cdev->p_iov_info; @@ -555,13 +528,12 @@ int qed_iov_alloc(struct qed_hwfn *p_hwfn) return qed_iov_allocate_vfdb(p_hwfn); } -void qed_iov_setup(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) +void qed_iov_setup(struct qed_hwfn *p_hwfn) { if (!IS_PF_SRIOV(p_hwfn) || !IS_PF_SRIOV_ALLOC(p_hwfn)) return; qed_iov_setup_vfdb(p_hwfn); - qed_iov_clear_vf_igu_blocks(p_hwfn, p_ptt); } void qed_iov_free(struct qed_hwfn *p_hwfn) diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.h b/drivers/net/ethernet/qlogic/qed/qed_sriov.h index 81a497c..801cc00 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_sriov.h +++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.h @@ -316,9 +316,8 @@ int qed_iov_alloc(struct qed_hwfn *p_hwfn); * @brief qed_iov_setup - setup sriov related resources * * @param p_hwfn - * @param p_ptt */ -void qed_iov_setup(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt); +void qed_iov_setup(struct qed_hwfn *p_hwfn); /** * @brief qed_iov_free - free sriov related resources @@ -397,7 +396,7 @@ static inline int qed_iov_alloc(struct qed_hwfn *p_hwfn) return 0; } -static inline void qed_iov_setup(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) +static inline void qed_iov_setup(struct qed_hwfn *p_hwfn) { }