Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815713/?format=api
{ "id": 815713, "url": "http://patchwork.ozlabs.org/api/patches/815713/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1505841979-26365-2-git-send-email-Michal.Kalderon@cavium.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1505841979-26365-2-git-send-email-Michal.Kalderon@cavium.com>", "list_archive_url": null, "date": "2017-09-19T17:26:16", "name": "[net-next,1/4] qed: Add iWARP enablement support", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "5644b5605b1f0945a4cad02787a8a20fa7a9f59a", "submitter": { "id": 69904, "url": "http://patchwork.ozlabs.org/api/people/69904/?format=api", "name": "Michal Kalderon", "email": "Michal.Kalderon@cavium.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/1505841979-26365-2-git-send-email-Michal.Kalderon@cavium.com/mbox/", "series": [ { "id": 3932, "url": "http://patchwork.ozlabs.org/api/series/3932/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=3932", "date": "2017-09-19T17:26:15", "name": "qed: iWARP fixes and enhancements", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/3932/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815713/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815713/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com\n\theader.i=@CAVIUMNETWORKS.onmicrosoft.com header.b=\"kocWpFEv\"; \n\tdkim-atps=neutral", "spf=none (sender IP is 50.232.66.26)\n\tsmtp.mailfrom=cavium.com; vger.kernel.org;\n\tdkim=none (message not signed)\n\theader.d=none; vger.kernel.org;\n\tdmarc=none action=none header.from=cavium.com; " ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxVDz46mBz9rvt\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 20 Sep 2017 03:27:31 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751374AbdISR10 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tTue, 19 Sep 2017 13:27:26 -0400", "from mail-by2nam01on0086.outbound.protection.outlook.com\n\t([104.47.34.86]:34250\n\t\"EHLO NAM01-BY2-obe.outbound.protection.outlook.com\"\n\trhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n\tid S1751284AbdISR1X (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tTue, 19 Sep 2017 13:27:23 -0400", "from CY1PR07CA0035.namprd07.prod.outlook.com (10.166.202.45) by\n\tBLUPR07MB482.namprd07.prod.outlook.com (10.141.203.14) with Microsoft\n\tSMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id\n\t15.20.77.7; Tue, 19 Sep 2017 17:27:20 +0000", "from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::168) by\n\tCY1PR07CA0035.outlook.office365.com (2a01:111:e400:c60a::45) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via\n\tFrontend Transport; Tue, 19 Sep 2017 17:27:20 +0000", "from CAEXCH02.caveonetworks.com (50.232.66.26) by\n\tBL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) with\n\tMicrosoft SMTP Server (version=TLS1_0,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384)\n\tid 15.20.35.14 via Frontend Transport; Tue, 19 Sep 2017 17:27:19 +0000", "from lb-tlvb-michal.il.qlogic.com.com (10.185.6.89) by\n\tCAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id\n\t14.2.347.0; Tue, 19 Sep 2017 10:27:17 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=WUTXMx1N7UXUYSCVhVYz11OaeC86aEmOd5To36UcV7Q=;\n\tb=kocWpFEvhqyeju0MAXX65aCKTQTwd01oXMmFd95IYC+aX5IIh6myAeRgdRkjVvJBz9Tf1ND72FLfkSSWcFwiF+CaxkMih0GUN3iv8NzHqpmUfnKENa+/SFau33C4YWqJnsKmeh4YzjsnHKuMCMvyphsZKOq4SexaGwos76fYiD4=", "Received-SPF": "None (protection.outlook.com: cavium.com does not designate\n\tpermitted sender hosts)", "From": "Michal Kalderon <Michal.Kalderon@cavium.com>", "To": "<davem@davemloft.net>, <netdev@vger.kernel.org>", "CC": "<linux-rdma@vger.kernel.org>, <dledford@redhat.com>,\n\tMichal Kalderon <Michal.Kalderon@cavium.com>,\n\tAriel Elior <Ariel.Elior@cavium.com>", "Subject": "[PATCH net-next 1/4] qed: Add iWARP enablement support", "Date": "Tue, 19 Sep 2017 20:26:16 +0300", "Message-ID": "<1505841979-26365-2-git-send-email-Michal.Kalderon@cavium.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1505841979-26365-1-git-send-email-Michal.Kalderon@cavium.com>", "References": "<1505841979-26365-1-git-send-email-Michal.Kalderon@cavium.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-EOPAttributedMessage": "0", "X-Forefront-Antispam-Report": "CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI;\n\tSFV:NSPM;\n\tSFS:(10009020)(6009001)(346002)(376002)(2980300002)(428002)(189002)(199003)(50466002)(77096006)(76176999)(107886003)(305945005)(50986999)(101416001)(4326008)(105586002)(69596002)(48376002)(81156014)(8676002)(2906002)(47776003)(104016004)(5003940100001)(81166006)(356003)(50226002)(106466001)(8936002)(5660300001)(478600001)(72206003)(316002)(189998001)(36756003)(575784001)(86362001)(16586007)(110136005)(54906002)(2950100002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR07MB482;\n\tH:CAEXCH02.caveonetworks.com; FPR:; SPF:None;\n\tPTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1;\n\tLANG:en; ", "X-Microsoft-Exchange-Diagnostics": [ "1; BL2FFO11FD056;\n\t1:B1oefVo1aEkCuH5czAnLhoSCwYxjOALpWzie/7Dt2yDvOvBu5MJ7+oMi4ERujkxxHuZukHUfcpy8e1uHSFfCAwPsZde/BRmxFDhr65iUvUjlR5g7x2b72SbyRnku+GOm", "1; BLUPR07MB482;\n\t3:8xN1WOgv4gBreepeQlu5UxSsLTTqPT+2p6tcoH8c1+/lPhMrnpVlCVVxqqlWnXIJoMfETW33/XzZ/GamQIfOGph7BBKAKRnaq/SUszB+hHNmW3M8dFvmuzfbFlO/MDttd48cD8f5d6/YNjDcZocBv15R6i3Pn/srB5oQmhc7guc2qWVWSP8McB9bocs0GiR3kPcOtH52ck5mEG6UZGgctPuS5Yyy6/IvFFawKSiTUss+oBIkx1NTiSzySiY0wW/A9TT+IGkqMpsdP8G+V7yp7/uYMGjhNyGOOz2Jz6IjVwj04RWKlGs4fucKs+V/kJWBeK9RE5G2jyMTlu577Ay4DpvjwwlGCuqKEs/rl51Fplk=;\n\t25:IxV0aOL+FMgiJq/HMoZwyTVOOiFm0u/Mcw65qOYY6RI09xMi6SOl0h8UfTN8gldR7l2nWU7oeCclKj8k/IJcXROlP9abZ2pjIllu10/0/Uj4Hj32ILPKgRxahIgGFGsp16OWZ8HSKr6P1DjPvq8FwRGbasJmOTlSSC5S4/U1HCbIWyxO5XNKvISf6+Dwfia2HOtaoVOKOU3AGtHKsvZwqJ7v4WU/haCgzRt0w3iZ7GCLVM06pwmMxM2tXJxVMlhCrOQrsw7Y1m/ScmYcNk3Q5yYczGJN7wie2l5qRUnd0kDY58izM5DJr/NQAnHt2Tk4xSntwUrVEgsepXMMR1WZbA==", "1; BLUPR07MB482;\n\t31:UC8kK9xYQYMr+5JkUY/He8tBXZHlq3lnK7XXtGaJuNDPP/MYnpjD9JT4K+xhYx7Vssmw6Atj/Rroj3+RnAISgbfh3E59dPyPvPaBnHRTobv/qVvjefgMG19m4esrznEk7sNtiyA95BK6ftfZFLQ8RsbkvUcN0NfQb8386sfFuWPmi2OscSfU+HSSUVnsn4roBirecz30Wo2hpiXPxP1DNdtmo7WZiSpOiT7Gz9oCQOg=;\n\t20:/jr4ytfRWJ5gPpZaFybMgep7/hiaGZqBNJYrOD/f/rSLPb4pjVVI3WfkL0ybZEzclX/pCzlgw92KwY+98sCz5IA+jifMU69xOkuTyPr8rW02EXjwUMLDlT3/A7ixe+t1IgD/OcDDNxJI3xdfQ7AQ/TOND4494FHDBwT3x1bTh12KGecvOmB47bfnQncEYyew8w4i5sMuJhgsiqkD+1cbAMJcpDD3HKrQXjMFsU6FPqqrIsM2X/E7eSFNIl/5pSqN7u/P+gqth1fmPpypFmiZC1zZHLRftf/hsFQ9OoNF3dbdUniRNrqlcDIz/QkY4atcf58aS5HbQMCH8xmDWh9ShTnsxrc5QO9p6PlfKDGkEUICtdz+Ccb7XxVUtSjDQzlhgkjPlKX+DUS+qwRThiQUkyU3bNZyMfyHO9hMMo+YWK1VW1ESEGG7EalrzWRj3VIU8JS1UdkdNDo3VOV0DRR/ofdr4rotSkw0nOrdgmpWZG0xGEFVmxp9eiYAzAA4fj+i", "1; BLUPR07MB482;\n\t4:kwvx7V6Op7ClU2+U0RADqAt1tGBZrWhfvClzTQqBUIixFja1rXprtzDNieOjTqqqaT39kWJhgLAzQZaAYzxheJvFR4va3QyPTGOJXCZ4Omi7sujaiu7EqlHHPa17l+HcnMkMkqxGyLUs1KUnHsQ81p69nUGWEikBKswW8Seic0088BdZp9Pw2n+r3P9gHFoCwQskFC8fNaJPuXTncBe++AJONobPpjyPoqFkmaKXGPCQBzchtss7cq1VTW4/UHWA", "1; BLUPR07MB482;\n\t23:tknvdhWkmht0iGLPXAnu7hP+HxGg3Gtiaycgpu8jXAK/tvBO8J1l5I+tIHf0ZL+G7G6s2EesL42gGkTco7is39MjErhdrwjWG5aoIfxI2k9EHPcNQaqJQ/BmwNaQLVIeUHJ81j/s4XQVAYiYP6Z+uRLtya2CZcH00gEcb5Eu+dBZ1J6sGxZS5B2DT2thlX1RApoQEY/UouUOqELkxh+AoYh9hHiSl5uhu3FQaqTRTxnnmNx6MZE2G2Gl5+HSQzAJZPex7f54vbqEJSI2VzBhRVEdTm1mHygTw3Xo4kQNXWsf8uvCZXhNRfwS/s1t3yUUoUDdYXFC4ERaZu8ht4CWUPK/kMX4sjQYI48ZoHRDqZN0iuSSbxZLhYdvz/9RllDueneEcAsniW4zQoJxOO1zrMPQ/q+rcD30SKMUCV8j105aNKbJyeFkan9dfkjvAYJVjSmgdwHMWsty79BkBXWAJ1Tgr2o0vEbmn2o2vIyVgXwp/QkftkT5sFfuYBs4DloB6HDmzAxRo5+Bv9/vXcX9bVPzZNleZNNhTy9Pe3nsXjPNMPrwhv2ENDJvzCX6Dr0xu5wBD2lEGPgvbYjqYH/yYEwJ0GDP4XvDRHA7C7KXIL0iKTZvhJpizQd3gnDea1yPFva7nCv2LhKHSQhEfXLWX0f+XGiE0+wP2qd2bwDTwTzaxt8cGr8glkrNJJmgGJxvpjQp2ZnVqySdk5MGAz4NKUm3cewgpe9D82S9GFjvCupXCkViEHWthDDcT3MfR149K4gpxDDihOlqYTfkwG327Zf6P1VgC42kcdIrut60KP6CnEEMhN79FW60SU2hl7BkiNVGfuedo4pJTQ1c4AdXr7SXUu/QSnbHtNpNj5sg1sRQ4A/n2cLeDKx63MdKKrKLbWIgBLvzpfD66o/VqhabYTBe3PMRfzQVEhli1Zp4L/7+ib7pym2TzSHZeZoIc9ikOuYdeBAARfA0QCDb5GYcXE4j2TiIeurOwF0bc33AT0Q=", "1; BLUPR07MB482;\n\t6:8SfrkxfuV4yTTgCD/AuK7Jl6JSOcnHUNEv1d9fBWc5kmXZeD33RIgxwaUQnHycIj1JRCNHLkXszEMLoN6aMu0YQBmSOlxWU45GTlYffOVqv0Dg7gDuhW1G6DxPh4uRkBe3OgvsfrUH8LjYLo9bS/2tl62qP6iM6RsbfF1yxvD2wQI7q7GerJLuJvQio00uOJ7reiglg+KvitDJY090rlxX+doPvZxVgrjr7Ty7CEYL9Cehl56LwdPcdpi9bK/4i9z+yBRCkkraLbGWCshD8WZnr7F7XD0t7wZMPoHrf5ti3Qj9iXX/Z1H8moJ3x89kqzmGrdNEb+nedUTI0JnmmJLA==;\n\t5:QH8ATI5c+X2r2whj+Y7epHzqzzB9GzU1jBVNjhUlvqT9XBm4oyPPzCz5uYixQhFM5EsDDfT82dd5hgDIv9srZ1OVKih8MHfrF43Yxm+ZjCZA4ursW4k9L3ccqJaOo/L0QPOkLbdzobsrLyTVvrytpw==;\n\t24:qtrCp7ZAVA8E9o7q/U7GhM7DnSjo4wucU1guVWrgGTxfZHD0qBTa5/DziQp9NT6nt5c8PqcRtRS4XSDs9i+wTYi/XUhpgVjtS62a4dU3mds=;\n\t7:crGIFaBU5AsMqblkKotRSWRdduM6pG3UfdMftvU16zuY8wfflR0zJDkZbsnYvc/fi4C6uLcMDPMJwXeNEClXrP/QoSC0wjwLqGbRnZQew0r75kEzUE9EAzssie6oLlQNVjxGUHbcd2uX0UxJCKRa75XEsxBZVyzWqY0CIDw4PKucjHzBjdDbphjJ6qLEUll225VAz2U3tr3mKQ25U1wIkieIthIfOAA1GKEvS1ovCEY=" ], "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "aa0759e0-9af2-482a-dabf-08d4ff83ae9c", "X-Microsoft-Antispam": "UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:BLUPR07MB482; ", "X-MS-TrafficTypeDiagnostic": "BLUPR07MB482:", "X-Exchange-Antispam-Report-Test": "UriScan:;", "X-Microsoft-Antispam-PRVS": "<BLUPR07MB48217CC2144A54BB2F5ED9588600@BLUPR07MB482.namprd07.prod.outlook.com>", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:BLUPR07MB482; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:BLUPR07MB482; ", "X-Forefront-PRVS": "04359FAD81", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "cavium.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Sep 2017 17:27:19.7808\n\t(UTC)", "X-MS-Exchange-CrossTenant-Id": "711e4ccf-2e9b-4bcf-a551-4094005b6194", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194;\n\tIp=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com]", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BLUPR07MB482", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "This patch is the last of the initial iWARP patch series. It\nadds the possiblity to actually detect iWARP from the device and enable\nit in the critical locations which basically make iWARP available.\n\nIt wasn't submitted until now as iWARP hadn't been accepted into\nthe rdma tree.\n\nSigned-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>\nSigned-off-by: Ariel Elior <Ariel.Elior@cavium.com>\n---\n drivers/net/ethernet/qlogic/qed/qed_cxt.c | 6 ++++++\n drivers/net/ethernet/qlogic/qed/qed_mcp.c | 10 +++++-----\n drivers/net/ethernet/qlogic/qed/qed_rdma.c | 5 ++++-\n drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 1 +\n 4 files changed, 16 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c\nindex af106be..afd07ad 100644\n--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c\n+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c\n@@ -2069,6 +2069,12 @@ static void qed_rdma_set_pf_params(struct qed_hwfn *p_hwfn,\n \n \tnum_srqs = min_t(u32, 32 * 1024, p_params->num_srqs);\n \n+\tif (p_hwfn->mcp_info->func_info.protocol == QED_PCI_ETH_RDMA) {\n+\t\tDP_NOTICE(p_hwfn,\n+\t\t\t \"Current day drivers don't support RoCE & iWARP simultaneously on the same PF. Default to RoCE-only\\n\");\n+\t\tp_hwfn->hw_info.personality = QED_PCI_ETH_ROCE;\n+\t}\n+\n \tswitch (p_hwfn->hw_info.personality) {\n \tcase QED_PCI_ETH_IWARP:\n \t\t/* Each QP requires one connection */\ndiff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c\nindex 376485d..8b99c7d 100644\n--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c\n+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c\n@@ -1691,12 +1691,12 @@ int qed_mcp_get_media_type(struct qed_dev *cdev, u32 *p_media_type)\n \tcase FW_MB_PARAM_GET_PF_RDMA_ROCE:\n \t\t*p_proto = QED_PCI_ETH_ROCE;\n \t\tbreak;\n-\tcase FW_MB_PARAM_GET_PF_RDMA_BOTH:\n-\t\tDP_NOTICE(p_hwfn,\n-\t\t\t \"Current day drivers don't support RoCE & iWARP. Default to RoCE-only\\n\");\n-\t\t*p_proto = QED_PCI_ETH_ROCE;\n-\t\tbreak;\n \tcase FW_MB_PARAM_GET_PF_RDMA_IWARP:\n+\t\t*p_proto = QED_PCI_ETH_IWARP;\n+\t\tbreak;\n+\tcase FW_MB_PARAM_GET_PF_RDMA_BOTH:\n+\t\t*p_proto = QED_PCI_ETH_RDMA;\n+\t\tbreak;\n \tdefault:\n \t\tDP_NOTICE(p_hwfn,\n \t\t\t \"MFW answers GET_PF_RDMA_PROTOCOL but param is %08x\\n\",\ndiff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c\nindex 6fb9951..06715f7 100644\n--- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c\n+++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c\n@@ -156,7 +156,10 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn,\n \t\treturn rc;\n \n \tp_hwfn->p_rdma_info = p_rdma_info;\n-\tp_rdma_info->proto = PROTOCOLID_ROCE;\n+\tif (QED_IS_IWARP_PERSONALITY(p_hwfn))\n+\t\tp_rdma_info->proto = PROTOCOLID_IWARP;\n+\telse\n+\t\tp_rdma_info->proto = PROTOCOLID_ROCE;\n \n \tnum_cons = qed_cxt_get_proto_cid_count(p_hwfn, p_rdma_info->proto,\n \t\t\t\t\t NULL);\ndiff --git a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c\nindex 46d0c3c..a1d33f3 100644\n--- a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c\n+++ b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c\n@@ -377,6 +377,7 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,\n \t\tp_ramrod->personality = PERSONALITY_ISCSI;\n \t\tbreak;\n \tcase QED_PCI_ETH_ROCE:\n+\tcase QED_PCI_ETH_IWARP:\n \t\tp_ramrod->personality = PERSONALITY_RDMA_AND_ETH;\n \t\tbreak;\n \tdefault:\n", "prefixes": [ "net-next", "1/4" ] }