From patchwork Thu Aug 17 01:30:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 802288 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="fLxPNKUz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xXpYf2qL5z9t3C for ; Thu, 17 Aug 2017 11:30:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751882AbdHQBaM (ORCPT ); Wed, 16 Aug 2017 21:30:12 -0400 Received: from mail-bn3nam01on0076.outbound.protection.outlook.com ([104.47.33.76]:50771 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751798AbdHQBaK (ORCPT ); Wed, 16 Aug 2017 21:30:10 -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=PyxYWB7dDUYQ7gdnPrEsNm3Pko4BXCL54QAnbeYOqKY=; b=fLxPNKUzAKc8PT+p0/wDvMnemii5BAsxkaVu2vHKmxHCWtxFvMqsZXVUlXcUM1M63o7OhKEVlkDekZeAcc/sEbLEU0l7zwrRvNFpTZWfk1qa9jnwZQ5mUNNayoYs+1ye/99B9/AhmLdX5iUyxyTqCUnrPY27bsEEqCHrYmP3W9g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by MWHPR07MB3181.namprd07.prod.outlook.com (10.172.96.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.21; Thu, 17 Aug 2017 01:30:08 +0000 Date: Wed, 16 Aug 2017 18:30:13 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, ricardo.farrington@cavium.com Subject: [PATCH net-next] liquidio: remove support for deprecated f/w cmd OCTNET_CMD_RESET_PF Message-ID: <20170817013013.GA3149@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR19CA0050.namprd19.prod.outlook.com (10.173.117.12) To MWHPR07MB3181.namprd07.prod.outlook.com (10.172.96.139) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79d3bfaf-be89-4d24-1ae4-08d4e50f7f21 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR07MB3181; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3181; 3:WJMwF8ci3YQn2ccoZe6QPj4+DdIXVM1WpOdfmeF5DQXPhg/RmLPmRU5zVHBVV62goI+b7gBDjQ7wvEZ5Ut7S0JQiP79d96UNkHo+Pp8chihfuzR8nFUMLrUy4zQ3C6q1/7CBwVMkqHfhEP2cySKre/pJ0ALNeUCDqjI+wmKWPJSLt2BDWsON5gzOHNX4Pf8/8r534E6i5WffpiYxbXpEwGAEPe4cSo/c6KS/PIW6TDPJR7RdO3Au4Ji/yRYqSyWM; 25:Tc+aalyem8SPk5p/eCrYFr8uiDcy0w7PHd/LLg6m12/2PMzBU0WYz0x5RyULr31+/LAazx/1lFEWIsHiJEm0sh+fG+yY4DqtMkY7aeYWxVFkGQJunmbCvvviZqcHOBxGJ8lRK3kySp248qWNP/f0xwY8o92nTwHmPmiadHQxH99HtInQpWmZAINlsUYDHdHuYRutOODuJuK/e9qPKAvz/Ti0NaVSCx9K61erGJ3kKF9ChJd/ROxYECaJzK5ZJzjoWJDyAUrd1kHkt6gEbCZya/LyYG64TXQxaWNzRnkD+k5/s1R6Iri6yJPpQaEsJQEJrJpcY2UnAb0aETdr89v7MA==; 31:6UhoG0yYVNuchX/2pJGwaIoC6aCd9VaWcvzN7jFTTdXaWGTH8eq6+wjr1HuXboFwqkd0/eFjONyQAbGswhg/9LLFGcweAxlK6th6JPOarXSK6pzt6weQ8dPrfc97FOp6O3EAsqNUIpQsuiq17Kg5LrG5SeCgmYdtiOC7JRMb1npUprdVJaJPLsz8+lra0nDHdXZ78WwcBQipHvHp/QEAr6yorpuHGQ1uj/BMxMAn9Xg= X-MS-TrafficTypeDiagnostic: MWHPR07MB3181: X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3181; 20:WBBvtnSTvHd0jEN0Pt20UDYP13S2bKQFNqe6VQL4NX9/5LaQ0CTBDlTXAbE9UQeTY9E6/TTBNCALUpOVwZTAYW58ny5UOkx6CfNaq59ek/aeyvXPL/tdVEc9+dV+j0DMNrL0TkUYm9D98dPHHeUo+0Fj8AR+B+ZqQ+jG9CdTDHCJM875owQV3IVZnx6z9nq2KL2qlAQaZ2jjdpChh3A0daEVz/qLAPgQ2VlUgHvfBxq8XO/GnAjR8Eu5dDxBXJM6mISpMlW8OOIUWP09HiMBr8UMvF+zjCfD3BZXU7vVWKadl1Vxll+rwNygOgIWsqNV1/M7nJas67uAk/Qxn5RXMz/PEbs6tZGVb0iGkgtf+qpD2EI4SlZ6TBy6kDwXkpyGQjUEKzp6MFVOYEDPkc0yvnidQ+UbA26HGRvi/J/KFS9Yn8YtO8Gxs2B+Bq2TIjB1vTJ1rlgoB6QhSqU9l9ZfdC7jsDv0xkAFEMsxD5Dc0aZtK4/PeQSrJBKKBUhW6IYk; 4:13uwMwZs6J7YBVg07ZTlsXn9Oqbk6iJsu6+y9tGCsj/yeJHLLPyMOLV/SOHeH5/OH4Y1YTsryrXZv7wEa7tKLwT6mBBodTgH4+/DfNRpP/3vdk8GTcdvY/ojVZbCo6Wtx6x+8PNrI+2VYTPmRCKE4jVz74RCQN/4gDjEgrbqhM5SciIm9unFKyYWTIRBKYRki4ZRH9BWyRtIcL1ng7EWw46sT0e9HXKFlKnqVdJf+gG9IrOYmef9wV0vZBXVsTJO 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)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR07MB3181; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR07MB3181; X-Forefront-PRVS: 0402872DA1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(6069001)(199003)(189002)(4326008)(97736004)(53936002)(25786009)(76506005)(47776003)(7736002)(83506001)(5660300001)(68736007)(478600001)(1076002)(2361001)(105586002)(106356001)(23726003)(6486002)(81166006)(2351001)(2906002)(54356999)(50466002)(50986999)(33656002)(72206003)(101416001)(66066001)(86362001)(81156014)(8676002)(305945005)(6496005)(3846002)(4001350100001)(42186005)(6116002)(7350300001)(189998001)(107886003)(6916009)(110136004)(6666003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3181; H:localhost; 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; MWHPR07MB3181; 23:887xSAki2q46y+2zq3sn3ULOliIYmSP4JIzKNwL/X?= =?us-ascii?Q?IGifnr47ARZV2UrDb89CS5adDrh8EwTdrMVnXzqiqWD+rh8PQT4Y8lpyJP1P?= =?us-ascii?Q?ICRQDO7ndou6BVSbOwkAf+BC7aIx4IHSQqqW1GgDdeCiteAPhDuHshD2SATH?= =?us-ascii?Q?XLnybU41zjkemO/U07QT0fnDgKF0v4ZmYgwl0IjSJH89qEs+ujN6y46cIWE6?= =?us-ascii?Q?1EZGvMs7ThiwVbOtDphjDxlc/ospTaBdYlEnfJk6VfnA3eObVZd9N9n0jysG?= =?us-ascii?Q?oHvhc2SKPb+OVqcfuF8LkK/g1wP+Gb+903mW5o2P7a4+SLAjtSHOuuX/mQw3?= =?us-ascii?Q?qG0ZWaLK5Zu8eqLdIsRqTPWRn7VGzpsqbyacbH0e5sdMIcyg00caSP5wTb3x?= =?us-ascii?Q?Cj352TwV6qOwcqAbQ/pCCK4NHijW5WPQe4yRmTSJzSuU6iOD492n2i6VSfPM?= =?us-ascii?Q?ez/WWWIg1rX+bs+cgkWr2gmK2yHgepNF2IRvg5nqekMfVWp1aOIAf+4nfpKT?= =?us-ascii?Q?1nEfn6ze5h2Yu2qjh/Y8OYYgjCKHDD6CPlZBLQa64ZRl1CpIq73fsFa23POF?= =?us-ascii?Q?z5meEfa+HQ7DNt7wqj1Aq+HaUzBZD9BJYoGK91LbsLG4P5IGddeoCepq5xdY?= =?us-ascii?Q?xZhBsMAi3ctZEgZ3lOpO84SZl518JPKDkMZkT+u8lRg7HU5aLUf0EOpyIjjA?= =?us-ascii?Q?M6z4KGsbidhSP7NAWo6WtaIMKqMOy+aCU0cMTnORYIrJvyPTguQcnskIa/7l?= =?us-ascii?Q?slTyYKQd3BUKv2YN38pskjctLtYLumOgXyFtyNVgNC1ZvkgAAo+83CVvq6ON?= =?us-ascii?Q?ZX1z7unByyhiGK8Lyad6otWrKon/Sxs/Iy3EeKrejF7R1d2N70UbMyYhgEYA?= =?us-ascii?Q?m7OV4g3xub7JnhNwA+5Y24ToB02kNGauzesfMinmAJc7lbWrXKdWW/GnOsYJ?= =?us-ascii?Q?hSCfGaif3rocwPJGAPV9bVo1XkGYQhyIgk6/Pl8NASUGmkNHRMy3cM1um+gD?= =?us-ascii?Q?5N1WopIvCn66MrApWc78znh6bCADPnxVa5rDi1Fs3/+nMywa+UONEeDFDwh5?= =?us-ascii?Q?n087ZUaiXeEHFnp3gCP8YlU+XstLBqdURCy/89v+YQVVf+bs0R6cj+Xli7iQ?= =?us-ascii?Q?jR4Sj0obg3IZMF52e+FbrVognUGGziVV0XlolUsSIa/64O4/Hu/iCL7vTqTL?= =?us-ascii?Q?DJ68sBCXUIMGvc=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3181; 6:bjzy692CBZ84b6IcGxSDo1EnP6+OE6aKzAx/qN2b2zMEtyg02LfTeAbZcFvnIoDf2qD1UzQtLyG5CTkUW/FP86SE4KfcB4ghJj2YRG05UnYuphtWXYR43/+Q5JpHpJAICq+0oRFjJjw4xRAIVc9RbLQ7re2rSMeDPURRxJcWrGCXhBh167WFlSSW1S+Y4mlPjzwyCjKUWoE8Dohh6YX4b8XwveBAMWplsVyWQFPP/JDafmtvD+zsmniB8u1k0QoEptl0C4WIkYRXA8MsglruiRdAzklFY7u7roJquyJxPK37sAIWe1iMu1Il28ilvuIiFvkHDxHAt2MuxaDYdzeBag==; 5:135SAh9qHj4lhCSpKIAJnkUW+qMbeVx+G4FL6zQOxIrghrj6F8gdh4Vuc80VUR9gLbjEN6ZdF9+vFXal+T30bBi4CQ9ISEQpstA8+s48awV4hBK3FHbJdTBRZ0vu7vQ7IKcxEkqrC3FAdB6FikarQg==; 24:UHEoA1bn0B4MMurZ4PFEwUm4pxff4FRBoirVK0PoC8TASMCP5XBGdpB2m6wq7S0gmAXWqSZWSMvSw/lulMtBr6h3Se5+LlGnzjtnQ84O8c4=; 7:SSo4GEbqM0M+hHKxhh8aIVo3QuHppGh5T7LKNfsbHC1/0XZhLvFmJKS3jixq7Ejn89dfwYr2F4HaIwBr5LMYnFxx4IqVN//Ep97dl9u43DJb2cNe88jJrNQQd+yC7MJkcpcAl5lQmWiaQCkHxnXsRlka21X6NnUOEBGCDG2MfXdBdn+jbytsAoVtGBpUn9r1uRBavtOPcO4atIOWl4R1wfp6wP7oZu5Ot6qXzdEmy5M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2017 01:30:08.5291 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3181 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rick Farrington Signed-off-by: Rick Farrington Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 9 --------- drivers/net/ethernet/cavium/liquidio/liquidio_common.h | 1 - 2 files changed, 10 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 0eea6a2..db85f8f 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1409,15 +1409,6 @@ static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx) if (atomic_read(&lio->ifstate) & LIO_IFSTATE_RUNNING) liquidio_stop(netdev); - if (fw_type_is_none()) { - struct octnic_ctrl_pkt nctrl; - - memset(&nctrl, 0, sizeof(struct octnic_ctrl_pkt)); - nctrl.ncmd.s.cmd = OCTNET_CMD_RESET_PF; - nctrl.iq_no = lio->linfo.txpciq[0].s.q_no; - octnet_send_nic_ctrl_pkt(oct, &nctrl); - } - if (oct->props[lio->ifidx].napi_enabled == 1) { list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) napi_disable(napi); diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h index 18d2955..906e30a 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h @@ -189,7 +189,6 @@ static inline void add_sg_size(struct octeon_sg_entry *sg_entry, #define OCTNET_CMD_Q 0 /* NIC Command types */ -#define OCTNET_CMD_RESET_PF 0x0 #define OCTNET_CMD_CHANGE_MTU 0x1 #define OCTNET_CMD_CHANGE_MACADDR 0x2 #define OCTNET_CMD_CHANGE_DEVFLAGS 0x3