From patchwork Fri Jan 25 07:23:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himanshu Madhani X-Patchwork-Id: 10780721 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 E1B8313BF for ; Fri, 25 Jan 2019 07:25:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8E1A2EF10 for ; Fri, 25 Jan 2019 07:25:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD13F2EF78; Fri, 25 Jan 2019 07:25:32 +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,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 5D0EC2EF10 for ; Fri, 25 Jan 2019 07:25:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728508AbfAYHZc (ORCPT ); Fri, 25 Jan 2019 02:25:32 -0500 Received: from mail-eopbgr760044.outbound.protection.outlook.com ([40.107.76.44]:18944 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727034AbfAYHZb (ORCPT ); Fri, 25 Jan 2019 02:25:31 -0500 Received: from BYAPR07CA0039.namprd07.prod.outlook.com (2603:10b6:a03:60::16) by MWHPR07MB3005.namprd07.prod.outlook.com (2603:10b6:300:e0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.19; Fri, 25 Jan 2019 07:25:29 +0000 Received: from DM3NAM05FT044.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::207) by BYAPR07CA0039.outlook.office365.com (2603:10b6:a03:60::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1558.16 via Frontend Transport; Fri, 25 Jan 2019 07:25:29 +0000 Authentication-Results: spf=fail (sender IP is 199.233.58.38) smtp.mailfrom=marvell.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=marvell.com; Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by DM3NAM05FT044.mail.protection.outlook.com (10.152.98.157) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1580.2 via Frontend Transport; Fri, 25 Jan 2019 07:25:28 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Thu, 24 Jan 2019 23:24:25 -0800 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 x0P7ONQ5003592; Thu, 24 Jan 2019 23:24:23 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x0P7ONKx003591; Thu, 24 Jan 2019 23:24:23 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 11/13] qla2xxx: Fix fw options handle eh_bus_reset() Date: Thu, 24 Jan 2019 23:23:49 -0800 Message-ID: <20190125072351.3504-12-hmadhani@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190125072351.3504-1-hmadhani@marvell.com> References: <20190125072351.3504-1-hmadhani@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131928747290118984;(abac79dc-c90b-41ba-8033-08d666125e47);(abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38;IPV:CAL;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(136003)(376002)(39860400002)(346002)(396003)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(81156014)(126002)(76176011)(50466002)(48376002)(8676002)(81166006)(68736007)(1076003)(36756003)(51416003)(97736004)(486006)(8936002)(85426001)(2616005)(69596002)(476003)(11346002)(446003)(106466001)(105606002)(50226002)(110136005)(86362001)(42186006)(316002)(36906005)(54906003)(53936002)(16586007)(80596001)(6666004)(2906002)(26005)(356004)(4326008)(336012)(87636003)(498600001)(26826003)(47776003)(305945005);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR07MB3005;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Fail;LANG:en;PTR:InfoDomainNonexistent;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT044;1:1FOvHf8Vz6MtDspbhFxmFaMzG3kErhgKx6o9SwdT9eS8C/yy4fWbcDRDQrgVNb/+6d4gvyaSD5kjOWobcIhMEMBCD77rq4EjRU7bUgsBQZm7B85Pu/0L8ITUoaEm8kfJFpPUGmIV/ICgLOygwyT8fg== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3e77d5b-0060-4a0c-55df-08d68296485a X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(5600110)(711020)(4605077)(2017052603328);SRVR:MWHPR07MB3005; X-Microsoft-Exchange-Diagnostics: 1;MWHPR07MB3005;3:dUsU9O7oH16ZCXVcUderMBJSGMKTCKhxg/ECs+bLxVxbGtmrdewZxXhBz0PfTNU1JWSlBhkMZ3CjdWvXn+u159lpnPA0QjhPYmRGT+CsQ2GFX2bwMbupH0ciKgKGaEK34AM610xKkauhEhg+TKlOEHtWM7Gn0RedBrBxn3wv6X0p3/11xb979H2ofVGqWwAtaQLSy1P0Fkogu7yFMMs6/5e19HMOum7d1sNx2tfFKKkvFmiUIrLxRbeWDwd8Gepakg8zrnBJmjs97CYmChxb7/xTt3YR1c9Udx0ZNRwGn9aoxnsfzoydGSXJ67t0N3mzXE0oFZIgHd5xuLNLjbB3ZUAGUoJNhRl6GOb6H6iUc32OxBJHwQAdHgl7cpX/tIzh;25:9BcblScxYAu3WL1gBRKbd8VfR7vGCBaIpeiiXa8aEvg31gnyk26NCQDBU+j4LPdgDSK69+5VMSTqJo2cLqUeSWbPm+OCsLwMuc/TDVaWB9i6aR1YnY6slbIiVDL9JG2HNlOGxEhEeLsFrM3XSbdillCnVD9FsUrNaE71V1L8T+t41VYedbINOPZZQysmoxlSysy2xDJRJA6zyhzitJUCaSmmYCv4l2Sx9OX0Yo/PrphTX/sUs17OazBuwq24Ob4nbSoRr1AChlhX3k6yxFy3gU8eGPMR+iliDFmdLNdbahGfFf9IvVO4d2YvMnoxRwWac3R/pq/81zDbb6SFJbCxYA== X-MS-TrafficTypeDiagnostic: MWHPR07MB3005: X-Microsoft-Exchange-Diagnostics: 1;MWHPR07MB3005;31:PT1y3kxTArqqF3XNxJEuyVreTZUCINV9tAOiS8CkIKojU5bCYN/djTG5Ih5/g2veRViSx7oMVD/iQjI16s46KkGWTLFCZml9FoZrxs8PNOz2iHOqfPe/lVYQYFW1+vfFf3X1PU1ICwQ6ReE29yGgAqhmM8WIXnOXNxyh/ceflhamzugJh3ByM03ANXgHzL+ea4jnjC5As1gh03G8VDLqBtkO/7/GW+ixfPrzQy1wa4c=;4:uv4kqFEnXvTzdkV+777Qf393gI5ZP7fv783EWx5kY6pe+Cmev9iT5lsJOvK6ggDb7DAeDQYS3vYwY+bqLxxkFbzn21TNoerLM1+8HPupeGA2EpGT4P9tPulh/dMovaLKrfRff8ByHO8ItlsqGl5gA0MF9fQ78jv4/mvjffGD/f9RC15vqhL3jYaEWAIonZeFKN5mVe1GLcJ16SNEUX7tzKUkSLnibC0PpwENyyqzZlpB+dPYJiD+ueOW3RbmSRPqchAfHfgpzytiojWDtlxi4hm1nEMX+cKBspybd95ZKYukRteWk0uIFk/tNfzMwxRe X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0928072091 X-Microsoft-Exchange-Diagnostics: 1;MWHPR07MB3005;23:4rvZy+4bn3ihaffc5RVVD7/oQ5gyFxHt4VJur/f9gw7pFhFwKmOGVpy/8MWu7RwexKZIkcBry9VQq8VjZTemzErUR8PUVqDMMYgIWNrDMh5sowIUpdx3E1iWGc/E7Zbq8STXktiNr+lxbcKflBkt3RLaGNx+4BpnQ/+3FOtmarEEzKtFVfebDM8aQm09OoR5m9vCxx55K9Rn7Iv9WmGwpPu1U0bg2P7oP4ZbBkE57FSyFFi9jMzGxMom8+upN84Z9v9lck5JL6cPjpecBwwIL1fSz2DCJm2r1Av5VsEjBsck3ZDjj3N1MTydr7eZ9UxDfA/7Zi+JkIEeRkOp7b4u+8r0MV3y9qYZLfw6y7dbvV13sk6fiSAlmpOutF6Uftbp88Wvgye4BkZzV7Wi6v1yBj+ZmjVhJ3ZSPyRvB8qyREIv6CD3BvaN0rgytzoGyuC5L9JUHCrrtQiaZBM2KmZyLLypLopTkN65n008bIySsecbgr703+I7Ht8FinsD4RnT31dKw7qsYe0lZqV2yVXg4j6cHPcsLghpdqPAcI2LgBXvondRIf77PH3hImpRTl2LJ5yYSX1Dek9aAeTuM43pomf+FklGAsrqJ6SYFJc3fwKXWcgeTlXD3afzSl/tGaSkDsqSRsyzY+BoOhxXBb37Fdq/Vz+9Ucky5ZrBk5yGUZYVyRhisCxIOZhEsuUUPaSUWW6f8jpj58KIK8dd6J6Uv+SE/3zqkAt7csWb4Y0mryrRta3AYzZYtOmlS5MMX86+JbyZgsPH0PTO4I1+znMRNjRXCN6CoPBUatkflkNIEs6CJ5poWx/pnKxkTorozRVrxiiJTbrKPOGjH9igQ/x143EYS+rJa469D1nJ6HgWfBPTKHKzJeMzS00S4NPTUdh6XC+4bqQvLSpammwCIwQI6yIj6pzZEjv6xvXXoN3eHY3JXfb0uXP93L2GYB/L5WXwsxAl4dbS0Vw5AWNnMiF/cLBTXtsnt1q+gUpQdhcqzm+/u0LBDYObxTJO1Uviiv/W3SL/IV0yV9ZYcB5u2N+w+a8aM93rQK63sRnBYfbamxOxY1oLwPBv81JGnp5NbbIEwh2h69IBKaS50ZYCdfxbbdw8G8S+h0I6/EknqlVF0CSEZc+42p6xQbt7d730EdC0kvTfDHlb0ij4bdebIhtHnRr/aYmbBPJ8jrr3q8/4r+5REayMLFzJPy/RDn2QnzOt X-Microsoft-Antispam-Message-Info: wM8JlJ7KCaBFZe0XCGW2MgaaSOyNVef465f8nw0o3iplrA7DgYckr7UOTcazDNInfDcaQwMFM/Yh5KEXnqFzk4x/8+yiiBtSDzIhHgUg7IjgjSYPnYEsym6+HBlllzCSYuvUhADCVOISLxPkHcgFl+/6Jw/14L8SJr2Lhsa08I5kD+PRdL3qjU+bB8XNtP5rLySMDi/JpZzR22rgtca8zKLg8T3JbEmxpkknHvlIc8CmGy/c08t15tqAms3lOrxfMYbpoNNA5QkseKSxGheusqtiLVWWPcvD/42O4/qGq2r0kpwoliNCTies6iiGgi5SP37hh/vkeARxQtXpj/Rdx3cI4jjwZToz6x3Pr3dC1uB9XHxS6uxvcI0pQnRYMhHxjbfP1+2W+hTaL3E7Q8HX96ixfBN8pwHTs94Cd7Lu2M0= X-Microsoft-Exchange-Diagnostics: 1;MWHPR07MB3005;6:Yc8q14oiDyCb+OsbcpO92TGFUcuoOF7UH2NUWctrSjDHy9j6uC6C43dSgDJZxL0deKn8QmocYOfBRD+tNaCxh2OE9MGsYOmR9nAJzy6rQEhhKmUz8zPpq866SM3fIZqpaM8MBMC/kLGAIn6xq5tUGN5IY0UTZrxi4GtA8zbeJ/mCR3w3nc/1AdDz2NorJxVq6v/7pNy6v2B+iwCdBKl3t2cUStqfXFoApsTqXPYlruwFRLaYQaL9KsPNL5solQoxazbO98tqkM7zygl3JGjmdXN6xHWsTMjhK1b9tUfG9tV4XCvjLW40WaspG0DfWZNhQYxXICItaPu8Q7Xis2lPmRehfT/f3c6j0JqzF2Ney4Pas8r3wavoMPmlHqct3pAOjPKOT+Q870NW+TAPFlNxlnXDTeOZTJc0OeWnrmGBKKdAOqOPZWl+D2P8HDTjisMVc+a0TVfUMcK7Zo+XXR0Uyg==;5:8DygtyJVpgsOiVsnLcqwkui//budrIW1K0IMejKIvv//Ek5QgCj3Udy/jykHlShjgg8iEZxyydrazd+LjF0dgH2wJoifYsUuNDLGtjmalmCq+D4nNqtqOLsb9WfFUA7q4v5jUIbuVgigVuYgUtFs39yImjCs+NB5G4FMjXHgCWO/E//hHby+bNHG0zmr//M0Hcy3E3PoGTDufjwEAEM94Q==;7:eoxw9jljDCfcepHa3CNzNN5t8JNnyjeYiC+C/uXoeJDCn9Ifr3cO/0YnLFezh15BiX+6+0Yd2WYmCl/P7b0NEZXnhXWSS868KWslTKzys3zg1pIU1PL44RMoBzXpcm0nnsR1I5xhUl4KqowMlI7RXg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2019 07:25:28.6716 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3e77d5b-0060-4a0c-55df-08d68296485a X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[199.233.58.38];Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3005 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 eh_bus_reset, driver suppose to reset the link. Current option to reset the link is applicable to Loop only. This patch updates current FW option with the one that is applicable to all topologies. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_mbx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 191b6b7c8747..3181235c3a32 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -2244,10 +2244,7 @@ qla2x00_lip_reset(scsi_qla_host_t *vha) mcp->out_mb = MBX_2|MBX_1|MBX_0; } else if (IS_FWI2_CAPABLE(vha->hw)) { mcp->mb[0] = MBC_LIP_FULL_LOGIN; - if (N2N_TOPO(vha->hw)) - mcp->mb[1] = BIT_4; /* re-init */ - else - mcp->mb[1] = BIT_6; /* LIP */ + mcp->mb[1] = BIT_4; mcp->mb[2] = 0; mcp->mb[3] = vha->hw->loop_reset_delay; mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0; @@ -2757,7 +2754,7 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha) "Entered %s.\n", __func__); mcp->mb[0] = MBC_LIP_FULL_LOGIN; - mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0; + mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_4 : 0; mcp->mb[2] = 0; mcp->mb[3] = 0; mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;