From patchwork Thu Oct 26 01:04:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 830421 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="G3jKLEj1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yMphK0j8Mz9t2r for ; Thu, 26 Oct 2017 12:05:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751998AbdJZBFD (ORCPT ); Wed, 25 Oct 2017 21:05:03 -0400 Received: from mail-co1nam03on0046.outbound.protection.outlook.com ([104.47.40.46]:29420 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751868AbdJZBFB (ORCPT ); Wed, 25 Oct 2017 21:05:01 -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=kyuKhcUoi3CF+DBPP9YEOInmxw/sutBcPrwjQd7cTdA=; b=G3jKLEj1BF2+N3fWfXde0M/oPEjqVWh97lb5XmhjIY+dmXiOfM+gTqefoTZr1otRkZbD4RDQKSBlt53uIAjTpqVXjfzRrmtzZzc/VhquWpPzswiDnLUk1QunUVE5r1QTTQ/lX2ccjp7myIOHWJoVV0mQph6Dw+QDrhfilBvUxhc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by BN6PR07MB3172.namprd07.prod.outlook.com (10.172.105.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4; Thu, 26 Oct 2017 01:04:59 +0000 Date: Wed, 25 Oct 2017 18:04:56 -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 Subject: [PATCH net-next] liquidio: deprecate 1-bit flag indicating watchdog kernel thread is running Message-ID: <20171026010456.GA17500@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: CY4PR1701CA0015.namprd17.prod.outlook.com (10.171.208.25) To BN6PR07MB3172.namprd07.prod.outlook.com (10.172.105.142) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e48b2e2f-4e53-4ffe-fe59-08d51c0d9459 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR07MB3172; X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3172; 3:t1SsLssQKAfmbGBKuQXeQGSC+C1gS1Khh9B3A/CgMLZV+cvUrPZjDgsY/64hhJjQzx6ZGW7ahi5mFlUjFBhqc8F+hrnzJm/j5Q+0fsrakv3plO8QTGhlV77/NKfnrcyn3EWm2v6kuUCvEOV7nOKoRYeLiX0Y5M8HhkccQVQNOBVnzLMuliej1UQfwML5TSV/8zxtsx7miKQsh2r01NDs8nBbIuD21E/U2Axf813gtDrYvGwajrnP/dJVvGxXw4Wk; 25:X1ZKMOVxP5+I3tV9Idbog4a5MCcLlBAidzEx7++DKBktLNLFWWfxT2yPAYtu+NqUEaLYu+nA9tceKbvEJS7O87LEyys/hFRzzUseYAZnIamGrpHGe1QVCB/u+Zgn4GZX7kMS94zaom/UwL0xI6celjxgEb9NGDY7a5qtqfcUSJ421jGSOKnOyl9oB2KvD29YAsSplseEKYzJqzo88DR3oCKm+RbUF/Y2fs51ODfw1iofYRpMeT/fIw5QvRDDmsfaX6Nv5ZYxSF1rK2xH6IwESFmGZyyBhSrItlz9iOQihyu9dmryrD1mUl5N1ZTWnHaCAFEc/PimJnKSZYWTkW1OEA==; 31:dNhwsrXqxfNPkXDnkAKZDNvHZ3Q8eUZhn1cHP1yyX6qCuv3SktoHfRCMiI/Hr9Er/gLSITQsCISSDKxBFY4/7qDHPSeYQobposHhJKSNNNcnKDaijwXnWM3Bdm7XjLPhx5DCLAJ0onZeoXIacdbtKuWfBJeNnxbKwuIiXKXIj+heeBbD8R2nZYIifFF9E8gjhxJGm7takRK1dUjs6MzrztgWUnugWOTeXx2BG6Tzgto= X-MS-TrafficTypeDiagnostic: BN6PR07MB3172: X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3172; 20:ITpbCOQaBYWXUcITAJP7NNn7xEFodI6bgQmMxhVHP06qbInZpTVTGYYxEwN0EDOsdGYXEuPAhpFJ8C9KCuabNObxKSakdwNBvL2FUhLDeQFa+PKOZhBFk1ffCYbO2849TMFC2x9kPCJngAH3mCf2rSyNERpTVGzZMpTDzOfc/+RqXBLXOk08hVb9VXI27VADBO5i907V3iUbTcYJLrqQX9Jb8ZYsWIofEfknI3aZx3+RdFzg+upf4o8PHvgUcV6EA5xOpeNd9mtUO5npUx8czDK2j/Ne1PjOrtotMqmzW19rKyLTbwWjaDRQDS5axEyUlPDG87OUSanouA9OLKE6elJjRc0vys/onNMMrond4kZzALvPDx6ypFYghy818HeUYlALsSy+49mrPxyzdLtJqNP/nZ2gvXil/EIwlIaOlueMXyifZoVV2LFAYDOxHqqmsY/VzWWQj02H6EOTI33rOFYpe2jWhhy4Fj19rCglV2PyZISyJYVfPe8dxxBgewZv; 4:qEGQh/Q2ev5HyjW5gFgOh8jEup4plFrASSup11qAWyl3hxK+cRHTpmEnZLeoYdWvdYDKgBkGabA+wVFzYlbO2myPnJ3hkwkCcPK+EFcv/XKdA1YjQiPq8p3LmZjzZJC2EODxLcx1Ib8z6gLPlwZ/+3FIcc7zIHkyOWYdLWjznZXuyzN7PborC665ANIp8SSR3bQvjLUtScCKQ0iEIP/aonPqu5DRvR8heDHg+fQe2YV7qs7OnTkKUBdKWr2el0dr 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)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3231020)(3002001)(6041248)(20161123562025)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR07MB3172; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR07MB3172; X-Forefront-PRVS: 04724A515E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(346002)(376002)(189002)(199003)(6666003)(5660300001)(8676002)(81156014)(478600001)(81166006)(8936002)(101416001)(72206003)(189998001)(305945005)(25786009)(68736007)(107886003)(50986999)(54356999)(58126008)(6496005)(4326008)(6486002)(6916009)(16586007)(7736002)(316002)(86362001)(83506002)(3846002)(6116002)(23726003)(50466002)(1076002)(97736004)(16526018)(2906002)(2351001)(2361001)(53936002)(76506005)(47776003)(33656002)(106356001)(105586002)(66066001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR07MB3172; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3172; 23:75eGLKLutHlsAz86A7ypaAUVOcoRJ9BZnLvTEUCHjMQocT9K/vnjwBypFqA7N2xMA3K20JIBPch92C3ItMBhFzrJZYTMkoLieo3peiaWri2iq39e0xPPRM5jHE96P9+C2Tnh4Acxbr3vUYRNlx6ZpNG6fGEh4MZsmWRs9HlQ7CWxDwopjyh2w8qUyO7UkQUW4UVVbTfmqdEfubFMUfnWFdmtWyj5wlwP1h383rBfaVdShFJTzzcNeS78DcE3HAD8atSKgf6RzImfEnIAx95hpMXK+ZUE3ijBBftYmh385bGBMRufiK+gkvENk7DPBlzFz598McT8Qg3u4P0zUZ8ds7853g3u+ym0q6/+uQ6GfbfRPkFiz4k0J/J788qJ0+fkqwBui3Sh6dNQYRjZaHcPRmR+DeB/T86orqRBxBrsH+ApjWNXRRsnbDKOmqHRdCbrBvQEGIyUGABLrSTg4JF3o7qSuz7mD7rPwe1HiuFO/0byMebrIIcUyFQuq2E+C3hR5+RUTpw7YvcIzPw3r2Pw2vHG/FI8sEmtNRks1zet0ej0vM7DfA4f3xB3AIfc497MzCVbiO3+srAp+IskOK1/NYBwrtaRAAwQ+kVqwZ+O/qIvx1pJzroTgKuHXqYZAKaQM+vxtwnF9T/IzpvQ5FqvdkpQ3FYPHoXNQ7ojciTvG/6jXuAqIKrDf1O1TyTaXJzyqDm2BbQTE54wgnDG8yj9OVS4T6xwrMeFNHX9li7liOjulBiA2VGWtvrg+WcTOz0vvEPn8EqarklAdPPrpm9FU4/vCY3WkFS0sZ1RccN3d0KzamyUjeFC14lmxf/w+OpXexLiPh44Hp3Sn+xgVk5540+3YLQPlHeoQFfZjPkDEKTUkEavyltd9MGQT+OMALSHV1nMK/1AVMksPADt+KSv2vtkXuntUwBz+rxEbHhL4z+zxDuK2wP6ISfjttASN2eR33MycdBlO4ZPpZDkIhYDMpwMLSSI9Fd6uVHkZHeZnM1zRd/xN9emR8gQP19bX/SxemAadvNnFA1/23z5PPJlcSAb7L1NBqbkfaW9JmmZwkXeavP+bB972yF8Lp2uyAKDVfQSNd0vtfA7xdbcpEkledgNZI0dyEFbYfqq2ieprhlaKcC5n0BCV1ZkGK3pm3hlfnimRvDEoXlg9Jhe3jG47w== X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3172; 6:LVRNrw7LAJwfcCbz1ldzfog8CFXRxvwGIZHwPWNNSOgvOkCSh03/klw8Jc9eqfHvc/CHOPcCyTYuw3ZN/PAXgwyXGigdN5hSTc4YNC/QLGosvoIf1ZrJGPbPaPlyZAyO+x3RbSSZ6XbsppOJyng4WVpcnYBXQd00CxUssdBVSvSNmg71OHTmvacAROEzV/AgLGq13c8RqF0iLn6dl5NW9fcHTG+ZJoV3/RkI2436l8/F2DqLe1pTybgBL86tErhGxj4p2TE+xHWP2S9vWuU3VmTNQX9mLk/o0vghT9TBRoLoPDldrssK0anX1fHKxzgG8oQ6qjJyhog1FPETAeobpA==; 5:Dj2GELv/m95GDqXEWygtwCeYFYPHU+6OS8JLUzLqxubua5QCzSPw8XPi3OX8gzkXGS40DaF0snEcQbgWcNGe+XwGXzsUO/SfmsKG0Rln3oj6Dycit4UcIMv6utyiUBawjBdqnPsZX8+4n108FzpI8g==; 24:7YVDwEa1k1a67tfPIcEsnha3ozhr61LEAoRFiUMF7gifxttCiGJjNhG1YyPtKCJfYgt03vzzOjFJzGXv3A18vfQX8vNeDD8o2rK+0FwpgZs=; 7:BJiF7uQLY7BOmMGcjhJbaCLm4ffp9ZIlXHwTCyMWMjzBPKHmAK8STG6QI4uLAgowAO4NbAO/iUJIJXQQN0qum9OeltKLsrrKkLamrp70zb3hrvlR1Kh8HnK33j5KmDt6Ju6+BPhVOESKFWQwot3ST6bbGuF5F+EGZTgFgSKvfJu0+0kA85eYGtPsduNpdjy14UG+e/sooFVCz/z9qYIbPk01+nYLVTFKaMkAXctCKgI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2017 01:04:59.0152 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e48b2e2f-4e53-4ffe-fe59-08d51c0d9459 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR07MB3172 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Deprecate the 1-bit flag (bit 2 in the SLI_SCRATCH_1 Octeon register) that indicates that the liquidio watchdog kernel thread is running for this NIC. Reason is: it is incompatible with the firmware's use for SLI_SCRATCH_1. In lieu of checking that now-deprecated flag, check the value of oct_dev->adapter_refcount to determine whether or not to create the watchdog kernel thread. Signed-off-by: Felix Manlunas Signed-off-by: Raghu Vatsavayi --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 963803b..d1a755b 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1076,19 +1076,13 @@ liquidio_probe(struct pci_dev *pdev, } if (OCTEON_CN23XX_PF(oct_dev)) { - u64 scratch1; u8 bus, device, function; - scratch1 = octeon_read_csr64(oct_dev, CN23XX_SLI_SCRATCH1); - if (!(scratch1 & 4ULL)) { - /* Bit 2 of SLI_SCRATCH_1 is a flag that indicates that - * the lio watchdog kernel thread is running for this - * NIC. Each NIC gets one watchdog kernel thread. + if (atomic_read(oct_dev->adapter_refcount) == 1) { + /* Each NIC gets one watchdog kernel thread. The first + * PF (of each NIC) that gets pci_driver->probe()'d + * creates that thread. */ - scratch1 |= 4ULL; - octeon_write_csr64(oct_dev, CN23XX_SLI_SCRATCH1, - scratch1); - bus = pdev->bus->number; device = PCI_SLOT(pdev->devfn); function = PCI_FUNC(pdev->devfn);