From patchwork Wed Aug 1 06:13:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10551733 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 15D471708 for ; Wed, 1 Aug 2018 06:13:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0620D2A5FC for ; Wed, 1 Aug 2018 06:13:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE22B2A64D; Wed, 1 Aug 2018 06:13:44 +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 236112A5FC for ; Wed, 1 Aug 2018 06:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733134AbeHAH5k (ORCPT ); Wed, 1 Aug 2018 03:57:40 -0400 Received: from mail-bn3nam01on0040.outbound.protection.outlook.com ([104.47.33.40]:7068 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1733087AbeHAH5k (ORCPT ); Wed, 1 Aug 2018 03:57:40 -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=bC4Syc/8mUt4OryPbD0RqJihQofIJ8P+hGAUD466+/g=; b=fEiKUMzzGEwiL+0w9RAMWRLdZ4KpNKQEP6cfhWiAbhUCiXLsPbrVmjlD/WUgVJHMrHBmrvUEzYze8bJHDG9bLUdk4hegRw8VCDUVYTUMCZ6vVdp+l9rOJZBaE4+l4ps4ZRCjqR7VXD2M+Wg+fdVzB6QTsc8rIrEhcjMwN3ge/48= Received: from BYAPR07CA0027.namprd07.prod.outlook.com (2603:10b6:a02:bc::40) by SN1PR07MB1469.namprd07.prod.outlook.com (2a01:111:e400:5838::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.15; Wed, 1 Aug 2018 06:13:39 +0000 Received: from BY2NAM05FT043.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::202) by BYAPR07CA0027.outlook.office365.com (2603:10b6:a02:bc::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.995.17 via Frontend Transport; Wed, 1 Aug 2018 06:13:38 +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 BY2NAM05FT043.mail.protection.outlook.com (10.152.100.180) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.1038.3 via Frontend Transport; Wed, 1 Aug 2018 06:13:38 +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; Tue, 31 Jul 2018 23:13:35 -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 w716DaAd028748; Tue, 31 Jul 2018 23:13:36 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w716DadU028747; Tue, 31 Jul 2018 23:13:36 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 01/16] qla2xxx: Cleanup for N2N code Date: Tue, 31 Jul 2018 23:13:20 -0700 Message-ID: <20180801061335.28709-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180801061335.28709-1-himanshu.madhani@cavium.com> References: <20180801061335.28709-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)(136003)(39850400004)(346002)(376002)(396003)(2980300002)(438002)(189003)(199004)(8936002)(575784001)(86362001)(478600001)(87636003)(2906002)(336012)(36756003)(356003)(186003)(26005)(50226002)(305945005)(72206003)(47776003)(4326008)(106002)(76176011)(1076002)(110136005)(51416003)(476003)(11346002)(446003)(6666003)(106466001)(486006)(81166006)(2616005)(126002)(50466002)(8676002)(44832011)(16586007)(54906003)(80596001)(316002)(42186006)(81156014)(48376002)(69596002)(52396003)(5660300001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR07MB1469;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;BY2NAM05FT043;1:e8w5ecUboi1MLJWIbOdxqqdWzyEFg6DNxtQoGtBZOCZoPCRex3waDla3ioupGyHoDAI0ni5nuvTf0825ujT2SqA2SYUt5AWf9lJgzsaembdkVvF3uCahogiJZNB1zUAs X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fc6bcf4-119f-499d-6639-08d5f775ec30 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060);SRVR:SN1PR07MB1469; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB1469;3:vPXpmMBWIIxXI8zx3ebF3D3Klj8DFN+D1S42FxrfR5riW+doayZmbk/mkIvphHFi8Fue2rN8Ly1l89UuTUqw89Qh22cyd3yuILoEBY1z8jthzFj6vG3wBXSdMvZ0rTJwPPWyNotkFdJ+jl0cMODTCdu0rsDe+s8HX3QAbIua5+Y9R1HGqngyFxX58bvZ0s1ZCIL7R6uGYA85VIUQNtUP+M1SGtPtaFNzp/gob4X9XeQDScv0k8op6F6LRV3Zcjs0xuLVcaJeBpaBbnK4W7hx6590VloU1IFTBVVbFOend58wWZdeyjAngJDSEzdtERCG9Zq7jjyug0pHdOTTm3PoB7CXSt0h0w3CvESOdHuMl6E=;25:Q3VBHCWTihaG2D4+lASCyhPHfzgZe9rBNF1FUaULZO9tHdiBQUGtLtsqZ+nwvvEi0+napX7O0/1MfrFkkh9DGDFODh3wGHOIsqVYscqpztgsf7req78vs5FISQC1FEx6w88zmyu6AipnQMGdHfWxIzMpIDLoLqr8vbNdhCNpPCasbYnACmRAu9XUXY6seUP7uz4Cf4ozrvdb3X2BbyLps9tAt8SQ2f7VEHgigTqUmKCdm871kNBXYCjzlt8Z26ljEZ8Vo06yCvCZAhl2phEAlLZlWRGRuIDygbTyHDv9u3ZF7gq8ftA7W17J1R8nYG7vjr+j8SuaC1SSjy6N1yd8+g== X-MS-TrafficTypeDiagnostic: SN1PR07MB1469: X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB1469;31:GgKLi7w9K/g/9fMpxzDcH2X8PdAN226gZPm/BkpDHHlOrn2ONCeOrLMjTIMjvsEH8SumrUxo4PWEwRQFyvD1m1R0GbXLasOcA2+1oS/WQUJE3ogILMm0xbybrkNCq8M0DpDzy+nqLFxVDJZR42W9OGIYV1aEgZ0Yjlq6CmgahmE/lOeckO5hDSCHWuGKakcue5txx1/izjFwSUTUbtMRoZTU2qmaahZG4hwWRuqoQPc=;20:LJRJAECyxqNo+MLegSohJfI5BSqcSBwskEwosBIuw0Mk7Cm5Fz1axlBEwHJ/snXeWauOmZM7CUT1ULGXcQUuno1WRFsbIagtIZAz7iZ2KKKzz68fKZHR832Fx/y7UsOr+CXWRfZs55kK5IAwK76CLHnXeq5okqntEAGAXN+S/uB5ZYfAHA9ytjdVkBeiRyKVXP7x0QCyLoqNSbMlAafIF+jNxEe9RNSyYBovyWDJMNkqE6JW1P8K0SxpeDvii5Wk9z3D77O5hhWaARKgovS7QeRZ3pAsuQDfDRUfW3sfDCJe7A/3J5OHV/ir6XaNQHgsi5e/UGW5AgFstiv2VpULC3DLf6/Av9rxDhH3N64VCNPk89YFMqWP2v3dO8Y3ShkAqGzvfen05E9E3ke5g2NNrgPqBNMODkiYXUVTkwpaj0H74VFGVMsdrnlz78FiYEUaffG2nhS6epfWt2HyFYdvHNawvq3EyLcKyO3j8A91VauIabVMSEO5G1QBpFHNJD00 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)(8121501046)(5005006)(93006095)(93004095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016);SRVR:SN1PR07MB1469;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB1469; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB1469;4:+GkZHjmkAvnhR5nwq3pMcOiRcCvdzx9Csi9nV0KwpV3HSm45TH8vkVB/bEMhLD59uEPwOLRYgSRu3gjNBJ4UsipkE9+emSun1FAi79yTfvOwvzL6YJVreiREEw7I+agPRu7O0Bes1A0AG7F0uRHzdEdNCNXUOn6qrZXFhqIVQ6Emeb1M7Lz6eKiTxHcBUStAP+YVP0loGXT/lKcbNmcM1x6IdpuUZAq6LIfQT4510D9LaoVIvSJEoCLx5+fZbC4SmiUo2D3x9HfjM/f/dZHcAA== X-Forefront-PRVS: 0751474A44 X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB1469;23:GmpvPsxA9s2zAA16w4sPRjae/Dii3GHWxZm75erL+9GM7SGDOkQJVtMfSnw9NVPuglrBI1uDnWvMv0PrLTOo17+sNGL31k+wMPz0FDE5ai7tJ0Y3F7uEakahSrDVlk/ygQvmr+gxXt9iiKvK9reEznAct7YUAj3Ht0CIl5MtzT8NRhSne3oHc3p6s7u8i0KeIqLOX/+BnP5GfyypLB+WjSmw+KY4d/Nd0eEZAjnobswfIKuKiMeJiZzSsfJjU3OvMDvd+9AJUnOvvm+nmLyIJY2F8qn9jE1LYCsnm6Xcg7wEMSRymMU/gRnyk1rWFs43HIf5XdHLBZZ6QhB0ydhQyaW6Vf7Mjc9B5PCE4owbUMdQ7al9uxK+Md5kI5oT+sOG3FAaZDrfAqDLbXzmpbxG0t+Yp1nH0nfiH6xbh+gjoOSadGuTdqtu4HDoiROIhIpoamQaT20VmkoG5FyAWZCAhlrO10OHI0k1wvy5vzfamD+IGgs12ebk2X8mC9G9Xoihc17y/YiKiOlVJvaRYxl63V6h0qNnpVkiZIFxywF1LtsU/1POa+R8pqsU5VjGPtt6IEWa1Uke3lKIaslEwNjGxtmQ9yoUY5fgikEV0guNoE9HPvzDjOWl8lpv4PaDoT4HdkG3JwnhlPqMve9YnWGeUwWN/ubVSCGWTTqGxYh94k/VWdaOg88kIwA+fRkilZ7aB0Pwvvq5HX7IAKZG8lW455jKzb6Zu/Ds5OkFUQfweb0zuxTOaMwEosO+gg/8Ud16ALXcfSLkS+WNXMa99YpV+DklCgKDpdA/pnsuECWF85ku/z/bY4KnFxTDcgnVvouc5kUglEMalgbJkA35m4jUzyPOsmbfkdAZ2cqyfy8dNFUg91st5kgVg8rgAq9IHq3HWJFgGyvvbGLKZXJ7NVtXdIpuS/MKJ4izJP44XLGFTphpNWLwhLlULJ3tLPQTEl/llONMSbfoE48XhUt9GfmWxCaA8ReneycLz45QxWRFEXK4SPkUHseOR4Q/rm0V0n1AlgGq40LUwik/6IYtUFxqxSywwbEQP4r7qmtOI1PQdbA3Y4nosU+To7G75SoELn0d1FDHJdpMuoztk1pBg3YeEHiuddWeNhctcoS9VcsSloBfweIGTI/LWXmiSRuZyt8p8iCc212Xa2r/eE90aUNnzA== X-Microsoft-Antispam-Message-Info: 7LnC86D3nAXdzsQpQ2/QU70dwNAdB+7WNWkftlc6n04NEZyvcWIKARHvqHkeoW2fvEGU63PzN+9xqyYTFIrhtRe3S8onBZWih9yNFcRMBVGdeqpHETjRhbLl/GFaVNXJCNRpJTzVhFi9tby7tbN5dtbcH0n2B1rNp1Nslr7zQMeqaxcaygl5ivdfwMNfSbMHINCpO0S9mpuP89aEfpwa3X6g+y7S7n77oXi4+4LbFUOk5PtTvZvIy94TuQEhD/R1kBy/XsJlimOR+0ceP5dAXuYyFfgOw6rFOdvCbjEOYk5j9SbsV0DBHU1xzVd+2n4zY+4JejmV7pU88CRU4GqyrHkR8kAFvBKuK+pZpOtO9ZI= X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB1469;6:7j5yC5Y+0cpUD0rq80OSI2/DYh+BWtvz1mizG4NKODfXkXh+038cRoXF+eCxTkuSHNAgBfiQukjZHrgAB4sN5LEJMwE1qNIMxm7sgKlN/yq7OTXFfs6BPR1w36Tk/VUi/SZq1ZUkzw8SlhCNFtnaUot+9jno19gZSmFo6AlGgfJdDuwQyZPZ3AOwF+2DHjrFWMARiLZ22nyMZ5hOqHmtWcAZp4FHkwVUBkaBiWLsZBteszbGtJahX6IylZFtwRWmwlxdqWmR4faiRrTKw1fKYr81atq7SLvG37dy0sp35NGh9XriaDU+msbxx2n8nYd+mDS5KkBG51TIyC3pmsZeaw7wGt2zfzE8uC3OCa/C/s46CED38My7UhvhhcFY+Bfc1rB/Jtrpw74c1wjue/k6x5uXiP2SLnCgiAogWtJ4EwxKzJeeJmKtMxrO4uWA8wUHm3mpqk0YE7h7xe09L93Lsg==;5:Qb/NJkP0Fp4gNm1CA5tHKpjgBmBUGrco3FpGOa8A6OwKRe8g0pMpcqOBZuecunBGM0bqeQ7zKvhT4rdYIsBOLKG5D8PVFZGqSb1h2KN9UiaS02cg6iyOuBtz4t1jb5NpC18XUMUPBL0BGfGUhT9PCRo37LyzkFHtPqy0OxbmXUM=;7:CXZWYVqZ4QRd/zGJmL7ACHdDqwHAVCXNQyJMKQKVtZaeS/TnW3Q0z42J4knbwd/OHavkN9R9AyuOvTtEsM8XpSm2Pr04FGnx8Eb/3xdBixduNZZdtOttUrnGSpFXe2XZ1gcq0oMK0gdCfSuwJ03Hy075xGImK6aeQU5c7J6CCvKqxueeoT1GPnUFzQ6aMopa0evlQFdEQyVYc24zkHFn872WeYSrIkxgK4TU/d335yMMIJQliEhU2NhaTTd16LrZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2018 06:13:38.6434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fc6bcf4-119f-499d-6639-08d5f775ec30 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: SN1PR07MB1469 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 Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_init.c | 112 ---------------------------------------- drivers/scsi/qla2xxx/qla_iocb.c | 25 --------- 2 files changed, 137 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 7b675243bd16..1de78697dc0d 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4687,110 +4687,6 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) } /* - * N2N Login - * Updates Fibre Channel Device Database with local loop devices. - * - * Input: - * ha = adapter block pointer. - * - * Returns: - */ -static int qla24xx_n2n_handle_login(struct scsi_qla_host *vha, - fc_port_t *fcport) -{ - struct qla_hw_data *ha = vha->hw; - int res = QLA_SUCCESS, rval; - int greater_wwpn = 0; - int logged_in = 0; - - if (ha->current_topology != ISP_CFG_N) - return res; - - if (wwn_to_u64(vha->port_name) > - wwn_to_u64(vha->n2n_port_name)) { - ql_dbg(ql_dbg_disc, vha, 0x2002, - "HBA WWPN is greater %llx > target %llx\n", - wwn_to_u64(vha->port_name), - wwn_to_u64(vha->n2n_port_name)); - greater_wwpn = 1; - fcport->d_id.b24 = vha->n2n_id; - } - - fcport->loop_id = vha->loop_id; - fcport->fc4f_nvme = 0; - fcport->query = 1; - - ql_dbg(ql_dbg_disc, vha, 0x4001, - "Initiate N2N login handler: HBA port_id=%06x loopid=%d\n", - fcport->d_id.b24, vha->loop_id); - - /* Fill in member data. */ - if (!greater_wwpn) { - rval = qla2x00_get_port_database(vha, fcport, 0); - ql_dbg(ql_dbg_disc, vha, 0x1051, - "Remote login-state (%x/%x) port_id=%06x loop_id=%x, rval=%d\n", - fcport->current_login_state, fcport->last_login_state, - fcport->d_id.b24, fcport->loop_id, rval); - - if (((fcport->current_login_state & 0xf) == 0x4) || - ((fcport->current_login_state & 0xf) == 0x6)) - logged_in = 1; - } - - if (logged_in || greater_wwpn) { - if (!vha->nvme_local_port && vha->flags.nvme_enabled) - qla_nvme_register_hba(vha); - - /* Set connected N_Port d_id */ - if (vha->flags.nvme_enabled) - fcport->fc4f_nvme = 1; - - fcport->scan_state = QLA_FCPORT_FOUND; - fcport->fw_login_state = DSC_LS_PORT_UNAVAIL; - fcport->disc_state = DSC_GNL; - fcport->n2n_flag = 1; - fcport->flags = 3; - vha->hw->flags.gpsc_supported = 0; - - if (greater_wwpn) { - ql_dbg(ql_dbg_disc, vha, 0x20e5, - "%s %d PLOGI ELS %8phC\n", - __func__, __LINE__, fcport->port_name); - - res = qla24xx_els_dcmd2_iocb(vha, ELS_DCMD_PLOGI, - fcport, fcport->d_id); - } - - if (res != QLA_SUCCESS) { - ql_log(ql_log_info, vha, 0xd04d, - "PLOGI Failed: portid=%06x - retrying\n", - fcport->d_id.b24); - res = QLA_SUCCESS; - } else { - /* State 0x6 means FCP PRLI complete */ - if ((fcport->current_login_state & 0xf) == 0x6) { - ql_dbg(ql_dbg_disc, vha, 0x2118, - "%s %d %8phC post GPDB work\n", - __func__, __LINE__, fcport->port_name); - fcport->chip_reset = - vha->hw->base_qpair->chip_reset; - qla24xx_post_gpdb_work(vha, fcport, 0); - } else { - ql_dbg(ql_dbg_disc, vha, 0x2118, - "%s %d %8phC post NVMe PRLI\n", - __func__, __LINE__, fcport->port_name); - qla24xx_post_prli_work(vha, fcport); - } - } - } else { - /* Wait for next database change */ - set_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags); - } - - return res; -} - -/* * qla2x00_configure_local_loop * Updates Fibre Channel Device Database with local loop devices. * @@ -4847,14 +4743,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) } new_fcport->flags &= ~FCF_FABRIC_DEVICE; - /* Inititae N2N login. */ - if (test_and_clear_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags)) { - rval = qla24xx_n2n_handle_login(vha, new_fcport); - if (rval != QLA_SUCCESS) - goto cleanup_allocation; - return QLA_SUCCESS; - } - /* Add devices to port list. */ id_iter = (char *)ha->gid_list; for (index = 0; index < entries; index++) { diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index a91cca52b5d5..b349e9b94c08 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2568,26 +2568,6 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) } static void -qla2x00_els_dcmd2_sp_free(void *data) -{ - srb_t *sp = data; - struct srb_iocb *elsio = &sp->u.iocb_cmd; - - if (elsio->u.els_plogi.els_plogi_pyld) - dma_free_coherent(&sp->vha->hw->pdev->dev, DMA_POOL_SIZE, - elsio->u.els_plogi.els_plogi_pyld, - elsio->u.els_plogi.els_plogi_pyld_dma); - - if (elsio->u.els_plogi.els_resp_pyld) - dma_free_coherent(&sp->vha->hw->pdev->dev, DMA_POOL_SIZE, - elsio->u.els_plogi.els_resp_pyld, - elsio->u.els_plogi.els_resp_pyld_dma); - - del_timer(&elsio->timer); - qla2x00_rel_sp(sp); -} - -static void qla2x00_els_dcmd2_iocb_timeout(void *data) { srb_t *sp = data; @@ -2648,10 +2628,6 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, } elsio = &sp->u.iocb_cmd; - fcport->d_id.b.domain = remote_did.b.domain; - fcport->d_id.b.area = remote_did.b.area; - fcport->d_id.b.al_pa = remote_did.b.al_pa; - ql_dbg(ql_dbg_io, vha, 0x3073, "Enter: PLOGI portid=%06x\n", fcport->d_id.b24); @@ -2664,7 +2640,6 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, qla2x00_init_timer(sp, ELS_DCMD_TIMEOUT); sp->done = qla2x00_els_dcmd2_sp_done; - sp->free = qla2x00_els_dcmd2_sp_free; ptr = elsio->u.els_plogi.els_plogi_pyld = dma_alloc_coherent(&ha->pdev->dev, DMA_POOL_SIZE,