From patchwork Fri May 19 21:53:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9738271 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 A06F16034C for ; Fri, 19 May 2017 21:54:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C64D28562 for ; Fri, 19 May 2017 21:54:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 812AE28585; Fri, 19 May 2017 21:54:35 +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 6E4C728562 for ; Fri, 19 May 2017 21:54:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932080AbdESVyc (ORCPT ); Fri, 19 May 2017 17:54:32 -0400 Received: from mail-bl2nam02on0048.outbound.protection.outlook.com ([104.47.38.48]:3063 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756731AbdESVyX (ORCPT ); Fri, 19 May 2017 17:54:23 -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=TxPrQzSWMbatZliiqUSu262Jwxe58HyaS15Oin/VcDY=; b=KLJZNUvVuqSFdSGnqmWku+ldARYTqieNQ6No06updRauWLYD8kSCRAG20hceAKyAmPcB9HNj5PaVwL33cpYc2bbMjjT4Hga5BLCPoBBI44k3eDwPoD5lObnZrLPZ8AnyX7U/nQiW73dOWW+Akxa4qweK9ud9q7q0b3sgv8VOBL4= Received: from SN1PR0701CA0009.namprd07.prod.outlook.com (10.162.96.19) by BLUPR0701MB1012.namprd07.prod.outlook.com (10.160.34.22) 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 21:54:21 +0000 Received: from BY2FFO11OLC009.protection.gbl (2a01:111:f400:7c0c::179) by SN1PR0701CA0009.outlook.office365.com (2a01:111:e400:5173::19) 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 21:54:20 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BY2FFO11OLC009.mail.protection.outlook.com (10.1.15.0) 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 21:54:20 +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 14:53:53 -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 v4JLrrsJ002287; Fri, 19 May 2017 14:53:53 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v4JLrrDA002286; Fri, 19 May 2017 14:53:53 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 19/25] qla2xxx: Replace ql2xexchoffld & ql_dm_tgt_ex_pct parameter Date: Fri, 19 May 2017 14:53:38 -0700 Message-ID: <20170519215344.2168-20-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)(39840400002)(39850400002)(39450400003)(39410400002)(39400400002)(2980300002)(428002)(189002)(199003)(40224003)(9170700003)(50466002)(106466001)(1076002)(105586002)(47776003)(4326008)(38730400002)(76176999)(48376002)(356003)(101416001)(5003940100001)(33646002)(50986999)(54906002)(72206003)(81166006)(8676002)(80596001)(2906002)(87636003)(189998001)(36756003)(42186005)(305945005)(2950100002)(5660300001)(6666003)(86362001)(50226002)(8936002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1012; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC009; 1:FC4pfa7E344BViEipoxoFJsJbWwhfRVxOo+eZj4dVzoJ22rbCphFKUcJz1hP+HqfHjXuOStTj+l7/L3QUL6E2SPkxwRfEyq4KOHn8IM/VYGmtG1ULjRg8INNHlf82Y+atofvpuTXiSK+Wgj8uRP7+kszlrpllN7U/4Ya8+lqQ+NKHQZZgDA7GTPu7z0V++9iyZhD7PtoRbE/JXNCA1xKmdPb11Nwxj6nolLlsyKcKUh//Eu67gMTTCIP4qiUpNuemG1+1VvFNKCqmIb4q7r1yrX7icBXAdtQj4ccu9WEWT9ZGTpaF40Ib4AVwXGHaERl8zLRYik/l7bSKPbfPcukWcTfHZ/h62EHLFUjmjnsJDwbAwVzemdMvCdOrlzGBcd8WCLk7yIMrxpwt61PPGUfgPGYJFjT40S8xCElOBGleLOrIqTCp8iRVRXzQ/6gU20WYwT0pPu7r0qcZlgLf6N+6G3kO/Cm5fH9UeDbcuqrSnAc1BsGpcNd0Xflx396f4UwLw/fmXk3DnPhanSzq4U8Gq+MqldNMVlaoX9ak9mGRvVr01LnxXTMBWLlkh6Sfe91CRqx1n+q4JxNOxV1Io8bZw== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLUPR0701MB1012: X-MS-Office365-Filtering-Correlation-Id: 5e6280ef-0f98-4455-a1bb-08d49f019a9d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR0701MB1012; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1012; 3:lGV+3WgE2dew5wT5lVbmSR74OD9jkCtogxe9Si341fuRvo7c5h833cVyJtHi6F5WG93tGkJ4My7PvU99cR4JuiyvXYI7MDpxma4RD7rowz35XZ1//c7PVVkyoqVFjSF991kDxdJWIBweZz3zrGfst33ck5QEnMSAz9rygoiPl7EFXXAAuA4218k65b1UoG5s2OOPMHR16I/uiXXtfqIVvzwkGKd0tRfKPeA/WvzlMJZMsTXw+mSVvz55jqcnx3ZliMgtEHB5poOj8uqC3c84VRJoOt8sgclE8fMDItCaMt2Bf1/OQfOMHlWaGhaKlcDaXvgI9FdIxdD2fq0INF/eu6BH7bM7y3lPXC+YW/ovYMv3Sa9xJGWHWJifyxmBLCFfFLzGQ/XZ0vHsa9kTMmLdFwl0RbOHnyEF+isxHpSF2K+uv1PWwoh8lfBizmxnXVclCcL+UvUpJCxfI7YDZhh20pyk3aSKWqyM8NTJKgsQRGiS8K/eijJ3FyqeMJ4g3Svj X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1012; 25:Y3mToBmlMdpolsLhblUTXm7Rf/4XTPuKyqTCGgoWzMOs4ACNbByciLsU1YoTpjKuxBlQgbbb0H4dH2fX+tXlVbGCgk+L9LmT/mni+A5w8vpDhgF8MsUGerkYdzqo8K+MAAbvxHBH06kZ6amHaCBKelbN9HXiLhv5pmMRQLgDu++7qjXSkWaAYjmwgO51cd4z5pYJ0RHNnc0v51aFR5eiRS9mwBv/E6tZKjTr8JDGhAeQoWwbW8MD5Y9NaPTfPeUiMwgqJWr5R9/kJZvkiiS8gkCPELAPhOHpA4/13lHvTF1/FY5nY9RVHsKwFI/vaZqtOdqA2W1jMP+/UwykjCNDd/M2BX2VTPjkyCsawMfJ8BlqlXMb4eQ2QkA4R/90ikmNv0fZ2FMnWOpJtDVS0Ixe43ioDVlqbvKllWupv+BaiZTGolbpL2N1aUxymknLxitxbltwuy3OPg441R0NUy4Y4HItS7K0n2E3zBuE92IIn44=; 31:eQ8Y4Ga+2hDi4BIaIHxl6exNRRdtduQdo+a1vh7nJ7qVc3V2juMhz1rHSALja02PbYDsKPbkXn4UE4sdxO7e79/ITiFk8R0tbqSI5B9t4S3+nCMYqC+KeCnNMyandhYCKTuDV1+K1PORHAYN5eaEXCyV2EeAjOok+EFznctyi7fDHvdlOiqI8rUtPuFuKnog+94TFrcrvwL1NVJrOROoL/oHhDCtiQ5w40E0KmJSR3GpiRtZ6w4He7ZBleQJdsOHypMbfNiR8rUKb7FUkMKEVw== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1012; 20:ecIcPAetvZxBYUmRq5uDFhZX1bI301jD7JZ4BjhldIwPfJAq1BWOAUR8qDAJyMK0KUvS8uJ9n8rvRFQ2/LV0xO2RjPFXr0bNrHe65ecrwGfZqR3ZnOs7zRtXe5A0A7kNsVygatdQDgNaVlO0EqEs76JvOhQFk2cvBhFO/8/k+kRSlzIkE0xvMPtdWQ1vLuglUh1vHOvqtAmEOKurIQfLBRQBBkeNJr0Rkxz+ag4/5irg2bVjF5Y/SHDDXBuXqOiu0aHsok+U01YFLN5Ih+FL2pTP4sPPpFCpYk4pl3q8YFCSVFH9VXttIv0L4JZ2vZu3oU9ZyaRPGh+m9qFKy0LAQOREcEqxX0P0T3STmDNx1s3pIHw6faS0n50JwiZ+YU2R1WoMPqJSSDPxJdhdFATbkoss3WAhEsVMj6vHKIPFIclW7xcM5wWLDJS8Kq73/WIUicpW1K5pWDdxQJiGG7cs+m4aVOtoXt+vlEjnT/NZb0JXa3mjgvlP+7G1mhJzuWeh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13018025)(13023025)(8121501046)(13015025)(5005006)(13024025)(13017025)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123564025)(20161123555025)(6072148); SRVR:BLUPR0701MB1012; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1012; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1012; 4:UmRP4WS4R19LLsvQAiwEwi5Sd7dwuQryK+dBCcn41bCvgPHKofXDY4ycGAlPFUGCEsX+N3MfYF8fdF+esK5QCE+qI9F3dcSfyzahHMZqMgSq0WXZownJJISWqPyZz69X/2uxQbECA0x4DLDiT4m8VG+Db9VVxKwiZLNFwkwwFvgoucUr3vLrHwMRl/aPF+kI8U9KJltXYHPJrmjQhsIUhSDE0/d8av93E7LnyBm7pmU2cZ+CWQBLR7Gv/Hy6/rw62PZ1LhTjuW0jXs1Zu3VcUMcjFxFJVQ1PNaHnuSCJC0c87cZfgp6slWEETAD+eu/TAKd5jBM2UXskv4h4CP2VvTninWtWZv7qHW0SCBwH6E8qDTa0zldu0XHApY2/Vn+a5yonAknnTPtxD9yiNOqvMLEB1DIW1rq67mUa+cVp1y8DmQm2sLXz5XTmvPi6NehAGQNdJdgBEiU8eXmQBKIjuxqQGNQgaN/m6fxbXqjRjhMjQ6u/zBJZkawARPtt2GaPR+YnWjRdLyEqucGFeWOwU6k2uh+lSQoghOCYR7YyCgou03pvizl/bjfBylptyTJ9EdJK5X4Eb+wimSxNfbHBvQH5Rsp3oQ6snMCS4/r96892OZ4hCyH8w/FsZlqm0vR5qPvtxZ8LFPNDgXjtwT68BzBjXpnor5C0sLjPi8jFA8lMnRZY3PLBgq1pPqsyeQJehcCOnOy7LBOYx1ObY2mj0dOcN+TDu/pVs2mmTyHAdrj2M+AcCqJqXUFmojaP624S53S10q3vauWjvubCfw8L7ig5ZB/3cYafzkANcEAn3LBepn/upGduCco6deaeVeUQQ2hDjmmvYAgvFZKc3yYUoSUkQ5EkbTTgNwoSQgqy1zZD5q0QqgFH+eCzaQHwwW9wNUFnT0ONE7g7IuwD6SLx9x9xVGp9WXCvH3Tb8Z7i F5U= X-Forefront-PRVS: 031257FE13 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1012; 23:4/NHnxRwsCmSBeH+DcoqTRCkSvx60S+fXqVlJ4l?= =?us-ascii?Q?ZJhZFOp8P/wBf33WN8CTxeHrXZmmqNSKVeb+AjTkgaeh9YN+oltWcrEJ0e/O?= =?us-ascii?Q?DwathtLJNH1nH+4WLjp3SPuQ4wxJmovEFvQ/OSQ2ryzSMX+hc3Blv7Kj4ZBd?= =?us-ascii?Q?x+JNao0y4yWj6A0/4Q3IFjpZcOrJE0auGX/xYGO2t+/QbjB8Bef18DpG2gWn?= =?us-ascii?Q?ftDPoi9ZeEXbA43kienD8mMqqWGgrenDSVM9v5o/3tuIwKzU5LqFQX1gEkVa?= =?us-ascii?Q?6OktNANf38ywfGQ0WvCc2F+M2a2Y6ddUlrjOORmeqzMnEen1qNgqBYgehlen?= =?us-ascii?Q?QufBqCwyEJI1SEkgJtZYP4jewR8NzAWqaNdvRdLtmEFgWkaqPejoBBXh/tUx?= =?us-ascii?Q?rOXvAThCVz0CuN4+oB80PwNVSAWmMuFsTN4yB7jALM7y56QXCXSczxObiK9J?= =?us-ascii?Q?LMao+xIybeDkUZuTvQ3iLUityMQYsDdwvNRO8sBSUArLrLrVW0JAa6U9vRcn?= =?us-ascii?Q?MBSvsiByUwrRwDyiXcnqh1Ww46TXRfDY1MEIgFmP6bYOBWWtRZKmNhigqxdd?= =?us-ascii?Q?OBBk3YVj+31Uwbp4qepHs3XgXqxGSPyb6CX/6Schq7dJNWCJLOE+Cr/gK7Dp?= =?us-ascii?Q?sLDvcsvVt+Jlw/Gbl+5kro2EIsgy2F7lsfinPTKnATDSfS+DlPml85VkToXa?= =?us-ascii?Q?uH3VhyRSeJ7RFIH6ZfVuF9pGQRMxnbK5rYv7cVzJDiI7W/HIdP3P8SJJsM5Z?= =?us-ascii?Q?uYCMZv0YQW+ODf8d1pDa/u18/FBxEOCBUwMGH6nvi7CTA9a6z6GHWWGDKpIM?= =?us-ascii?Q?+xFtZYFyy5jwhXXtdFHB1XU9gnGd4Bw7c2q1Wu0uVj5rnGKrtGk8vgq5bYnq?= =?us-ascii?Q?rYwQpVu76BY+81SUJGNPYM3mmMPgA68FxcrZN0Q7ht5OafvQbeej0yPEaHF2?= =?us-ascii?Q?yrzE+1qgxK+x9c0/APj9W9IpooeTArgpK7WgGiuvFCYZVScW+XklfIVFNF5l?= =?us-ascii?Q?H93a97Z4Xdlle1SLBlueryUF+q3LTJYC3FsH8dbCuf8OX6wamdcAe9BbuHod?= =?us-ascii?Q?a7pNrZPS8n8Zg1cIPl5HNx4r4ildrY/wlO6tgFxay5ckSlMH+9g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1012; 6:ChuTNQC7lEeFcsw3xYPFk8gXQ1GHkQMG1Oa4y1gGeJhWMmPqIITsafMlSW51PWNTxaCtJG7rQeVdJebvoplpqvKgDootqUk4kpHL8Mbnt29k706MpFD33aXoSnMCpwi4QineLk/n/fs+lF4MqjssLj/7N7QaGIfHBqPiY5ne7beIrmtDF7peRNYMucb3bdlWp9Zl8kQQcuiHpCm9XduEiMq0Oqpaw/D8GSCBQV6ByVC3om2/5gUqIe9Iq/ZDkJ5hzHxTgFYQL55hzZs3BvkCuP7NDtOZROGDHUALzRHt854QdBwWGXHGE4FJ7HTFcZLnqfbAKVS6+mvwYR4R1+DvPKuT8L1bhyVS+OvywxoezNK3rcxYpFeB/46TWy0EYQPGTFbWLcEeDqPD0sBxZ69+QN+R/bzoElA6BaWfiBBqddvkWE0CXqqL1ICVCEYSjXTHGp51B1AYeCRieGWr2G/Eqr+fQUirW3MFOuhut6PaQ8/KYVJXuK7V5KhR6TQnj+ZhGrio0yxmQfb03/q7SgAu7w==; 5:LtCluZ+mBopjN8lJSXKc/rZSwY0TLswSjYoHTquKjUARoVgqHAC+/TRFGN98v/0Cf4umOHUTqZkBQCWoPcUM1CNgPNIOpBJJWj6DiSzXgL2f1B2kBnCW1Z9+BMlgXkDU3p1PxB/nJ7CT70XwiHLjyw==; 24:P8L8mnbaBx1OaNTiByraSkH5ENBzQoTM5ff/5trSZZ7rMVJNoj9mC4Y5wvioZO3W1TonTokVbPGuMfZqqOr5Kz4shw5E2pzMYc/lpArz2OE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1012; 7:FF31OET5zyYR+EVYalf4oAtJVUqxaEtkwXbxHfKlvVFrc9As+aDAARVxHRhPQ3bN+HXncd+BQAkf1UnnTt4VVQR9rjduakGE1x+Ia3oyn9bUHPF6cbjI6OxB8DxWR6lRF7Vb7FElxwlRSk2d+qnO7ZCPe/5ejEKpLBf9vRHx9hb01p+c3l257aCi75iEAPREhUY17GYWS4JCOvEu7EyNeGRc1/MKzHJG+e7+5X+gv+cCaNqO4r5OhJs4DlbTNn6me99BOQt8/Owamsf4/nTQuk3BG89PdC2rFGaNp/LJKyOnbLtwXuZqfq49XjP4WY8Z/VRq4rz3ZMFMlyxXO3QAlQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 21:54:20.1860 (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: BLUPR0701MB1012 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Quinn Tran Replace driver parameters ql2xexchoffld & ql_dm_tgt_ex_pct with ql2xtgtexchg & ql2xiniexchg for readability. Previously, the ql2xexchoffld module parameter was used to control the max number of exchanges to be offload onto host memory. Module parameter ql_dm_tgt_ex_pct was used to control the percentage of exchanges allocated to the Target side. With the updated module parameters, users can control the exact number of exchanges for either Initiator or Target. The exchange offload feature will be automatically enabled when the total number of exchanges exceeds 2048 limit. Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_def.h | 6 +- drivers/scsi/qla2xxx/qla_gbl.h | 5 +- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_inline.h | 16 +++++ drivers/scsi/qla2xxx/qla_mbx.c | 14 ++-- drivers/scsi/qla2xxx/qla_os.c | 138 +++++++++++++++++++++++++++----------- drivers/scsi/qla2xxx/qla_target.c | 53 +++------------ 7 files changed, 141 insertions(+), 93 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 51b262b236b4..ddf93efe3986 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -286,7 +286,7 @@ struct name_list_extended { #define RESPONSE_ENTRY_CNT_MQ 128 /* Number of response entries.*/ #define ATIO_ENTRY_CNT_24XX 4096 /* Number of ATIO entries. */ #define RESPONSE_ENTRY_CNT_FX00 256 /* Number of response entries.*/ -#define EXTENDED_EXCH_ENTRY_CNT 32768 /* Entries for offload case */ +#define FW_DEF_EXCHANGES_CNT 2048 struct req_que; struct qla_tgt_sess; @@ -3593,6 +3593,10 @@ struct qla_hw_data { #define IS_SHADOW_REG_CAPABLE(ha) (IS_QLA27XX(ha)) #define IS_DPORT_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha)) #define IS_FAWWN_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha)) +#define IS_EXCHG_OFFLD_CAPABLE(ha) \ + (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) +#define IS_EXLOGIN_OFFLD_CAPABLE(ha) \ + (IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) /* HBA serial number */ uint8_t serial0; diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 5b2451745e9f..8ceb7299014c 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -136,7 +136,8 @@ extern uint64_t ql2xmaxlun; extern int ql2xmdcapmask; extern int ql2xmdenable; extern int ql2xexlogins; -extern int ql2xexchoffld; +extern int ql2xiniexchg; +extern int ql2xtgtexchg; extern int ql2xfwholdabts; extern int ql2xmvasynctoatio; @@ -839,7 +840,7 @@ extern int qla_get_exlogin_status(scsi_qla_host_t *, uint16_t *, uint16_t *); extern int qla_set_exlogin_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr); extern int qla_get_exchoffld_status(scsi_qla_host_t *, uint16_t *, uint16_t *); -extern int qla_set_exchoffld_mem_cfg(scsi_qla_host_t *, dma_addr_t); +extern int qla_set_exchoffld_mem_cfg(scsi_qla_host_t *); extern void qlt_handle_abts_recv(struct scsi_qla_host *, response_t *); int qla24xx_async_notify_ack(scsi_qla_host_t *, fc_port_t *, diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 32fb3ed4fb33..0b91b886e5a3 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -2730,7 +2730,7 @@ qla2x00_setup_chip(scsi_qla_host_t *vha) if (ql2xexlogins) ha->flags.exlogins_enabled = 1; - if (ql2xexchoffld) + if (qla_is_exch_offld_enabled(vha)) ha->flags.exchoffld_enabled = 1; rval = qla2x00_execute_fw(vha, srisc_address); diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index c61a6a871c8e..2ad74353f21e 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -307,3 +307,19 @@ qla2x00_set_retry_delay_timestamp(fc_port_t *fcport, uint16_t retry_delay) fcport->retry_delay_timestamp = jiffies + (retry_delay * HZ / 10); } + +static inline bool +qla_is_exch_offld_enabled(struct scsi_qla_host *vha) +{ + if (qla_ini_mode_enabled(vha) && + (ql2xiniexchg > FW_DEF_EXCHANGES_CNT)) + return true; + else if (qla_tgt_mode_enabled(vha) && + (ql2xtgtexchg > FW_DEF_EXCHANGES_CNT)) + return true; + else if (qla_dual_mode_enabled(vha) && + ((ql2xiniexchg + ql2xtgtexchg) > FW_DEF_EXCHANGES_CNT)) + return true; + else + return false; +} diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 8c9f238631ee..e69b854f19ae 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -821,7 +821,7 @@ qla_get_exchoffld_status(scsi_qla_host_t *vha, uint16_t *buf_sz, */ #define CONFIG_XCHOFFLD_MEM 0x3 int -qla_set_exchoffld_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr) +qla_set_exchoffld_mem_cfg(scsi_qla_host_t *vha) { int rval; mbx_cmd_t mc; @@ -834,12 +834,12 @@ qla_set_exchoffld_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr) memset(mcp->mb, 0 , sizeof(mcp->mb)); mcp->mb[0] = MBC_GET_MEM_OFFLOAD_CNTRL_STAT; mcp->mb[1] = CONFIG_XCHOFFLD_MEM; - mcp->mb[2] = MSW(phys_addr); - mcp->mb[3] = LSW(phys_addr); - mcp->mb[6] = MSW(MSD(phys_addr)); - mcp->mb[7] = LSW(MSD(phys_addr)); - mcp->mb[8] = MSW(ha->exlogin_size); - mcp->mb[9] = LSW(ha->exlogin_size); + mcp->mb[2] = MSW(ha->exchoffld_buf_dma); + mcp->mb[3] = LSW(ha->exchoffld_buf_dma); + mcp->mb[6] = MSW(MSD(ha->exchoffld_buf_dma)); + mcp->mb[7] = LSW(MSD(ha->exchoffld_buf_dma)); + mcp->mb[8] = MSW(ha->exchoffld_size); + mcp->mb[9] = LSW(ha->exchoffld_size); mcp->out_mb = MBX_9|MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0; mcp->in_mb = MBX_11|MBX_0; mcp->tov = MBX_TOV_SECONDS; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index a46a38ecbd8b..ea885f3881ed 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -224,11 +224,15 @@ MODULE_PARM_DESC(ql2xexlogins, "Number of extended Logins. " "0 (Default)- Disabled."); -int ql2xexchoffld = 0; -module_param(ql2xexchoffld, uint, S_IRUGO|S_IWUSR); -MODULE_PARM_DESC(ql2xexchoffld, - "Number of exchanges to offload. " - "0 (Default)- Disabled."); +int ql2xtgtexchg = 1024; +module_param(ql2xtgtexchg, uint, 0644); +MODULE_PARM_DESC(ql2xtgtexchg, + "Number of target exchanges."); + +int ql2xiniexchg = 1024; +module_param(ql2xiniexchg, uint, 0644); +MODULE_PARM_DESC(ql2xtgtexchg, + "Number of initiator exchanges."); int ql2xfwholdabts = 0; module_param(ql2xfwholdabts, int, S_IRUGO); @@ -3982,6 +3986,9 @@ qla2x00_set_exlogins_buffer(scsi_qla_host_t *vha) if (!ql2xexlogins) return QLA_SUCCESS; + if (!IS_EXLOGIN_OFFLD_CAPABLE(ha)) + return QLA_SUCCESS; + ql_log(ql_log_info, vha, 0xd021, "EXLOGIN count: %d.\n", ql2xexlogins); max_cnt = 0; rval = qla_get_exlogin_status(vha, &size, &max_cnt); @@ -3992,21 +3999,27 @@ qla2x00_set_exlogins_buffer(scsi_qla_host_t *vha) } temp = (ql2xexlogins > max_cnt) ? max_cnt : ql2xexlogins; - ha->exlogin_size = (size * temp); - ql_log(ql_log_info, vha, 0xd024, - "EXLOGIN: max_logins=%d, portdb=0x%x, total=%d.\n", - max_cnt, size, temp); - - ql_log(ql_log_info, vha, 0xd025, "EXLOGIN: requested size=0x%x\n", - ha->exlogin_size); - - /* Get consistent memory for extended logins */ - ha->exlogin_buf = dma_alloc_coherent(&ha->pdev->dev, - ha->exlogin_size, &ha->exlogin_buf_dma, GFP_KERNEL); - if (!ha->exlogin_buf) { - ql_log_pci(ql_log_fatal, ha->pdev, 0xd02a, + temp *= size; + + if (temp != ha->exlogin_size) { + qla2x00_free_exlogin_buffer(ha); + ha->exlogin_size = temp; + + ql_log(ql_log_info, vha, 0xd024, + "EXLOGIN: max_logins=%d, portdb=0x%x, total=%d.\n", + max_cnt, size, temp); + + ql_log(ql_log_info, vha, 0xd025, + "EXLOGIN: requested size=0x%x\n", ha->exlogin_size); + + /* Get consistent memory for extended logins */ + ha->exlogin_buf = dma_alloc_coherent(&ha->pdev->dev, + ha->exlogin_size, &ha->exlogin_buf_dma, GFP_KERNEL); + if (!ha->exlogin_buf) { + ql_log_pci(ql_log_fatal, ha->pdev, 0xd02a, "Failed to allocate memory for exlogin_buf_dma.\n"); - return -ENOMEM; + return -ENOMEM; + } } /* Now configure the dma buffer */ @@ -4037,15 +4050,49 @@ qla2x00_free_exlogin_buffer(struct qla_hw_data *ha) } } +static void +qla2x00_number_of_exch(scsi_qla_host_t *vha, u32 *ret_cnt, u16 max_cnt) +{ + u32 temp; + *ret_cnt = FW_DEF_EXCHANGES_CNT; + + if (qla_ini_mode_enabled(vha)) { + if (ql2xiniexchg > max_cnt) + ql2xiniexchg = max_cnt; + + if (ql2xiniexchg > FW_DEF_EXCHANGES_CNT) + *ret_cnt = ql2xiniexchg; + } else if (qla_tgt_mode_enabled(vha)) { + if (ql2xtgtexchg > max_cnt) + ql2xtgtexchg = max_cnt; + + if (ql2xtgtexchg > FW_DEF_EXCHANGES_CNT) + *ret_cnt = ql2xtgtexchg; + } else if (qla_dual_mode_enabled(vha)) { + temp = ql2xiniexchg + ql2xtgtexchg; + if (temp > max_cnt) { + ql2xiniexchg -= (temp - max_cnt)/2; + ql2xtgtexchg -= (((temp - max_cnt)/2) + 1); + temp = max_cnt; + } + + if (temp > FW_DEF_EXCHANGES_CNT) + *ret_cnt = temp; + } +} + int qla2x00_set_exchoffld_buffer(scsi_qla_host_t *vha) { int rval; - uint16_t size, max_cnt, temp; + u16 size, max_cnt; + u32 temp; struct qla_hw_data *ha = vha->hw; - /* Return if we don't need to alloacate any extended logins */ - if (!ql2xexchoffld) + if (!ha->flags.exchoffld_enabled) + return QLA_SUCCESS; + + if (!IS_EXCHG_OFFLD_CAPABLE(ha)) return QLA_SUCCESS; max_cnt = 0; @@ -4056,30 +4103,45 @@ qla2x00_set_exchoffld_buffer(scsi_qla_host_t *vha) return rval; } - temp = (ql2xexchoffld > max_cnt) ? max_cnt : ql2xexchoffld; - ha->exchoffld_size = (size * temp); - ql_log(ql_log_info, vha, 0xd016, - "Exchange offload: max_count=%d, buffers=0x%x, total=%d.\n", - max_cnt, size, temp); + qla2x00_number_of_exch(vha, &temp, max_cnt); + temp *= size; - ql_log(ql_log_info, vha, 0xd017, - "Exchange Buffers requested size = 0x%x\n", ha->exchoffld_size); - - /* Get consistent memory for extended logins */ - ha->exchoffld_buf = dma_alloc_coherent(&ha->pdev->dev, - ha->exchoffld_size, &ha->exchoffld_buf_dma, GFP_KERNEL); - if (!ha->exchoffld_buf) { - ql_log_pci(ql_log_fatal, ha->pdev, 0xd013, - "Failed to allocate memory for exchoffld_buf_dma.\n"); - return -ENOMEM; + if (temp != ha->exchoffld_size) { + qla2x00_free_exchoffld_buffer(ha); + ha->exchoffld_size = temp; + + ql_log(ql_log_info, vha, 0xd016, + "Exchange offload: max_count=%d, buffers=0x%x, total=%d.\n", + max_cnt, size, temp); + + ql_log(ql_log_info, vha, 0xd017, + "Exchange Buffers requested size = 0x%x\n", + ha->exchoffld_size); + + /* Get consistent memory for extended logins */ + ha->exchoffld_buf = dma_alloc_coherent(&ha->pdev->dev, + ha->exchoffld_size, &ha->exchoffld_buf_dma, GFP_KERNEL); + if (!ha->exchoffld_buf) { + ql_log_pci(ql_log_fatal, ha->pdev, 0xd013, + "Failed to allocate memory for exchoffld_buf_dma.\n"); + return -ENOMEM; + } } /* Now configure the dma buffer */ - rval = qla_set_exchoffld_mem_cfg(vha, ha->exchoffld_buf_dma); + rval = qla_set_exchoffld_mem_cfg(vha); if (rval) { ql_log(ql_log_fatal, vha, 0xd02e, "Setup exchange offload buffer ****FAILED****.\n"); qla2x00_free_exchoffld_buffer(ha); + } else { + /* re-adjust number of target exchange */ + struct init_cb_81xx *icb = (struct init_cb_81xx *)ha->init_cb; + + if (qla_ini_mode_enabled(vha)) + icb->exchange_count = 0; + else + icb->exchange_count = cpu_to_le16(ql2xtgtexchg); } return rval; diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 4fce4ff406d8..21e8993baf4b 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -59,13 +59,6 @@ MODULE_PARM_DESC(qlini_mode, "when ready " "\"enabled\" (default) - initiator mode will always stay enabled."); -static int ql_dm_tgt_ex_pct = 50; -module_param(ql_dm_tgt_ex_pct, int, S_IRUGO|S_IWUSR); -MODULE_PARM_DESC(ql_dm_tgt_ex_pct, - "For Dual Mode (qlini_mode=dual), this parameter determines " - "the percentage of exchanges/cmds FW will allocate resources " - "for Target mode."); - int ql2x_ini_mode = QLA2XXX_INI_MODE_EXCLUSIVE; static int temp_sam_status = SAM_STAT_BUSY; @@ -6437,8 +6430,9 @@ void qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv) { struct qla_hw_data *ha = vha->hw; - u32 tmp; - u16 t; + + if (!QLA_TGT_MODE_ENABLED()) + return; if (qla_tgt_mode_enabled(vha) || qla_dual_mode_enabled(vha)) { if (!ha->tgt.saved_set) { @@ -6453,24 +6447,10 @@ qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv) ha->tgt.saved_set = 1; } - if (qla_tgt_mode_enabled(vha)) { + if (qla_tgt_mode_enabled(vha)) nv->exchange_count = cpu_to_le16(0xFFFF); - } else { /* dual */ - if (ql_dm_tgt_ex_pct > 100) { - ql_dm_tgt_ex_pct = 50; - } else if (ql_dm_tgt_ex_pct == 100) { - /* leave some for FW */ - ql_dm_tgt_ex_pct = 95; - } - - tmp = ha->orig_fw_xcb_count * ql_dm_tgt_ex_pct; - tmp = tmp/100; - if (tmp > 0xffff) - tmp = 0xffff; - - t = tmp & 0xffff; - nv->exchange_count = cpu_to_le16(t); - } + else /* dual */ + nv->exchange_count = cpu_to_le16(ql2xtgtexchg); /* Enable target mode */ nv->firmware_options_1 |= cpu_to_le32(BIT_4); @@ -6555,8 +6535,6 @@ void qlt_81xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_81xx *nv) { struct qla_hw_data *ha = vha->hw; - u32 tmp; - u16 t; if (!QLA_TGT_MODE_ENABLED()) return; @@ -6574,23 +6552,10 @@ qlt_81xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_81xx *nv) ha->tgt.saved_set = 1; } - if (qla_tgt_mode_enabled(vha)) { + if (qla_tgt_mode_enabled(vha)) nv->exchange_count = cpu_to_le16(0xFFFF); - } else { /* dual */ - if (ql_dm_tgt_ex_pct > 100) { - ql_dm_tgt_ex_pct = 50; - } else if (ql_dm_tgt_ex_pct == 100) { - /* leave some for FW */ - ql_dm_tgt_ex_pct = 95; - } - - tmp = ha->orig_fw_xcb_count * ql_dm_tgt_ex_pct; - tmp = tmp/100; - if (tmp > 0xffff) - tmp = 0xffff; - t = tmp & 0xffff; - nv->exchange_count = cpu_to_le16(t); - } + else /* dual */ + nv->exchange_count = cpu_to_le16(ql2xtgtexchg); /* Enable target mode */ nv->firmware_options_1 |= cpu_to_le32(BIT_4);