From patchwork Tue Dec 5 23:17:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10094091 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 DD84F60329 for ; Tue, 5 Dec 2017 23:17:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF5B228334 for ; Tue, 5 Dec 2017 23:17:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3C6528535; Tue, 5 Dec 2017 23:17:38 +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 69E8828334 for ; Tue, 5 Dec 2017 23:17:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752808AbdLEXRh (ORCPT ); Tue, 5 Dec 2017 18:17:37 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:41629 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752734AbdLEXRg (ORCPT ); Tue, 5 Dec 2017 18:17:36 -0500 Received: by mail-wm0-f65.google.com with SMTP id g75so4279654wme.0 for ; Tue, 05 Dec 2017 15:17:35 -0800 (PST) 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=XSzwItKtlUxguKowIixCbBkr31b0nys4DWeysnUF3uc=; b=MZNI1+a0cDCg175g7o6/m7mDyMyJff/yamFBXyJQehBvrgcK3YbjIh/CD7XOWUQjpg laQV8tiDfwVR/xAhjxIIdo5Tr7igqCZLeqZiUQvfFsBdBzQDxMaJYZ80P50sOFP1ELpY hAHGpyQ9/Z79+1WP9/neqZ4teSIldmnOVqIT3B2EZ4mROJZMDbvUPFMjkTG6Afq/SrkW Ry/D0EP50p1Zj7eUNfHH0SkzIWZpMEyWt3YtVXhou4aGMHAHpIy+sJovR8eymMZyUClR oOeeReYrq9gXntojSn//teE57QLtIix1H3jdOJPimXQYkfMX8qZVtt6D1naa/KGiHcLw jp4A== 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=XSzwItKtlUxguKowIixCbBkr31b0nys4DWeysnUF3uc=; b=fg6bjQomtV/B5XE6VcGja6SFOGchn0JhJt27L4YJ6EIIIU6t67RQQWh+ks4l9v5WgG 9604n0+xCv63nZfMOHVP77xWWD8G/G2X5OipCzE7CluW5WhpZQx/kt0m0NZHGPViiz6g q2seHYRJDvfIrvpiBUrNoNRRWguVEjGLbECMug9d1MbBJN3vy5UVwQ/8nLkMPsWGLz8Z zutIunn37ChZwYxKegzk4Y0G7WlgczVQHaF8TPKFGo2P2rJfl+MfrLDbM3XKOu7DuZCZ GVOCf1oMIKCF73QoqsFqZDp1EmL/QZnRw4s7j0K7zR/OIrrKCMHk0YAdLmoNn8rGxA8P CDLg== X-Gm-Message-State: AKGB3mLG935Lt85RtbT554W5CtZ1W5IusEL91OO/VW16myIktoAG52Jv 1SwobhHc4dGJuS2gWzlHpjHTiQBoJnk= X-Google-Smtp-Source: AGs4zMY1+BF7IjVuaKvNAgcGQWpJO0/+MN2mbTnnxfPy0ebNQs4tdI5lRkk5DjCcbUnPpwY1/niQZw== X-Received: by 10.28.181.209 with SMTP id e200mr10955126wmf.68.1512515854964; Tue, 05 Dec 2017 15:17:34 -0800 (PST) Received: from ziepe.ca (S010614cc2056d97f.ed.shawcable.net. [70.74.179.152]) by smtp.gmail.com with ESMTPSA id i3sm1230250wre.33.2017.12.05.15.17.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 15:17:34 -0800 (PST) Received: from jgg by mlx.ziepe.ca with local (Exim 4.86_2) (envelope-from ) id 1eMMSy-00054N-8O; Tue, 05 Dec 2017 16:17:32 -0700 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH 3/8] verbs: Get rid of verbs_context->has_comp_mask Date: Tue, 5 Dec 2017 16:17:16 -0700 Message-Id: <20171205231721.19410-4-jgg@ziepe.ca> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171205231721.19410-1-jgg@ziepe.ca> References: <20171205231721.19410-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 This never made any sense, and was never used. Just get rid of the vestigial remains. Signed-off-by: Jason Gunthorpe --- libibverbs/verbs.h | 11 +---------- providers/mlx4/mlx4.c | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libibverbs/verbs.h b/libibverbs/verbs.h index b9db76bc628707..9a3d09e27dc7f8 100644 --- a/libibverbs/verbs.h +++ b/libibverbs/verbs.h @@ -1650,15 +1650,6 @@ struct ibv_values_ex { struct timespec raw_clock; }; -enum verbs_context_mask { - VERBS_CONTEXT_XRCD = 1 << 0, - VERBS_CONTEXT_SRQ = 1 << 1, - VERBS_CONTEXT_QP = 1 << 2, - VERBS_CONTEXT_CREATE_FLOW = 1 << 3, - VERBS_CONTEXT_DESTROY_FLOW = 1 << 4, - VERBS_CONTEXT_RESERVED = 1 << 5 -}; - struct verbs_context { /* "grows up" - new fields go here */ int (*modify_cq)(struct ibv_cq *cq, struct ibv_modify_cq_attr *attr); @@ -1696,7 +1687,7 @@ struct verbs_context { struct ibv_xrcd * (*open_xrcd)(struct ibv_context *context, struct ibv_xrcd_init_attr *xrcd_init_attr); int (*close_xrcd)(struct ibv_xrcd *xrcd); - uint64_t has_comp_mask; + uint64_t _ABI_placeholder3; size_t sz; /* Must be immediately before struct ibv_context */ struct ibv_context context; /* Must be last field in the struct */ }; diff --git a/providers/mlx4/mlx4.c b/providers/mlx4/mlx4.c index 0ed77d2c021513..1ba2b427071fcb 100644 --- a/providers/mlx4/mlx4.c +++ b/providers/mlx4/mlx4.c @@ -238,8 +238,6 @@ static int mlx4_init_context(struct verbs_device *v_device, mlx4_map_internal_clock(dev, ibv_ctx); } - verbs_ctx->has_comp_mask = VERBS_CONTEXT_XRCD | VERBS_CONTEXT_SRQ | - VERBS_CONTEXT_QP; verbs_set_ctx_op(verbs_ctx, close_xrcd, mlx4_close_xrcd); verbs_set_ctx_op(verbs_ctx, open_xrcd, mlx4_open_xrcd); verbs_set_ctx_op(verbs_ctx, create_srq_ex, mlx4_create_srq_ex);