From nobody Fri May 8 02:20:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4E0DC433F5 for ; Thu, 12 May 2022 20:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358332AbiELUX3 (ORCPT ); Thu, 12 May 2022 16:23:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344991AbiELUX0 (ORCPT ); Thu, 12 May 2022 16:23:26 -0400 X-Greylist: delayed 63 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 12 May 2022 13:23:22 PDT Received: from rcdn-iport-9.cisco.com (rcdn-iport-9.cisco.com [173.37.86.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 853817C17B; Thu, 12 May 2022 13:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=64662; q=dns/txt; s=iport; t=1652387002; x=1653596602; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=rAGYB0DjLb+fM5CrJhplvfzu7ABf+6/YEjsH7vvwV/A=; b=GiiYONUSj7GHxTTXLnF7ElBBOSGSC/g9mII5HU6AdFgCFfU0qxFWqOwo gEXHD+YTFRIVe/fMaaF5Mrab4lJwDVo6HmY5Ir0NZNMaOmPJhSrRAs/yU tRNj9r+dBxoEeJGnNDNDpU+RxAdtaNhVUr6/6pPWnh1yE4uGa0txxgahm 0=; IronPort-PHdr: =?us-ascii?q?A9a23=3AnIeyRBeFwzRPxbfnknacf0NmlGM/tYqcDmcuA?= =?us-ascii?q?tIPh7FPd/Gl+JLvdAza6O52hVDEFYPc97pfiuXQvqyhPA5I4ZuIvH0YNpAZU?= =?us-ascii?q?RgDhJYamgU6C5uDDkv2ZPfhcy09GpFEU1lot3G2OERYAoDwfVrX93az9jUVX?= =?us-ascii?q?B74MFkdGw=3D=3D?= IronPort-Data: =?us-ascii?q?A9a23=3AGJua5amXKSi3M0wzxX0wBm7o5gwHJERdPkR7X?= =?us-ascii?q?Q2eYbSJt1+Wr1GztxIYD2yDPPzcMDb8L90nOongoUIE6JTczoUxHAFprH0zR?= =?us-ascii?q?FtH+JHPbTi7wugcHM8zwvUuxyuL1u1GAjX7BJ1yHya0SiuFaOC79yEhjPvQH?= =?us-ascii?q?NIQNcadUsxPbV48IMseoUoLd94R2uaEsPDha++/kYqaT/73YDdJ7wVJ3lc8s?= =?us-ascii?q?Mpvnv/AUMPa41v0tnRmDRxCUcS3e3M9VPrzLonpR5f0rxU9IwK0ewrD5OnRE?= =?us-ascii?q?mLx5RwhDJaulaz2NxdMSb/JNg/IgX1TM0SgqkEd/WppjeBqb7xFNBw/Zzahx?= =?us-ascii?q?7idzP1OvIasSAMgPYXHmf8WVF9TFCQW0ahuqeSZeynk6JPNp6HBWz62qxl0N?= =?us-ascii?q?2kyPIsF6qN0DHtI+PgwNj8AdFaAiviwzbb9TfNj7uwnLc/2LMYEsWph5S/WA?= =?us-ascii?q?OxgQp3ZRajOo9hC018Yg8lUAffYIdIUdTd1dxnGSxpVM1wTBdQ1m+LArnvyc?= =?us-ascii?q?TdwrFOTuLpx4mLWigd21dDFMt3YUsSHX85Vk13erWXDl1kVqDly2Me30zGJ9?= =?us-ascii?q?DengfXC2Hm9U4MJH7r+/flv6GB/D1c7UHU+PWZXa9Hj0iZSg+5iFnE=3D?= IronPort-HdrOrdr: =?us-ascii?q?A9a23=3AJ87kDaP3Tl/DdMBcT4X255DYdb4zR+YMi2?= =?us-ascii?q?TDiHoedfUFSKOlfp6V8MjzjSWE9Ar4WBkb6LS90dq7MAzhHPlOkMcs1NaZLU?= =?us-ascii?q?bbUQ6TTb2KgrGSuwEIdxeOlNK1kJ0QDpSWa+eATGSS7/yKmzVQeuxIqLLsnc?= =?us-ascii?q?DY5ts2jU0dNz2CAJsQiDuRfzzra3GeMzM2Y6bReqDsg/Zvln6FQzA6f867Dn?= =?us-ascii?q?4KU6zovNvQjq/rZhYAGloO9BSOpSnA0s+7LzGomjMlFx9fy7Yr9mbI1ybj4L?= =?us-ascii?q?+4jv29whjAk0fO8pVtnsf7wNcrPr3OtiFVEESvtu+bXvUkZ1SwhkFznAhp0i?= =?us-ascii?q?dtrDD4mWZkAy200QKJQoj6m2q05+Cq6kdR15ar8y7ovZKkm72jeNr/YPAx2L?= =?us-ascii?q?6wtXDimhAdVZhHodJ29nPcuJxNARzamiPho9DOShFxj0Kx5WEviOgJkhVkIM?= =?us-ascii?q?AjgZJq3MUiFXluYd899ePBmfQaOfgrCNuZ6OddcFucYXyctm5zwMa0VnB2Gh?= =?us-ascii?q?udWEANtsGczjATxRlCvgYl7d1amm1F+IM2SpFC6eiBOqN0lKtWRstTaa5mHu?= =?us-ascii?q?8OTca+F2SIGXv3QS6vCEWiELtCN2PGqpbx7rlw7Oa2eIYQxJ93nJjaSltXuW?= =?us-ascii?q?M7ZkqrA8yT259A9AzLXQyGLH7Q49Ab44I8tqz3RbLtPyHGQFcyk9G4q/FaGc?= =?us-ascii?q?HfU+bbAuMhPxYiFxqYJW9k5XyNZ3AJEwhsbCQ8gKdPZ26z?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0AYAADfa31i/5ldJa1aGwEBAQEBAQE?= =?us-ascii?q?BBQEBARIBAQEDAwEBAUCBOwYBAQELAYFRKigHdVo5Q4ROg0wDhFJfhQmDAgO?= =?us-ascii?q?QR4pxgSwUgREDVAsBAQENAQFCBAEBhQICFoUoAiU0CQ4BAgQBAQESAQEFAQE?= =?us-ascii?q?BAgEHBIEJE4VoDYZCAQEBAQIBEggBCAQNDAEBLwgBCwQCAQYCEQQBAQECAiY?= =?us-ascii?q?CAgIwFAEICAIEAQ0FCBqCA4M8Aw0kAZBDjzcBgT4Cih96fzKBAYIIAQEGBAS?= =?us-ascii?q?FDRiCOAmBECwBgxOEKYcjJxyCDYEUAUN5bYEBPoQqARsFEA8GDAKDHDeCLpN?= =?us-ascii?q?xgVIdOwNVgQYSgSFxAQoGBgcKBTIGAgwYFAQCFRFTHgITDAoGFg5UGQwPAxI?= =?us-ascii?q?DEQEHAgsSCBUsCAMCAwgDAgMjCwIDGAkHCgMdCAocEhAUAgQTHwsIAxofLQk?= =?us-ascii?q?CBA4DQwgLCgMRBAMTGAsWCBAEBgMJLw0oCwMFDw8BBgMGAgUFAQMgAxQDBSc?= =?us-ascii?q?HAyEHCyYNDQQcBx0DAwUmAwICGwcCAgMCBhcGAgJyCigNCAQIBBweJhMFAgc?= =?us-ascii?q?xBQQvAh4EBQYRCQIWAgYEBQIEBBYCAhIIAggnGwcWNhkBBV4GCwkjHC4NBgU?= =?us-ascii?q?GFgMnJxEFBB8BG1SWRj4GAQEVFxANMQkLGycJAS8GARwSE0wvHgEBRJIKCQE?= =?us-ascii?q?Dgw1GjgCbVIEnCoNLoCUVqFMtljggoSVEhHICBAIEBQIOAQEGgWE8gVlwFYM?= =?us-ascii?q?jURkPjiAMFoNQil51OwIGAQoBAQMJjDFdAQE?= X-IronPort-AV: E=Sophos;i="5.91,220,1647302400"; d="scan'208";a="936293176" Received: from rcdn-core-2.cisco.com ([173.37.93.153]) by rcdn-iport-9.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 12 May 2022 20:21:54 +0000 Received: from mail.cisco.com (xfe-aln-005.cisco.com [173.37.135.125]) by rcdn-core-2.cisco.com (8.15.2/8.15.2) with ESMTPS id 24CKLsFv029201 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=OK); Thu, 12 May 2022 20:21:54 GMT Received: from xfe-aln-002.cisco.com (173.37.135.122) by xfe-aln-005.cisco.com (173.37.135.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Thu, 12 May 2022 15:21:53 -0500 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (173.37.151.57) by xfe-aln-002.cisco.com (173.37.135.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14 via Frontend Transport; Thu, 12 May 2022 15:21:53 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IGJ71tYcCcApnpGknW6/cG/XvFCHEyEham/yid5B0OiLVHm8jElpgFlPNhQ4rJGy+hoJuaKFDBxZ3HDfFntfjOUZikQZh+Q2PI5feZCiSBq1OxnimQv8Tu5Ndz2m+9bWoubvG2Dw1S1o5Q2gftu7MNrAA81VW6aql9DljYP15x6O5jsfyWO3yMCT13IKM9HtPeVtn9T6L4TX1F1IPV1ZKxk58UPK8C1uVGFVMT3sm8eWR4h8YYET8k+9AVQItXWPc1B5U9gRxCGoAXb9nOMDsEeuS8LVK2ag1jN79suPfpqVBlI1PePj+g79otlab8/wEA2qwh1clkmlkxl+Nc05Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rAGYB0DjLb+fM5CrJhplvfzu7ABf+6/YEjsH7vvwV/A=; b=QFQp67B+YW8JFTL1+s69rBDbc2rMUx0bOUmnxvFqEb/qO15L+x60QBeZptQ67zsFfvkZtxPl4iQKvPv3RBlK01qeS+u3FrPVhrzf1HsgwYtCkJKEDfvrma0nEyYPcEkT0aYD9QVTAUbrVAex0yxF1LDsY34OuoG9KkCaztfCydy533OUMpZJyJIMax1KmfrTDKfFdM5nVEMLBFsUFW5cy/mcmrjexkeEU+ZOxr+Za9578muINMj/iKOImlww65tR8KZffC01nsb16H6Zd5eEJ7b27c7clhZtavOSwratnEgT9U55Ch4oKIWo1jtRCAB49pbTchJGdumblAQe0cspwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cisco.com; dmarc=pass action=none header.from=cisco.com; dkim=pass header.d=cisco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.onmicrosoft.com; s=selector2-cisco-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rAGYB0DjLb+fM5CrJhplvfzu7ABf+6/YEjsH7vvwV/A=; b=LphGBz8VPh+HeL1nwx5ax979qmFSy1U0Z/0AUG2zRx41dntPXLTp3D0i4doz0ZYxXCaEZH6cYyglEYJFvfbJLpQ/0lEnqD2sUOBjYCE/VjsKcpunYvjyl9T5eqWXMKNT9EGpfHRhoFimsrWZgrODSnLMlnSqqoI336tnvJabHhU= Received: from SJ0PR11MB5896.namprd11.prod.outlook.com (2603:10b6:a03:42c::19) by CY4PR11MB1847.namprd11.prod.outlook.com (2603:10b6:903:127::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Thu, 12 May 2022 20:21:51 +0000 Received: from SJ0PR11MB5896.namprd11.prod.outlook.com ([fe80::ad33:f30e:382c:67cd]) by SJ0PR11MB5896.namprd11.prod.outlook.com ([fe80::ad33:f30e:382c:67cd%7]) with mapi id 15.20.5227.023; Thu, 12 May 2022 20:21:50 +0000 From: "Karan Tilak Kumar (kartilak)" To: Joe Perches , "Arulprabhu Ponnusamy (arulponn)" , "Satish Kharat (satishkh)" CC: "Sesidhar Baddela (sebaddel)" , "jejb@linux.ibm.com" , "martin.petersen@oracle.com" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH] scsi: fnic: Change shost_printk to FNIC_MAIN_DBG Thread-Topic: [PATCH] scsi: fnic: Change shost_printk to FNIC_MAIN_DBG Thread-Index: AQHWv6cBuVBK05OfYkWCVqi/7ekz2qnWfw8AgAAtNQCDSE6D4A== Date: Thu, 12 May 2022 20:21:50 +0000 Message-ID: References: <20201121013739.18701-1-kartilak@cisco.com> <4761b2dd93acc89b748916399b94489549fce2f5.camel@perches.com> In-Reply-To: <4761b2dd93acc89b748916399b94489549fce2f5.camel@perches.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cisco.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 32b8cd89-d5ef-4e2d-1fd6-08da34550c3c x-ms-traffictypediagnostic: CY4PR11MB1847:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: S7/dKtDrO5/n6Meeql1qqgJBZuMewYUF/DkG1rPM6rhDtLCNvEoBl3HUKwihgxG/7/qAgs2PCr2S+pcAIjXsTzJtBkM+yeplIhPQP49YyAuz6UQI77FE9jWJWcoKzHwcxv2moc1BqMJj4W0Nxq5N//vELZ6epdxQBnApZDp9ZnAohao+yPHwZDX7LKYs39A7U0FOmYMHqIMD8SFzOcEKjWvSrP7WbagfWkBDAbPdRzDVvXXurbfy2CnekcthyREosFbMq/HAHvPFtOTBqGjeq+BqzAcNgH1dF+iWQc5vMs6fHSeBQ5imwhFGAMLjhF637mbJwKTOzALPCTCqQp3/hc7dfSxSs4q/EXQqfAQkAK+CXbILPw+qrQSDI2N78biRspm4uotxgAWXPFuTEgHN6cOoclTpgO4QZ2ZQYL+H52ZORKw73yS0WIilcYrSeAFfQeCWD5TysjKEi9PorDbcmtOtpPk5hzqqcqQ6VcHvrs47vSIbAcoY9ea39dLkntuFIiQ3mvx3BBZi/0c6n5Fm6xOVe+WIriURB51NgvTzRMlG5p9We8zKkw2ryKIRXPeexFhTVa2q9bX0YnZ2mwcdS9aiHggSP1BKB4vqpatUrUEnjLuXXsbc02ODy4gEbZkIz3ORRfm8n1m2wEIkVnydaE/Djm5Of4pyfo7R498UoHj65mflJxnAbNXi9DCsScve9MqPP8klfAoms+Kc7oiD7A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5896.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(33656002)(122000001)(83380400001)(186003)(7696005)(30864003)(9686003)(4001150100001)(2906002)(55016003)(8936002)(38070700005)(508600001)(38100700002)(5660300002)(86362001)(71200400001)(66476007)(66446008)(64756008)(66556008)(76116006)(66946007)(54906003)(6636002)(8676002)(4326008)(52536014)(53546011)(316002)(6506007)(110136005)(559001)(579004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 2 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?aGdOenVnZHFycnp3bHR6VFdsQVRvdTkyNVZVMjVpd2xwUTNteFQrMlU4bUxK?= =?utf-8?B?QzRaNHdMaVlnWjJrNVFvWFgyaEprUEFKeC8vUU9FSTgrckx6UURZTWZ3L2Uz?= =?utf-8?B?d2tJWWsxdmtUUUJja0hYYnZmdjZLNDBKNE0zdFo1dVNGbnB4bytPV2o3Vjhi?= =?utf-8?B?aDltMVlyaktCZTVkSG0vNjhONVZkTkw5OGVuVXplUUlDR3dEWW43WnFkb0Vj?= =?utf-8?B?bXJBckpZS1FSYWhhMnlKN0dtMzZIK014Rkd1TDc4NnhVNGkreURzZlRYdE1K?= =?utf-8?B?b3lqR1pGdndZeGVXWENOdTIyRDBqZ092SHYyTHk5WGZzd3FaL2cyeUNTNHYv?= =?utf-8?B?RHhCOWdnWXdBN2h4dkE3QXFCdnFVV3BLV25aNFNIRnE5b0UrTXNyTi94R1l1?= =?utf-8?B?SDltSFFvdFdpL1FleXUwS1p2OWNWUzJidnJSNEM5SktBQkhhNmtiYXlyeUR3?= =?utf-8?B?NStPQXpjMC9vbkpaY2p3L0FwM0gwQTZnOGVFNWgzSDlHQk9TcmxLaTRCc2Fn?= =?utf-8?B?K0lsTU52Z0JiUGlnbzdFdzZhR1NjaVBTT2lSd28vbUlLNVA5Y2xoR2ZDY3ZG?= =?utf-8?B?TEQ0VTdXVjRJSitYNy9vWXJIeEZWVlFzeXdQUnFGNEtmd3BRK1B2eUx3cDd2?= =?utf-8?B?ZmIvR25uOWVOT0Q3WHEyc1VLSWwvVXdkZHpUSlA5ajNsamFDbFhwaXdhNks1?= =?utf-8?B?VEhQQkJqZmF0UFhWdDc2QXdNQzE0Nm4vSkVqZGNyUmRQeEQydVZXVDA4MGY1?= =?utf-8?B?MWozd0Q5MzBIN2dvcHMrUXpWdFRJQUZXK0RybllUaWxWR3ZrNC9UeEQyUmVX?= =?utf-8?B?Q0lYTkd5cE9tYUhHSmd4dGNMem1HT3NlWkI0K2E2djJZclZQeEVRdktjejFu?= =?utf-8?B?VlBuaytNdEpVTmZMQndQV0JMVEgyb2duSncxb1ZTdnpOV3hJclVSV01pMk5K?= =?utf-8?B?Y214dUJXSzROZEhxQjVPMUprZk9GQmZBUTJTUGlrTUpEb3R1eVBQQ1R1bjdz?= =?utf-8?B?SlM0TmVaOENBak05N1YvSHBNMVVweCs3ZVZ1M0I1L1ZnYnRra29BNHFCVkdt?= =?utf-8?B?TW5kejlmeW4rR0ZXSkUwNVhIUERrZ3VlTmc1RFQ5QkI5a3U4TnRrRFBRdnFi?= =?utf-8?B?dkYvejBndjJjTVNIWlNXT1pCL1dnYmpkN0JQa1FZSlk5TzVxNnhzSnhMNTRD?= =?utf-8?B?RVBmNThUaHVaNUZ1am55bVlrMk9uREd5Wk5hcjJLWUE5UlFpbkQ0UlF4OFZj?= =?utf-8?B?azByZjhLL0xOOS92SVA0QWhDb3JNSS8zSkhVTVpidEU5Z0Z0M0RmenQrT0tv?= =?utf-8?B?VjZKOXhrQXUrMjQ0enk2YXlaOFZacGYwYjVaRWFyUFZMU3pNYmNFV3hjeWJS?= =?utf-8?B?YVMrSzErSlBxRDI1MFlUUkJTSGpnaStYcE93T0JPU3IzWTMzd20yTHJGbUYw?= =?utf-8?B?KzVFYVUzWjVLNi9udTlGbmgvRkY3N1lMS2lIUGU1ME15SWF2Q2tjMmhjQmVz?= =?utf-8?B?NlVSUWNWanN1U21iU0FQQXJrUy9YTW9aUDNMY0Zjb2pNdi9halpacnZhRk5W?= =?utf-8?B?cDFzc1VNUnJCaFJDbTk4YmpIL2MxQ0JjUzNFcU9QMmR4QWJacC82NzNDVkN0?= =?utf-8?B?TTZsNG5UaFV2cytHRzRLL3dpNllZdHFmeXFubHdabDBVenlSQUtpcGNTUWN1?= =?utf-8?B?UXVhVlpOUlVXWVd1czBxR0dXbDIyRkRUdXBTK0d6Z2hpbkdxMFJhNmZrZ2ZW?= =?utf-8?B?WWg0OVJwdklWdE9CRm03V04vYmEyQlZHcTlZUENLK2FURmdEUjk1NmFYL3g2?= =?utf-8?B?R0dBdmU1bG5Xa0tkMk95M2Rtb0EyMVQ3aE5mOVRIY200WGJWeWJveGM1RE1s?= =?utf-8?B?OXlDY2xuZ2puTENwbzRTZU5OV1NlZys0Qmg2ZnZSYlVoNk4ydmZ2dlhQMitv?= =?utf-8?B?Y2kvL0dPWjJNU082cG5GYUYwZjJib2ZWVU9SSGQva1lyejQ1cjdZanJEVmdm?= =?utf-8?B?MFBSWlNTT0trUC9TempGT1YzWkRFZW0rN3FZL05IY2IrQ05TY2lLVy9KRDVy?= =?utf-8?B?UFhwUFI4dStFbDN5TU50N1hDZnFmT3UrTS9NbVllTFRKWE02ajN2MkdUa0ps?= =?utf-8?B?QWlLK1BndWthSnJIcDR3cThWMjdBNkk5bU5TbXVLR3RJdkkyQjMzUUtXNkM4?= =?utf-8?B?ZGlWaU9BZHFFZW0zdnRlRDBvalptYkdRRkpLZVJvWUZ1QzZoK3FTVk9WNnNB?= =?utf-8?B?d2dhc2xqQUJhYjNycFFCeXFPaHBicUhSRTVFSVhVVWlWOGh1S0NOTzVrV1ZH?= =?utf-8?B?ZEpFMi9tWHJNZXYyK00vcjdpUmxHTTZFYUdGSlVsQkhUYXk3WkpvVnFnYzFK?= =?utf-8?Q?GQI6jf+a2OCmGMs+26W/w4jCma0rNzrgkw6STLv+5Px9P?= x-ms-exchange-antispam-messagedata-1: M0chb6gJoKzbbQ== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5896.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32b8cd89-d5ef-4e2d-1fd6-08da34550c3c X-MS-Exchange-CrossTenant-originalarrivaltime: 12 May 2022 20:21:50.7853 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5ae1af62-9505-4097-a69a-c1553ef7840e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: EXcjfdaKkBn107q3R+YSLgqoG+UT8W9ex4TOhlu9G/BaTckIwkQK0MLW2JWEXKTejtTumd4loD3puwo+9jRbUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1847 X-OriginatorOrg: cisco.com X-Outbound-SMTP-Client: 173.37.135.125, xfe-aln-005.cisco.com X-Outbound-Node: rcdn-core-2.cisco.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks for your review, Joe. It looks like I had missed responding to this.= Apologies. >> Versions are attached to the kernel version. >> The general need for driver specific version information is low. Usually, we ask partners to pull patches to their distros. We bump up the v= ersion number so that we understand whether a particular distro has a bug f= ix or not. By looking at the "modinfo fnic" output, we are certain that the distros ha= ve pulled in the appropriate bug fixes. That's the rationale behind it. If there's a better way of accomplishing this goal, we can consider it. >> Not my code, not my choices really, but I do think this is more sensible Thanks for your review. We can consider this in the future to align better = with the kernel . Regards, Karan -----Original Message----- From: Joe Perches =20 Sent: Monday, November 23, 2020 7:56 PM To: Arulprabhu Ponnusamy (arulponn) ; Karan Tilak Kumar= (kartilak) ; Satish Kharat (satishkh) Cc: Sesidhar Baddela (sebaddel) ; jejb@linux.ibm.com; m= artin.petersen@oracle.com; linux-scsi@vger.kernel.org; linux-kernel@vger.ke= rnel.org Subject: Re: [PATCH] scsi: fnic: Change shost_printk to FNIC_MAIN_DBG On Tue, 2020-11-24 at 01:14 +0000, Arulprabhu Ponnusamy (arulponn) wrote: > Looks good. I'm not sure why this look good. It looks very odd to me. > =EF=BB=BFOn 11/20/20, 5:38 PM, "Karan Tilak Kumar" w= rote: >=20 > =C2=A0=C2=A0=C2=A0=C2=A0Replacing shost_printk with FNIC_MAIN_DBG so that > =C2=A0=C2=A0=C2=A0=C2=A0these log messages are controlled by fnic_log_lev= el > =C2=A0=C2=A0=C2=A0=C2=A0flag in fnic_handle_link. [] > =C2=A0=C2=A0=C2=A0=C2=A0diff --git a/drivers/scsi/fnic/fnic.h b/drivers/s= csi/fnic/fnic.h [] > =C2=A0=C2=A0=C2=A0=C2=A0@@ -39,7 +39,7 @@ >=20 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#define DRV_NAME "fnic" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#define DRV_DESCRIPTION "Cisco FCoE HBA Dr= iver" > =C2=A0=C2=A0=C2=A0=C2=A0-#define DRV_VERSION "1.6.0.50" > =C2=A0=C2=A0=C2=A0=C2=A0+#define DRV_VERSION "1.6.0.51" Versions are attached to the kernel version. The general need for driver specific version information is low. > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#define PFX DRV_NAME ": " > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#define DFX DRV_NAME "%= d: " >=20 > =C2=A0=C2=A0=C2=A0=C2=A0diff --git a/drivers/scsi/fnic/fnic_fcs.c=20 > b/drivers/scsi/fnic/fnic_fcs.c > =C2=A0=C2=A0=C2=A0=C2=A0index 3337d6627baf..e0cee4dcb439 100644 > =C2=A0=C2=A0=C2=A0=C2=A0--- a/drivers/scsi/fnic/fnic_fcs.c > =C2=A0=C2=A0=C2=A0=C2=A0+++ b/drivers/scsi/fnic/fnic_fcs.c > =C2=A0=C2=A0=C2=A0=C2=A0@@ -75,7 +75,7 @@ void fnic_handle_link(struct wo= rk_struct *work) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 atomic64_set(&fnic->fnic_stats.misc_stats.= current_port_speed, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 new_port_speed); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (old_port_speed !=3D new_port_speed) > =C2=A0=C2=A0=C2=A0=C2=A0- shost_printk(KERN_INFO, fnic->lport->host, > =C2=A0=C2=A0=C2=A0=C2=A0+ FNIC_MAIN_DBG(KERN_INFO, fnic->lport->host, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "Current vnic speed set to : %llu\n", > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 new_port_speed); It's odd to output this at KERN_INFO with call named _DBG How about converting this and the other logging macros to something like a = style more commonly used in the kernel. FNIC__DBG(KERN_INFO, host, ...) -> fnic_info(host, , ...) FNIC__DBG(KERN_DEBUG, host, ...) -> fnic_dbg(host, , ...) FNIC_MAIN_NOTE(KERN_NOTICE, host, ...) -> fnic_notice(host, ...) Perhaps some of these fnic_info uses really should use fnic_dbg. Not my code, not my choices really, but I do think this is more sensible. --- drivers/scsi/fnic/fnic.h | 36 ++--- drivers/scsi/fnic/fnic_fcs.c | 80 +++++------ drivers/scsi/fnic/fnic_is= r.c | 10 +- drivers/scsi/fnic/fnic_main.c | 110 ++++++--------- drivers= /scsi/fnic/fnic_scsi.c | 310 +++++++++++++++++++----------------------- 5 files changed, 234 insertions(+), 312 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 4775= 13dc23b7..387f3e3c2bff 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -135,32 +135,18 @@ extern unsigned int io_completions; #define FNIC_SCS= I_LOGGING 0x04 #define FNIC_ISR_LOGGING 0x08 =20 -#define FNIC_CHECK_LOGGING(LEVEL, CMD) \ -do { \ - if (unlikely(fnic_log_level & LEVEL)) \ - do { \ - CMD; \ - } while (0); \ +#define fnic_notice(host, fmt, ...) \ + shost_printk(KERN_NOTICE, host, fmt, ##__VA_ARGS__) +#define fnic_info(host, LEVEL, fmt, ...) \ +do { \ + if (unlikely(fnic_log_level & FNIC_##LEVEL##_LOGGING)) \ + shost_printk(KERN_INFO, host, fmt, ##__VA_ARGS__); \ +} while (0) +#define fnic_dbg(host, LEVEL, fmt, ...) \ +do { \ + if (unlikely(fnic_log_level & FNIC_##LEVEL##_LOGGING)) \ + shost_printk(KERN_DEBUG, host, fmt, ##__VA_ARGS__); \ } while (0) - -#define FNIC_MAIN_DBG(kern_level, host, fmt, args...) \ - FNIC_CHECK_LOGGING(FNIC_MAIN_LOGGING, \ - shost_printk(kern_level, host, fmt, ##args);) - -#define FNIC_FCS_DBG(kern_level, host, fmt, args...) \ - FNIC_CHECK_LOGGING(FNIC_FCS_LOGGING, \ - shost_printk(kern_level, host, fmt, ##args);) - -#define FNIC_SCSI_DBG(kern_level, host, fmt, args...) \ - FNIC_CHECK_LOGGING(FNIC_SCSI_LOGGING, \ - shost_printk(kern_level, host, fmt, ##args);) - -#define FNIC_ISR_DBG(kern_level, host, fmt, args...) \ - FNIC_CHECK_LOGGING(FNIC_ISR_LOGGING, \ - shost_printk(kern_level, host, fmt, ##args);) - -#define FNIC_MAIN_NOTE(kern_level, host, fmt, args...) \ - shost_printk(kern_level, host, fmt, ##args) =20 extern const char *fnic_state_str[]; =20 diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c in= dex e3384afb7cbd..134204ca71b7 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -73,9 +73,9 @@ void fnic_handle_link(struct work_struct *work) atomic64_set(&fnic->fnic_stats.misc_stats.current_port_speed, new_port_speed); if (old_port_speed !=3D new_port_speed) - shost_printk(KERN_INFO, fnic->lport->host, - "Current vnic speed set to : %llu\n", - new_port_speed); + fnic_info(fnic->lport->host, MAIN, + "Current vnic speed set to : %llu\n", + new_port_speed); =20 switch (vnic_dev_port_speed(fnic->vdev)) { case DCEM_PORTSPEED_10G: @@ -123,8 +123,7 @@ void fnic_handle_link(struct work_struct *work) "Link Status:UP_DOWN_UP", strlen("Link_Status:UP_DOWN_UP") ); - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "link down\n"); + fnic_dbg(fnic->lport->host, FCS, "link down\n"); fcoe_ctlr_link_down(&fnic->ctlr); if (fnic->config.flags & VFCF_FIP_CAPABLE) { /* start FCoE VLAN discovery */ @@ -138,8 +137,7 @@ void fnic_handle_link(struct work_struct *work) fnic_fcoe_send_vlan_req(fnic); return; } - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "link up\n"); + fnic_dbg(fnic->lport->host, FCS, "link up\n"); fcoe_ctlr_link_up(&fnic->ctlr); } else { /* UP -> UP */ @@ -162,7 +160,7 @@ void fnic_handle_link(struct work_struct *work) fnic_fcoe_send_vlan_req(fnic); return; } - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link up\n"); + fnic_dbg(fnic->lport->host, FCS, "link up\n"); fnic_fc_trace_set_data(fnic->lport->host->host_no, FNIC_FC_LE, "Link Status: DOWN_UP", strlen("Link Status: DOWN_UP")); fcoe_ctlr_link_up(&fnic->ctlr); @@ -170,14 +168,14 @@ void fnic_handle_link(struct work_struct *work) /* UP -> DOWN */ fnic->lport->host_stats.link_failure_count++; spin_unlock_irqrestore(&fnic->fnic_lock, flags); - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link down\n"); + fnic_dbg(fnic->lport->host, FCS, "link down\n"); fnic_fc_trace_set_data( fnic->lport->host->host_no, FNIC_FC_LE, "Link Status: UP_DOWN", strlen("Link Status: UP_DOWN")); if (fnic->config.flags & VFCF_FIP_CAPABLE) { - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "deleting fip-timer during link-down\n"); + fnic_dbg(fnic->lport->host, FCS, + "deleting fip-timer during link-down\n"); del_timer_sync(&fnic->fip_timer); } fcoe_ctlr_link_down(&fnic->ctlr); @@ -279,13 +277,13 @@ void fnic_handle_event(struct work_struct *work) spin_lock_irqsave(&fnic->fnic_lock, flags); break; case FNIC_EVT_START_FCF_DISC: - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "Start FCF Discovery\n"); + fnic_dbg(fnic->lport->host, FCS, + "Start FCF Discovery\n"); fnic_fcoe_start_fcf_disc(fnic); break; default: - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "Unknown event 0x%x\n", fevt->event); + fnic_dbg(fnic->lport->host, FCS, "Unknown event 0x%x\n", + fevt->event); break; } kfree(fevt); @@ -379,8 +377,7 @@ static void fnic_fcoe_send_vlan_req(struct fnic *fnic) fnic->set_vlan(fnic, 0); =20 if (printk_ratelimit()) - FNIC_FCS_DBG(KERN_INFO, fnic->lport->host, - "Sending VLAN request...\n"); + fnic_info(fnic->lport->host, FCS, "Sending VLAN request...\n"); =20 skb =3D dev_alloc_skb(sizeof(struct fip_vlan)); if (!skb) @@ -432,12 +429,11 @@ static void fnic_fcoe_process_vlan_resp(struct fnic *= fnic, struct sk_buff *skb) u64 sol_time; unsigned long flags; =20 - FNIC_FCS_DBG(KERN_INFO, fnic->lport->host, - "Received VLAN response...\n"); + fnic_info(fnic->lport->host, FCS, "Received VLAN response...\n"); =20 fiph =3D (struct fip_header *) skb->data; =20 - FNIC_FCS_DBG(KERN_INFO, fnic->lport->host, + fnic_info(fnic->lport->host, FCS, "Received VLAN response... OP 0x%x SUB_OP 0x%x\n", ntohs(fiph->fip_op), fiph->fip_subcode); =20 @@ -472,7 +468,7 @@ static void fnic_fcoe_process_vlan_resp(struct fnic *fn= ic, struct sk_buff *skb) if (list_empty(&fnic->vlans)) { /* retry from timer */ atomic64_inc(&fnic_stats->vlan_stats.resp_withno_vlanID); - FNIC_FCS_DBG(KERN_INFO, fnic->lport->host, + fnic_info(fnic->lport->host, FCS, "No VLAN descriptors in FIP VLAN response\n"); spin_unlock_irqrestore(&fnic->vlans_lock, flags); goto out; @@ -730,7 +726,7 @@ void fnic_update_mac_locked(struct fnic *fnic, u8 *new) new =3D ctl; if (ether_addr_equal(data, new)) return; - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "update_mac %pM\n", new); + fnic_dbg(fnic->lport->host, FCS, "update_mac %pM\n", new); if (!is_zero_ether_addr(data) && !ether_addr_equal(data, ctl)) vnic_dev_del_addr(fnic->vdev, data); memcpy(data, new, ETH_ALEN); @@ -772,8 +768,7 @@ void fnic_set_port_id(struct fc_lport *lport, u32 port_= id, struct fc_frame *fp) u8 *mac; int ret; =20 - FNIC_FCS_DBG(KERN_DEBUG, lport->host, "set port_id %x fp %p\n", - port_id, fp); + fnic_dbg(lport->host, FCS, "set port_id %x fp %p\n", port_id, fp); =20 /* * If we're clearing the FC_ID, change to use the ctl_src_addr. @@ -799,10 +794,9 @@ void fnic_set_port_id(struct fc_lport *lport, u32 port= _id, struct fc_frame *fp) if (fnic->state =3D=3D FNIC_IN_ETH_MODE || fnic->state =3D=3D FNIC_IN_FC_= MODE) fnic->state =3D FNIC_IN_ETH_TRANS_FC_MODE; else { - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "Unexpected fnic state %s while" - " processing flogi resp\n", - fnic_state_to_str(fnic->state)); + fnic_dbg(fnic->lport->host, FCS, + "Unexpected fnic state %s while processing flogi resp\n", + fnic_state_to_str(fnic->state)); spin_unlock_irq(&fnic->fnic_lock); return; } @@ -879,8 +873,8 @@ static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq,= struct cq_desc skb_trim(skb, bytes_written); if (!fcs_ok) { atomic64_inc(&fnic_stats->misc_stats.frame_errors); - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "fcs error. dropping packet.\n"); + fnic_dbg(fnic->lport->host, FCS, + "fcs error. dropping packet.\n"); goto drop; } if (fnic_import_rq_eth_pkt(fnic, skb)) @@ -895,12 +889,10 @@ static void= fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc =20 if (!fcs_ok || packet_error || !fcoe_fc_crc_ok || fcoe_enc_error) { atomic64_inc(&fnic_stats->misc_stats.frame_errors); - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "fnic rq_cmpl fcoe x%x fcsok x%x" - " pkterr x%x fcoe_fc_crc_ok x%x, fcoe_enc_err" - " x%x\n", - fcoe, fcs_ok, packet_error, - fcoe_fc_crc_ok, fcoe_enc_error); + fnic_dbg(fnic->lport->host, FCS, + "fnic rq_cmpl fcoe x%x fcsok x%x pkterr x%x fcoe_fc_crc_ok x%x, fcoe_e= nc_err x%x\n", + fcoe, fcs_ok, packet_error, + fcoe_fc_crc_ok, fcoe_enc_error); goto drop; } =20 @@ -976,8 +968,8 @@ int fnic_alloc_rq_frame(struct vnic_rq *rq) len =3D FC_FRAME_HEADROOM + FC_MAX_FRAME + FC_FRAME_TAILROOM; skb =3D dev_alloc_skb(len); if (!skb) { - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "Unable to allocate RQ sk_buff\n"); + fnic_dbg(fnic->lport->host, FCS, + "Unable to allocate RQ sk_buff\n"); return -ENOMEM; } skb_reset_mac_header(skb); @@ -1342,8 +1334,8 @@ void fnic_handle_fip_timer(struct fnic *fnic) spin_unlock_irqrestore(&fnic->vlans_lock, flags); /* no vlans available, try again */ if (printk_ratelimit()) - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "Start VLAN Discovery\n"); + fnic_dbg(fnic->lport->host, FCS, + "Start VLAN Discovery\n"); fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC); return; } @@ -1354,16 +1346,16 @@ void fnic_handle_fip_timer(struct fnic *fnic) vlan->vid, vlan->state, vlan->sol_count); switch (vlan->state) { case FIP_VLAN_USED: - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "FIP VLAN is selected for FC transaction\n"); + fnic_dbg(fnic->lport->host, FCS, + "FIP VLAN is selected for FC transaction\n"); spin_unlock_irqrestore(&fnic->vlans_lock, flags); break; case FIP_VLAN_FAILED: spin_unlock_irqrestore(&fnic->vlans_lock, flags); /* if all vlans are in failed state, restart vlan disc */ if (printk_ratelimit()) - FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, - "Start VLAN Discovery\n"); + fnic_dbg(fnic->lport->host, FCS, + "Start VLAN Discovery\n"); fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC); break; case FIP_VLAN_SENT: diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c in= dex 2fb2731f50fb..e85fab7452c8 100644 --- a/drivers/scsi/fnic/fnic_isr.c +++ b/drivers/scsi/fnic/fnic_isr.c @@ -263,8 +263,8 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->intr_count =3D vecs; fnic->err_intr_offset =3D FNIC_MSIX_ERR_NOTIFY; =20 - FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host, - "Using MSI-X Interrupts\n"); + fnic_dbg(fnic->lport->host, ISR, + "Using MSI-X Interrupts\n"); vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_MSIX); return 0; @@ -289,8 +289,7 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->intr_count =3D 1; fnic->err_intr_offset =3D 0; =20 - FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host, - "Using MSI Interrupts\n"); + fnic_dbg(fnic->lport->host, ISR, "Using MSI Interrupts\n"); vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_MSI); =20 return 0; @@ -315,8 +314,7 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->cq_count =3D 3; fnic->intr_count =3D 3; =20 - FNIC_ISR_DBG(KERN_DEBUG, fnic->lport->host, - "Using Legacy Interrupts\n"); + fnic_dbg(fnic->lport->host, ISR, "Using Legacy Interrupts\n"); vnic_dev_set_intr_mode(fnic->vdev, VNIC_DEV_INTR_MODE_INTX); =20 return 0; diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c = index 5f8a7ef8f6a8..2f7ce533f565 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -220,9 +220,8 @@ static struct fc_host_statistics *fnic_get_stats(struct= Scsi_Host *host) spin_unlock_irqrestore(&fnic->fnic_lock, flags); =20 if (ret) { - FNIC_MAIN_DBG(KERN_DEBUG, fnic->lport->host, - "fnic: Get vnic stats failed" - " 0x%x", ret); + fnic_dbg(fnic->lport->host, MAIN, + "fnic: Get vnic stats failed 0x%x\n", ret); return stats; } vs =3D fnic->stats; @@ -248,66 +247,46 @@ static struct fc_host_statistics *fnic_get_stats(stru= ct Scsi_Host *host) void fnic_dump_fchost_stats(struct Scsi_Host *host, struct fc_host_statistics *stats) { - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: seconds since last reset =3D %llu\n", - stats->seconds_since_last_reset); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: tx frames =3D %llu\n", - stats->tx_frames); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: tx words =3D %llu\n", - stats->tx_words); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: rx frames =3D %llu\n", - stats->rx_frames); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: rx words =3D %llu\n", - stats->rx_words); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: lip count =3D %llu\n", - stats->lip_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: nos count =3D %llu\n", - stats->nos_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: error frames =3D %llu\n", - stats->error_frames); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: dumped frames =3D %llu\n", - stats->dumped_frames); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: link failure count =3D %llu\n", - stats->link_failure_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: loss of sync count =3D %llu\n", - stats->loss_of_sync_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: loss of signal count =3D %llu\n", - stats->loss_of_signal_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: prim seq protocol err count =3D %llu\n", - stats->prim_seq_protocol_err_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: invalid tx word count=3D %llu\n", - stats->invalid_tx_word_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: invalid crc count =3D %llu\n", - stats->invalid_crc_count); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: fcp input requests =3D %llu\n", - stats->fcp_input_requests); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: fcp output requests =3D %llu\n", - stats->fcp_output_requests); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: fcp control requests =3D %llu\n", - stats->fcp_control_requests); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: fcp input megabytes =3D %llu\n", - stats->fcp_input_megabytes); - FNIC_MAIN_NOTE(KERN_NOTICE, host, - "fnic: fcp output megabytes =3D %llu\n", - stats->fcp_output_megabytes); + fnic_notice(host, "fnic: seconds since last reset =3D %llu\n", + stats->seconds_since_last_reset); + fnic_notice(host, "fnic: tx frames =3D %llu\n", + stats->tx_frames); + fnic_notice(host, "fnic: tx words =3D %llu\n", + stats->tx_words); + fnic_notice(host, "fnic: rx frames =3D %llu\n", + stats->rx_frames); + fnic_notice(host, "fnic: rx words =3D %llu\n", + stats->rx_words); + fnic_notice(host, "fnic: lip count =3D %llu\n", + stats->lip_count); + fnic_notice(host, "fnic: nos count =3D %llu\n", + stats->nos_count); + fnic_notice(host, "fnic: error frames =3D %llu\n", + stats->error_frames); + fnic_notice(host, "fnic: dumped frames =3D %llu\n", + stats->dumped_frames); + fnic_notice(host, "fnic: link failure count =3D %llu\n", + stats->link_failure_count); + fnic_notice(host, "fnic: loss of sync count =3D %llu\n", + stats->loss_of_sync_count); + fnic_notice(host, "fnic: loss of signal count =3D %llu\n", + stats->loss_of_signal_count); + fnic_notice(host, "fnic: prim seq protocol err count =3D %llu\n", + stats->prim_seq_protocol_err_count); + fnic_notice(host, "fnic: invalid tx word count=3D %llu\n", + stats->invalid_tx_word_count); + fnic_notice(host, "fnic: invalid crc count =3D %llu\n", + stats->invalid_crc_count); + fnic_notice(host, "fnic: fcp input requests =3D %llu\n", + stats->fcp_input_requests); + fnic_notice(host, "fnic: fcp output requests =3D %llu\n", + stats->fcp_output_requests); + fnic_notice(host, "fnic: fcp control requests =3D %llu\n", + stats->fcp_control_requests); + fnic_notice(host, "fnic: fcp input megabytes =3D %llu\n", + stats->fcp_input_megabytes); + fnic_notice(host, "fnic: fcp output megabytes =3D %llu\n", + stats->fcp_output_megabytes); return; } =20 @@ -332,9 +311,8 @@ static void fnic_reset_host_stats(struct Scsi_Host *hos= t) spin_unlock_irqrestore(&fnic->fnic_lock, flags); =20 if (ret) { - FNIC_MAIN_DBG(KERN_DEBUG, fnic->lport->host, - "fnic: Reset vnic stats failed" - " 0x%x", ret); + fnic_dbg(fnic->lport->host, MAIN, + "fnic: Reset vnic stats failed 0x%x\n", ret); return; } fnic->stats_reset_time =3D jiffies; diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c = index d1f7b84bbfe8..9059d967288d 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -240,12 +240,10 @@ int fnic_fw_reset_handler(struct fnic *fnic) =20 if (!ret) { atomic64_inc(&fnic->fnic_stats.reset_stats.fw_resets); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Issued fw reset\n"); + fnic_dbg(fnic->lport->host, SCSI, "Issued fw reset\n"); } else { fnic_clear_state_flags(fnic, FNIC_FLAGS_FWRESET); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Failed to issue fw reset\n"); + fnic_dbg(fnic->lport->host, SCSI, "Failed to issue fw reset\n"); } =20 return ret; @@ -288,15 +286,15 @@ int fnic_flogi_reg_handler(struct fnic *fnic, u32 fc_= id) fc_id, gw_mac, fnic->data_src_addr, lp->r_a_tov, lp->e_d_tov); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "FLOGI FIP reg issued fcid %x src %pM dest %pM\n", - fc_id, fnic->data_src_addr, gw_mac); + fnic_dbg(fnic->lport->host, SCSI, + "FLOGI FIP reg issued fcid %x src %pM dest %pM\n", + fc_id, fnic->data_src_addr, gw_mac); } else { fnic_queue_wq_copy_desc_flogi_reg(wq, SCSI_NO_TAG, format, fc_id, gw_mac); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "FLOGI reg issued fcid %x map %d dest %pM\n", - fc_id, fnic->ctlr.map_dest, gw_mac); + fnic_dbg(fnic->lport->host, SCSI, + "FLOGI reg issued fcid %x map %d dest %pM\n", + fc_id, fnic->ctlr.map_dest, gw_mac); } =20 atomic64_inc(&fnic->fnic_stats.fw_stats.active_fw_reqs); @@ -373,8 +371,8 @@ static inline int fnic_queue_wq_copy_desc(struct fnic *= fnic, =20 if (unlikely(!vnic_wq_copy_desc_avail(wq))) { spin_unlock_irqrestore(&fnic->wq_copy_lock[0], intr_flags); - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "fnic_queue_wq_copy_desc failure - no descriptors\n"); + fnic_info(fnic->lport->host, SCSI, "%s - no descriptors\n", + __func__); atomic64_inc(&misc_stats->io_cpwq_alloc_failures); return SCSI_MLQUEUE_HOST_BUSY; } @@ -445,8 +443,8 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, = void (*done)(struct scsi_ =20 rport =3D starget_to_rport(scsi_target(sc->device)); if (!rport) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "returning DID_NO_CONNECT for IO as rport is NULL\n"); + fnic_dbg(fnic->lport->host, SCSI, + "returning DID_NO_CONNECT for IO as rport is NULL\n"); sc->result =3D DID_NO_CONNECT << 16; done(sc); return 0; @@ -454,8 +452,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, = void (*done)(struct scsi_ =20 ret =3D fc_remote_port_chkready(rport); if (ret) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "rport is not ready\n"); + fnic_dbg(fnic->lport->host, SCSI, "rport is not ready\n"); atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); sc->result =3D ret; done(sc); @@ -464,9 +461,9 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, = void (*done)(struct scsi_ =20 rp =3D rport->dd_data; if (!rp || rp->rp_state =3D=3D RPORT_ST_DELETE) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "rport 0x%x removed, returning DID_NO_CONNECT\n", - rport->port_id); + fnic_dbg(fnic->lport->host, SCSI, + "rport 0x%x removed, returning DID_NO_CONNECT\n", + rport->port_id); =20 atomic64_inc(&fnic_stats->misc_stats.rport_not_ready); sc->result =3D DID_NO_CONNECT<<16; @@ -475,9 +472,9 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, = void (*done)(struct scsi_ } =20 if (rp->rp_state !=3D RPORT_ST_READY) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "rport 0x%x in state 0x%x, returning DID_IMM_RETRY\n", - rport->port_id, rp->rp_state); + fnic_dbg(fnic->lport->host, SCSI, + "rport 0x%x in state 0x%x, returning DID_IMM_RETRY\n", + rport->port_id, rp->rp_state); =20 sc->result =3D DID_IMM_RETRY << 16; done(sc); @@ -650,15 +647,14 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fn= ic *fnic, if (fnic->state =3D=3D FNIC_IN_FC_TRANS_ETH_MODE) { /* Check status of reset completion */ if (!hdr_status) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "reset cmpl success\n"); + fnic_dbg(fnic->lport->host, SCSI, + "reset cmpl success\n"); /* Ready to send flogi out */ fnic->state =3D FNIC_IN_ETH_MODE; } else { - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "fnic fw_reset : failed %s\n", - fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "fnic fw_reset : failed %s\n", + fnic_fcpio_status_to_str(hdr_status)); =20 /* * Unable to change to eth mode, cannot send out flogi @@ -671,10 +667,= 9 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic, ret =3D -1; } } else { - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "Unexpected state %s while processing" - " reset cmpl\n", fnic_state_to_str(fnic->state)); + fnic_dbg(fnic->lport->host, SCSI, + "Unexpected state %s while processing reset cmpl\n", + fnic_state_to_str(fnic->state)); atomic64_inc(&reset_stats->fw_reset_failures); ret =3D -1; } @@ -725,22 +720,20 @@ static int fnic_fcpio_flogi_reg_cmpl_handler(struct f= nic *fnic, =20 /* Check flogi registration completion status */ if (!hdr_status) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "flog reg succeeded\n"); + fnic_dbg(fnic->lport->host, SCSI, + "flog reg succeeded\n"); fnic->state =3D FNIC_IN_FC_MODE; } else { - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "fnic flogi reg :failed %s\n", - fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "fnic flogi reg :failed %s\n", + fnic_fcpio_status_to_str(hdr_status)); fnic->state =3D FNIC_IN_ETH_MODE; ret =3D -1; } } else { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Unexpected fnic state %s while" - " processing flogi reg completion\n", - fnic_state_to_str(fnic->state)); + fnic_dbg(fnic->lport->host, SCSI, + "Unexpected fnic state %s while processing flogi reg completion\n", + fnic_state_to_str(fnic->state)); ret =3D -1; } =20 @@ -901,12 +894,9 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic = *fnic, if(FCPIO_ABORTED =3D=3D hdr_status) CMD_FLAGS(sc) |=3D FNIC_IO_ABORTED; =20 - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "icmnd_cmpl abts pending " - "hdr status =3D %s tag =3D 0x%x sc =3D 0x%p " - "scsi_status =3D %x residual =3D %d\n", - fnic_fcpio_status_to_str(hdr_status), - id, sc, + fnic_info(fnic->lport->host, SCSI, + "icmnd_cmpl abts pending hdr status =3D %s tag =3D 0x%x sc =3D 0x%p s= csi_status =3D %x residual =3D %d\n", + fnic_fcpio_status_to_str(hdr_status), id, sc, icmnd_cmpl->scsi_status, icmnd_cmpl->residual); return; @@ -1113,9 +1103,9 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic = *fnic, if ((id & FNIC_TAG_ABORT) && (id & FNIC_TAG_DEV_RST)) { /* Abort and terminate completion of device reset req */ /* REVISIT : Add asserts about various flags */ - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "dev reset abts cmpl recd. id %x status %s\n", - id, fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "dev reset abts cmpl recd. id %x status %s\n", + id, fnic_fcpio_status_to_str(hdr_status)); CMD_STATE(sc) =3D FNIC_IOREQ_ABTS_COMPLETE; CMD_ABTS_STATUS(sc) =3D hdr_status; CMD_FLAGS(sc) |=3D FNIC_DEV_RST_DONE; @@ -1135,9 +1125,9 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic = *fnic, &term_stats->terminate_fw_timeouts); break; case FCPIO_ITMF_REJECTED: - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "abort reject recd. id %d\n", - (int)(id & FNIC_TAG_MASK)); + fnic_info(fnic->lport->host, SCSI, + "abort reject recd. id %d\n", + (int)(id & FNIC_TAG_MASK)); break; case FCPIO_IO_NOT_FOUND: if (CMD_FLAGS(sc) & FNIC_IO_ABTS_ISSUED) @@ -1170,10 +1160,10 @@ static= void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic, if (!(CMD_FLAGS(sc) & (FNIC_IO_ABORTED | FNIC_IO_DONE))) atomic64_inc(&misc_stats->no_icmnd_itmf_cmpls); =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "abts cmpl recd. id %d status %s\n", - (int)(id & FNIC_TAG_MASK), - fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "abts cmpl recd. id %d status %s\n", + (int)(id & FNIC_TAG_MASK), + fnic_fcpio_status_to_str(hdr_status)); =20 /* * If scsi_eh thread is blocked waiting for abts to complete, @@ -1184,8= +1174,8 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic, complete(io_req->abts_done); spin_unlock_irqrestore(io_lock, flags); } else { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "abts cmpl, completing IO\n"); + fnic_dbg(fnic->lport->host, SCSI, + "abts cmpl, completing IO\n"); CMD_SP(sc) =3D NULL; sc->result =3D (DID_ERROR << 16); =20 @@ -1226,11 +1216,10 @@ static void fnic_fcpio_itmf_cmpl_handler(struct fni= c *fnic, jiffies_to_msecs(jiffies - start_time), desc, 0, (((u64)CMD_FLAGS(sc) << 32) | CMD_STATE(sc))); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Terminate pending " - "dev reset cmpl recd. id %d status %s\n", - (int)(id & FNIC_TAG_MASK), - fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "Terminate pending dev reset cmpl recd. id %d status %s\n", + (int)(id & FNIC_TAG_MASK), + fnic_fcpio_status_to_str(hdr_status)); return; } if (CMD_FLAGS(sc) & FNIC_DEV_RST_TIMED_OUT) { @@ -1241,19 +1230,18 @@ st= atic void fnic_fcpio_itmf_cmpl_handler(struct fnic *fnic, jiffies_to_msecs(jiffies - start_time), desc, 0, (((u64)CMD_FLAGS(sc) << 32) | CMD_STATE(sc))); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "dev reset cmpl recd after time out. " - "id %d status %s\n", - (int)(id & FNIC_TAG_MASK), - fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "dev reset cmpl recd after time out. id %d status %s\n", + (int)(id & FNIC_TAG_MASK), + fnic_fcpio_status_to_str(hdr_status)); return; } CMD_STATE(sc) =3D FNIC_IOREQ_CMD_COMPLETE; CMD_FLAGS(sc) |=3D FNIC_DEV_RST_DONE; - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "dev reset cmpl recd. id %d status %s\n", - (int)(id & FNIC_TAG_MASK), - fnic_fcpio_status_to_str(hdr_status)); + fnic_dbg(fnic->lport->host, SCSI, + "dev reset cmpl recd. id %d status %s\n", + (int)(id & FNIC_TAG_MASK), + fnic_fcpio_status_to_str(hdr_status)); if (io_req->dr_done) complete(io_req->dr_done); spin_unlock_irqrestore(io_lock, flags); @@ -1312,9 +1300,9 @@ static int= fnic_fcpio_cmpl_handler(struct vnic_dev *vdev, break; =20 default: - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "firmware completion type %d\n", - desc->hdr.type); + fnic_dbg(fnic->lport->host, SCSI, + "firmware completion type %d\n", + desc->hdr.type); break; } =20 @@ -1418,10 +1406,10 @@ static void fnic_cleanup_io(struct fnic *fnic, int = exclude_id) mempool_free(io_req, fnic->io_req_pool); =20 sc->result =3D DID_TRANSPORT_DISRUPTED << 16; - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "%s: tag:0x%x : sc:0x%p duration =3D %lu DID_TRANSPORT_DISRUPTED\= n", - __func__, sc->request->tag, sc, - (jiffies - start_time)); + fnic_dbg(fnic->lport->host, SCSI, + "%s: tag:0x%x : sc:0x%p duration =3D %lu DID_TRANSPORT_DISRUPTED\n", + __func__, sc->request->tag, sc, + (jiffies - start_time)); =20 if (atomic64_read(&fnic->io_cmpl_skip)) atomic64_dec(&fnic->io_cmpl_skip); @@ -1494,8 +1482,7 @@ void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy= *wq, =20 wq_copy_cleanup_scsi_cmd: sc->result =3D DID_NO_CONNECT << 16; - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "wq_copy_cleanup_handler:" - " DID_NO_CONNECT\n"); + fnic_dbg(fnic->lport->host, SCSI, "wq_copy_cleanup_handler:=20 +DID_NO_CONNECT\n"); =20 if (sc->scsi_done) { FNIC_TRACE(fnic_wq_copy_cleanup_handler, @@ -1536,8 +1523,8 @@ static inline int fnic_queue_abort_io_req(struct fnic= *fnic, int tag, if (!vnic_wq_copy_desc_avail(wq)) { spin_unlock_irqrestore(&fnic->wq_copy_lock[0], flags); atomic_dec(&fnic->in_flight); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_queue_abort_io_req: failure: no descriptors\n"); + fnic_dbg(fnic->lport->host, SCSI, + "%s: failure: no descriptors\n", __func__); atomic64_inc(&misc_stats->abts_cpwq_alloc_failures); return 1; } @@ -1571,10 +1558,8 @@ static void fnic_rport_exch_reset(struct fnic *fnic,= u32 port_id) struct scsi_lun fc_lun; enum fnic_ioreq_state old_ioreq_state; =20 - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "fnic_rport_exch_reset called portid 0x%06x\n", - port_id); + fnic_dbg(fnic->lport->host, SCSI, "%s called portid 0x%06x\n", + __func__, port_id); =20 if (fnic->in_remove) return; @@ -1598,9 +1583,9 @@ static void fnic_rport_exch_reset(struct fnic *fnic, = u32 port_id) =20 if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) && (!(CMD_FLAGS(sc) & FNIC_DEV_RST_ISSUED))) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_rport_exch_reset dev rst not pending sc 0x%p\n", - sc); + fnic_dbg(fnic->lport->host, SCSI, + "%s dev rst not pending sc 0x%p\n", + __func__, sc); spin_unlock_irqrestore(io_lock, flags); continue; } @@ -1633,15 +1618,14 @@ static void fnic_rport_exch_reset(struct fnic *fnic= , u32 port_id) if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET) { atomic64_inc(&reset_stats->device_reset_terminates); abt_tag =3D (tag | FNIC_TAG_DEV_RST); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_rport_exch_reset dev rst sc 0x%p\n", - sc); + fnic_dbg(fnic->lport->host, SCSI, + "%s dev rst sc 0x%p\n", __func__, sc); } =20 BUG_ON(io_req->abts_done); =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_rport_reset_exch: Issuing abts\n"); + fnic_dbg(fnic->lport->host, SCSI, + "fnic_rport_reset_exch: Issuing abts\n"); =20 spin_unlock_irqrestore(io_lock, flags); =20 @@ -1712,11 +1696,9 @@ void fnic_terminate_rport_io(struct fc_rport *rport) return; } fnic =3D lport_priv(lport); - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, "fnic_terminate_rport_io called" - " wwpn 0x%llx, wwnn0x%llx, rport 0x%p, portid 0x%06x\n", - rport->port_name, rport->node_name, rport, - rport->port_id); + fnic_dbg(fnic->lport->host, SCSI, "%s called wwpn 0x%llx, wwnn0x%llx, rpo= rt 0x%p, portid 0x%06x\n", + __func__, + rport->port_name, rport->node_name, rport, rport->port_id); =20 if (fnic->in_remove) return; @@ -1749,9 +1731,9 @@ void fnic_terminate_rport_io(struct fc_rport *rport) =20 if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) && (!(CMD_FLAGS(sc) & FNIC_DEV_RST_ISSUED))) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_terminate_rport_io dev rst not pending sc 0x%p\n", - sc); + fnic_dbg(fnic->lport->host, SCSI, + "%s dev rst not pending sc 0x%p\n", + __func__, sc); spin_unlock_irqrestore(io_lock, flags); continue; } @@ -1770,10 +1752,9 @@ void fnic_terminate_rport_io(struct fc_rport *rport) fnic_ioreq_state_to_str(CMD_STATE(sc))); } if (!(CMD_FLAGS(sc) & FNIC_IO_ISSUED)) { - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "fnic_terminate_rport_io " - "IO not yet issued %p tag 0x%x flags " - "%x state %d\n", + fnic_info(fnic->lport->host, SCSI, + "%s IO not yet issued %p tag 0x%x flags %x state %d\n", + __func__, sc, tag, CMD_FLAGS(sc), CMD_STATE(sc)); } old_ioreq_state =3D CMD_STATE(sc); @@ -1782,15 +1763,14 @@ void fnic_terminate_rport_io(struct fc_rport *rport) if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET) { atomic64_inc(&reset_stats->device_reset_terminates); abt_tag =3D (tag | FNIC_TAG_DEV_RST); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_terminate_rport_io dev rst sc 0x%p\n", sc); + fnic_dbg(fnic->lport->host, SCSI, + "%s dev rst sc 0x%p\n", __func__, sc); } =20 BUG_ON(io_req->abts_done); =20 - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "fnic_terminate_rport_io: Issuing abts\n"); + fnic_dbg(fnic->lport->host, SCSI, "%s: Issuing abts\n", + __func__); =20 spin_unlock_irqrestore(io_lock, flags); =20 @@ -1864,10 +1844,9 @@ int fnic_abort_cmd(struct scsi_cmnd *sc) =20 rport =3D starget_to_rport(scsi_target(sc->device)); tag =3D sc->request->tag; - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "Abort Cmd called FCID 0x%x, LUN 0x%llx TAG %x flags %x\n", - rport->port_id, sc->device->lun, tag, CMD_FLAGS(sc)); + fnic_dbg(fnic->lport->host, SCSI, + "Abort Cmd called FCID 0x%x, LUN 0x%llx TAG %x flags %x\n", + rport->port_id, sc->device->lun, tag, CMD_FLAGS(sc)); =20 CMD_FLAGS(sc) =3D FNIC_NO_FLAGS; =20 @@ -1919,8 +1898,9 @@ int fnic_abort_cmd(struct scsi_cmnd *sc) else atomic64_inc(&abts_stats->abort_issued_greater_than_60_sec); =20 - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "CBD Opcode: %02x Abort issued time: %lu msec\n", sc->cmnd[0], abt_issue= d_time); + fnic_info(fnic->lport->host, SCSI, + "CBD Opcode: %02x Abort issued time: %lu msec\n", + sc->cmnd[0], abt_issued_time); /* * Command is still pending, need to abort it * If the firmware completes the command after this point, @@ -2009,8 +19= 89,8 @@ int fnic_abort_cmd(struct scsi_cmnd *sc) =20 if (!(CMD_FLAGS(sc) & (FNIC_IO_ABORTED | FNIC_IO_DONE))) { spin_unlock_irqrestore(io_lock, flags); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Issuing Host reset due to out of order IO\n"); + fnic_dbg(fnic->lport->host, SCSI, + "Issuing Host reset due to out of order IO\n"); =20 ret =3D FAILED; goto fnic_abort_cmd_end; @@ -2057,10 +2037,9 @@ int fnic_abort_cmd(struct scsi_cmnd *sc) (u64)sc->cmnd[4] << 8 | sc->cmnd[5]), (((u64)CMD_FLAGS(sc) << 32) | CMD_STATE(sc))); =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Returning from abort cmd type %x %s\n", task_req, - (ret =3D=3D SUCCESS) ? - "SUCCESS" : "FAILED"); + fnic_dbg(fnic->lport->host, SCSI, + "Returning from abort cmd type %x %s\n", + task_req, (ret =3D=3D SUCCESS) ? "SUCCESS" : "FAILED"); return ret; } =20 @@ -2090,8 +2069,8 @@ static inline int fnic_queue_dr_io_req(struct fnic *f= nic, free_wq_copy_descs(fnic, wq); =20 if (!vnic_wq_copy_desc_avail(wq)) { - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "queue_dr_io_req failure - no descriptors\n"); + fnic_dbg(fnic->lport->host, SCSI, + "queue_dr_io_req failure - no descriptors\n"); atomic64_inc(&misc_stats->devrst_cpwq_alloc_failures); ret =3D -EAGAIN; goto lr_io_req_end; @@ -2164,9 +2143,8 @@ static int fnic_clean_pending_aborts(struct fnic *fni= c, * Found IO that is still pending with firmware and * belongs to the LUN that we are resetting */ - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Found IO in %s on lun\n", - fnic_ioreq_state_to_str(CMD_STATE(sc))); + fnic_dbg(fnic->lport->host, SCSI, "Found IO in %s on lun\n", + fnic_ioreq_state_to_str(CMD_STATE(sc))); =20 if (CMD_STATE(sc) =3D=3D FNIC_IOREQ_ABTS_PENDING) { spin_unlock_irqrestore(io_lock, flags); @@ -2174,9 +2152,9 @@ static in= t fnic_clean_pending_aborts(struct fnic *fnic, } if ((CMD_FLAGS(sc) & FNIC_DEVICE_RESET) && (!(CMD_FLAGS(sc) & FNIC_DEV_RST_ISSUED))) { - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "%s dev rst not pending sc 0x%p\n", __func__, - sc); + fnic_info(fnic->lport->host, SCSI, + "%s dev rst not pending sc 0x%p\n", + __func__, sc); spin_unlock_irqrestore(io_lock, flags); continue; } @@ -2200,7 +2178,7 @@ static int fnic_clean_pending_aborts(struct fnic *fni= c, abt_tag =3D tag; if (CMD_FLAGS(sc) & FNIC_DEVICE_RESET) { abt_tag |=3D FNIC_TAG_DEV_RST; - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, + fnic_info(fnic->lport->host, SCSI, "%s: dev rst sc 0x%p\n", __func__, sc); } =20 @@ -2356,9 +2334,9 @@ int fnic_device_reset(struct scsi_cmnd *sc) atomic64_inc(&reset_stats->device_resets); =20 rport =3D starget_to_rport(scsi_target(sc->device)); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Device reset called FCID 0x%x, LUN 0x%llx sc 0x%p\n", - rport->port_id, sc->device->lun, sc); + fnic_dbg(fnic->lport->host, SCSI, + "Device reset called FCID 0x%x, LUN 0x%llx sc 0x%p\n", + rport->port_id, sc->device->lun, sc); =20 if (lp->state !=3D LPORT_ST_READY || !(lp->link_up)) goto fnic_device_reset_end; @@ -2407,7 +2385,7 @@ int fnic_device_reset(struct scsi_cmnd *sc) CMD_LR_STATUS(sc) =3D FCPIO_INVALID_CODE; spin_unlock_irqrestore(io_lock, flags); =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "TAG %x\n", tag); + fnic_dbg(fnic->lport->host, SCSI, "TAG %x\n", tag); =20 /* * issue the device reset, if enqueue failed, clean up the ioreq @@ -2435= ,8 +2413,8 @@ int fnic_device_reset(struct scsi_cmnd *sc) io_req =3D (struct fnic_io_req *)CMD_SP(sc); if (!io_req) { spin_unlock_irqrestore(io_lock, flags); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "io_req is null tag 0x%x sc 0x%p\n", tag, sc); + fnic_dbg(fnic->lport->host, SCSI, + "io_req is null tag 0x%x sc 0x%p\n", tag, sc); goto fnic_device_reset_end; } io_req->dr_done =3D NULL; @@ -2449,8 +2427,7 @@ int fnic_device_reset(struct scsi_cmnd *sc) */ if (status =3D=3D FCPIO_INVALID_CODE) { atomic64_inc(&reset_stats->device_reset_timeouts); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Device reset timed out\n"); + fnic_dbg(fnic->lport->host, SCSI, "Device reset timed out\n"); CMD_FLAGS(sc) |=3D FNIC_DEV_RST_TIMED_OUT; spin_unlock_irqrestore(io_lock, flags); int_to_scsilun(sc->device->lun, &fc_lun); @@ -2477,9 +2454,9 @@ int fnic= _device_reset(struct scsi_cmnd *sc) CMD_STATE(sc) =3D FNIC_IOREQ_ABTS_PENDING; io_req->abts_done =3D &tm_done; spin_unlock_irqrestore(io_lock, flags); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Abort and terminate issued on Device reset " - "tag 0x%x sc 0x%p\n", tag, sc); + fnic_dbg(fnic->lport->host, SCSI, + "Abort and terminate issued on Device reset tag 0x%x sc 0x%p\n", + tag, sc); break; } } @@ -2503,9 +2480,8 @@ int fnic_device_reset(struct scsi_cmnd *sc) /* Completed, but not successful, clean up the io_req, return fail */ if (status !=3D FCPIO_SUCCESS) { spin_lock_irqsave(io_lock, flags); - FNIC_SCSI_DBG(KERN_DEBUG, - fnic->lport->host, - "Device reset completed - failed\n"); + fnic_dbg(fnic->lport->host, SCSI, + "Device reset completed - failed\n"); io_req =3D (struct fnic_io_req *)CMD_SP(sc); goto fnic_device_reset_clean; } @@ -2520,9 +2496,8 @@ int fnic_device_reset(struct scsi_cmnd *sc) if (fnic_clean_pending_aborts(fnic, sc, new_sc)) { spin_lock_irqsave(io_lock, flags); io_req =3D (struct fnic_io_req *)CMD_SP(sc); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Device reset failed" - " since could not abort all IOs\n"); + fnic_dbg(fnic->lport->host, SCSI, + "Device reset failed since could not abort all IOs\n"); goto fnic_device_reset_clean; } =20 @@ -2558,10 +2533,8 @@ int fnic_device_reset(struct scsi_cmnd *sc) if (unlikely(tag_gen_flag)) fnic_scsi_host_end_tag(fnic, sc); =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Returning from device reset %s\n", - (ret =3D=3D SUCCESS) ? - "SUCCESS" : "FAILED"); + fnic_dbg(fnic->lport->host, SCSI, "Returning from device reset %s\n", + (ret =3D=3D SUCCESS) ? "SUCCESS" : "FAILED"); =20 if (ret =3D=3D FAILED) atomic64_inc(&reset_stats->device_reset_failures); @@ -2581,8 +2554,7 @@ int fnic_reset(struct Scsi_Host *shost) fnic =3D lport_priv(lp); reset_stats =3D &fnic->fnic_stats.reset_stats; =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_reset called\n"); + fnic_dbg(fnic->lport->host, SCSI, "%s called\n", __func__); =20 atomic64_inc(&reset_stats->fnic_resets); =20 @@ -2592,10 +2564,8 @@ int fnic_reset(struct Scsi_Host *shost) */ ret =3D fc_lport_reset(lp); =20 - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "Returning from fnic reset %s\n", - (ret =3D=3D 0) ? - "SUCCESS" : "FAILED"); + fnic_dbg(fnic->lport->host, SCSI, "Returning from fnic reset %s\n", + (ret =3D=3D 0) ? "SUCCESS" : "FAILED"); =20 if (ret =3D=3D 0) atomic64_inc(&reset_stats->fnic_reset_completions); @@ -2628,8 +2598,8 @@ int fnic_host_reset(struct scsi_cmnd *sc) fnic->internal_reset_inprogress =3D true; } else { spin_unlock_irqrestore(&fnic->fnic_lock, flags); - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "host reset in progress skipping another host reset\n"); + fnic_dbg(fnic->lport->host, SCSI, + "host reset in progress skipping another host reset\n"); return SUCCESS; } spin_unlock_irqrestore(&fnic->fnic_lock, flags); @@ -2702,10 +2672,9 @@ v= oid fnic_scsi_abort_io(struct fc_lport *lp) =20 spin_lock_irqsave(&fnic->fnic_lock, flags); fnic->remove_wait =3D NULL; - FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, - "fnic_scsi_abort_io %s\n", - (fnic->state =3D=3D FNIC_IN_ETH_MODE) ? - "SUCCESS" : "FAILED"); + fnic_dbg(fnic->lport->host, SCSI, "%s %s\n", + __func__, + (fnic->state =3D=3D FNIC_IN_ETH_MODE) ? "SUCCESS" : "FAILED"); spin_unlock_irqrestore(&fnic->fnic_lock, flags); =20 } @@ -2818,9 +2787,8 @@ int fnic_is_abts_pending(struct fnic *fnic, struct sc= si_cmnd *lr_sc) * Found IO that is still pending with firmware and * belongs to the LUN that we are resetting */ - FNIC_SCSI_DBG(KERN_INFO, fnic->lport->host, - "Found IO in %s on lun\n", - fnic_ioreq_state_to_str(CMD_STATE(sc))); + fnic_info(fnic->lport->host, SCSI, "Found IO in %s on lun\n", + fnic_ioreq_state_to_str(CMD_STATE(sc))); =20 if (CMD_STATE(sc) =3D=3D FNIC_IOREQ_ABTS_PENDING) ret =3D 1;