From patchwork Fri Aug 31 18:24:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10584349 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 92AC2112B for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F8792C5B4 for ; Fri, 31 Aug 2018 18:25:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 723932C5B5; Fri, 31 Aug 2018 18:25:01 +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 E8BCF2C5B2 for ; Fri, 31 Aug 2018 18:25:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727598AbeHaWdl (ORCPT ); Fri, 31 Aug 2018 18:33:41 -0400 Received: from mail-by2nam03on0076.outbound.protection.outlook.com ([104.47.42.76]:54897 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727561AbeHaWdj (ORCPT ); Fri, 31 Aug 2018 18:33:39 -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=lXPpI/8ievWp5mSB3QOpFeFtLoh9M/imtaMT6JTwF+Wq50+AMkpkxuHkFmOg196vYmR579oUNre0LoEtvSoYby9JVI2WETlnSSOBcgs7xCrsi72xB5jtZX8IxBet3wQAYPRTJ/VFe3V6+J8gXZSbGL8PfSEzH5vCjpuAsFVU+LI= Received: from DM5PR07CA0086.namprd07.prod.outlook.com (2603:10b6:4:ae::15) by CY1PR07MB1448.namprd07.prod.outlook.com (2a01:111:e400:50eb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Fri, 31 Aug 2018 18:24:55 +0000 Received: from DM3NAM05FT030.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::209) by DM5PR07CA0086.outlook.office365.com (2603:10b6:4:ae::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1101.14 via Frontend Transport; Fri, 31 Aug 2018 18:24:54 +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 DM3NAM05FT030.mail.protection.outlook.com (10.152.98.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256) id 15.20.1122.2 via Frontend Transport; Fri, 31 Aug 2018 18:24:54 +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; Fri, 31 Aug 2018 11:24:41 -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 w7VIOfko024265; Fri, 31 Aug 2018 11:24:41 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w7VIOfHl024264; Fri, 31 Aug 2018 11:24:41 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 12/14] qla2xxx: Defer chip reset until target mode is enabled Date: Fri, 31 Aug 2018 11:24:37 -0700 Message-ID: <20180831182439.24182-13-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180831182439.24182-1-himanshu.madhani@cavium.com> References: <20180831182439.24182-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)(376002)(39860400002)(136003)(396003)(2980300002)(438002)(189003)(199004)(126002)(110136005)(106466001)(54906003)(80596001)(16586007)(44832011)(8676002)(2616005)(42186006)(446003)(316002)(11346002)(476003)(69596002)(14444005)(486006)(4326008)(87636003)(5660300001)(72206003)(36756003)(305945005)(356003)(2906002)(478600001)(47776003)(8936002)(48376002)(26005)(50226002)(81166006)(81156014)(1076002)(86362001)(6666003)(106002)(50466002)(336012)(51416003)(76176011)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR07MB1448;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;DM3NAM05FT030;1:UmNk293uEm2VHlhWeeeAGXSid8txDjsba8r21DPZ3lFm+m5zaweO8rh4J2ONhdK5lvMVP8Gt+SIb3gITac2uWkxYwPbAzcfBAx/E/YxPWiJyoQoihbUki9ajrch5DSgu X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4c8f25b-84e7-4699-8543-08d60f6f0cbd X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:CY1PR07MB1448; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;3:Pqf5Th7MtQjPRokuPI7yhX2BW4N7MmhY2yiIUcaejIEqnUG2mtZb5cEkmKDfQGK90WFIFZIGjKerBL+zQl/aWhLX93G5x1H46Va/4zExIML13jw1zX+oLgntQWYHl8ebpygxjTapbOFHDLuoBLYCCTRCu/zoMrvXPstncszzGFndtAtHLkge2m8INHKiCRg1uB7GPWJzzoYSlPZGsYjTPImf8QXHqM26I7bnl/eJin2eIgB/da1uUuDNADMUe06WHP0mlOIDbi8Sw1+E/L71X9kejCTR617cqtSWMOxgqmDZnFZWh6CKEKDMdZ/62rkfKa/2JHd98f83DA1SZjfc+G3+iPPjY/TxGY3aEz1sGRg=;25:7kWzYIxTKHyOUTdKFJML/YC/U2zecXfDfzYnWF+qISDMLyOcYukvWCFLzYQFDV7Jhft2UqOM+bAc//JI163VvwFj8RXSKdMzMC5nY64LnVrMblHGuXDoqQzsEnEcKguV6VI4AgZnOfffsUvGOJgKpHx/bhOV6zM6AYFAVRYi7+FRfs1knlxskzPzKq+6eTmEPdHQqjhqxWdQ/pbjMq6EW8R/IYwp0CeNW7sOXhRSMKb5HhbAavvQJ/bzvvKC4GPSDFVoPm9U++csH+p6NAF0nKybTuNThx3vlMaMMcsZOJT9Mjgg/sBGY4QWq5sU0dJashxVnxM1c3K/v4c3mKnrEA== X-MS-TrafficTypeDiagnostic: CY1PR07MB1448: X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;31:nWxhBpFbERGzZVsu57CcYq5ZJ3xtuGcBIHLwQRJ3+SQCcY1LzVKHB/Q3D1BNAsEK9n4+0iOI+kBChaaMglrmxt7inwyeMmXFMaXnw6USUGsx3737qxTZZnwNOev60Sgk42a+P4dKA504uuC5aaoj8Xi0oQ7DLmjHOKcYR0GzB5xCb5Pk+NKdZN31xCUXF++QWa6VVvwug3oYEUHB0RNprb3D4C2f1aGPOxeExvZqaPE=;20:dS4cVT+fgY8IKE8glP7zWAFOk1OVVYheoIRFPpLOqmUxaCIDIVy51r9maoLa0N+WtX7U1xVSsPZWGuW6LR9W1jFZWoQnMXXsok1Q/dmekyyxqqiOtjpTZloP8vT2bp/JHgg3SQoxEzERha7fTiFZWnffELKC72yyTR77bhxhEq/Fo2Kps3A9eX2xBMprGPkdedj1jfFKrdTJtGaQOMEuI9FeEJz4iJuF7CVDz9gF48qQcuHSKLhwhHBpg4qdb+NpVQosdmTJy55U1El64rVcam8XkV6XzWhWzS0CIL8MPg9V8tqR8zGKZUqlhJlnytm5WMN+nF+w8FAXCef/gMUW2nCyoAMzhqHXdyO3YDg0ulwsuBcD4ZbfUHvU+/3Ko6MMV1y6Wne07KR6TpzsgKioPz6tQwuaBOMEIZDsM6gt0EwOSKe+IVuUyaTEewrHERMrMPxw2LNiq4BW6p1J+KwOF2J861x6OuUN3XlERQh7IlL2ew0yKuqAoxHbtid/u+Ug 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)(10201501046)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:CY1PR07MB1448;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB1448; X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;4:03QZFKe7FrgDhYRaBb8dVjGNW7rKANRW9Bfdyni7TG5e6lPhWz5Wk5TupshKQnHvTbUE037fo1rI5Ff6nWmhdMuCcTIsPtIyg2LkAzda922mXe8F21kkEY2/jadomwHx9iZr3d46YCpe75VqvW0CfDR7+ZrZ/BUuUbYmpQ+rUWfGyTj60rcu5lDDQu7AIYNt13KZRpVW6Mf615nnsZrozwvYlgEv+lCKBufF2bvn7t03Zr/ILYiVeZlp6aJT3waqQbP+nKcZFKg3yroma2Arug== X-Forefront-PRVS: 07817FCC2D X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;23:B3CFMRp4YKr7qEpXzHGGXXyP81/WgePbsVoH8pMFW6NUfwo/tPcrSDsfsZR+uYUl6jTJk4JZdYQVF1r7AIvHtaQuLs+i4dhRzMpwH5ewli/t1mO6vO350yu0HW3agPDcexDsp0X8rZuM/KNX4E9GVrJ1rFeykW6LW2DHLRu2WqvJLskNupWfJGnyojJsACTplC2XOB8jjFS/YhpA9aMBrx3Tfc319vbYPkB67hpSZegKM14RHXNz9Kj343n9OqE9pFEoOapzezqVwvfZdJ/Wt397BQ/dl/3OSiBp6WKrQIM790T0vDgeqJw0Pi1Nh9Tplom1P8yGpyiePf4UDyXHXK02hVlEtpWlWQyHwT/N5mdwWrZbl1EZepsZx+mziH4CGOSNVUVT33OO85ChinNNJKo/JwLLkny8MPGk2obhnEuUyyG+2zg2Ks7bMmSSGJJIvUfldhdckkwIlKdmmHqY2IjOuk4FWBYyZEC+5NcIiyhpSIk+PRHPUTATXDviMRssWics58tCnhjDlHZcPN7PHeTaUcpJt6qJK5Y8ITddUVjf8SJ/BT7nFOZO94KkwdY/QPNX0Z9ytrQgitIRi/m454ViX8CfND77Vn/2eLss65nEOPR7L6D1FeJCV7l8tirhyItey2Xh3F9YS0yo/FADov/lkn4OhXugTq9OBE44SJ28CvOASH6aFei83d8Z2L8a8fNz8sX4ns5f60fzeeMGLebB9YI7MwafR9pWeYu+X9fi+otl+yedCB7VtgPg1N2Junwu5PIbpMFT5nRr4p4EKbeITAYJHKkekP1F/KwAS+3BkOt9qLziJg5vHOKnVKBxbPuBJG1vZ5kklMGSCCG4hLg4DHfPwLdDgbHXSV969KW5BQPN/dp2LOJ5vDW+5Fe/x4eFGzbxQC9iiKVJG9FDITmROfsEHlV/jKTcBJlRqp1MK7jHH/6GD7HB4yrRG9zedv3kwk+SPP+Aitwm7wXgZMpmwSMMBZzIQlg8lGPp7kBaJakWfF9fIQcQ+WZTRuJAylOuCIZWi1XJEqad+vIsOg3CcaUY/sWgkqrLkEAqI2BUqxX8RN7erdO8d7R12XaVFhBTkVoZ1nm+/F8ZFgBSuBCgxks4X1XwfLM/tqoLUeddriYHtUD+DzVmh6iaWgmZ X-Microsoft-Antispam-Message-Info: ISKYe0ODwe7mHxJSO8XSP8bp5/QjCkNQkTIdBPae5jrcTbqYfDsDz6reMNXOIIS/OUhtiBH7Dn0TzTeEux471aQ4VtFDVnu+oKOcnwQ0N9SETtF+hq3ZPM8Hi7VN2Hp2f+UEzF9acLy0E4Pr8Jvuws1EDNsLm+N1XkIfFL5kZqiCFB6yhPsT5Zr2EV7gT9jnRUvy639zBTPaopM2T1mVnZb/ctyAG5fOR4/zFRMDr1JqiMnAoVfGqbe/lB0enSDKjyoflzOhEY0hUU2wXYZD5Ky3qaE/JBqVowe1SmAoihFdOpvIkxNviFDZoj5tALmpmYHMOr5lGO7OPRQ0cYwB0oPoZ8ywpElbvrI+duOPSQE= X-Microsoft-Exchange-Diagnostics: 1;CY1PR07MB1448;6:eFVXSF45oNKaAhEUyKyFnFPTK+oZQxTFhC4iHAfA7eZHxiXVXZQrU6Ee7m0LD/FnBB19ZenqNRIBmd1QSQFSQ72+EzetPCkWf+AIhnr/0WqP+zPBsTsyl7rGg31fD/URClv4qtaSdPBByCH13K7B1ZvKCtV6i0p+A2Vm4S4cqumocRmFaN5p74Tqu2es+sR10NHFJ0acHhzhY0+pZHyPz+SnCXQKp1Q5xVgxjZ6wdUSZvDioa3dHHJPE+bXa750aOZdMrX/OyyMmGz0uPF3BUbNej/hXIEyHJ5z15agd5yEkzPvbdj0j3702QukH+ppxYP6Uc3mPtnzAjifbb1GQ//OH+TZFpkCYrHQydny+RETTI35Kk4nfDWa1fab+3rKjAxeBwCC+ZAUpVKeMpSVDwWpfJ7u90Xi/wrEXD4TOjLGWtnTILTdZkdgUtLavP/uWVrCdTAw63xZ/g67R6qx1dQ==;5:HyQvINokB1+pHIj4DxbRzOG6se+OE+1BM19fZcalAhGgLkXxv9ZahGYgk09ak8w4KkXhcEPWnKeV4wvj7cqEjncIV9jGvaGSaZtr/TnezKH8Czhzm8NpCbCtzmuDIhmDZ+JDNs3zQiP2zH3HR0R5CJKOawqrU8Ja9krIXg3FvHI=;7:Mmv6XaNrqD1wEknKmb2T3o2peE4sh3Ml7bVIeXuH3AUMDCDn93Nmv2BEU6DA3eSi64FUUw5Po9ASqLkSxEAUonSihgIjnj2/i5GQ9qdJDMl2Ph+AH8MsJbzSK+1AakCaen85/bJjjhHJcsQvMkAvY+2NijOAPUchoh0Y8bed/Etgq0iNysnF53N3yWABf7oELDp4QkASzOxuOzcov5DEQrbaQQZ6j8eDFWYP316PhlNUljr3juXodMA91KynEXfy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 18:24:54.6068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4c8f25b-84e7-4699-8543-08d60f6f0cbd 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: CY1PR07MB1448 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,