From patchwork Tue Mar 20 21:18:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10298017 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 BFAE1602B3 for ; Tue, 20 Mar 2018 21:55:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC7F929659 for ; Tue, 20 Mar 2018 21:55:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E9162966D; Tue, 20 Mar 2018 21:55:53 +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 8EFFE29688 for ; Tue, 20 Mar 2018 21:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751390AbeCTVzv (ORCPT ); Tue, 20 Mar 2018 17:55:51 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:35163 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751064AbeCTVzu (ORCPT ); Tue, 20 Mar 2018 17:55:50 -0400 Received: by mail-io0-f194.google.com with SMTP id e7so4223664iof.2 for ; Tue, 20 Mar 2018 14:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dRAqTtgID3dn9Tzz2m03M1AS4vGKZxlknmfGUXPjWHE=; b=c+fxtallXa/wxGru1nJfd80WbQCxNioW6PaOTiWvPHoR0jV6tfDcZMPlEeRBcg8/Nv /ruz8gonTm9HAZHN+DrNFN7dKa/+hKAHBuHQn8tHGwNBy8qsKmq/vfAulP6AzX9DZGzp t10YHQntBAB8DczjYv54NB4zQYAq103gpkHrI6TRLC0jdy1xouWNh4sgqttzbph6FQUO ih7LP1mAaKOZdmkPyQ8/MODNWyHmk9v99g1um3EpG1gHCtRccybhozdL6xzQnSG0/XLa /MmCFluqB54rwVCdi/f1kwp3pNppGU0K8/P73CuoVb6zgxseC5wNLUrIazpIYyw2ig9p UYjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dRAqTtgID3dn9Tzz2m03M1AS4vGKZxlknmfGUXPjWHE=; b=ZZzcqMaJQwBA+6s5WdeWcInPYz7mn4NtzNKTw9Mg4/3EPPcUDlcCRCATK++U/TyxS0 6UsKw2UzMyMyrWsrwBiLAIoZoRFRKisu34tRqnvHXtJKt65JJ0Ffg/Dk4Zj7r7ssmPXK zcroLiyITrnUp2HMdsksUGrCD+tMaUdS9yX4jPpT/SoTSNQ+PvuJxodjDHfqS58ofvMY 1NnuotYhAOcfMI0qytxLZq1ZosYitStna6/Vf2mdOoxQ9Oa1FV+WQj9u+yg41SmKRpDx 5OqSI/9y2WmjLfXd1mKC7qL2P5Vel1yFPj5PcojtubX/kP1xqElPuQWa58S9t24tdU1i gVXw== X-Gm-Message-State: AElRT7GRxHaPdBDbnGPtqUZ/CtFYVgBQXd+UiQITgQ8WE/0lnGxmAlKU 7slHYAg7LngqPSIHe+/mvzvpiMX2LqQ= X-Google-Smtp-Source: AG47ELtyUFd7d4qUh8O6paBJ1n5XxQKhT3pVbIuYqwrnDL4ass+IEaFuwuk6Nmeu4k1DzqqWWNyA8A== X-Received: by 10.107.1.213 with SMTP id 204mr18692780iob.113.1521582949838; Tue, 20 Mar 2018 14:55:49 -0700 (PDT) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [174.3.196.123]) by smtp.gmail.com with ESMTPSA id j91sm594621ioo.22.2018.03.20.14.55.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 14:55:49 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1eyOeo-0002gd-0P; Tue, 20 Mar 2018 15:18:58 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe , Tatyana Nikolova Subject: [PATCH rdma-core 19/20] i40iw: Use kernel uapi headers Date: Tue, 20 Mar 2018 15:18:49 -0600 Message-Id: <20180320211850.10090-20-jgg@ziepe.ca> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180320211850.10090-1-jgg@ziepe.ca> References: <20180320211850.10090-1-jgg@ziepe.ca> 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 From: Jason Gunthorpe There is one enum block that is shared. Signed-off-by: Jason Gunthorpe --- providers/i40iw/i40iw-abi.h | 11 +++-------- providers/i40iw/i40iw_uverbs.c | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/providers/i40iw/i40iw-abi.h b/providers/i40iw/i40iw-abi.h index 8b35a8decfb9cf..469cf3d12104d0 100644 --- a/providers/i40iw/i40iw-abi.h +++ b/providers/i40iw/i40iw-abi.h @@ -32,10 +32,11 @@ * *******************************************************************************/ -#ifndef I40IW_ABI_H -#define I40IW_ABI_H +#ifndef PROVIDER_I40IW_ABI_H +#define PROVIDER_I40IW_ABI_H #include +#include #define I40IW_ABI_VER 5 @@ -74,12 +75,6 @@ struct i40iw_ucreate_cq_resp { __u32 reserved; }; -enum i40iw_umemreg_type { - I40IW_UMEMREG_TYPE_MEM = 0x0000, - I40IW_UMEMREG_TYPE_QP = 0x0001, - I40IW_UMEMREG_TYPE_CQ = 0x0002 -}; - struct i40iw_ureg_mr { struct ibv_reg_mr ibv_cmd; __u16 reg_type; diff --git a/providers/i40iw/i40iw_uverbs.c b/providers/i40iw/i40iw_uverbs.c index d77a46911ef30a..9a363b95d2b6c5 100644 --- a/providers/i40iw/i40iw_uverbs.c +++ b/providers/i40iw/i40iw_uverbs.c @@ -159,7 +159,7 @@ struct ibv_mr *i40iw_ureg_mr(struct ibv_pd *pd, void *addr, size_t length, int a if (!mr) return NULL; - cmd.reg_type = I40IW_UMEMREG_TYPE_MEM; + cmd.reg_type = IW_MEMREG_TYPE_MEM; if (ibv_cmd_reg_mr(pd, addr, length, (uintptr_t)addr, access, mr, &cmd.ibv_cmd, sizeof(cmd), @@ -254,7 +254,7 @@ struct ibv_cq *i40iw_ucreate_cq(struct ibv_context *context, int cqe, memset(info.cq_base, 0, totalsize); info.shadow_area = (u64 *)((u8 *)info.cq_base + (cq_pages << 12)); - reg_mr_cmd.reg_type = I40IW_UMEMREG_TYPE_CQ; + reg_mr_cmd.reg_type = IW_MEMREG_TYPE_CQ; reg_mr_cmd.cq_pages = cq_pages; @@ -526,7 +526,7 @@ static int i40iw_vmapped_qp(struct i40iw_uqp *iwuqp, struct ibv_pd *pd, info->rq = &info->sq[sqsize / I40IW_QP_WQE_MIN_SIZE]; info->shadow_area = info->rq[rqsize / I40IW_QP_WQE_MIN_SIZE].elem; - reg_mr_cmd.reg_type = I40IW_UMEMREG_TYPE_QP; + reg_mr_cmd.reg_type = IW_MEMREG_TYPE_QP; reg_mr_cmd.sq_pages = sq_pages; reg_mr_cmd.rq_pages = rq_pages;