From patchwork Fri Dec 9 17:10:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adit Ranadive X-Patchwork-Id: 9468775 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 EDC0C607D8 for ; Fri, 9 Dec 2016 17:47:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E152F2867F for ; Fri, 9 Dec 2016 17:47:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D597E28682; Fri, 9 Dec 2016 17:47:33 +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 759EF2867F for ; Fri, 9 Dec 2016 17:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751742AbcLIRrb (ORCPT ); Fri, 9 Dec 2016 12:47:31 -0500 Received: from mail-bn3nam01on0085.outbound.protection.outlook.com ([104.47.33.85]:13488 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751729AbcLIRra (ORCPT ); Fri, 9 Dec 2016 12:47:30 -0500 X-Greylist: delayed 1040 seconds by postgrey-1.27 at vger.kernel.org; Fri, 09 Dec 2016 12:47:30 EST DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=onevmw.onmicrosoft.com; s=selector1-vmware-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1GxYsC/ZF3E1jzv+KGaBAcT4fIcwJMaAnfi7bEjTSVA=; b=BaAHdTEhWn8pCcEXg1TjH6iSy1MY1vspTIFyE+yZ2HTExdEKFAKcvVa3aa3gPb/UDef+aVNXwZTT7RjhkjEB1cDl8sYJUi1kOtlcLwjUuMfKdS8B10t/1V3bAvK+4TGu9N9vxBtbVn9QkaxtgVaRL6di0uCcJN41Q1D4MRcowSA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aditr@vmware.com; Received: from gandalf.eng.vmware.com (208.91.1.34) by BLUPR0501MB836.namprd05.prod.outlook.com (10.141.251.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.4; Fri, 9 Dec 2016 17:14:37 +0000 From: Adit Ranadive To: , , CC: Adit Ranadive , , , , Subject: [PATCH 4/4] IB/vmw_pvrdma: Update ABI file name Date: Fri, 9 Dec 2016 09:10:06 -0800 Message-ID: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [208.91.1.34] X-ClientProxiedBy: MWHPR01CA0015.prod.exchangelabs.com (10.168.201.153) To BLUPR0501MB836.namprd05.prod.outlook.com (10.141.251.150) X-MS-Office365-Filtering-Correlation-Id: 8fa9c56f-8629-45d1-224a-08d42056db96 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BLUPR0501MB836; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 3:tsKzNcInG0kZphfyzWA7NCzpg4ECQgNE5k0vJRIbo4FaYebl+NgClMcrwFQWndv9fGbopUD+nDSOUHvsiPtrBrOKTbgQsVNFGsPbOIoZNm8H9qRZ/mEi/MouIEKnstjTQ3Arj5qQEls2Br5CjAXjZoSM9vITINqx18PAmU6sUv2H7P2AyRHTn2QAICxQvmYXNyvMjpGpUfrtbKUeJkt5xjQus+VO4Tn2o7kAKOaaI2NWGG/YYa8G15LvpDDBITS42pF9lF4JhXfgeeatfjOvaw==; 25:7F3r7QWnVETJonmQuiSrBj/3Hg30PFwklpFlbtlTRJgJyK/C5UdlR/FakvnJd1RcYYxLaesAxvlTjYPWuDnW8U45/E13Oo1pFxUkQ4aWretZ6W5QWANsY6Uv8wwC2B1/y2Yb94zEYcVI8ViKWRtk6PpyX+gTgetlHhDAufbslRoMmSsVRBztB4D3CHivxyxk/vH1yhEkwMt0B5dRD/4qjiEmgYYo9VvOybYOdO+sKKcxvaHPz/XaAfawKbgOwop1ncpYfeqx4bQDFVCNzwJKhZw94JpkVy9N17pIo78l7OHbRSDwbr2sEXUn7/JJhTcblIKYKs316vKdmsOTKVSlFJwg4G1dSsDEYaZ1Z1wnc35YPYbNyddCLKg36iikL3tK9ibaf4igi0qyojZHOFYL2JJotixR91ldybUcUrORDflEeDWcck4duXiVi4g+Tq3p9pZ34LeNYuwA97Wpf5WcEw== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 31:TnMutDSDnmJhnR4BsP2FUXvQD5zTL7wCrR6//mGIe/TOJ7xj5C9elu3iA6A7wnEOuiirTceByOYhdYG/AKgaX8td8p1Onxvd3vNrb6Rd0LsiarbMoURMrUfCt1X8P711O5r1+cZNzH5kGTsMA3oWaK0+KLrFGvFVWR22NHucq60q7C8HbJfE/hCfgGLUnEhmtixUpLX+4NlCmbGAHrEBOvkM9i4OCXIh15ZEbo3PV1iimIJDsm5sYAm9h0X88FDjdBNicA7/rHH7ajz6bKbrlg==; 20:epFob05zU4x0QU8mo4JKWZ0fGWe6G0hIJ6y+LAlqLyaEKAxM5EO7NqL8NWzrb6iEP8fESI/VAdk32kE5NbmWxqXBIgCMlsKYbVXF9swJq8q/+RkErA12neQHvra5ShD7HoAyhxWfyynPWVwf6bkNECEBmvqyPMhP8/eVSQObczQPFnl1XmVdCZ4VqsDzxhIz2NjsKm/CI4YeN22aOlVdNFFZJC5P0bSRlI8HsQ92UT8w2PvFibnJ5QWY0wvBUxI7buVucdIuo/a6BePKiVgg+ihN9wQ6jt/nExSynFB21Y2vbDkpsqVp0d4g3gZU2zEN+279QB6o0wvlQkD0O7IRJ9MbRxDq+CilxTxcUNdSHcjKva1odazOPj7zP0pfV0HrmFB6Q/p6AyMCXYgFWaf8q6/c/uwuU0w1+4P53lx/taq+7JUGKNbSg4OhNSizVIa3pSK6dYj7tqHFteIxLshSE5ag+8Qk4FRrYzTpg00OcK0ipMQCNlRJccYKCVaFIO70 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(61668805478150)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123555025)(20161123564025)(20161123560025)(20161123562025)(6072148); SRVR:BLUPR0501MB836; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0501MB836; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 4:rnkIsvtw5MgGGPrNEtie+6Ya1OSFPONzwXn8n3uqAqf7d+FLWi8bsWLqnLAlJLnoANW4VnDVcFId4ti+1VkZ22hrzbr7EypNtg0yWHCQ4vHx4U6qmX0DgrnIWCgT/yy5Q/7bM0NQCjzbYaNSgWzcRy28dz74ZUyaitytHZLYNKRdTvXCFxrBnPRk857Oy4f5zauJjq8+WcZZJkj6xLQIM1/b23Kz84ciDVdFduaEEh0SD+ynklZ5zOZAwGOY7Ck9JQZq3x1SeR/NvQRXAvPpYGAaU4R3AYYmxox828eNwO7eltt7UMXm+WwtiHoxGLpiEOcnFd6w94cX16bOOSKgKr+pYbhVYjlFxwAhH+Hiw5L6e0PcVwtj0PYaLne5IYt+oOd7nUCHNIIQGFfTCdeCGQpnAUWMnXvpPb8pHLVjlhrZYQf+nIKj94NgD5qi4p99aFLRkMv5c7A7itcnaUaccS7cLbfSnQuQD8sTBkW+dxUXiS5GowTCQQPp5b1wPxL7yfd5TLNWQ2kJpOLTJM3Igaw2pHdo6ku8GDIjwI5OaD/vHHoBlzxzPoDLtiL3gDQAAPix2qjLfkJZPQVqaxhgJUqNgsun/2pHvgA9wYwGrm32juT86UDl6kH4nVa9De9E4YqojhyhH5qg6x8Y1I4KVA6B/QxSIeAZHDt6dMF1fSzSkoI19/6uU7PZrqUzrnLY X-Forefront-PRVS: 015114592F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(2906002)(50986999)(4001430100002)(10710500007)(76176999)(118296001)(36756003)(6636002)(92566002)(2420400007)(38730400001)(107886002)(15650500001)(66066001)(2201001)(81166006)(81156014)(47776003)(8676002)(305945005)(7736002)(5001770100001)(5003940100001)(3846002)(5660300001)(106356001)(50226002)(86362001)(575784001)(6486002)(101416001)(6116002)(50466002)(97736004)(33646002)(105586002)(6862003)(7110500001)(48376002)(189998001)(4326007)(2950100002)(68736007)(42186005)(6666003)(7099028)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0501MB836; H:gandalf.eng.vmware.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0501MB836; 23:s9EFMpIV85wgdaZSJozD0J5/DooneJhIsFVIQvJd?= =?us-ascii?Q?iMPJlSyuYeT8IjU6JPJ7/xyzZlvT9y49RhCJ/IZNX0CwzRwH8EAXmWmYeG0e?= =?us-ascii?Q?URyQjF7fRieYb9tcTGnwqRF21uX5jdH4Lf7SLLCF8gONeus3mlmoy/f1rtoV?= =?us-ascii?Q?fh1OMqvOCGe0VkpYhx9ZpwDjqM79O27LGSpe3F6phRJDqH4DwFr7jSe114IS?= =?us-ascii?Q?UEIisDRFQot47hEYa6+zx+JDMs+DV5Ys2020r2w7Xmb1XIf+0FsMpdbAwKEr?= =?us-ascii?Q?dpl9xBA6Ddf4fL8lnFqjdbTNb4TGzhsO3vXMVwCqJShxN5kZgH3yxyiU29c1?= =?us-ascii?Q?O57/qUsQSzBuSBMPvbs7u8tR3HkxZMB431qkEFG56OYS9jSxVqjqQERD1VX5?= =?us-ascii?Q?8rIRc6n8pb9lykWrPw1SqBLjyp7uKyvC3vSPlIy9WuLJ3+9ZVfPTDYK3FYSg?= =?us-ascii?Q?X5UzAbhcY4X09XnXqHcaNy1YkqHarXicKIZYO672Us4i2fxPOqbl+as7efPv?= =?us-ascii?Q?pqQiit1uTYvwhz33+GSqjGFeOZhPM1L07dW0re35mQA/xObbmM/9w6pp13MV?= =?us-ascii?Q?oXyOODN3LbDTGXCDggips2RP2ws5RcGw3n6+nkcx/5dJ2zHzM3Un9/0ZerNg?= =?us-ascii?Q?dM5HCuzfkEF6MtQvd8zuRQZLH4CisVURRGROSIrj69D9K9hAbM9LA1XnNolF?= =?us-ascii?Q?7DCLSax7u11X8W+f6aViuy/JKYyQvVVOswOEBOssdj/zibnxhibamnchu9RG?= =?us-ascii?Q?Lgpz5Ju3t7IbCH9MMWR6b71bxeCtrbUeiYqfTNhlPYAf5j55Q33LXNhpilBO?= =?us-ascii?Q?qUZektBehEZX1zOxChtdCF+eGHCFtWtMG7gAOUN2YxU3pIvPWgR766t9mIxV?= =?us-ascii?Q?ejKWa/f7LJdyCSIf4oL5cGGko7atcCEcwbFsZNug0lpd4iZGdwL9JdJFCG4b?= =?us-ascii?Q?2yhv5KrcSvatttiZADcdF8dAntca7rdksK8rYoZxttTBzyOYmAFjS2E9jtuX?= =?us-ascii?Q?UAFgIIX/ZlZ7/RvJX7PRak2wh4JZ5au52iLSG2YU4UrX/cARiodFRkqoxt94?= =?us-ascii?Q?xWsyk844QJOTuMu9bgr6bSEi24oNdy+c6AaoYsDiZxcrpiZcvVvQSIdqR/1c?= =?us-ascii?Q?Zgmc/e1qbGuXC+ZzvW7ZB1F6WvoVdfk5MDZioYjIge4lhCneMwgQ3goHPwYl?= =?us-ascii?Q?6bdUP5mSYefKCHL3vAaTeh/6yPlB7jJynoE1ZZr3p6Fe/KGRY9j+f9nbLRH4?= =?us-ascii?Q?AP9sSHizAXwCv7RQdBLj+4iB2wrS74cU68xcLag2s6wyviKo69UAq6omJw/s?= =?us-ascii?Q?MqjB5a+BxvTWkPLKJyGyUa0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 6:EeLDe9oS58sGLIslcu1eTUZXUmTyu5FcTn6CTI9UTbXYfUwMBHshRCcszDox7vY+ZV2KTVTt9/IYyHVcl5TjDLcHKjYR5qJecCWWVywZQdR0ALBm2FqfUtKwRW5W1HR3UlryLLospcwibqUQkzTevztw+Wt1iaWl+a08T8XiR/fOem5Q0j6i3Jl2mmAtI67VnF/fwO65JDaARXiWkQ3TL7UPHbXm4vmz9OzjP1zP2SQUE5Ab/3xXDgHBTLiKKoSho/Xb/qGaMU2V+GXwJFu2HBUHg3WtGE0DQahoq7+9RmzgHt7NEWLesZ2DRGZAkKE3nQipy9D9WGhRVK5kkTFTYa+3sNOg4cYJhMHNqnouNH5xHcn+Q1uSnHEBv1PjDuVT/wLr0024H5YHwziN1kS389RvXFUYkxSrIiSArJ7juDs=; 5:qEci24zExxAUNCKqa2Dd1uzQ3pRL6ie4flIewIqVlIP1ZRSW+ApMSgHZHZG7ridrbeBQqx1hZ7cvmcdoV09arAUO8FpNg+PEBH3qzJvrbHH+bT6cGHX3UQQwSJLW7Pf8R9Noa8Og0mrSjxshOIIo7MnbPPt931984K15M9fb/+8=; 24:WlU+50Sgouusu3u5IeDCNIfHKPF9PIdxDzhipERVrZ0v7uEwGwQjOcIezX6/Od73tzNPJNqpwN4/jejctU1tcZVbrEvCJ0fqmvaaBqK/gzw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0501MB836; 7:MT99W29tpYEMdXin2RtXkZNtUZM1AbMVKX2X2SxsKhwyH6aMR8RAxPZi2wG/+DUnbmTgusjiE0lwB7beQ7sSOw1NOA72+rYPkwAFjmPQgr2kPxbG9f4G4H03xpm3XEoRX/bH9byCgXR+2vxcW7BqFs5+MVlttBXAIUt1KXmxTJdqzcxilF7nYdjKFDdRbpYUqLHMDj1F3gWtYW/nS81OCuBnc+jUg6JCxgEaQdL+BrvRBBMsQ2qd5Wj9xNFNDfj0cCU8Fm1ysVFosBm2p/Eezm+cbdYMqQAKOkxdyRE8PqcogoiaSFEHqgijxMKkFXTBJk0HxJLIGydXxpDvbKVlNViEEDOvYiOLi+piDpiSzPdjpbatXbh7Hy9yh/BehV5cTo5j9ACzaWtjWmW8/z+y2MFqWC/TC83YBp87RjKjwPahEt3+6mD3Yma69+aeT90pp4EoxcrXi2rPyBl3T9B70A==; 20:YtJ7fCd3USpYSA6yx0RtW0PdkY+NGwTRKH1zeR4DEp95EWkcPCR5UZoSmkUElpAn8dstWwVbLHMn/VFBZ8/yZh0XM9ow/1U14r29QRA1ids4Ljud0PRCL2pftiiKs1AosVuhGXIuyYlCk9sZR1x1xLtj1goOE2cO2IvOMj1PCjg= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2016 17:14:37.8979 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0501MB836 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 Update the build and source files to pick up the new ABI file. Signed-off-by: Adit Ranadive --- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 2 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 2 +- include/uapi/rdma/Kbuild | 2 +- include/uapi/rdma/pvrdma-abi.h | 289 ------------------------ include/uapi/rdma/vmw_pvrdma-abi.h | 289 ++++++++++++++++++++++++ 5 files changed, 292 insertions(+), 292 deletions(-) delete mode 100644 include/uapi/rdma/pvrdma-abi.h create mode 100644 include/uapi/rdma/vmw_pvrdma-abi.h diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h b/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h index deb6792..71e1d55 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma.h @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "pvrdma_ring.h" #include "pvrdma_dev_api.h" diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c index a7aef93d..ddf3bc6 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "pvrdma.h" diff --git a/include/uapi/rdma/Kbuild b/include/uapi/rdma/Kbuild index e6942c4..6a8a934 100644 --- a/include/uapi/rdma/Kbuild +++ b/include/uapi/rdma/Kbuild @@ -14,4 +14,4 @@ header-y += mlx5-abi.h header-y += mthca-abi.h header-y += nes-abi.h header-y += ocrdma-abi.h -header-y += pvrdma-abi.h +header-y += vmw_pvrdma-abi.h diff --git a/include/uapi/rdma/pvrdma-abi.h b/include/uapi/rdma/pvrdma-abi.h deleted file mode 100644 index 5ca0e91..0000000 --- a/include/uapi/rdma/pvrdma-abi.h +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (c) 2012-2016 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of EITHER the GNU General Public License - * version 2 as published by the Free Software Foundation or the BSD - * 2-Clause License. This program is distributed in the hope that it - * will be useful, but WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License version 2 for more details at - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html. - * - * You should have received a copy of the GNU General Public License - * along with this program available in the file COPYING in the main - * directory of this source tree. - * - * The BSD 2-Clause License - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __PVRDMA_ABI_H__ -#define __PVRDMA_ABI_H__ - -#include - -#define PVRDMA_UVERBS_ABI_VERSION 3 /* ABI Version. */ -#define PVRDMA_UAR_HANDLE_MASK 0x00FFFFFF /* Bottom 24 bits. */ -#define PVRDMA_UAR_QP_OFFSET 0 /* QP doorbell. */ -#define PVRDMA_UAR_QP_SEND BIT(30) /* Send bit. */ -#define PVRDMA_UAR_QP_RECV BIT(31) /* Recv bit. */ -#define PVRDMA_UAR_CQ_OFFSET 4 /* CQ doorbell. */ -#define PVRDMA_UAR_CQ_ARM_SOL BIT(29) /* Arm solicited bit. */ -#define PVRDMA_UAR_CQ_ARM BIT(30) /* Arm bit. */ -#define PVRDMA_UAR_CQ_POLL BIT(31) /* Poll bit. */ - -enum pvrdma_wr_opcode { - PVRDMA_WR_RDMA_WRITE, - PVRDMA_WR_RDMA_WRITE_WITH_IMM, - PVRDMA_WR_SEND, - PVRDMA_WR_SEND_WITH_IMM, - PVRDMA_WR_RDMA_READ, - PVRDMA_WR_ATOMIC_CMP_AND_SWP, - PVRDMA_WR_ATOMIC_FETCH_AND_ADD, - PVRDMA_WR_LSO, - PVRDMA_WR_SEND_WITH_INV, - PVRDMA_WR_RDMA_READ_WITH_INV, - PVRDMA_WR_LOCAL_INV, - PVRDMA_WR_FAST_REG_MR, - PVRDMA_WR_MASKED_ATOMIC_CMP_AND_SWP, - PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD, - PVRDMA_WR_BIND_MW, - PVRDMA_WR_REG_SIG_MR, -}; - -enum pvrdma_wc_status { - PVRDMA_WC_SUCCESS, - PVRDMA_WC_LOC_LEN_ERR, - PVRDMA_WC_LOC_QP_OP_ERR, - PVRDMA_WC_LOC_EEC_OP_ERR, - PVRDMA_WC_LOC_PROT_ERR, - PVRDMA_WC_WR_FLUSH_ERR, - PVRDMA_WC_MW_BIND_ERR, - PVRDMA_WC_BAD_RESP_ERR, - PVRDMA_WC_LOC_ACCESS_ERR, - PVRDMA_WC_REM_INV_REQ_ERR, - PVRDMA_WC_REM_ACCESS_ERR, - PVRDMA_WC_REM_OP_ERR, - PVRDMA_WC_RETRY_EXC_ERR, - PVRDMA_WC_RNR_RETRY_EXC_ERR, - PVRDMA_WC_LOC_RDD_VIOL_ERR, - PVRDMA_WC_REM_INV_RD_REQ_ERR, - PVRDMA_WC_REM_ABORT_ERR, - PVRDMA_WC_INV_EECN_ERR, - PVRDMA_WC_INV_EEC_STATE_ERR, - PVRDMA_WC_FATAL_ERR, - PVRDMA_WC_RESP_TIMEOUT_ERR, - PVRDMA_WC_GENERAL_ERR, -}; - -enum pvrdma_wc_opcode { - PVRDMA_WC_SEND, - PVRDMA_WC_RDMA_WRITE, - PVRDMA_WC_RDMA_READ, - PVRDMA_WC_COMP_SWAP, - PVRDMA_WC_FETCH_ADD, - PVRDMA_WC_BIND_MW, - PVRDMA_WC_LSO, - PVRDMA_WC_LOCAL_INV, - PVRDMA_WC_FAST_REG_MR, - PVRDMA_WC_MASKED_COMP_SWAP, - PVRDMA_WC_MASKED_FETCH_ADD, - PVRDMA_WC_RECV = 1 << 7, - PVRDMA_WC_RECV_RDMA_WITH_IMM, -}; - -enum pvrdma_wc_flags { - PVRDMA_WC_GRH = 1 << 0, - PVRDMA_WC_WITH_IMM = 1 << 1, - PVRDMA_WC_WITH_INVALIDATE = 1 << 2, - PVRDMA_WC_IP_CSUM_OK = 1 << 3, - PVRDMA_WC_WITH_SMAC = 1 << 4, - PVRDMA_WC_WITH_VLAN = 1 << 5, - PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_VLAN, -}; - -struct pvrdma_alloc_ucontext_resp { - __u32 qp_tab_size; - __u32 reserved; -}; - -struct pvrdma_alloc_pd_resp { - __u32 pdn; - __u32 reserved; -}; - -struct pvrdma_create_cq { - __u64 buf_addr; - __u32 buf_size; - __u32 reserved; -}; - -struct pvrdma_create_cq_resp { - __u32 cqn; - __u32 reserved; -}; - -struct pvrdma_resize_cq { - __u64 buf_addr; - __u32 buf_size; - __u32 reserved; -}; - -struct pvrdma_create_srq { - __u64 buf_addr; -}; - -struct pvrdma_create_srq_resp { - __u32 srqn; - __u32 reserved; -}; - -struct pvrdma_create_qp { - __u64 rbuf_addr; - __u64 sbuf_addr; - __u32 rbuf_size; - __u32 sbuf_size; - __u64 qp_addr; -}; - -/* PVRDMA masked atomic compare and swap */ -struct pvrdma_ex_cmp_swap { - __u64 swap_val; - __u64 compare_val; - __u64 swap_mask; - __u64 compare_mask; -}; - -/* PVRDMA masked atomic fetch and add */ -struct pvrdma_ex_fetch_add { - __u64 add_val; - __u64 field_boundary; -}; - -/* PVRDMA address vector. */ -struct pvrdma_av { - __u32 port_pd; - __u32 sl_tclass_flowlabel; - __u8 dgid[16]; - __u8 src_path_bits; - __u8 gid_index; - __u8 stat_rate; - __u8 hop_limit; - __u8 dmac[6]; - __u8 reserved[6]; -}; - -/* PVRDMA scatter/gather entry */ -struct pvrdma_sge { - __u64 addr; - __u32 length; - __u32 lkey; -}; - -/* PVRDMA receive queue work request */ -struct pvrdma_rq_wqe_hdr { - __u64 wr_id; /* wr id */ - __u32 num_sge; /* size of s/g array */ - __u32 total_len; /* reserved */ -}; -/* Use pvrdma_sge (ib_sge) for receive queue s/g array elements. */ - -/* PVRDMA send queue work request */ -struct pvrdma_sq_wqe_hdr { - __u64 wr_id; /* wr id */ - __u32 num_sge; /* size of s/g array */ - __u32 total_len; /* reserved */ - __u32 opcode; /* operation type */ - __u32 send_flags; /* wr flags */ - union { - __u32 imm_data; - __u32 invalidate_rkey; - } ex; - __u32 reserved; - union { - struct { - __u64 remote_addr; - __u32 rkey; - __u8 reserved[4]; - } rdma; - struct { - __u64 remote_addr; - __u64 compare_add; - __u64 swap; - __u32 rkey; - __u32 reserved; - } atomic; - struct { - __u64 remote_addr; - __u32 log_arg_sz; - __u32 rkey; - union { - struct pvrdma_ex_cmp_swap cmp_swap; - struct pvrdma_ex_fetch_add fetch_add; - } wr_data; - } masked_atomics; - struct { - __u64 iova_start; - __u64 pl_pdir_dma; - __u32 page_shift; - __u32 page_list_len; - __u32 length; - __u32 access_flags; - __u32 rkey; - } fast_reg; - struct { - __u32 remote_qpn; - __u32 remote_qkey; - struct pvrdma_av av; - } ud; - } wr; -}; -/* Use pvrdma_sge (ib_sge) for send queue s/g array elements. */ - -/* Completion queue element. */ -struct pvrdma_cqe { - __u64 wr_id; - __u64 qp; - __u32 opcode; - __u32 status; - __u32 byte_len; - __u32 imm_data; - __u32 src_qp; - __u32 wc_flags; - __u32 vendor_err; - __u16 pkey_index; - __u16 slid; - __u8 sl; - __u8 dlid_path_bits; - __u8 port_num; - __u8 smac[6]; - __u8 reserved2[7]; /* Pad to next power of 2 (64). */ -}; - -#endif /* __PVRDMA_ABI_H__ */ diff --git a/include/uapi/rdma/vmw_pvrdma-abi.h b/include/uapi/rdma/vmw_pvrdma-abi.h new file mode 100644 index 0000000..5016abc --- /dev/null +++ b/include/uapi/rdma/vmw_pvrdma-abi.h @@ -0,0 +1,289 @@ +/* + * Copyright (c) 2012-2016 VMware, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of EITHER the GNU General Public License + * version 2 as published by the Free Software Foundation or the BSD + * 2-Clause License. This program is distributed in the hope that it + * will be useful, but WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License version 2 for more details at + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html. + * + * You should have received a copy of the GNU General Public License + * along with this program available in the file COPYING in the main + * directory of this source tree. + * + * The BSD 2-Clause License + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __VMW_PVRDMA_ABI_H__ +#define __VMW_PVRDMA_ABI_H__ + +#include + +#define PVRDMA_UVERBS_ABI_VERSION 3 /* ABI Version. */ +#define PVRDMA_UAR_HANDLE_MASK 0x00FFFFFF /* Bottom 24 bits. */ +#define PVRDMA_UAR_QP_OFFSET 0 /* QP doorbell. */ +#define PVRDMA_UAR_QP_SEND BIT(30) /* Send bit. */ +#define PVRDMA_UAR_QP_RECV BIT(31) /* Recv bit. */ +#define PVRDMA_UAR_CQ_OFFSET 4 /* CQ doorbell. */ +#define PVRDMA_UAR_CQ_ARM_SOL BIT(29) /* Arm solicited bit. */ +#define PVRDMA_UAR_CQ_ARM BIT(30) /* Arm bit. */ +#define PVRDMA_UAR_CQ_POLL BIT(31) /* Poll bit. */ + +enum pvrdma_wr_opcode { + PVRDMA_WR_RDMA_WRITE, + PVRDMA_WR_RDMA_WRITE_WITH_IMM, + PVRDMA_WR_SEND, + PVRDMA_WR_SEND_WITH_IMM, + PVRDMA_WR_RDMA_READ, + PVRDMA_WR_ATOMIC_CMP_AND_SWP, + PVRDMA_WR_ATOMIC_FETCH_AND_ADD, + PVRDMA_WR_LSO, + PVRDMA_WR_SEND_WITH_INV, + PVRDMA_WR_RDMA_READ_WITH_INV, + PVRDMA_WR_LOCAL_INV, + PVRDMA_WR_FAST_REG_MR, + PVRDMA_WR_MASKED_ATOMIC_CMP_AND_SWP, + PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD, + PVRDMA_WR_BIND_MW, + PVRDMA_WR_REG_SIG_MR, +}; + +enum pvrdma_wc_status { + PVRDMA_WC_SUCCESS, + PVRDMA_WC_LOC_LEN_ERR, + PVRDMA_WC_LOC_QP_OP_ERR, + PVRDMA_WC_LOC_EEC_OP_ERR, + PVRDMA_WC_LOC_PROT_ERR, + PVRDMA_WC_WR_FLUSH_ERR, + PVRDMA_WC_MW_BIND_ERR, + PVRDMA_WC_BAD_RESP_ERR, + PVRDMA_WC_LOC_ACCESS_ERR, + PVRDMA_WC_REM_INV_REQ_ERR, + PVRDMA_WC_REM_ACCESS_ERR, + PVRDMA_WC_REM_OP_ERR, + PVRDMA_WC_RETRY_EXC_ERR, + PVRDMA_WC_RNR_RETRY_EXC_ERR, + PVRDMA_WC_LOC_RDD_VIOL_ERR, + PVRDMA_WC_REM_INV_RD_REQ_ERR, + PVRDMA_WC_REM_ABORT_ERR, + PVRDMA_WC_INV_EECN_ERR, + PVRDMA_WC_INV_EEC_STATE_ERR, + PVRDMA_WC_FATAL_ERR, + PVRDMA_WC_RESP_TIMEOUT_ERR, + PVRDMA_WC_GENERAL_ERR, +}; + +enum pvrdma_wc_opcode { + PVRDMA_WC_SEND, + PVRDMA_WC_RDMA_WRITE, + PVRDMA_WC_RDMA_READ, + PVRDMA_WC_COMP_SWAP, + PVRDMA_WC_FETCH_ADD, + PVRDMA_WC_BIND_MW, + PVRDMA_WC_LSO, + PVRDMA_WC_LOCAL_INV, + PVRDMA_WC_FAST_REG_MR, + PVRDMA_WC_MASKED_COMP_SWAP, + PVRDMA_WC_MASKED_FETCH_ADD, + PVRDMA_WC_RECV = 1 << 7, + PVRDMA_WC_RECV_RDMA_WITH_IMM, +}; + +enum pvrdma_wc_flags { + PVRDMA_WC_GRH = 1 << 0, + PVRDMA_WC_WITH_IMM = 1 << 1, + PVRDMA_WC_WITH_INVALIDATE = 1 << 2, + PVRDMA_WC_IP_CSUM_OK = 1 << 3, + PVRDMA_WC_WITH_SMAC = 1 << 4, + PVRDMA_WC_WITH_VLAN = 1 << 5, + PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_VLAN, +}; + +struct pvrdma_alloc_ucontext_resp { + __u32 qp_tab_size; + __u32 reserved; +}; + +struct pvrdma_alloc_pd_resp { + __u32 pdn; + __u32 reserved; +}; + +struct pvrdma_create_cq { + __u64 buf_addr; + __u32 buf_size; + __u32 reserved; +}; + +struct pvrdma_create_cq_resp { + __u32 cqn; + __u32 reserved; +}; + +struct pvrdma_resize_cq { + __u64 buf_addr; + __u32 buf_size; + __u32 reserved; +}; + +struct pvrdma_create_srq { + __u64 buf_addr; +}; + +struct pvrdma_create_srq_resp { + __u32 srqn; + __u32 reserved; +}; + +struct pvrdma_create_qp { + __u64 rbuf_addr; + __u64 sbuf_addr; + __u32 rbuf_size; + __u32 sbuf_size; + __u64 qp_addr; +}; + +/* PVRDMA masked atomic compare and swap */ +struct pvrdma_ex_cmp_swap { + __u64 swap_val; + __u64 compare_val; + __u64 swap_mask; + __u64 compare_mask; +}; + +/* PVRDMA masked atomic fetch and add */ +struct pvrdma_ex_fetch_add { + __u64 add_val; + __u64 field_boundary; +}; + +/* PVRDMA address vector. */ +struct pvrdma_av { + __u32 port_pd; + __u32 sl_tclass_flowlabel; + __u8 dgid[16]; + __u8 src_path_bits; + __u8 gid_index; + __u8 stat_rate; + __u8 hop_limit; + __u8 dmac[6]; + __u8 reserved[6]; +}; + +/* PVRDMA scatter/gather entry */ +struct pvrdma_sge { + __u64 addr; + __u32 length; + __u32 lkey; +}; + +/* PVRDMA receive queue work request */ +struct pvrdma_rq_wqe_hdr { + __u64 wr_id; /* wr id */ + __u32 num_sge; /* size of s/g array */ + __u32 total_len; /* reserved */ +}; +/* Use pvrdma_sge (ib_sge) for receive queue s/g array elements. */ + +/* PVRDMA send queue work request */ +struct pvrdma_sq_wqe_hdr { + __u64 wr_id; /* wr id */ + __u32 num_sge; /* size of s/g array */ + __u32 total_len; /* reserved */ + __u32 opcode; /* operation type */ + __u32 send_flags; /* wr flags */ + union { + __u32 imm_data; + __u32 invalidate_rkey; + } ex; + __u32 reserved; + union { + struct { + __u64 remote_addr; + __u32 rkey; + __u8 reserved[4]; + } rdma; + struct { + __u64 remote_addr; + __u64 compare_add; + __u64 swap; + __u32 rkey; + __u32 reserved; + } atomic; + struct { + __u64 remote_addr; + __u32 log_arg_sz; + __u32 rkey; + union { + struct pvrdma_ex_cmp_swap cmp_swap; + struct pvrdma_ex_fetch_add fetch_add; + } wr_data; + } masked_atomics; + struct { + __u64 iova_start; + __u64 pl_pdir_dma; + __u32 page_shift; + __u32 page_list_len; + __u32 length; + __u32 access_flags; + __u32 rkey; + } fast_reg; + struct { + __u32 remote_qpn; + __u32 remote_qkey; + struct pvrdma_av av; + } ud; + } wr; +}; +/* Use pvrdma_sge (ib_sge) for send queue s/g array elements. */ + +/* Completion queue element. */ +struct pvrdma_cqe { + __u64 wr_id; + __u64 qp; + __u32 opcode; + __u32 status; + __u32 byte_len; + __u32 imm_data; + __u32 src_qp; + __u32 wc_flags; + __u32 vendor_err; + __u16 pkey_index; + __u16 slid; + __u8 sl; + __u8 dlid_path_bits; + __u8 port_num; + __u8 smac[6]; + __u8 reserved2[7]; /* Pad to next power of 2 (64). */ +}; + +#endif /* __VMW_PVRDMA_ABI_H__ */