Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp981708ybt; Wed, 17 Jun 2020 19:51:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxojGlc8ugeNcUIY36e2B9yO0mdeLvIiyHJwF0ZFp4cI+e0SQQzoVkSxFwl0A/u9eBGzhGY X-Received: by 2002:a05:6402:13ca:: with SMTP id a10mr2087790edx.224.1592448690252; Wed, 17 Jun 2020 19:51:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448690; cv=none; d=google.com; s=arc-20160816; b=OEzTK5MADmc7aGEsrv8bAPc1vnufVBNtIzcxDTyYlSLpdBWg49u/xGH4NAKtol1R2v lfXiqIcyOiZ7LOuYjhFP2dYiVTfPdbLtl++CG7fcqLOAQ+g8p01c3KKaZXwd67Too421 XIuiB6o9k8sXu8JIoFLeX5ayJfBFPnCy61MqTMSjQlkP77w/I7qkocbo6VLye+DAjp/h Fy0UBNdfXJq33hb3nrr0PYUhV/GTvkf5SVAdIIblm6xX5bxlvDjl6TBDAylf2aEugm7V XQCGp1U9LtKPoPYjgatj5G2vB5tQqHFDLfasKG3NC05OtBgPD+cNWoFfoHglBI+UQIsg eoIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eWkd9n09tkiANxi1D8TU1G8hcnxWeiZSKY3eRA6uhnQ=; b=o4nz/E4DeuCw5LWpITA0KGvtzqMoUmDLW1PavtjcrOEVU5XRpWPK3eT9i3UVpR+kjx 9bxZZTLcIZxAU17kiRSSmm3IdEV/72p2WhukUlE8f6/LWfOmg+gYKCO0OcQV4z1CJrDR MN1Z3Q5UQ4Ibw0aaA2CIaooA//6O605A7Sj1At+iw8nlPROPa2Us1w5FkbvpV+y6M8oR vYW7ccZ1vdYHvBWeJIDrkMBQW4n7iJ9IUzfZLltoOQkmhb9AwY/ICBkw+geX61nd2PZX YUOUkxYaiIs2BDpGxRiJ9yGvFLzKHdD5tlIlaj+NCsPSYu5x73WM+d/EZybErL1hZTer ATPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KQZIHfhg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a5si1105751ejv.78.2020.06.17.19.51.08; Wed, 17 Jun 2020 19:51:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KQZIHfhg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387874AbgFRCsq (ORCPT + 99 others); Wed, 17 Jun 2020 22:48:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:36568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728254AbgFRBJu (ORCPT ); Wed, 17 Jun 2020 21:09:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D4A9521D81; Thu, 18 Jun 2020 01:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442589; bh=fWXoNeWIuJf9vCcApP5j1kVjbuJieCGDmtWUW1sTry0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KQZIHfhgNHqD29q1y1l35m19Z/VSs0CRsNXn88sTlAHQjQKhGVfvXyoGmGs6tzsLI dQsCbss0kOehSdsayCO3UsmWpEqn0fl+B9Vqv4nfsHv9I4QaciqRxEsdolD7IDS8n8 Xejoc7z2+gX+t9Vy36WF8huc0BZ/GmACZzZGntsk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Zhang , Maor Gottlieb , Leon Romanovsky , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 079/388] IB/mlx5: Fix DEVX support for MLX5_CMD_OP_INIT2INIT_QP command Date: Wed, 17 Jun 2020 21:02:56 -0400 Message-Id: <20200618010805.600873-79-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Zhang [ Upstream commit d246a3061528be6d852156d25c02ea69d6db7e65 ] The commit citied in the Fixes line wasn't complete and solved only part of the problems. Update the mlx5_ib to properly support MLX5_CMD_OP_INIT2INIT_QP command in the DEVX, that is required when modify the QP tx_port_affinity. Fixes: 819f7427bafd ("RDMA/mlx5: Add init2init as a modify command") Link: https://lore.kernel.org/r/20200527135703.482501-1-leon@kernel.org Signed-off-by: Mark Zhang Reviewed-by: Maor Gottlieb Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mlx5/devx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c index d0742823ab49..ed10e2f32aab 100644 --- a/drivers/infiniband/hw/mlx5/devx.c +++ b/drivers/infiniband/hw/mlx5/devx.c @@ -494,6 +494,10 @@ static u64 devx_get_obj_id(const void *in) obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_QP, MLX5_GET(rst2init_qp_in, in, qpn)); break; + case MLX5_CMD_OP_INIT2INIT_QP: + obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_QP, + MLX5_GET(init2init_qp_in, in, qpn)); + break; case MLX5_CMD_OP_INIT2RTR_QP: obj_id = get_enc_obj_id(MLX5_CMD_OP_CREATE_QP, MLX5_GET(init2rtr_qp_in, in, qpn)); -- 2.25.1