From patchwork Fri Aug 11 09:09:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selvin Xavier X-Patchwork-Id: 9895239 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 60BAB602DA for ; Fri, 11 Aug 2017 09:10:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5546428968 for ; Fri, 11 Aug 2017 09:10:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A23E28BF6; Fri, 11 Aug 2017 09:10:20 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 B0E0628968 for ; Fri, 11 Aug 2017 09:10:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752542AbdHKJKS (ORCPT ); Fri, 11 Aug 2017 05:10:18 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:38445 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752526AbdHKJKR (ORCPT ); Fri, 11 Aug 2017 05:10:17 -0400 Received: by mail-wr0-f174.google.com with SMTP id f21so11156775wrf.5 for ; Fri, 11 Aug 2017 02:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=N5ptX2pUIJnA3K/Z18bSPIZWAgfMJCDD2bqiOt1D4T0=; b=iI2sIlDGe1jDEUyngK1WpY0/BjtxV64BNUYV2CreSEfqJPttjuW/4oana2zOw7Ba2v /Z4XAHSJce3b4qzuDQ3JByndZZxUJhTQn7CMLsNPSJj1XIRxO6ri2oPwawWvgPb7aD+z aDs5jm9eUGgdTAj9Oe141HKUO9erAWO8UzIOo= 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; bh=N5ptX2pUIJnA3K/Z18bSPIZWAgfMJCDD2bqiOt1D4T0=; b=sVHlEU0c6oso6bRFhcxclcNxTaBI4MCQsLNM78YTd/qq0kptDoth2lI+QgaHlA/5hD w44vVlww2dVj/kHqZAbnJFFv91lHO3Gz0nDBZ0CZUWs8ezewgqfxrk6+aMvms9lULwj3 niiPGCGngzo5bBUkuaFxDREJFjb6dE5l73hdH6Yq0vJzZMov6SslvyMCBOmxP8oOh+Eu ja1CxaF04P3wiabDb4SqlhOVxPcUMbCQBFI/1Nr7JqFYTmlQBks9PfZGklO4vgJVc/YL oyeCEcSW7NkmpiYN+HSSCLiJtoIkaZeqqSQ1slJorwwUW5xdNg1awroUOPCCXP2PqIZ1 GBSA== X-Gm-Message-State: AHYfb5hIiYUiyBY9XktTa9Q29HAIZ0DKgIfuY7Ob5zxP0KZtVSanS/hd FUOISMDCmBJoSXQi X-Received: by 10.223.164.194 with SMTP id h2mr12956713wrb.137.1502442616499; Fri, 11 Aug 2017 02:10:16 -0700 (PDT) Received: from dhcp-10-192-206-197.iig.avagotech.net ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id d91sm722738wma.23.2017.08.11.02.10.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2017 02:10:15 -0700 (PDT) From: Selvin Xavier To: dledford@redhat.com Cc: linux-rdma@vger.kernel.org, Selvin Xavier , Somnath Kotur Subject: [PATCH for-next] IB/cma: Fix gid type setting for RoCE Date: Fri, 11 Aug 2017 02:09:45 -0700 Message-Id: <1502442585-22391-1-git-send-email-selvin.xavier@broadcom.com> X-Mailer: git-send-email 2.5.5 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 RoCE gid_type should be 0 or 1 based on RoCE v1 or RoCE V2. Since bit mask is used now, cma_dev->default_gid_type is set to 2 (1 << IB_GID_TYPE_ROCE_UDP_ENCAP). Use the bit mask to check the prefered gid_type and assign the gid_type value to IB_GID_TYPE_ROCE(0) or IB_GID_TYPE_ROCE_UDP_ENCAP(1). Fixes: 3c7f67d1880d (IB/cma: Fix default RoCE type setting) Signed-off-by: Selvin Xavier Signed-off-by: Somnath Kotur --- drivers/infiniband/core/cma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index ca4135c..eb420da 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -72,7 +72,8 @@ MODULE_LICENSE("Dual BSD/GPL"); #define CMA_MAX_CM_RETRIES 15 #define CMA_CM_MRA_SETTING (IB_CM_MRA_FLAG_DELAY | 24) #define CMA_IBOE_PACKET_LIFETIME 18 -#define CMA_PREFERRED_ROCE_GID_TYPE (1 << IB_GID_TYPE_ROCE_UDP_ENCAP) +#define CMA_PREFERRED_ROCE_GID_TYPE_MASK (1 << IB_GID_TYPE_ROCE_UDP_ENCAP) +#define CMA_PREFERRED_ROCE_GID_TYPE __ffs(CMA_PREFERRED_ROCE_GID_TYPE_MASK) static const char * const cma_events[] = { [RDMA_CM_EVENT_ADDR_RESOLVED] = "address resolved", @@ -4282,7 +4283,7 @@ static void cma_add_one(struct ib_device *device) for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) { supported_gids = roce_gid_type_mask_support(device, i); WARN_ON(!supported_gids); - if (supported_gids & CMA_PREFERRED_ROCE_GID_TYPE) + if (supported_gids & CMA_PREFERRED_ROCE_GID_TYPE_MASK) cma_dev->default_gid_type[i - rdma_start_port(device)] = CMA_PREFERRED_ROCE_GID_TYPE; else