From patchwork Wed Aug 23 22:05:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 19512600C5 for ; Wed, 23 Aug 2017 22:05:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C29A28A39 for ; Wed, 23 Aug 2017 22:05:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0102828A74; Wed, 23 Aug 2017 22:05:47 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 68F3A28A39 for ; Wed, 23 Aug 2017 22:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751061AbdHWWFp (ORCPT ); Wed, 23 Aug 2017 18:05:45 -0400 Received: from mail-sn1nam01on0085.outbound.protection.outlook.com ([104.47.32.85]:62336 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751133AbdHWWFm (ORCPT ); Wed, 23 Aug 2017 18:05:42 -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=2VD40BOktkk6rR9OTpL87pWDzPTgUKNvgjCab7LnaOY=; b=NeZ5BxZezKfbCSjXYkAtAjWxSnLZWP3O5/acpsOBmIqmotWqKHG06Eq3i0UM07ET3gpNo0HLfLZ0zJ3MEhP1pqjGZTsmBHKbsU2kWGGZyRgVRmmpqhvBeuIiXX3y+yPiXcM32Xp56pzj+9QY9l6FG7dika8YevZYBbqz0itpW3Q= Received: from DM5PR07CA0046.namprd07.prod.outlook.com (10.168.109.32) by BN3PR07MB2514.namprd07.prod.outlook.com (10.167.4.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Wed, 23 Aug 2017 22:05:40 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::189) by DM5PR07CA0046.outlook.office365.com (2603:10b6:3:16::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Wed, 23 Aug 2017 22:05:40 +0000 Authentication-Results: spf=none (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=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:39 +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; Wed, 23 Aug 2017 15:05:26 -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 v7NM5QWT003186; Wed, 23 Aug 2017 15:05:26 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5QLS003185; Wed, 23 Aug 2017 15:05:26 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 09/31] qla2xxx: Fix NPIV host enable after chip reset Date: Wed, 23 Aug 2017 15:05:03 -0700 Message-ID: <20170823220525.3115-10-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-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)(6009001)(2980300002)(428002)(189002)(199003)(8676002)(87636003)(86362001)(575784001)(478600001)(101416001)(189998001)(72206003)(2950100002)(76176999)(50986999)(8936002)(50226002)(5660300001)(42186005)(1076002)(33646002)(50466002)(36756003)(106466001)(81156014)(48376002)(105586002)(6666003)(81166006)(47776003)(626005)(54906002)(356003)(2906002)(4326008)(5003940100001)(305945005)(80596001)(69596002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR07MB2514; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD037; 1:P1eyAFTy6hYaLNTorl0tKr7uFSJKVoD+WwklGZudVVOhHMczkg+90834vA/k7z/lfTQ1hY+prNgAAABusAGg4GOgomnjvbSVBWcwlCDLZVGOIyCDtXCH5Ugigx8cv8+u X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93d6ed70-3e9e-4f63-9c52-08d4ea73177e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN3PR07MB2514; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2514; 3:gvV+9uEJOAqnnqAOhzs8r/UZUwGHdbWj8XE0G9u3loLvNSUKYXmnWi67bUb5SJj3NhYMJiiV02IdTPDJwI88Mfz/4agbOE11GFJp8PAF/PP9PapLqfpVIwxYwJHxwMwGGA5VoEIgmVK7Y78MY3R8J15tuWiuUdLMVJtgOXrD7t/cEiXPXxe8vnJgx2bQlN7Uk9RR+w2qQN2p5336LHkCFQiuc/fnRqEKs0sV/2hakNAJ9IGAgYczjD4Cj6+BeZybUInHqyHd3nisGs782Qri0tEdGm59ao3PMDEN7Cxna5G2H/BLdtj+Sb4aFF4+PlHsjvuv8VjBt691yp63r8PmhA==; 25:ITsuxrS9KnkuFIe0stHFQHf4veNYXQVAejR/51vrzG68V3YwFfcS152Ex1r8E5JeGgwx51h3SIsMIzS1rrydIIENrXJEciAakMKP0DdHJr4Ll73pyVUXNZfZwGhvY1Snd8YMLs04sRdBocTiPBvFhLKELfBOWFgDjr3/daNfUk1X7ozBQIFIOxASskZfCNn6iI3GBCp7fdYjgdgStYlL827n1BgBi5WbBF41jzhHr3nOUWYyZ2GlFn17nv4ChC2bV0gWZSm/p6kZEEUuq5fE5+vBa/3+DWwPm4VTIf4myIn5skRrlYEnuoWEaktsYbXZoCqljXtxC0ci9RnOUZIBHA==; 31:JR3AjIwwDtCC6I2HPFmd8fUDN9ypkA68Qn6lPMoaN8oyTKBen3/2f5phIUkAD5gMHxvVNi2B7P0oHWN03RT4zlGSU+u50Xq6ysReX0f0iTBMEWPLlwQHorWRv5aMf5hSQ38+eAWk+1VjH0k635puH2/uUPDMnXdbU+odyrLGMwiMVFYQuwbrdRmiiVpyMWX8AlJtkvsfzrhd7OWafCRmUxrasv//byi+fI+7/YOBW+g= X-MS-TrafficTypeDiagnostic: BN3PR07MB2514: X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2514; 20:qoBBAtLoHrEW5dJMbBLqWsWmtiy+BPpf2yY9wiw/bcPymwe/I/iWvH/xXThekT7rwJGBcaU7g9J5oJnWdzYLf3w9wEtL2XHFYVZbWAgg4sjFhl5GqTnRrjOCX5DLfsr/zsDM1GIPNG7fHW7HTNlnDsU0EGBBlQNH1dpFKRw3nl1VSt7xrJmT5NLZS5D4KvNDZ7NjdpHVVYnk3ld6rFizZ2hOgczt7ldZJexFP6hpT6nA5GntLRVa2wMnBK8MS25whLxDDawHBOInrfiMgBW1YHnyoF3Elv+VehkaMeB7TyT0zjPD2x8XAdz1RYh9mzrBt673o9yAw6KVbXOwy+I7WHuZJRoR+FdYRtGsxHOg3mFpGvggb9b0oOFj3GH1IoYfKnVJl9b0d6WeBfTgODCDi4Rz3lJLBu3EH9sB+ORkFsSNOt1utqdlDJQXBHYA13ZOzI5RSqJerlcbceDajx+YPZ+xjYjvVHjUc/3s12hyyBEq/sAXDf4Y32+BMHN0wBlR; 4:T38sjvPyeWt+BPDd+KaYetc5E9t5XKCsFPE4QkU/cJqDyX/5lrK052Bja62vmfuyGjRRceGKtTEgcpySobaNMCUitXljCTd6dXEDbtoBrLvOrM7i3ZTpU8s1GStJMxU6bzw1CdzpqHNE+tacZy5doPjGFmMq7mwCNu2diIhBaOeQiVAcd3L6UMoYmtFaIQl0DfrF/G+BTTRkViJXUR6w2dZgO1Kp4OkqmkEEZeXJeww6otl+w6lwRF6OmTJwLwuI 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)(5005006)(13016025)(8121501046)(13018025)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123555025)(20161123558100)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR07MB2514; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR07MB2514; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR07MB2514; 23:qcnNxxwtLybyWXeldqyjPUB8hdba3DO2yZWGCYwur?= =?us-ascii?Q?/Jg4hH7W8T9Xz8PrJmlSzBJ1Clf9RcIwaOwVLuF52Ux4eAwHZRyBp6ctExBg?= =?us-ascii?Q?fjYAIgD8Rd3nHK+DJRpFHIOcDvrwORxiG39avvuhlZ//9l+nRiQXza98Cwg8?= =?us-ascii?Q?ST0JMPIiFhiRPEROvood5pKGmUOW0xO1SPydho+tUYVfOaCPTrtXzQ7Ezl+W?= =?us-ascii?Q?AgWYOMm+eorGgVZ/VnRwrRD+KdcD5GAu/ePLtawHPEcxfcndEEPkroUxftVh?= =?us-ascii?Q?MUgTpWw73vPvbmIq99+5IFr/ZrCUZVg15HAGNkssfsukSFSp76smLYc+CIIA?= =?us-ascii?Q?hQV/+PA68qwl10D1ZEEP+d1KM4Xbm39hRhRCUqISCasp0/uW/P+aVRIlo6q8?= =?us-ascii?Q?JpZV8H1AOWjHgMvjNu0V8Cd/UDjB0zyvMqE9rqNP71++e4DmttYS+68Gs7g3?= =?us-ascii?Q?blISv0ciBqgpsEFQyMtCwQcYlGee0YKC1NU8ZZ1ooAn0XZixrlkSpaIIo3Uu?= =?us-ascii?Q?TUY2P4b+mw+syrUO664xyBUmB3nbQWDphj0WDvX8GCHH6Hm4OituCyfcO90E?= =?us-ascii?Q?bWitgnzDeAo4uj4QbAxuNBJ1vY2Bd28DNcck/g966DEZsZgU80Om/MlIpXid?= =?us-ascii?Q?hXppaQ2gfvs2lAzDBwCcqw8BXZtLmUAbtNXrI6AK5S+f3+9XIwZKc50+oo24?= =?us-ascii?Q?IscR7rOygz2j06z/EzwAi7bJqBgmw5cYRtDXeowgVISx47XnJ7Zw4dYKFaLI?= =?us-ascii?Q?oyfplvMWFNuOMqODfKtjb4IVBQrC1OEn8NFONiYyRdS8bv+BsevXlguWtnsN?= =?us-ascii?Q?grxZWwhW4SMi8ToiJc2ltc6CT4iSmWg+Dzm86O0pKCEBC3aTnZYyqRhlSqmT?= =?us-ascii?Q?qyLLBpcIFGEgEPMlh1zl7b/LSsp+pe174SLSSsnZgAj9TpncI6FDbjeafIEu?= =?us-ascii?Q?Yhed/5DfxDdcGGyIyE7FiuOMrczbjtirTdDsgjPJpLZV6aW6EVzpTgjnKtcq?= =?us-ascii?Q?q0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2514; 6:dkbH6WXk6NuvKaas87KEs5OXs9SPAyMNJcRxso9991jAIn3No8dX9m+YtUguGSR6Xwh4L+f70OiUD6XOWNGdYkrq20ZDZFRBaMxqgPGsTR2hjv3YmkXt90Go4Q2RigJrQpivMM6X8eDTdh9XLUnku3dgui0jbbMSLGD3JyLcpaugRfEdtllBAVGrt+3BgykOtCywbI0sErn+yh+WU9ht+5kxXNGEVZaeH4yOZFJwMU1mvE5FkwU/pdXMNYAhM7sGG9WSIRyxNa8P/Fr/EwtU+ZmxQKjhIHhUfum9UlktrE1fJ/jdRKxpwmeIUUntFqlOMHDvp8izOWyPUD1bExzxfA==; 5:hezAM7VOOeHHcsHt+wIjlErxR1cDT4Y03UtLQrqIaSODWEcoVjUd7wKrPLK7IYxSONAx/ksrDckxfqoDkXlMo8uFBm0wQaOHkiWfNqeug5oQ9MIpA1mDKxlaXvr76YmoUciZmvIXoafYPOWA/7UQmQ==; 24:hGyG9hadgrwtIPeoJjMC8OWNl9TDdm7iDhvn5OTcIVIg5rr1yjLKH0uK8/61oZjx3GQJkmDQ/COasEJJxruPKYKFkdizqj5Yp/6+0ScNiM4=; 7:U1KvNBH1eq5APIYp5s4WLnIqAeP9gXq6n+LoGXmGaJXIdhYE/yiMrdSA8wqd/xjMlkqAicEhhxLVrlOd2Qx8x0qVJ1vhG1FiIKpLLWQdWJ71EKhvmKIp9AQq8Di0B+7yav5P+xb9NMluiWeW1z413B0DKem5jBM8XKB6GVetXhTPWjWTsusl1Z5he+AZLl9o0DEIYz5EP/xaG6+2I04t5bhAjFWg7sFFgj5Gkn62W30= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:39.8806 (UTC) 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: BN3PR07MB2514 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 NPIV ports, call configure_hba() so that NPIV ports can proceed to loop initialization. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 ++ drivers/scsi/qla2xxx/qla_mid.c | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 7b74973d5788..7e7cd79038be 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -41,7 +41,7 @@ * | | | 0x70ad-0x70ae | * | | | 0x70d0-0x70d6 | * | | | 0x70d7-0x70db | - * | Task Management | 0x8042 | 0x8000,0x800b | + * | Task Management | 0x8042 | 0x8000 | * | | | 0x8019 | * | | | 0x8025,0x8026 | * | | | 0x8031,0x8032 | diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 988fb5d0f9e7..8f84cedab853 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -5913,7 +5913,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) if (!status) { ql_dbg(ql_dbg_taskm, vha, 0x8022, "%s succeeded.\n", __func__); - + qla2x00_configure_hba(vha); spin_lock_irqsave(&ha->vport_slock, flags); list_for_each_entry(vp, &ha->vp_list, list) { if (vp->vp_idx) { diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 6164a2c9a1f4..f101aaa5254b 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -55,6 +55,8 @@ static struct rom_cmd { { MBC_GET_RETRY_COUNT }, { MBC_TRACE_CONTROL }, { MBC_INITIALIZE_MULTIQ }, + { MBC_IOCB_COMMAND_A64 }, + { MBC_GET_ADAPTER_LOOP_ID }, }; static int is_rom_cmd(uint16_t cmd) diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index 608d1aeb97be..c0f8f6c17b79 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c @@ -187,6 +187,11 @@ qla24xx_enable_vp(scsi_qla_host_t *vha) !(ha->current_topology & ISP_CFG_F)) { vha->vp_err_state = VP_ERR_PORTDWN; fc_vport_set_state(vha->fc_vport, FC_VPORT_LINKDOWN); + ql_dbg(ql_dbg_taskm, vha, 0x800b, + "%s skip enable. loop_state %x topo %x\n", + __func__, base_vha->loop_state.counter, + ha->current_topology); + goto enable_failed; }