From patchwork Tue Feb 12 23:40:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himanshu Madhani X-Patchwork-Id: 10808935 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 4F2A21390 for ; Tue, 12 Feb 2019 23:41:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CA912C080 for ; Tue, 12 Feb 2019 23:41:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E4862C083; Tue, 12 Feb 2019 23:41:59 +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 BE0BE2C080 for ; Tue, 12 Feb 2019 23:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730743AbfBLXl6 (ORCPT ); Tue, 12 Feb 2019 18:41:58 -0500 Received: from mail-eopbgr710044.outbound.protection.outlook.com ([40.107.71.44]:18880 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728579AbfBLXl5 (ORCPT ); Tue, 12 Feb 2019 18:41:57 -0500 Received: from DM6PR07CA0044.namprd07.prod.outlook.com (2603:10b6:5:74::21) by BY1PR0701MB1925.namprd07.prod.outlook.com (2a01:111:e400:51ab::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.19; Tue, 12 Feb 2019 23:41:56 +0000 Received: from CO1NAM05FT054.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::202) by DM6PR07CA0044.outlook.office365.com (2603:10b6:5:74::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1622.16 via Frontend Transport; Tue, 12 Feb 2019 23:41:55 +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 CO1NAM05FT054.mail.protection.outlook.com (10.152.96.170) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1580.2 via Frontend Transport; Tue, 12 Feb 2019 23:41:55 +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; Tue, 12 Feb 2019 15:40:50 -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 x1CNeoxm029857; Tue, 12 Feb 2019 15:40:50 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x1CNeo4L029848; Tue, 12 Feb 2019 15:40:50 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 01/12] qla2xxx: Fix LUN discovery if loop id is not assigned yet by firmware Date: Tue, 12 Feb 2019 15:40:35 -0800 Message-ID: <20190212234046.29809-2-hmadhani@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190212234046.29809-1-hmadhani@marvell.com> References: <20190212234046.29809-1-hmadhani@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131944885158441199;(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)(376002)(346002)(136003)(396003)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(53936002)(76176011)(105606002)(1076003)(110136005)(16586007)(42186006)(4326008)(106466001)(51416003)(86362001)(126002)(6666004)(87636003)(498600001)(54906003)(2616005)(11346002)(356004)(26826003)(69596002)(80596001)(446003)(476003)(336012)(486006)(97736004)(2906002)(85426001)(68736007)(50466002)(305945005)(48376002)(8936002)(36906005)(316002)(50226002)(26005)(36756003)(81156014)(81166006)(47776003)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1925;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Fail;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CO1NAM05FT054;1:6sBgK3O/VU3ZQ2l3AELCtBmn0dropbdQCWco/PSuWl0MDuEoG+9V8UCafql8Qr/SjPdJ7vWn3Mw/i1XSFIPNEh+denDS7ZUeMZC8p5jdQI+weio2Zuk7sEx6mAh6StnnRiUBeyrTosBFHTQvO5g/pd4ZGkfgYgxakZw4r/NPa9Y= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88cb1f54-3485-4e01-b001-08d69143ac2c X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(5600110)(711020)(4605077)(2017052603328);SRVR:BY1PR0701MB1925; X-MS-TrafficTypeDiagnostic: BY1PR0701MB1925: X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0946DC87A1 X-Microsoft-Exchange-Diagnostics: 1;BY1PR0701MB1925;23:tywA70Auj2VrgB79AsZXJL4BIfCS2Hk6kJUv0iDZ2LwRMC0tUxBvUhrslVVwMQB5BF2RX/XzcFUssyapl++tT7E/ERVGbrfa1U1D4387we9TSP7btMUXA5uLhmCSlPV0zx/QpA96g9tvSuAARb99Dkl8UR7yWyF9yZV/5yiD9Z+uvJmTPX3jYVmgVwLd+O8abSNHXnfQT5T1PIE/SRgWFzzml+IQo5wYBmklOTCqT+FWGrf6f/NeXKl61LZW3vBTfInoG/kNC8SBPYUZIkK0bMhIU4e0eNZ0hQiLT760XTd/x+FV+BKhGP3KLCdh+UxwTCI+UDSuRf+4eyLmF0NnI+BLBnJX0idiMM2NAWdnD9LEKfU9VpKThal8vx5TY9nnXoIE0U1Z2msk4l6vo4x1sCWz70cefVMmoTX6lVAFfH44LPNJrVordnON6Y83yihKPj6xLU+IUh0MXTsZI92yOXadtOXZfViCx8Ixhmj2rmohTu2x5rq9IsbzZqY/lF4rDH3KVwph4wADv6RWwmaaHMxrDjOBfmO5Gj3OkAJeghdKMmRCSS2IczLKLiuiooOvoit18yTWlUqWDwao5sUmbPHtBzQ1ThyFzykrfTmkb4EdXdnhsuhhrKUH0WeOYb5vCCgEmsYWYUuKgLhvBQ+9O0xGs8hDhc4F3Ej2tZqVQyGrxhsR48Nzml/T1pzRSHb+Vr3a50DZLkt1TlEGZ721tDmkdyuj5JEaF11yZH69nCbn9ef1vwhwDagRdBGpHHhtBR357woMuL9fvMU7GhrrM2islwV2FOBFej6Lewolgc/iCsdeB0AMtFZyccg4scF/v/jgYFqnNH1BbODbvTpaIHSu9XU0JM0O5ejdC9Slho9UFz7h/m9M95xSh91KkmHveIBZDXXw6hh+fcxIRMNx/wIxzDTJTGLGc+783vYZZ+YTUKn2/vdZSIbIEpOwhP1k5Ttltv+dREq7NooPXlc6vLQSuw/06/0gedcLpnk11buK23C4I6THaU85KaSjFN7sow+FmYXm8dO3VBk/0FpRo+fb3ICECIvawrsRkOn5iCch7mStnwVnq2E9/+ynNCzUE0QxlaeRAYT/isHOcqDS7kp/B+e2wgJgsvPiJKISwnRX98R1LX12yJok/x4/ZpEeWUB46AhWbLQuuijxC6Fu/Zqp0ktBrdfkOn4NkNhxTwwo5fK9YyFejv3AUjz6H5F5 X-Microsoft-Antispam-Message-Info: HSxh2XqN9rdPfXi9oqslkXDh8cBhmy/cGUeFmvK+UsSG2YQKFKkn8OfoUAthyyJ7tJivWrEQgAfrZnKTh7ZXo+Db8EBxse+Bal/wQIht2LdlobZah9uEZv5xvBubG4n8DHh8jf3g77QxOI+Ju54JTtcH2xlzWl9VUyUZiVIjzSd46XYpiy5/gGddBv9jQ0SHhJYidV4e/YrYEOEoK+cMDgm+OjjqRLSs4j5BvVAUEDiE7aQkgFnbttlIAJ3IQeaaZfayC7D9uH1lEpsy0nELkKDHrVKjYteApbWjPa7wMVhYQYxIihXHE45EVLeDj/8fCjyMwv2DRm1wB04bRrss6IKDylFGsftA2/KKyMLfuQHuNisOPZTZbkuvysRvGNd3HehRgARy8yx08REWvYYm9nxBIJqMdwBSFE9R52KuY14= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2019 23:41:55.4047 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88cb1f54-3485-4e01-b001-08d69143ac2c 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: BY1PR0701MB1925 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 This patch fixes LUN discovery when loop ID is not yet assigned by the firmware during driver load/sg_reset operations. Driver will now search for new loop id before retrying login. Fixes: 48acad099074 ("scsi: qla2xxx: Fix N2N link re-connect") Cc: stable@vger.kernel.org #4.19 Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 8307eac796a2..cdf57eb643b3 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -644,11 +644,14 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, break; case DSC_LS_PORT_UNAVAIL: default: - if (fcport->loop_id != FC_NO_LOOP_ID) - qla2x00_clear_loop_id(fcport); - - fcport->loop_id = loop_id; - fcport->fw_login_state = DSC_LS_PORT_UNAVAIL; + if (fcport->loop_id == FC_NO_LOOP_ID) { + qla2x00_find_new_loop_id(vha, fcport); + fcport->fw_login_state = + DSC_LS_PORT_UNAVAIL; + } + ql_dbg(ql_dbg_disc, vha, 0x20e5, + "%s %d %8phC\n", __func__, __LINE__, + fcport->port_name); qla24xx_fcport_handle_login(vha, fcport); break; }