From patchwork Wed Sep 20 05:39:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalderon, Michal" X-Patchwork-Id: 9960861 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 A90A5601D5 for ; Wed, 20 Sep 2017 05:40:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99D8E28F9C for ; Wed, 20 Sep 2017 05:40:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D48F28FA6; Wed, 20 Sep 2017 05:40:15 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 F1A9028F9C for ; Wed, 20 Sep 2017 05:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751468AbdITFkO (ORCPT ); Wed, 20 Sep 2017 01:40:14 -0400 Received: from mail-sn1nam02on0045.outbound.protection.outlook.com ([104.47.36.45]:4158 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750859AbdITFkN (ORCPT ); Wed, 20 Sep 2017 01:40:13 -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=JVXlj4lckDgFBtDAOg+/g3ZqJ58OtRx775VIAsrMF3c=; b=m2Mbm+iLYCr/lYsRJKkExgcTWdEQYyaZ1+wcnwxcLm8JDh/seCpKOlCFKCgDhDxqlbUP3n1xsHflz4Ns01vEPbk5AH/uYbnu3kiNB33kirXNmu8ZByHjUh+81b8Jr/o94+NCaunTrS3L51Ubx73c6XSGnGB6M+NqAbvCKFfYvz4= Received: from SN1PR0701CA0030.namprd07.prod.outlook.com (10.162.96.40) by CO2PR07MB489.namprd07.prod.outlook.com (10.141.197.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Wed, 20 Sep 2017 05:40:10 +0000 Received: from BN1AFFO11FD045.protection.gbl (2a01:111:f400:7c10::130) by SN1PR0701CA0030.outlook.office365.com (2a01:111:e400:5173::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.56.8 via Frontend Transport; Wed, 20 Sep 2017 05:40:09 +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 BN1AFFO11FD045.mail.protection.outlook.com (10.58.53.60) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 05:40:09 +0000 Received: from lb-tlvb-michal.il.qlogic.com.com (10.185.6.89) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Tue, 19 Sep 2017 22:40:02 -0700 From: Michal Kalderon To: , , CC: , Michal Kalderon , Ariel Elior Subject: [PATCH v1 rdma-next] RDMA/qedr: Fix rdma_type initialization Date: Wed, 20 Sep 2017 08:39:46 +0300 Message-ID: <1505885986-5873-1-git-send-email-Michal.Kalderon@cavium.com> X-Mailer: git-send-email 1.9.3 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)(346002)(376002)(2980300002)(428002)(199003)(189002)(478600001)(189998001)(101416001)(36756003)(72206003)(5003940100001)(50226002)(6666003)(105586002)(8676002)(106466001)(356003)(69596002)(50986999)(104016004)(107886003)(305945005)(48376002)(47776003)(4326008)(2906002)(81166006)(81156014)(8936002)(77096006)(2201001)(316002)(54906003)(16586007)(5660300001)(86362001)(50466002)(110136005); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR07MB489; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD045; 1:1uNwE5yNpil95e5f/k72xd2k9Pvt2JHjQQUK/kkQ0AoybQjPD1VRgon1F3R/TRsYarD2iYVRc64O9MfNfxC5m00faJNzLnAxoozD69UQ+Y4KanLQ93vxtsdyMW/rvuiu X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e30ea046-d0bd-4abc-fc25-08d4ffea0ea6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR07MB489; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB489; 3:kqeooDx9E6vN0OQup6faXSrMUZQfusxiJ2Er7cLDMcYp4BpnYzVl4Uy8m7SmiOeZY3cy6sHXXzIGFUwOaTbvMaPB/Q5r5vKcjBPbh30txj5um9GUkrbmdZ0z12ubO6UNJIJqVa/noy+QL4GyrPHtCNPXjc4DWudPB7j6UGQWrJdsA/sPkJbMgYbvTjCLQrKx180lNhhZ07kHNkMeV3jc5iSuT0YFryJv8O3A0dOXCSGWKrz7Xh/F3tojss+9rp6p7P0I+U9WfjaIIenzL7zn1XTdVe54d6nj01Htri+dHJHfCv81ccUoAwQv6BbSEn5rPuYOxs22mkss/txJF/D7Cg==; 25:QsmuDDQId4+rp0QXfwlfVUX1szGwGiNdT18kOO9vKP62qgTDKIDcSnGE6mhiT3KDt6e8YnWe0JynUpymBFZjtHXujn+xTjNbdeF/e/53b74AOUlZ8YYOpxv2s1+Qshv3rypVizTneN4BTVA6CJrsKqBL1yG584muJQ/aB54ItQJ805p05q/07u/UYyCAo+9Qmsh/t3+8clo/Nq6vd1ZzCm+JPpMPhR4nqlSMdh7JJYkbGZ7Yy4JFNCahe2ZxVFEbnN93EVWzYeWGOXueSqn567VXtUCm/BxfZwTolFNj5F9DXe/HW5hXBYnyViMf5+lvQaYUWsA1dxsChhxnGdsX3g==; 31:Lf/LWkgG1H5nC9uB1DAa///V5VuqOCASoiq8Jr8NdNmNWhSVYHB2E8jque7tve/1Y3gotZNzUhJx5G5KjMHdb2nM+lRs4SDzoSBD5LoOTJBa/3hBB/R8FwLcnUZioDiwS22uHVtQbwh66kQT+iXjWxUumiRgmI+vGK6axNvxub26qjlssN1gVie2j3Z1d1nPxYBh3G+93Yhd8kh8aOWIvHSg3kYgHW+Vj7FYW22q4YI= X-MS-TrafficTypeDiagnostic: CO2PR07MB489: X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB489; 20:DaH/1T/Cb/U0UJLV1Ad9ZJhiI4ErMcdU4wfg5CtPuOErnnTdVUE1Q5P1r8P2qfhknxhwHfh8mTjDgkXBUtuM2qEhmPST4teeOysAuoy4layQKoqH47McJCKYzjmPd1Do5hqhJ+04UuetSVwrohiUbknw8QnCZDdNEMlmvqpdDGKwD8Y/RQE61Jop0haC+Qt57s2SShqIpG8h9qfsuXZka4qmTlhsox+rCFL2Jr1lAynKWYIPE5t/n6CsCm5mnWdisBeULl5CcQtvRVvO4wYQ6yaWYgt1t0oexEOUJZ0zWchxaif9eqZSvQdqyb3FgT+JEo3+JC62gAaZz2Hwcqf6ata91SzCXUy0LBlok/ffBQVmq/Zwba/iMYtTfCZQZH0Rtvgp+FTYl5ubVhI270l/I8O81TCFVyZ3X6cBxGLZHopmHKpczAKkaMGpoVW4IxHKf04ni316EEcTyE20UJmw8k3Kf9ZgrihFwxwzMkiZ3+rWLnJITQPoDZkvI4mejPTa; 4:Shs4kHLCzFlCUpTatB8ve37LW0uyXEf2Kwf/KyE6sHgvEuknfCWZK89WXdsHZZh5fA7nSyIgJN4mlKfiZiBRDZ2A5z59mizxXESwnpSsbrKgT0VQ7JiV0Ev7QXOnkQ5oW3PtT99Og93wywiMaJYwF7BHE4AKTSm6SkB15QcruzWFZHuE98zkjAKK9tyXJT6sNXnrJbBygOYT6H+DjF3FmVyihDRIs/zS+J2AIMPCU2ig5QyPS0OWxABsvBB7yGDy X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123560025)(20161123564025)(20161123558100)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR07MB489; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR07MB489; X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR07MB489; 23:f08tlEVycHTP+ajEOIq4rIV3YCYfX96j6Jba4QjPEK?= =?us-ascii?Q?do6Ag4HqWBGdbFUgiUKRTVZgVdRqPBp2YEyi3tcvjrYeiLWiq4kto73zJlNu?= =?us-ascii?Q?md1Np0b/Fpokc5Ml7A1d/Q8bMWQHHNrniMLT4eC6qXsk8WSBCwZcU4MNZ8RE?= =?us-ascii?Q?E/IrLVBxdjz8U2Txfss8ZPSnWYJQyMHQ+2wdYu5nCIzfenUV8f3iYtyh7Ozo?= =?us-ascii?Q?jMYClhXKo4qcbOuDqfiL9mSFa94O+tv90ip8H3xECTKQ5rAK9fHyosb2o5/Q?= =?us-ascii?Q?ooDcrWcsvckYebS2Cy1xxuYk1meWSci1l5TyNU6p0w4s+dFkHpmkCsP3W+4u?= =?us-ascii?Q?u5s2goP8xdFAExVViw/sPQGhow1IRR0atVVUPofrKTVov6+/rXbYPYo64B+z?= =?us-ascii?Q?+8xrg8YlGkyEbSS+xnGkAjgn5UsOydVuCvSXPKrxfGRLintLB+7qYDJNXCIz?= =?us-ascii?Q?8qYnuwMSiAYA8bUcC98yYAbXvNuD+yhFDmCgfCnrIwlZwQOvKb/EGuxk2Xqf?= =?us-ascii?Q?NbnhNZczJy3cygdklgoeVwoHREShlGXXpUJs4l+PdWtBiFjkv+WoDirMXloO?= =?us-ascii?Q?RYnLw1q9Da5TW59R6whEMzsaB3XYqShfoA82Gv5OrefH0MB88thlZFNO/NU3?= =?us-ascii?Q?h17FAQAoQQV+EX+0WxVptRxJEYBTH8ZyrbV1R7SSBIP8MOaSvDMrQPVuBW6s?= =?us-ascii?Q?MRsgrz81vcD2Q3c28AbOCmXIG42J/caf0WGutS+5e+65NDVcKmjl1yFY7BOR?= =?us-ascii?Q?30W3rikB0cQSYpssW6m2Pg5cFHSE+ay7NbEJ1ONjY0UvS+yllEuHvhs0wLkY?= =?us-ascii?Q?aNhL0rUR28tjOJTX7Xp1D/eURic/wOoURlIgYfjXtVEdIikH8RZSod2wWeVE?= =?us-ascii?Q?mz9tKRX2m+W724EQN64o8UPXlWuq6iiMtFtmJmCNPL7NE0T8zjJ/cIQQ+xqG?= =?us-ascii?Q?0RvDKvCYQhyX3QTI+jzLHXCq6Wi/Key9ergBc0EA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB489; 6:t28sg2mAlKFtAn6Yb0UyRZWxbSC3ilZQ+X077iYuI72I+gss5BZ3JFY/TaLX/tWqFViiTepdEB/hFZRCTDhgvyPIvqzqGhuWj34KfPx1dEgFq0vVRtXQpzwyzgLtjqlloc3hsIvI5tgZqSXRT67x4Qh8bj1ALUQrbdWGnPgcGAtPfVDjGLx/CSNV6b6Do7JFZvDvzOoewHZ3cn4AUlriQtOi5d1vDJkiTznYGHp0DYMlYf7g6AgDgD+xSVM6u/AYUbj2CW4/IbcvOxBvbZn/Moc40Xp2RdrDP9PRm9drAfGivk5Qv9/YmDfVNTmBgur4gMsDhgCSAkZvjxmR2q/Mfg==; 5:B4KS7ZgE0VeJlWNN7E6fZuuyLD+hf7/SESuBH+gM5itr7bjJFTNanRw3d5m/k7yI9sQBjgIciDEvsIchvnKd08tB5FijcDe3WfpgLs1GVVw/UZZHpL5GvF62Kbp238GQqfLtP5oh/Kcd84LJEehjoSDiFC0GNmXGAd/mRARSTmA=; 24:DbOjvV4eJRc4p6lLvh2YIt6ppi6ZE+n8SpeDlCqV4qUqaILenlNvwcvK+nLl2nS6c3f8NKWf5mLDnxzQCUyf0DhElydiQMgyJSsLR/XuC0E=; 7:/K6DgVbi1g2nUWUlzFDOxGDyJ2BMmz3bEj/ZgT5MExZYg77XuXbQNjDJSR+hN75IQ/DkqmYYfHRaWb7BeewewxnYDTaid4+oXQ6pxXSYXqStjFGAcHPQ8qZkKIPZdmuRQYjrBVTUCypzLH0ymBrW8n5/QG65YrZFL23LJu4h/EvwJJGF8q24/DC0z4syDaX3fAU+afFdnkn60/ATgNcfW7Tm5xUkoJivjJUE2HLgMFs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 05:40:09.5905 (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: CO2PR07MB489 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Initialize the rdma_type (iWARP or RoCE) which is set according to device configuration in qed. Fixes: e6a38c54faf ("RDMA/qedr: Add support for registering an iWARP device") Signed-off-by: Michal Kalderon Signed-off-by: Ariel Elior --- This patch applies cleanly on k.o/for-next-merged Changes from V0: - Added Fixes in commit comment. --- drivers/infiniband/hw/qedr/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c index ca93171..1afc267 100644 --- a/drivers/infiniband/hw/qedr/main.c +++ b/drivers/infiniband/hw/qedr/main.c @@ -870,6 +870,7 @@ static struct qedr_dev *qedr_add(struct qed_dev *cdev, struct pci_dev *pdev, goto init_err; dev->user_dpm_enabled = dev_info.user_dpm_enabled; + dev->rdma_type = dev_info.rdma_type; dev->num_hwfns = dev_info.common.num_hwfns; dev->rdma_ctx = dev->ops->rdma_get_rdma_ctx(cdev);