From patchwork Fri May 19 21:53:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9738299 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 182236020B for ; Fri, 19 May 2017 22:30:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 176DA283B0 for ; Fri, 19 May 2017 22:30:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C4D928593; Fri, 19 May 2017 22:30:38 +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 86344283B0 for ; Fri, 19 May 2017 22:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756828AbdESWaf (ORCPT ); Fri, 19 May 2017 18:30:35 -0400 Received: from mail-dm3nam03on0052.outbound.protection.outlook.com ([104.47.41.52]:1248 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756815AbdESWae (ORCPT ); Fri, 19 May 2017 18:30:34 -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=+VWrTv4vweAHhcKGe2ZtKgD1vMyW28Nl8mTMXaKSOco=; b=GsF6l4Msb/FQxFXHRoPpuNUVaL6GCpMfurpDf3oISk4IzWJjSZp6kBWmrbswKfTMtyRLZ2yEr63KJjfnuUgGWjOsRbjI7aqzdZs9e58ZpFsX+q0B/zLgRgJ7iz7CW9KfZ9tcL8W29Hsht3c6CJANJbwnQWCZTaIsE8EtNce0LmQ= Received: from MWHPR07CA0001.namprd07.prod.outlook.com (10.172.94.11) by BN3PR0701MB1573.namprd07.prod.outlook.com (10.163.38.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 22:30:31 +0000 Received: from BY2FFO11FD018.protection.gbl (2a01:111:f400:7c0c::117) by MWHPR07CA0001.outlook.office365.com (2603:10b6:300:dc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14 via Frontend Transport; Fri, 19 May 2017 22:30:31 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; oracle.com; dkim=none (message not signed) header.d=none; oracle.com; 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 BY2FFO11FD018.mail.protection.outlook.com (10.1.14.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1075.5 via Frontend Transport; Fri, 19 May 2017 22:30:31 +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, 19 May 2017 15:30:28 -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 v4JLrsox002316; Fri, 19 May 2017 14:53:54 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4JLrsoc002315; Fri, 19 May 2017 14:53:54 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 25/25] qla2xxx: Simplify debug printing of portid. Date: Fri, 19 May 2017 14:53:44 -0700 Message-ID: <20170519215344.2168-26-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170519215344.2168-1-himanshu.madhani@cavium.com> References: <20170519215344.2168-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)(39400400002)(39410400002)(39840400002)(39450400003)(39850400002)(2980300002)(428002)(199003)(189002)(9170700003)(72206003)(33646002)(81166006)(101416001)(87636003)(305945005)(478600001)(1076002)(50986999)(76176999)(80596001)(106466001)(105586002)(189998001)(42186005)(50226002)(8936002)(8676002)(36756003)(48376002)(50466002)(2906002)(54906002)(356003)(4326008)(2950100002)(86362001)(575784001)(38730400002)(5660300001)(6666003)(47776003)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0701MB1573; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD018; 1:11CTSl15mQEuwW6MIFUaSrTIs79IcQ9EHptal1pSIw61xh4Z0n4NNZ9oUXdlErIUSaxE8MtVUc9oqT6YKJYS2blhmDBRBjNsIaDib2HJ6F7HHI2a0+A7MRQ24luFBHknTC/hIg6MlhbfyG8GPXAlso7t1XvJrAuqo54x6vaCT+H2xSnRk4QeqMLAQHSndahE4TvRm1J6EfzkjAKyfBt+Kd69n+g9Wq9p57TEIhj/cdimwOWDnFQ+BtQ0lYARYgnHdJh/M/gmbxC4fhKra5D8gBd3TqxeesHtSqf95MRDcD1kgZXc5psgRzK9iaz2G07TWdk/AtmWsLmjDNvW6XqZGK4wAsMvWKQHrMXPyzpG3W87m3EPyGfhH9QZ0B2V29vvl28tVt9WSnGKwkL7QnfZ9eUI6KlA+2fo2Z9PQOc4fp8wztnBg/LnJ4Xg3l2SgzcpUQRnLMxKWRllf6hbuDdDoodh5p0LYIhbUe8uCoukUNneueEJ2Ffv3BPrR0BfE8oa41nGVag2LbNpZUfGU1WT7CTzieHhIGOO5TTH8rOe9WRIt4ZQJ+9GBwMRWaC1QKneW91HrwbburEqr4mH50QfEA== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PR0701MB1573: X-MS-Office365-Filtering-Correlation-Id: 8be55841-295f-47d7-e59c-08d49f06a8a6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:BN3PR0701MB1573; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1573; 3:TPuBY+BccO4CgBQdpBDQvyWQsuTnosNwp9VVtBMfc+67S1L4/g/ABD6zGXVs1ZLY2vJgQkYifmQP+FZu9WvhN0ni0y/dWK+frzNIoAHUd7tz8ZKGUDFF6WB4b1/KlUYKwDH99CinC0CYZTjXwXMBzMSU3rXUlUMeMbxMQpC+vObyojHGYe77qckwLaRQpzlXqu9PCAxULtDeLLmQt3CzIzVHDYL6VJjY5UM6uRRAC1WHBWMLLpL4R96cWRghjwJtq8ee9UTJjwsHBwci+NtNuoUaQnrejzlnJ8Rc0ZGXhuCy1ycYiqoCOtEDJiIobIp/X3DHiFdthSHDgxUvshEkynrSqzv2y+EdXY+q+kSiv8Tm8Yn0R17H2DFMbXIHaUZCQQQSITQIkQuGHr/9yt4iNlOFFAFp5C5RHDyMfc2jIpiVZJPsaOKbwVxrlXdLdnS225skDsTz3Tj7bVkb5Eg+qw== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1573; 25:mgKR713FcQn42O9iHggTXTUyQVNVRZbp2P9ZAgDe4/exAP36Ol8CLIZdZmW+15PdK92EjhjQdivlye3sqMrmBzMUIVAflcjpMV+gDynU4qPgoloKHW3GJFbULQChQSxpuZIcPBl8PG4bQDbaicSdto5XOE4kD5tAJpC2BdOp2d5OAoWJzbb5/QPli9iD7R/o7+lB2pmhPSG6LIAcPyh0/uL53Ad1dzryby4GsdkD8btmJRKzF9G7MS6/56OpknvYBW4b2ewas5v/Ag3N0YGpUa2yq+FV10cFWpF1VMh5QQTVK9wis88V7RZJb+gSQvuS4CcL+inm7vFlw+1nUFgOnv0n5bTGCciO32IE/Fp0hKiJBQO++hzLZ3MPETZEY1SP+lGLqaOt2HALnBW7eLnLlM2bLXkotyBePj3+iPZTo3Zo8WDrF+KCWnkp749ZwUov3OC7Cu1oq2fWy3lPSz3w5oZYWe+kbZWqsL8DVR97LrE=; 31:oc+Z1BC9k3fFAqn29JeALUh92wxaR4YvzVWEAegUFdlSVtqjVBakqw7VFRppOW2F+oFJD3wFzinLXTWudgxIDcWIBuS0HIT2QDSPbVP+jlSQMmt24kNQ7i2aUw3XW5LhLltIu4gAuUpb+Sw5VQJBw4JlnBKWGsgdUrDlEVK58WHgjUKg6PkATvJYnrVSfBJl0zozK0lakPQOaK///ranSX9LhRhOFRFgcb401MY/Rv6Th8dB2il0Sc1hqZPI/fizTH2dW3Ybq0MfZF01LABJYLiFkr/14A9jrOqyn6Kl1PE= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1573; 20:bg2cHsrFI4PXZ+htQvNCbfmX9pfM0MMAszRu7Zl9jHdKUnflqLiK+ApV0mA0wwlYNnwsQv0Il05hcoiEXcZOIXpPdNQZ/v09eqygiooatzoMaO8AO65f6zXTp912SlDaf7P7i7K+XvScZayL0tpIvp1YW3fUZjcFqcLiJcc9DvSEoDzn7JpHoPk4p5aXLaJcupUPHqDClPbi4TNfnWD34ej9mMnLZcpS/3RQCGgG9GEmoojfgPUpl/nAmdw7SjuwDfyGM1u9UJaiD+tv2g9Xnw28xUpAIKM9nzLE/RwMbkYqFcGIpqFaE+/ZibWG4zdR+AEf8UZ2Z87rQV4OGf1+GtsjTvxM3TC3N08t8YLDXVb8sw3hJW2HV1AS55rKayIIrtNMCr91EffbEiq7VK0nWhvZ32vhLyzFuEhVuhi1mzMe8yPawQbwDcUBD27Wzm2oM9b0HRHNV3UnA63DeBOaGxqzZytp/IhzbsKftNG+ufaulOASBpTcfnbM9f2GTQYN X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13024025)(13023025)(13018025)(8121501046)(5005006)(13015025)(13017025)(10201501046)(93006095)(93001095)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(6072148); SRVR:BN3PR0701MB1573; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0701MB1573; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1573; 4:0Fc9xAbEr0BqLBgsyepy5Z00dHa738de6VBex6dGgahSSy5Yvt0tiWQ/T2Qbo5xZYYp50IfkSUsMGP4vvoHXDBg5jHJ3jG4QvNgPI6ZOQzIbavqX1UJTvydcaUDxExNeMaEWV0Sou+HmauOp3EGLhfANUoewY9jYZR/zZr64YpFTpO6lSUPQMrPqrc3uDJFKXCwerdltV6yiu4JOQZ/AjFAqYTXaXC3fpgFOdEIuRozYjs7ELhX2q1tz6xn5GM/Gis/YlQ0ezqMxEnsfE8g7g41U2oxs5FsOfADCcIR7TT3W+1Oy1KWDhgDl1H8+Bm8Zk5UkdTEIzuT8EgSVQVjs9Ac9kUNonRxOupscTuWYP1Y2eMwlwjVQVKu/ESdJHGtAh0NWe0mZ2F1cJy20Kft/MvQLlllKBwKIHdHL+UR5YurlEZ8bCvEvQMqM/3xETTupLsH1vdN6905aeBMEHJfJK2svZ7bcMtpHGzqSPxu5gatPLJSOzTE15KeZMujjgAivxpwQIDn1iB69OzG7FB0xx7YUPxJQ0j97YG0wIH+mEWaD748xxdjLfW7AiV7GplvkRA7pyVm2kIe1Qv5c/HzXmf14XrNu5GU1fTCdS/5OqJtBvcMAQx8DqC3lvvbCQi2yn4x2I7licOWBhPDJESxxQ+b61OYnAZcOZUysHvyXnKM5WMJ3yj+q7R1a9pIyok2KoOtRDP7/aFGcvcnpGkO//GwHgEzWicumk0aMI1+EOuDfc2RcQkSjiu9Tsrywled9Jp+76zJzCXx79sdz/OLvt35Ow5mPOWL3F5r4VIq5gIShAbFv2ubulNW5XxXML9DA9xOkbQz5njL682pn9rx2qnTvhnQU2XhOwys7ju+9iz3z8epU8Jz+OAvYx2rS3mde X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0701MB1573; 23:pbxMPjsRuobTkVfeO1P75SDUwsLsuMkn/cCZRTB?= =?us-ascii?Q?9hDuDjD66dAXK4ySCaLLgF/pMk7HJCG7n3dzX5u/RuOjmOARs6TtXua/VUHl?= =?us-ascii?Q?8JY/QhOcEf/yovA3Opbc70g63UyR5hl/ZlzyeznX0pWwPqcC5UvU6Y85coQT?= =?us-ascii?Q?JHUzRP8PEJWaafufvDdRUUORG4z/W/3c9dmFxCCd8NpCCKSeAFU+5gJ9ycDY?= =?us-ascii?Q?xWNUeskzFbNSEoGuA+6fepzWdqiZbQ19uG+xFWvN2XCEIkJ5sbU31aKhmZqk?= =?us-ascii?Q?KalCqIC1qpDGa7fVY9Z2nPX5WWTK65Fc85lS1vW+AA++niIbl74YoWf/wt9O?= =?us-ascii?Q?uhPLojznmWksydgJ08uus7ucdoMi2gIZL9ZzOe5/w8KclaIyLhGvXEnkCExK?= =?us-ascii?Q?N+K2GeQrB6I3rVnVARYzKmMNIaEVYbg7U5EmjjZarvIPwdBcrX3I8n3R5Xe7?= =?us-ascii?Q?47cELkeGW0pwKjiXGwrXtWB/c+041Nm3Y3i1ByLzjP5H+HUV7LnVnj4RfW+H?= =?us-ascii?Q?snKJxAndlzHsDyztHVXGQlIigTfjct4k1glz/Lp7Xhu0kU0mJE5DAcJaxv0W?= =?us-ascii?Q?FkayRuj18FAfwwKOyqyHZAHyfr0o2rWVUHX3oI+HHVFWC/90si4WFGWzQzAL?= =?us-ascii?Q?EHwuZ/VlPfeCYDV0Td4Np54ZRxJO1TX2EnVcMtKGrufiYId3TTpqYgssk2LB?= =?us-ascii?Q?Fcrovk7dTHeYKO093QGsX1ZvEhaj5paRBgvwOgWBrNHLhs/2vyA7RSeOm4F1?= =?us-ascii?Q?peyUCv7svC1CJJ35nN5x7LhMMOqG53jbfHexuj8mFIIfE8xQ69l4Z1VLGyp+?= =?us-ascii?Q?zoNzyNYBpGNqaXoHQpGYZ8X8PpzbqKmDvGPUCEn30q6rZm+FGfb0ZZBMGfiB?= =?us-ascii?Q?bWBKf4v2lihGrT2y/GC4/MY2I3BklxZktwc+Gv/mU/RxYonhRGCHmEYSvsIe?= =?us-ascii?Q?TpyeO4ftERV5Zn08ti1OM/O+iPNKD+1UIPmbICApyqcdLXQNCI9n1Tj6w/1z?= =?us-ascii?Q?vKcIIoAx35kuriS4CLoAhlDDJUQXtEpJiuuW6USTZqmo9UeV6g/oEQ54xFJL?= =?us-ascii?Q?DinSyeQOigH9UwEhmgkwJ62UYzSriltloE4MlGNU9RZN+4lcO00pwEqRHGR2?= =?us-ascii?Q?2Xu7BG++C/p4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1573; 6:0w5eDTaWipRdB8+JverjECw65vK+bkEdgAZ0P4mOb9pW2sV2MHEf37auFAvlar32xJgh1G/uQbAz/830y6Jo2sSlCAGdeZaMRRdkt5g2sc/dTS+zvO+YOM21EWcEPr+LjLWRwl035r7RxTndtPDPKBkw4lGwwzWceYajejghhiDIO6NZdJpNre/dTufauy4vyj32eEHwcjECrqpK1eDYNimldrSpvVl7+PebqzRN+grrJaQgyznCVp2vXzeu34puwFs4xoq1AHvH2/uCKGeSuDnpkfhFVMg/I8IdjjhFXgAqv1IvmuYLGXkVr+9PQ25ZCl4AyzR7qTu41X4+g4U6G+k6K5+NHokqsE9r1HNssJ+XmN8rmftTOM30CPABukRCtMHmayPYvfQ4kHjXkuhNgR5JdKM4z/UBwi1IAspyU5gWzOMoJqx0Lxjw+bndRI0iEpAeVFpObNlTyNIP6g3xO/s6dq3i8d5czykrZQXXXSzn1A4CQTGqGHzXVZimJ+c2WImc6ctLvAi4Q5OqxvdS6Q==; 5:cb2rffl7D4ohVYmsvQaDWqRi0Xu79DaqPL3SrOsOwglUlfSb/Zbijj+nzrrWcmg9UmeTNQ0YSye4ZIkIwPgK5WgV57hUuoh7rgj/g4nw7/JGwnpglPHcEySSmnN9mdgmL73jyjuDx6aS+YpKrZ6anw==; 24:Sja0k8DlqP7r8Ka9ZcfNP9PKkwsp/wllImzCu0UZBCNq1HAVfZFImp65BZr64EAgHp7mAgbgsLYCu8xCeW3piVRpQbSAO3jOXMSgC+R7NV4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1573; 7:nqQn7ywCu6tUo8dSgko9G543+bTVmu5lWjslbA7IjElLeIGPSw/avLYBYJq+5XAXPrDMoFk353uxgk4TFdMpYM3vrJhsWGNUAVGlTi1EMkU8A5RHg0fc8QdyW6tGgXOmWPnB7vU5FOdaTVT0VQXfoDtkGnxJk1n6qkxHKwDt/Z9GSsxfOq6fAhjdHilT1c1DlI3Nl8Dj1GVEtbEzsI1Udxz+pfGOEDBBJ/BZhghIlT23QPry8YXHNNxHdZRT3AGacpHd3TqTMF7IwvQqui2nLGpgKAozSDvDYa5akgwhi5F4fzN6D0ImZUhi624/wjbeXYLlAApKCPlhDdz22gxFOQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 22:30:31.2028 (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: BN3PR0701MB1573 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: Joe Carnuccio Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_attr.c | 4 +- drivers/scsi/qla2xxx/qla_bsg.c | 15 +++---- drivers/scsi/qla2xxx/qla_gs.c | 54 +++++++++----------------- drivers/scsi/qla2xxx/qla_init.c | 82 ++++++++++++++------------------------- drivers/scsi/qla2xxx/qla_inline.h | 8 ++-- drivers/scsi/qla2xxx/qla_iocb.c | 18 ++++----- drivers/scsi/qla2xxx/qla_isr.c | 58 +++++++++++---------------- drivers/scsi/qla2xxx/qla_mbx.c | 7 ++-- 8 files changed, 91 insertions(+), 155 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index a7ac81b473a4..4ab771cc0c15 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -769,9 +769,7 @@ qla2x00_issue_logo(struct file *filp, struct kobject *kobj, did.b.area = (type & 0x0000ff00) >> 8; did.b.al_pa = (type & 0x000000ff); - ql_log(ql_log_info, vha, 0xd04d, "portid=%02x%02x%02x done\n", - did.b.domain, did.b.area, did.b.al_pa); - + ql_log(ql_log_info, vha, 0xd04d, "portid=%06x done\n", did.b24); ql_log(ql_log_info, vha, 0x70e4, "%s: %d\n", __func__, type); qla24xx_els_dcmd_iocb(vha, ELS_DCMD_LOGO, did); diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index eb2b873f12ba..7d025aec7b9d 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -382,10 +382,9 @@ qla2x00_process_els(struct bsg_job *bsg_job) sp->done = qla2x00_bsg_job_done; ql_dbg(ql_dbg_user, vha, 0x700a, - "bsg rqst type: %s els type: %x - loop-id=%x " - "portid=%-2x%02x%02x.\n", type, - bsg_request->rqst_data.h_els.command_code, fcport->loop_id, - fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa); + "bsg rqst type: %s els type: %x - loop-id=%x portid=%06x.\n", + type, bsg_request->rqst_data.h_els.command_code, fcport->loop_id, + fcport->d_id.b24); rval = qla2x00_start_sp(sp); if (rval != QLA_SUCCESS) { @@ -529,11 +528,9 @@ qla2x00_process_ct(struct bsg_job *bsg_job) sp->done = qla2x00_bsg_job_done; ql_dbg(ql_dbg_user, vha, 0x7016, - "bsg rqst type: %s else type: %x - " - "loop-id=%x portid=%02x%02x%02x.\n", type, - (bsg_request->rqst_data.h_ct.preamble_word2 >> 16), - fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa); + "bsg rqst type: %s else type: %x - loop-id=%x portid=%06x.\n", + type, bsg_request->rqst_data.h_ct.preamble_word2 >> 16, + fcport->loop_id, fcport->d_id.b24); rval = qla2x00_start_sp(sp); if (rval != QLA_SUCCESS) { diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index 7a2fe05baf4f..1b6fc3d80ec8 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -129,9 +129,8 @@ qla2x00_chk_ms_status(scsi_qla_host_t *vha, ms_iocb_entry_t *ms_pkt, rval = QLA_FUNCTION_FAILED; if (ms_pkt->entry_status != 0) { ql_dbg(ql_dbg_disc, vha, 0x2031, - "%s failed, error status (%x) on port_id: %02x%02x%02x.\n", - routine, ms_pkt->entry_status, vha->d_id.b.domain, - vha->d_id.b.area, vha->d_id.b.al_pa); + "%s failed, error status (%x) on port_id: %06x.\n", + routine, ms_pkt->entry_status, vha->d_id.b24); } else { if (IS_FWI2_CAPABLE(ha)) comp_status = le16_to_cpu( @@ -145,10 +144,9 @@ qla2x00_chk_ms_status(scsi_qla_host_t *vha, ms_iocb_entry_t *ms_pkt, if (ct_rsp->header.response != cpu_to_be16(CT_ACCEPT_RESPONSE)) { ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x2077, - "%s failed rejected request on port_id: %02x%02x%02x Completion status 0x%x, response 0x%x\n", - routine, vha->d_id.b.domain, - vha->d_id.b.area, vha->d_id.b.al_pa, - comp_status, ct_rsp->header.response); + "%s failed rejected request on port_id: %06x Compeltion status 0x%x, response 0x%x\n", + routine, vha->d_id.b24, comp_status, + ct_rsp->header.response); ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x2078, (uint8_t *)&ct_rsp->header, sizeof(struct ct_rsp_hdr)); @@ -178,10 +176,8 @@ qla2x00_chk_ms_status(scsi_qla_host_t *vha, ms_iocb_entry_t *ms_pkt, break; default: ql_dbg(ql_dbg_disc, vha, 0x2033, - "%s failed, completion status (%x) on port_id: " - "%02x%02x%02x.\n", routine, comp_status, - vha->d_id.b.domain, vha->d_id.b.area, - vha->d_id.b.al_pa); + "%s failed, completion status (%x) on port_id: %06x.\n", + routine, comp_status, vha->d_id.b24); break; } } @@ -259,11 +255,8 @@ qla2x00_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport) fcport->d_id.b.domain = 0xf0; ql_dbg(ql_dbg_disc, vha, 0x2063, - "GA_NXT entry - nn %8phN pn %8phN " - "port_id=%02x%02x%02x.\n", - fcport->node_name, fcport->port_name, - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa); + "GA_NXT entry - nn %8phN pn %8phN port_id=%06x.\n", + fcport->node_name, fcport->port_name, fcport->d_id.b24); } return (rval); @@ -494,11 +487,9 @@ qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list) ct_rsp->rsp.gnn_id.node_name, WWN_SIZE); ql_dbg(ql_dbg_disc, vha, 0x2058, - "GID_PT entry - nn %8phN pn %8phN " - "portid=%02x%02x%02x.\n", + "GID_PT entry - nn %8phN pn %8phN portid=%06x.\n", list[i].node_name, list[i].port_name, - list[i].d_id.b.domain, list[i].d_id.b.area, - list[i].d_id.b.al_pa); + list[i].d_id.b24); } /* Last device exit. */ @@ -868,11 +859,8 @@ qla2x00_sns_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport) fcport->d_id.b.domain = 0xf0; ql_dbg(ql_dbg_disc, vha, 0x2061, - "GA_NXT entry - nn %8phN pn %8phN " - "port_id=%02x%02x%02x.\n", - fcport->node_name, fcport->port_name, - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa); + "GA_NXT entry - nn %8phN pn %8phN port_id=%06x.\n", + fcport->node_name, fcport->port_name, fcport->d_id.b24); } return (rval); @@ -1055,11 +1043,9 @@ qla2x00_sns_gnn_id(scsi_qla_host_t *vha, sw_info_t *list) WWN_SIZE); ql_dbg(ql_dbg_disc, vha, 0x206e, - "GID_PT entry - nn %8phN pn %8phN " - "port_id=%02x%02x%02x.\n", + "GID_PT entry - nn %8phN pn %8phN port_id=%06x.\n", list[i].node_name, list[i].port_name, - list[i].d_id.b.domain, list[i].d_id.b.area, - list[i].d_id.b.al_pa); + list[i].d_id.b24); } /* Last device exit. */ @@ -2919,10 +2905,9 @@ int qla24xx_async_gidpn(scsi_qla_host_t *vha, fc_port_t *fcport) goto done_free_sp; ql_dbg(ql_dbg_disc, vha, 0x20a4, - "Async-%s - %8phC hdl=%x loopid=%x portid %02x%02x%02x.\n", + "Async-%s - %8phC hdl=%x loopid=%x portid %06x.\n", sp->name, fcport->port_name, - sp->handle, fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + sp->handle, fcport->loop_id, fcport->d_id.b24); return rval; done_free_sp: @@ -3077,10 +3062,9 @@ int qla24xx_async_gpsc(scsi_qla_host_t *vha, fc_port_t *fcport) goto done_free_sp; ql_dbg(ql_dbg_disc, vha, 0x205e, - "Async-%s %8phC hdl=%x loopid=%x portid=%02x%02x%02x.\n", + "Async-%s %8phC hdl=%x loopid=%x portid=%06x.\n", sp->name, fcport->port_name, sp->handle, - fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + fcport->loop_id, fcport->d_id.b24); return rval; done_free_sp: diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 497cba4ba72f..e44daf66e1d9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -202,10 +202,9 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport, } ql_dbg(ql_dbg_disc, vha, 0x2072, - "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x " - "retries=%d.\n", fcport->port_name, sp->handle, fcport->loop_id, - fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa, - fcport->login_retry); + "Async-login - %8phC hdl=%x, loopid=%x portid=%06x retries=%d.\n", + fcport->port_name, sp->handle, fcport->loop_id, + fcport->d_id.b24, fcport->login_retry); return rval; done_free_sp: @@ -253,10 +252,8 @@ qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport) goto done_free_sp; ql_dbg(ql_dbg_disc, vha, 0x2070, - "Async-logout - hdl=%x loop-id=%x portid=%02x%02x%02x %8phC.\n", - sp->handle, fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, - fcport->port_name); + "Async-logout - hdl=%x loop-id=%x portid=%06x %8phC.\n", + sp->handle, fcport->loop_id, fcport->d_id.b24, fcport->port_name); return rval; done_free_sp: @@ -307,9 +304,8 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport, goto done_free_sp; ql_dbg(ql_dbg_disc, vha, 0x206f, - "Async-adisc - hdl=%x loopid=%x portid=%02x%02x%02x.\n", - sp->handle, fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "Async-adisc - hdl=%x loopid=%x portid=%06x.\n", + sp->handle, fcport->loop_id, fcport->d_id.b24); return rval; done_free_sp: @@ -359,10 +355,8 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, n = ea->data[0] / sizeof(struct get_name_list_extended); ql_dbg(ql_dbg_disc, vha, 0x20e1, - "%s %d %8phC n %d %02x%02x%02x lid %d \n", - __func__, __LINE__, fcport->port_name, n, - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa, fcport->loop_id); + "%s %d %8phC n %d %06x lid %d \n", __func__, __LINE__, + fcport->port_name, n, fcport->d_id.b24, fcport->loop_id); for (i = 0; i < n; i++) { e = &vha->gnl.l[i]; @@ -381,12 +375,10 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, loop_id = (loop_id & 0x7fff); ql_dbg(ql_dbg_disc, vha, 0x20e2, - "%s found %8phC CLS [%d|%d] ID[%02x%02x%02x|%02x%02x%02x] lid[%d|%d]\n", + "%s found %8phC CLS [%d|%d] ID[%06x|%06x] lid[%d|%d]\n", __func__, fcport->port_name, e->current_login_state, fcport->fw_login_state, - id.b.domain, id.b.area, id.b.al_pa, - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa, loop_id, fcport->loop_id); + id.b24, fcport->d_id.b24, loop_id, fcport->loop_id); if ((id.b24 != fcport->d_id.b24) || ((fcport->loop_id != FC_NO_LOOP_ID) && @@ -1071,9 +1063,8 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea) rc = qla24xx_post_gpnid_work(vha, &ea->id); if (rc) { ql_log(ql_log_warn, vha, 0xd044, - "RSCN GPNID work failed %02x%02x%02x\n", - ea->id.b.domain, ea->id.b.area, - ea->id.b.al_pa); + "RSCN GPNID work failed %06x\n", + ea->id.b24); } } else { ea->fcport = fcport; @@ -1189,9 +1180,8 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun, goto done_free_sp; ql_dbg(ql_dbg_taskm, vha, 0x802f, - "Async-tmf hdl=%x loop-id=%x portid=%02x%02x%02x.\n", - sp->handle, fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "Async-tmf hdl=%x loop-id=%x portid=%06x.\n", + sp->handle, fcport->loop_id, fcport->d_id.b24); wait_for_completion(&tm_iocb->u.tmf.comp); @@ -1359,10 +1349,9 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host *vha, struct event_arg *ea) break; case MBS_PORT_ID_USED: ql_dbg(ql_dbg_disc, vha, 0x20ed, - "%s %d %8phC NPortId %02x%02x%02x inuse post gidpn\n", - __func__, __LINE__, ea->fcport->port_name, - ea->fcport->d_id.b.domain, ea->fcport->d_id.b.area, - ea->fcport->d_id.b.al_pa); + "%s %d %8phC NPortId %06x inuse post gidpn\n", + __func__, __LINE__, ea->fcport->port_name, + ea->fcport->d_id.b24); qla2x00_clear_loop_id(ea->fcport); qla24xx_post_gidpn_work(vha, ea->fcport); @@ -4667,10 +4656,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha) first_dev = 0; } else if (new_fcport->d_id.b24 == wrap.b24) { ql_dbg(ql_dbg_disc, vha, 0x209f, - "Device wrap (%02x%02x%02x).\n", - new_fcport->d_id.b.domain, - new_fcport->d_id.b.area, - new_fcport->d_id.b.al_pa); + "Device wrap (%06x).\n", new_fcport->d_id.b24); break; } @@ -4905,10 +4891,8 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport, for (;;) { ql_dbg(ql_dbg_disc, vha, 0x2000, - "Trying Fabric Login w/loop id 0x%04x for port " - "%02x%02x%02x.\n", - fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "Trying Fabric Login w/loop id 0x%04x for port %06x.\n", + fcport->loop_id, fcport->d_id.b24); /* Login fcport on switch. */ rval = ha->isp_ops->fabric_login(vha, fcport->loop_id, @@ -4930,10 +4914,8 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport, fcport->loop_id = mb[1]; ql_dbg(ql_dbg_disc, vha, 0x2001, - "Fabric Login: port in use - next loop " - "id=0x%04x, port id= %02x%02x%02x.\n", - fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "Fabric Login: port in use - next loop id=0x%04x, port id= %06x.\n", + fcport->loop_id, fcport->d_id.b24); } else if (mb[0] == MBS_COMMAND_COMPLETE) { /* @@ -5001,10 +4983,8 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport, * unrecoverable / not handled error */ ql_dbg(ql_dbg_disc, vha, 0x2002, - "Failed=%x port_id=%02x%02x%02x loop_id=%x " - "jiffies=%lx.\n", mb[0], fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, - fcport->loop_id, jiffies); + "Failed=%x port_id=%06x loop_id=%x jiffies=%lx.\n", + mb[0], fcport->d_id.b24, fcport->loop_id, jiffies); *next_loopid = fcport->loop_id; ha->isp_ops->fabric_logout(vha, fcport->loop_id, @@ -7542,17 +7522,13 @@ qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *vha, fc_port_t *fcport) if (ret == QLA_SUCCESS) { if (fcport->fcp_prio != priority) ql_dbg(ql_dbg_user, vha, 0x709e, - "Updated FCP_CMND priority - value=%d loop_id=%d " - "port_id=%02x%02x%02x.\n", priority, - fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "Updated FCP_CMND priority - value=%d loop_id=%d port_id=%06x.\n", + priority, fcport->loop_id, fcport->d_id.b24); fcport->fcp_prio = priority & 0xf; } else ql_dbg(ql_dbg_user, vha, 0x704f, - "Unable to update FCP_CMND priority - ret=0x%x for " - "loop_id=%d port_id=%02x%02x%02x.\n", ret, fcport->loop_id, - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa); + "Unable to update FCP_CMND priority - ret=0x%x for loop_id=%d port_id=%06x.\n", + ret, fcport->loop_id, fcport->d_id.b24); return ret; } diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index 2ad74353f21e..bc55775f8a11 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -154,11 +154,9 @@ qla2x00_set_fcport_state(fc_port_t *fcport, int state) /* Don't print state transitions during initial allocation of fcport */ if (old_state && old_state != state) { ql_dbg(ql_dbg_disc, fcport->vha, 0x207d, - "FCPort %8phC state transitioned from %s to %s - " - "portid=%02x%02x%02x.\n", fcport->port_name, - port_state_str[old_state], port_state_str[state], - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa); + "FCPort %8phC state transitioned from %s to %s - portid=%06x.\n", + fcport->port_name, port_state_str[old_state], + port_state_str[state], fcport->d_id.b24); } } diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 8404f17f3c6c..34767a1d294e 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c @@ -2366,9 +2366,8 @@ qla2x00_els_dcmd_iocb_timeout(void *data) unsigned long flags = 0; ql_dbg(ql_dbg_io, vha, 0x3069, - "%s Timeout, hdl=%x, portid=%02x%02x%02x\n", - sp->name, sp->handle, fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa); + "%s Timeout, hdl=%x, portid=%06x\n", + sp->name, sp->handle, fcport->d_id.b24); /* Abort the exchange */ spin_lock_irqsave(&ha->hardware_lock, flags); @@ -2393,9 +2392,8 @@ qla2x00_els_dcmd_sp_done(void *ptr, int res) struct scsi_qla_host *vha = sp->vha; ql_dbg(ql_dbg_io, vha, 0x3072, - "%s hdl=%x, portid=%02x%02x%02x done\n", - sp->name, sp->handle, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "%s hdl=%x, portid=%06x done\n", + sp->name, sp->handle, fcport->d_id.b24); complete(&lio->u.els_logo.comp); } @@ -2432,8 +2430,7 @@ qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode, 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, "portid=%02x%02x%02x done\n", - fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa); + ql_dbg(ql_dbg_io, vha, 0x3073, "portid=%06x done\n", fcport->d_id.b24); sp->type = SRB_ELS_DCMD; sp->name = "ELS_DCMD"; @@ -2472,9 +2469,8 @@ qla24xx_els_dcmd_iocb(scsi_qla_host_t *vha, int els_opcode, } ql_dbg(ql_dbg_io, vha, 0x3074, - "%s LOGO sent, hdl=%x, loopid=%x, portid=%02x%02x%02x.\n", - sp->name, sp->handle, fcport->loop_id, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "%s LOGO sent, hdl=%x, loopid=%x, portid=%06x.\n", + sp->name, sp->handle, fcport->loop_id, fcport->d_id.b24); wait_for_completion(&elsio->u.els_logo.comp); diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 3508c48a1eee..857418849dc7 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -1345,11 +1345,10 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, QLA_LOGIO_LOGIN_RETRIED : 0; if (mbx->entry_status) { ql_dbg(ql_dbg_async, vha, 0x5043, - "Async-%s error entry - hdl=%x portid=%02x%02x%02x " + "Async-%s error entry - hdl=%x portid=%06x " "entry-status=%x status=%x state-flag=%x " "status-flags=%x.\n", type, sp->handle, - fcport->d_id.b.domain, fcport->d_id.b.area, - fcport->d_id.b.al_pa, mbx->entry_status, + fcport->d_id.b24, mbx->entry_status, le16_to_cpu(mbx->status), le16_to_cpu(mbx->state_flags), le16_to_cpu(mbx->status_flags)); @@ -1365,10 +1364,8 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, status = 0; if (!status && le16_to_cpu(mbx->mb0) == MBS_COMMAND_COMPLETE) { ql_dbg(ql_dbg_async, vha, 0x5045, - "Async-%s complete - hdl=%x portid=%02x%02x%02x mbx1=%x.\n", - type, sp->handle, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, - le16_to_cpu(mbx->mb1)); + "Async-%s complete - hdl=%x portid=%06x mbx1=%x.\n", + type, sp->handle, fcport->d_id.b24, le16_to_cpu(mbx->mb1)); data[0] = MBS_COMMAND_COMPLETE; if (sp->type == SRB_LOGIN_CMD) { @@ -1394,10 +1391,10 @@ qla2x00_mbx_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, } ql_log(ql_log_warn, vha, 0x5046, - "Async-%s failed - hdl=%x portid=%02x%02x%02x status=%x " - "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n", type, sp->handle, - fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa, - status, le16_to_cpu(mbx->mb0), le16_to_cpu(mbx->mb1), + "Async-%s failed - hdl=%x portid=%06x status=%x " + "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n", + type, sp->handle, fcport->d_id.b24, status, + le16_to_cpu(mbx->mb0), le16_to_cpu(mbx->mb1), le16_to_cpu(mbx->mb2), le16_to_cpu(mbx->mb6), le16_to_cpu(mbx->mb7)); @@ -1649,10 +1646,8 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req, QLA_LOGIO_LOGIN_RETRIED : 0; if (logio->entry_status) { ql_log(ql_log_warn, fcport->vha, 0x5034, - "Async-%s error entry - %8phC hdl=%x" - "portid=%02x%02x%02x entry-status=%x.\n", - type, fcport->port_name, sp->handle, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, + "Async-%s error entry - %8phC hdl=%x portid=%06x entry-status=%x.\n", + type, fcport->port_name, sp->handle, fcport->d_id.b24, logio->entry_status); ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x504d, (uint8_t *)logio, sizeof(*logio)); @@ -1662,10 +1657,8 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req, if (le16_to_cpu(logio->comp_status) == CS_COMPLETE) { ql_dbg(ql_dbg_async, fcport->vha, 0x5036, - "Async-%s complete - %8phC hdl=%x portid=%02x%02x%02x " - "iop0=%x.\n", type, fcport->port_name, sp->handle, - fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, + "Async-%s complete - %8phC hdl=%x portid=%06x iop0=%x.\n", + type, fcport->port_name, sp->handle, fcport->d_id.b24, le32_to_cpu(logio->io_parameter[0])); vha->hw->exch_starvation = 0; @@ -1736,10 +1729,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req, } ql_dbg(ql_dbg_async, fcport->vha, 0x5037, - "Async-%s failed - %8phC hdl=%x portid=%02x%02x%02x comp=%x " + "Async-%s failed - %8phC hdl=%x portid=%06x comp=%x " "iop0=%x iop1=%x.\n", type, fcport->port_name, - sp->handle, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, + sp->handle, fcport->d_id.b24, le16_to_cpu(logio->comp_status), le32_to_cpu(logio->io_parameter[0]), le32_to_cpu(logio->io_parameter[1])); @@ -2513,11 +2505,10 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) if (atomic_read(&fcport->state) == FCS_ONLINE) { ql_dbg(ql_dbg_disc, fcport->vha, 0x3021, - "Port to be marked lost on fcport=%02x%02x%02x, current " - "port state= %s comp_status %x.\n", fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, - port_state_str[atomic_read(&fcport->state)], - comp_status); + "Port to be marked lost on fcport=%06x, current port state=%s comp_status=%x.\n", + fcport->d_id.b24, + port_state_str[atomic_read(&fcport->state)], + comp_status); if (no_logout) fcport->logout_on_delete = 0; @@ -2557,14 +2548,11 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) out: if (logit) ql_dbg(ql_dbg_io, fcport->vha, 0x3022, - "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu " - "portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x " - "rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n", - comp_status, scsi_status, res, vha->host_no, - cp->device->id, cp->device->lun, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa, ox_id, - cp->cmnd, scsi_bufflen(cp), rsp_info_len, - resid_len, fw_resid_len, sp, cp); + "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu portid=%06x oxid=0x%x cdb=%10phN len=0x%x rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n", + comp_status, scsi_status, res, vha->host_no, cp->device->id, + cp->device->lun, fcport->d_id.b24, ox_id, cp->cmnd, + scsi_bufflen(cp), rsp_info_len, resid_len, fw_resid_len, + sp, cp); if (rsp->status_srb == NULL) sp->done(sp, res); diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 864a2db3a317..f5c42ffacee9 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -1783,10 +1783,9 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt) if (pd->master_state != PD_STATE_PORT_LOGGED_IN && pd->slave_state != PD_STATE_PORT_LOGGED_IN) { ql_dbg(ql_dbg_mbx, vha, 0x100a, - "Unable to verify login-state (%x/%x) - " - "portid=%02x%02x%02x.\n", pd->master_state, - pd->slave_state, fcport->d_id.b.domain, - fcport->d_id.b.area, fcport->d_id.b.al_pa); + "Unable to verify login-state (%x/%x) - portid=%06x.\n", + pd->master_state, pd->slave_state, + fcport->d_id.b24); rval = QLA_FUNCTION_FAILED; goto gpd_error_out; }