From patchwork Fri Dec 21 17:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himanshu Madhani X-Patchwork-Id: 10740769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02C5C924 for ; Fri, 21 Dec 2018 17:35:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A12285C6 for ; Fri, 21 Dec 2018 17:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF26C285D2; Fri, 21 Dec 2018 17:34:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 658F2285C6 for ; Fri, 21 Dec 2018 17:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387438AbeLURe7 (ORCPT ); Fri, 21 Dec 2018 12:34:59 -0500 Received: from mail-eopbgr730058.outbound.protection.outlook.com ([40.107.73.58]:1118 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730364AbeLURe6 (ORCPT ); Fri, 21 Dec 2018 12:34:58 -0500 Received: from DM5PR07CA0081.namprd07.prod.outlook.com (2603:10b6:4:ad::46) by DM6PR07MB4761.namprd07.prod.outlook.com (2603:10b6:5:a1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1446.17; Fri, 21 Dec 2018 17:34:54 +0000 Received: from DM3NAM05FT049.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::205) by DM5PR07CA0081.outlook.office365.com (2603:10b6:4:ad::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1446.21 via Frontend Transport; Fri, 21 Dec 2018 17:34:54 +0000 Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by DM3NAM05FT049.mail.protection.outlook.com (10.152.98.163) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1471.7 via Frontend Transport; Fri, 21 Dec 2018 17:34:53 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Fri, 21 Dec 2018 09:33:49 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id wBLHXm9p015645; Fri, 21 Dec 2018 09:33:48 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id wBLHXmMi015644; Fri, 21 Dec 2018 09:33:48 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 1/2] qla2xxx: Add protection mask module parameters Date: Fri, 21 Dec 2018 09:33:44 -0800 Message-ID: <20181221173345.15606-2-hmadhani@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20181221173345.15606-1-hmadhani@marvell.com> References: <20181221173345.15606-1-hmadhani@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131898872941892253;(abac79dc-c90b-41ba-8033-08d666125e47);(abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38;IPV:CAL;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(39860400002)(376002)(136003)(396003)(346002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(336012)(97736004)(80596001)(575784001)(1076003)(2616005)(476003)(6346003)(5660300001)(126002)(86362001)(51416003)(54906003)(50226002)(8936002)(14444005)(42186006)(16586007)(316002)(36906005)(47776003)(110136005)(6666004)(356004)(305945005)(8676002)(81156014)(81166006)(498600001)(68736007)(4326008)(2906002)(48376002)(50466002)(446003)(11346002)(76176011)(486006)(106466001)(105606002)(26826003)(87636003)(36756003)(69596002)(53936002)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR07MB4761;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Fail;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;DM3NAM05FT049;1:4XgdAXPTAKfX8NOrVz0w5CaMZYPjR81JJdc4zv616Rk6ojhsNCP5JqU3fm3gDIkDTs+HToACqy/AigmzVsfrQoJ/tpYu36tIOyPnl6MvGczZ+LxRGZTCgOgvrWA3fVzS X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 400dc640-97de-4bab-0de0-08d6676a9e6c X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(5600074)(711020)(2017052603328);SRVR:DM6PR07MB4761; X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4761;3:qgwgYFNAmdzOSh6hkzT6GRdpwm3m1aqAgffhwDdcimhj2xVBgIq29V7mKf5TTjNeBg+hPdmbGMnAZR00RE1cf/YSjVeZUI8rwQSDnVn4CTVqnLZutRtxjGVdEEyIy3BhB8w5W8wXXjrxOSKwbNht2K2aLTdiCaQIdhgI+4cByKeVqpkxEoOv/lJflObvKIROsvqYGR1p4WQKQNP0yalHqFXVoZj2Pr1vO5OWWMggJql/zA8Oe3LSCn5SiXJymKrdnLKU1aWBqF7UYy2lHe49bqwhQMxOWmIMEHplKHw1bXkI8LByIX2RMZkbFtqljOWn8rMGEcquql+ion55UIXZ+knUICbi5vWm721E5PA4U3Y=;25:L/3KeggmQRkIk1gSjmR27kir8n/is2RYH+S78+xrVoypBomzW2Hkj4exJzXgvp0jPVqHqsq9hmT/uZF+78hX2ZYPzlraUkrmqcji4LDaIGsH0TLSPNj1T1VkeeDZdBA2Zz37YPY6hO1YmI5HVjBjVDwr2LFQtcjuHqehkE04uwWXX1ZAEo/5B6eyWUsPEcSnyXSxMmcrxR/moWT4Y3bFvGVzDE+/rw+6LFoioDF7Hq3p6NQ/zeTHwdhSuv0JM2kjmDkV4VfxBGwhTg5K0SwNeExKng4hQoyKFuHYsFjZZcKax2hI2MuKIBNKztwXUk2sHesQum3OKPOadJ/l5ENbeg== X-MS-TrafficTypeDiagnostic: DM6PR07MB4761: X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4761;31:0sSy2VxipyZDu4qWEkmRNA5G7SquoBHmj9hZJWAZ2AlubHrONymiaTt6XKshlg3qlqPnjnzG2XA9ip2BVW6UIvlSeyH64ZTGFw7xB9CwQ1SXrby28+nA5delrlJxgLYr59onK4G+Y3V22vE3oYDPdOGztzZKe4qvUvcBRkevt2FKV6Hrj7h6SXWzI/xzDV/nlecASZGJNWAH5pTarD6kfcnfVZHzZC6+eIIT5GhoHY8=;4:CP+tIq5W4m9Rrgpn4daLB0N5gCRfmAgJ8QEDx2IL3VgLYBcOj0qh/2m7lyALxHm6jEsWJOK0w3OI6JhnmEjE9G1P/sT+q2F5xyBMRHlbPlbNICT4jg9xSGeGm4qkU/DYXlD588Je+xKBPLSAapdGSRGN+TCxFxmMtHvEoT5DwiRbV4go8mQJJqKmWW+k4mh2T7CpkDkMXkN+zOBl+JsFQOE6l0+GqKZowYTTxuherzoy53m4IywOC8FG8BVHl2KSBnNjcm4z7sYGi9yN9vzfig== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(3230021)(999002)(5005026)(6095135)(8220043)(2401047)(8121501046)(93006095)(93001095)(3231475)(944501520)(52105112)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123563025)(20161123556025)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123565025)(201708071742011)(7699051)(76991095);SRVR:DM6PR07MB4761;BCL:0;PCL:0;RULEID:(400006);SRVR:DM6PR07MB4761; X-Forefront-PRVS: 0893636978 X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4761;23:TsEmc+cfCkUnwPX3zApEO9v1Xec6WYGPQwf5P3gV90HDlfk6GpHyXBuCs76f9QFIay6eC8QGpgLT+1lrRBATJ44ScM6jiTrLLquUGl9lPi9Fy9IBDrpgyF6fKFnHypcGt9l+LIZZBUFh0eA8o1ga3JBOpH3C8W0r5LKsQvGYLU7vyVCF6N4kGhIfFGW715ThhisgIdC1UkNyRAEAr46fjUXIcg2n7QGOK5nReMc6nybWU5MN02WOz4+HhTTWFpU9nw6eN2mZqTVZeNi/Evd/10KpZagI/ZHUtA80JYq3QtE6ktHld4tBgYAV4Kwy/TLTvVl8E0N8JNIRkSS4MVTpYrYJti4Abpxd1m7dpcbIVnUihR2jQMUwnBCy+SPq242nHM4/F6a5XgfTL6rIZX80kwB293p2kcs7nRNP2lXdlst5XcBx8mhMbEkoxRDcjAi5Ilqlyulz9J+JNyBnggQZJOXzg5M4io3Wo1AvinFZ6HRpbSF3hZ0yoTLpCUcAZDcCQJivu7+JpWrNYPZLHhCpHn7AF5aW7e8pF+A63hUx7GGFDSZc3ODY8L+Yl9xUP7zb9sMJOwT2NRbbATKE2Ogdw4PxQUHk287eRZkj5xSEejOOo7ctNqvXxp8hWs4DX0PeD4vf3kejzut5eLmSWuyMyfLKi64Wq70ZFRwSvjUb6Y49UmSgN6iFcRuDqU7bDFfZWtb8oCGikhgG7xxzjM+az4C1ckkJrBlsF/n8WcGOUUbYIIlZEsK9XQjiERJiYku4CibaX0c+pMoIAnx3hllwcKz1TJYD1S891Io61jr/+Nxm/Tzd2Nt8UqAc3S8xrbqTA07/tlZSHo5/JxFtE/apW6tsZqdrQHmCkQGDmlOvybqsS0kMbtmqapC4RUaAmTTSkzwqTMkwyxI93GiZ9GGFjiSVHZI6g/ViJ2zWrhpFTjdabacVWhBZXpuJ8jENp8opxFgtlvuHDRbjM/H6yvO/9PlB8ZQAfw4s9COKILZsOgk3qvt0MR5VXaNoqch0LaGP3DgYjlyE2reRbLJEos6XygROTX2MKhT5FGq9V2us871sqiJ8xLo5u7CR/THiYr48mbyaRg0n8Blr8tdG/w2jIILI4T7welywiFtfPsx9+edsfZz96kpgz/hMFxloupepzqKL248o25X1rK8Tr6eaYSpjCY3ONyD0UcLZf5EcFxCyXziJ8SU+sBLF5oIBQnKX6GDgh1/5VsTpBhAIcF+S8U0+caOxINGtkyoh72cHgfIQZkS27niM6qF9p/AcQ6rN X-Microsoft-Antispam-Message-Info: mlsrHVBgVPd1qITdz4lCyfXGNXrtdvn/VJmsxBtj+EJkrjgOF2I9Z3UfpdABRHYQ2Dgb98LsGsZ1YlJ7AtFBtLgplHEooTMAF54d4c/+Hu4QgPYqxtl0mcHRwqviiVUZ/iR7w/XpFWMv0whD2H5FejY3SnYi4s53wZaZaVNj8KgkYujzhgq0DwfUseUVaHpruxlhmzsnHk+6kcmh8QuuNCa0jZqb86vhUaezFuA1OoYwhPJRa9REjKjX7hm57oXCsp/zphto1qi6ud0+aykGemn3Nc2NymDChunriElzyHeAtshmQWsC5xzDy7lvLxlJ X-Microsoft-Exchange-Diagnostics: 1;DM6PR07MB4761;6:2cdgaSVdGn68WcU8EmFn8EahG2COSWdCXwCH0sEoVIdmElTTzroqupHaOLtvAN7rOjdcoldqUhugffOAdVHffxxAzZacXmoPcZT5gT8dVPzWrggEh5eBUp05fJ2kjJ6/Pb1jymEU8xynQdQhg+eVHeWdQIh+gR20GirzBOZUDU1Bs2EfK8LwGlIowIATgpZEg30onpvU/WmbH0scgGaDCaYSCqd8wpEnlCvPFyeYEsvvmNgzQVrBMYg9iMlWdhup5laoqiGbRgzJqOXmR6E3kByczmq0nM3ACNRO81v+xAvA2R610Pb72ZV5soiqC7ETCtJQjhqYDN5LpgXw6dGkN5EQxdQa89i774Pa/TMFz4lwmUdy3r7ztJiCgjarywqh8madC1cJstvyiu+7cwhWBBVAHhk0blMnkxMYF9quDb7OAj6QWFCwTCIo/AlSOHMpQZeNNUN2+fOdCBdXQc8/BQ==;5:kuylkKDFmEIvnQ98mxFAAh9xhIhD9qcTxFA8L0ka+0n+Xn2ESkD8G29sxMEo0PK3IiHrXPuDFL8nmIB5FW39AZ5CT2gYSIPVgu6FaDwa6TQW5yrMt+jsQ3RilakmSeE6ljnf8MlgqpigLzH3zW4M/bZLv85vDFtihLjA/l0aba4=;7:thbHqsX33Y+v4B8Q8yG2pUCZ+vVtZa2uGYQu6YnThQr9bBeY+S2gvFQ9Agic/6PM8Lkx05Cx/iJr3mtFpZ8GCgytn0GA3bitASKYomYRipUkOz2ZhQZMPD6RBsvEdIAzC52vZKqDgC91X1/oaGP+Zg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2018 17:34:53.8298 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 400dc640-97de-4bab-0de0-08d6676a9e6c X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[199.233.58.38];Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB4761 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: "Martin K. Petersen" Allow user to selectively enable/disable DIF/DIX protection capabilities mask. Signed-off-by: Martin K. Petersen Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index f0ffb0e5c113..deb923058d08 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -285,6 +285,20 @@ MODULE_PARM_DESC(qla2xuseresexchforels, "Reserve 1/2 of emergency exchanges for ELS.\n" " 0 (default): disabled"); +int ql2xprotmask; +module_param(ql2xprotmask, int, 0644); +MODULE_PARM_DESC(ql2xprotmask, + "Override DIF/DIX protection capabilities mask\n" + "Default is 0 which sets protection mask based on capabilities " + "reported by HBA firmware.\n"); + +int ql2xprotguard; +module_param(ql2xprotguard, int, 0644); +MODULE_PARM_DESC(ql2xprotguard, "Override choice of DIX checksum\n" + " 0 -- Let HBA firmware decide\n" + " 1 -- Force T10 CRC\n" + " 2 -- Force IP checksum\n"); + /* * SCSI host template entry points */ @@ -3355,13 +3369,16 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) "Registering for DIF/DIX type 1 and 3 protection.\n"); if (ql2xenabledif == 1) prot = SHOST_DIX_TYPE0_PROTECTION; - scsi_host_set_prot(host, - prot | SHOST_DIF_TYPE1_PROTECTION - | SHOST_DIF_TYPE2_PROTECTION - | SHOST_DIF_TYPE3_PROTECTION - | SHOST_DIX_TYPE1_PROTECTION - | SHOST_DIX_TYPE2_PROTECTION - | SHOST_DIX_TYPE3_PROTECTION); + if (ql2xprotmask) + scsi_host_set_prot(host, ql2xprotmask); + else + scsi_host_set_prot(host, + prot | SHOST_DIF_TYPE1_PROTECTION + | SHOST_DIF_TYPE2_PROTECTION + | SHOST_DIF_TYPE3_PROTECTION + | SHOST_DIX_TYPE1_PROTECTION + | SHOST_DIX_TYPE2_PROTECTION + | SHOST_DIX_TYPE3_PROTECTION); guard = SHOST_DIX_GUARD_CRC; @@ -3369,7 +3386,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) (ql2xenabledif > 1 || IS_PI_DIFB_DIX0_CAPABLE(ha))) guard |= SHOST_DIX_GUARD_IP; - scsi_host_set_guard(host, guard); + if (ql2xprotguard) + scsi_host_set_guard(host, ql2xprotguard); + else + scsi_host_set_guard(host, guard); } else base_vha->flags.difdix_supported = 0; }