From patchwork Thu Aug 30 16:35:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10582321 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86F03175A for ; Thu, 30 Aug 2018 16:36:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7668F2C0EF for ; Thu, 30 Aug 2018 16:36:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69CBA2C132; Thu, 30 Aug 2018 16:36:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D424B2C0EF for ; Thu, 30 Aug 2018 16:36:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727707AbeH3UjN (ORCPT ); Thu, 30 Aug 2018 16:39:13 -0400 Received: from mail-co1nam03on0078.outbound.protection.outlook.com ([104.47.40.78]:61600 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727702AbeH3UjM (ORCPT ); Thu, 30 Aug 2018 16:39:12 -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:X-MS-Exchange-SenderADCheck; bh=94UoFnRB5YFTLdcuKrHjLii4pjhcBfnB4NKXOjVfqAI=; b=DbtFED8w6rOnITXFt+497kiSempWh3rKIHdrvAlJg7ISix56iSTKo3DTQni8bzTtJ0gMuo7PjJzDsX28/QXknNPDxoeCDYs0vHDmdQLHn352xBSczzkRtS7cAAhE5R7Ecmxj6ppPsjTlpOXWp89HV60oVa9Mg47ag5249J9nM/U= Received: from CO2PR07CA0083.namprd07.prod.outlook.com (2603:10b6:100::51) by DM2PR07MB1449.namprd07.prod.outlook.com (2a01:111:e400:50c3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 16:36:08 +0000 Received: from CO1NAM05FT009.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::207) by CO2PR07CA0083.outlook.office365.com (2603:10b6:100::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.18 via Frontend Transport; Thu, 30 Aug 2018 16:36:08 +0000 Authentication-Results: spf=pass (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=bestguesspass action=none header.from=cavium.com; Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by CO1NAM05FT009.mail.protection.outlook.com (10.152.96.116) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1122.2 via Frontend Transport; Thu, 30 Aug 2018 16:36:08 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Thu, 30 Aug 2018 09:35:52 -0700 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 w7UGZql2027371; Thu, 30 Aug 2018 09:35:52 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7UGZq6L027370; Thu, 30 Aug 2018 09:35:52 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 12/14] qla2xxx: Defer chip reset until target mode is enabled Date: Thu, 30 Aug 2018 09:35:48 -0700 Message-ID: <20180830163550.27288-13-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180830163550.27288-1-himanshu.madhani@cavium.com> References: <20180830163550.27288-1-himanshu.madhani@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)(346002)(396003)(136003)(376002)(39860400002)(2980300002)(438002)(189003)(199004)(8936002)(478600001)(50466002)(2906002)(48376002)(476003)(126002)(47776003)(4326008)(446003)(486006)(86362001)(44832011)(80596001)(106466001)(14444005)(69596002)(72206003)(5660300001)(186003)(2616005)(87636003)(26005)(36756003)(81166006)(54906003)(11346002)(6666003)(1076002)(50226002)(81156014)(76176011)(42186006)(110136005)(8676002)(305945005)(16586007)(356003)(51416003)(336012)(106002)(316002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB1449;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Pass;LANG:en;PTR:50-232-66-26-static.hfc.comcastbusiness.net;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT009;1:+77gxgqLw8WBfsmNlVDxD6XwjhPivQhVjWj++oFB+aNoBIw1Z83o8tOnZJAwGP0DRzs4tznYodIlTdD8Voe3dFskoknzSe8H/9qBLPJ6rnXiMwPLj7KDpf2MAlXYWe+3 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffe13994-c8de-4d9f-1535-08d60e96b04c X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:DM2PR07MB1449; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;3:A1O81vc6oLoAWuCjG78xRDF4Alfq+vZwaP2HrlJCoTQAWWLBMeMeekIM7Mk561vEW4wp/kSjRYDeHT7kHThghy+rX4zuIqR5qePP9eVGDOpbQ7RkXGRMNIqMdULeqQxX9qfPU70ItxcMqmHqMyNuAgUSbP33vle4a7y1sfVgm9z7t8Jk47EGJLQCex4b5Lwd0k9u7GpXNCDAGnrN4e+yQQx4mu6szcqC1P/MHsXTWC2q5NdaxxefHNalKTLhlRh+IwSsavGJr1/WwgopofAQQ0QnHoULzlUFm9DH5FRVgBLsdjZAvZSkDBjYzAyC1skfuB4S4a9zSCXzFUhS9MK3QD/AAEDoP5BXdxxu4YIU9X0=;25:4yigvRjXXNj/S7PaafIV410fcPe+exyf7Cx2Omo53J0m+9fm9Fp/WXax0yWOA2wWASkD+wnf/1yQT2LtnFsrT2UsS6g9s62NEnmEwckSKVqgQJZnS5S0K3hH5XI54gRlD3Yyk2bGdGvUkYNyU3sV7wiMvIM8qyrT948UBDRtb/7wDoO/Bq8t2MbYXfQ2NLLmGn3TtqmDxIZRT6bXE3o6Hu7Gckb+YueHWEgne9n8nHAYUOQXmg8keTSraoBljAyqZlamsrg0GbNnqtpiyjbf7nuJQu6zhYP2Pa3IG0lWDWOkWDIVtS03rHx/JvBPM3g/+pBbeK0l5jCxy0Ado4iU3A== X-MS-TrafficTypeDiagnostic: DM2PR07MB1449: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;31:9u8sb6e4mUGbVcuAPdwayDW4N/d6xX0f21w73haCsfFF0s57rI+YyXxHoRThGMcurpkcMTw++N+auMpW1vYyiI4YW3QdZiwhfBKOUyStbBqZdYO17KDThRJ2ww/jqQgrCcRx26NBrY34j+Wzdi+GVeJ2XhuRnyc+9PNmrmVcBD3I8MwYjMPWKq8TEd5z/6Yn2KONdb0aRJarDldBqZHRrFb3YMnE0Sjs9NIbGkcdk+M=;20:WNv5Xe4Cq6X7aQcnNUvZhoOUI20B2nCfy7OeGW2WRjQvdM8xuRbG4jG/UsMYzP7SO8Pa9QC0ZYFE1T2Z0myCIeqNz6AhFOtUXVuQ9TiJOrxhat/uO1B1mEKrvz8/Ds4exa4GLSUdCpx9rLs5bLqACXc7gCf7CEyAi7Fj2/VjFnOwzyxJ9EhN+hwERItqAaFgb3WujTUtInknjmMpxb9hAktqQZUlCymJYztql5yWQbpxWRgP6Kugo7pcz7A4175qVP4jehshm/FiMXNn7jskxyDcW9MJN//wyE50Yq1UFKdnz/X6spGCfSY16TwTJD+tvrrUBxj/peCPMqWj8uiLmSS94QvzaLLuTaM2s5uXEremwdaO9eZi6rlPoJ6Kuvt4s2zLQk+g3rZsBRgVt7P+ogTUcRIyGk3XWMMl78+cPQN5PDYlnZ8uetko/Ez7jgSxLDl6YCdVkifyDNE58zM9xjCJDaFkXJtQ4xWA0dOgYJK68ECQVGGvsfOmDAcW2CF2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(3231311)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699016);SRVR:DM2PR07MB1449;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB1449; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;4:zX4c14EJVX/qyL+PEgwmvly9hHD/HwYLVUN+GZMr9uRZ1uCc63+GWGZwWSeO+gja4YhL8WtEha/srnEHbeE9QO7jg/VGcCnlWPx2IV89+9rCSAMI9EoZkKBErjENHhMeEonZk3vfi0Iyr9A3DNlJ+6rLn4N9lwTOWPbhrELqarWhBVKT2IDT63xNDWEuIzEnpTaKw+Aum3RC9aaqcuN0m4gtqvi0ZK/OYhpHTATXjosnQAHrjPvwr0/UebvYBDdAnDE9l2d6N6YIjjLIWB/F9g== X-Forefront-PRVS: 07807C55DC X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;23:Ds/n9eFZ9LbNQj3nksAQEB/0Z5TVouWTsqRiJikSkbnuyfkyLVySmReekFbuZj5OwVnlW1PB1M7IHau6mbF4fyI1qY+64OfOiRW25bUXE3hauCIW49DX3O7ptUPeY90kWItCZXrohVZNupO7a/zFQFblZuNebkpetOkJGCXaO2y75v5pA7pZYmDkzxxdb069RFGEjUdCHdM1vEY3RJLgWZWg6CTtu+MrohDSeosyGGOym4avgw8ka5Jo1LL6Yp/5N6u1T2UEHgt7Yu8s5PLlovWyt3lQw2QgCXMEsy4Cx8qYyJ6yrnI4ybMZ5L8PvmSxVJtp1I1RHllc/Rz8FHA3l2o1I7gklnhZ3qJpj0W58v2DM8Pi0bXSkkiP1WLij4slYor6PSiWmiqlUKnVZkQ7gHQ7mGTTU3GMirDBGvcF6LqFSkFN4tGKvxgAqPtiBXt+qIs+S/+vKDMukw/WLNCNgDFzGBXH0AIIWPaOA94vev07NiCM4EVR1TohPJt4eAR2Yd4FmrMx87bLavvv0zJrLipTnfCrGuy1aDiialsxrqWZc9G0jpt9XR8POSUpDGCBWDEi08uz5fMugALIR2WKVsJiW11hd87LYi5+7R5RENGWLIGriyMMVQnoz1IBFMGJmbh4sJRYh2j0soE6rGNLDtmAdVj5IPQG/Q82C9RBPGp84JvUFKBvBctvMp7Ybu7UAXOMFwdbkj77ct55x48NJbDk4Ufv77mcdq6HyARakr3iDy30C4QSi+jbmKRPBipfc+Z0omnZfVn+k1HCrng6I2oiG/2pmK+TF6QZp9IY5LTG5yqIjKSuIKTn21VWLiurVcEs1H6SxA67AXuBU0j3F/OAhpfHK4dWph3ULaSxiK4mXG/+HsyWZqYUjpT6W9o6m/fcIZfaLcmSDdnK+WysjVe+hsn0FngaHP+aocKqHqA1yrPeiIk88oiQVbyBkq8IhzTe++Y3Dng0dqrBMmXQDS4++ZU3AywdyNRgANY7PgDu9NPkxrz1mkk3w+eilchu/6h7eDfEHK2wXjJ/YHmQLtomLCug4ZqtMNZx78TLcXyMMYJoZrKl+23Zp6ry74MwtFuUQnptZ2mgO44akXlKadDyj7hAdTXRGLEvI+SngawaZ47GGVLsjULZDX/u0Ln7 X-Microsoft-Antispam-Message-Info: YwgcnJWloEfDMKl5c8OfrXO0jG3rf1N0DOGTplTddKVXTv/MYJTq/7La+CcxeObp5VFj8aqeHccFQfT9x6Ot2ajfnqM/mor5kd3Z/yRMzamVZszvw6DMyrCJzuGYQShxLF4PPVWQd96SFjY3uqweTcyxLJ8KtrHeA4GzUHV7hFyH5MBw0bTK4R8nEXnxoJZYVTJ5bfvz8lNRJPqXeGov8Cb1HrjQovYuo9Lf2/o1nn8LXO0gEoyU00Cm3sGGqdZeZi7BCBPoOgdf1c2WiFo8iIz/ooL9AwTt+JjeL8gRWiTqiPqZ23u0qluvCwzNxY5kx1a8lX/gj2UYUBQfJVfexMzXH77hpwj5RkR+1kdPmD4= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB1449;6:w7WlDjvnosPOfgnMUt/pOKJhCQveLMH1/1rO5m7dqEeLJzgwmvHuOIjcH1snya2XljlxcHy8P05bMFh7wtivbVPM3xaNvsCMUwDfmxuQeiHIXywTok025a+76e73Q4yxA+7YLwdlx23pNDjw4BRTI4sBIqP81yGrHFRaVdhAE2UKlvn7jUOim+psoSuTvYtWZatDzXjq91AxqGvahhicPFfNn3T1gu7P/+nhOucBGFNt1rkEmSiBgFa5RSgxcRHhTAQh4OENgdD9Oq1Qa4QkCFyc1avHYvf86vb70AFUn25mQEiYCKhe3FpaSl3EigRLw88xD9XkcEnnfAb0zBlQuxBOAuDrG8TiIT/llxbMSF6V3xpIUXd+LkY+BYiCtVRH1oAePK2paJU7LbMMh5BzfySHsawzDJ35IRZNyE6CbRLRNaKTeWjJwg8zgKn1HlRNWYgpqnnOdQjFoCu/d8XMwQ==;5:CCPf+UnyHy03NUxl6nw8hJKtZ0bFCwEsNGr5dBPVpvbdWs7uryjZFcVWPyAgPO1Y5/mWvjqZ/031BeB6q357aot75LiWIma+JbbyEb0myL1k6PkUV0Y26ITlM0mAuY6TILV3dfIRTZAjgOji6Ngdw1qscNUAOvRx2xKBbpcUoSs=;7:8n4aoooOL9OoU/0fgnC/AovbcOG2/9ovXfmjc/pkpRBq/c++uqqJh+eRy1E4UDjdI2tvBV0mKk4Sk6lFyAHLFh+Br2x3Lqb+GZdWt0aYuKlNKeQ5o4xSpSas60qMy3x9Lgx80Bg8jv3oZipRokgtM8bu11ZZvHCT2noa9thj93gmyUdvI18YanlDxP5l83dAXPpnmVXpvde3hAIz8ssBLQaIQMBN8wJVkcI1Er/VDUdhFWFxKD7HucYMutmq3e/0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 16:36:08.2507 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ffe13994-c8de-4d9f-1535-08d60e96b04c 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: DM2PR07MB1449 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Quinn Tran For target mode, any chip reset is triggered before target mode is enabled will be hold off until user is ready to enable. This prevents the chip from starting or running before it is intended. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 1ae31a119a37..9628fe4a967f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -6047,12 +6047,27 @@ qla2x00_do_dpc(void *data) if (test_and_clear_bit (ISP_ABORT_NEEDED, &base_vha->dpc_flags) && !test_bit(UNLOADING, &base_vha->dpc_flags)) { + bool do_reset = true; + + switch (ql2x_ini_mode) { + case QLA2XXX_INI_MODE_ENABLED: + break; + case QLA2XXX_INI_MODE_DISABLED: + if (!qla_tgt_mode_enabled(base_vha)) + do_reset = false; + break; + case QLA2XXX_INI_MODE_DUAL: + if (!qla_dual_mode_enabled(base_vha)) + do_reset = false; + break; + default: + break; + } - ql_dbg(ql_dbg_dpc, base_vha, 0x4007, - "ISP abort scheduled.\n"); - if (!(test_and_set_bit(ABORT_ISP_ACTIVE, + if (do_reset && !(test_and_set_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags))) { - + ql_dbg(ql_dbg_dpc, base_vha, 0x4007, + "ISP abort scheduled.\n"); if (ha->isp_ops->abort_isp(base_vha)) { /* failed. retry later */ set_bit(ISP_ABORT_NEEDED, @@ -6060,10 +6075,9 @@ qla2x00_do_dpc(void *data) } clear_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags); + ql_dbg(ql_dbg_dpc, base_vha, 0x4008, + "ISP abort end.\n"); } - - ql_dbg(ql_dbg_dpc, base_vha, 0x4008, - "ISP abort end.\n"); } if (test_and_clear_bit(FCPORT_UPDATE_NEEDED,