Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp976508ybt; Wed, 17 Jun 2020 19:40:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwM2T3HpEuro9QVzHJl2ofFGCNfr/NzQl0mE8m1DzKmLCqsPfIMKDsLVR1RFRndxwxEM5O0 X-Received: by 2002:a17:906:e4b:: with SMTP id q11mr1967225eji.302.1592448052475; Wed, 17 Jun 2020 19:40:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448052; cv=none; d=google.com; s=arc-20160816; b=vNlAow2aq9mEH7CNSXcRlcwdQduZ21fDPjafC+Ji1l/f1Mz5Hs4+6cBIt1nJY+Ke3a xjeWtMTa+F5ILajgclBMEemyv+GGupJnxwn660BMd6+fkJvZQGkGL0sV7BwURCpIIXNI eBrkjeaU0dlPaBj/IZsqawcsdjZqJSHISvGfnGAzr5KIFGsG1jRURChAiS3rsc61M7SO fwa+d3tuiD/3tZdkZPH6XjacQ/8phmPlFXL0tDJFzIDXmALrEb0IkE7P4WxThSCLdfmD eMm7JZgE4FMdhrDQwZgkIqg0dZOlX/k568QpnDcqVejJZ002vRWhRs8QMbxxCmGA4r9Z 4N5Q== 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=gqrghTfSxdqLIlZ6Za3uww1Sswqu5L/8x6uum2vDvIg=; b=Q7sB0mOQ14l8P4QcDgKTmxIby05JvTDgA45SKwgrw8nGQ1S4m/sFP+p2mFyk4i3bDh xWcuBwLqVqS/iXNJ/EUBVtuB9TNvntr40jbjd25wvzgPpvTX+x1YYby9gHl9DcZi2LEM ced7O5REjsV0gVtqCeNtnMzaBU5FH2NN7Ed5/gDBe6XTZFR1QRxuwcoKamkew9oayf8f 0iVFjakkn1AhxbV+E+CV6tTZ1zNbeFTT9GAYArD4iQKEi2PwKJLxZ9ymBJDSTMSXmFVB FgyY3C6fHTn1GyzR5krVLf6LvgOWQjtElHz/OPZoov7gVa2NKUB5CAEX1vWLeQDSpTgG 0oKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=if59RPg9; 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 f12si925566ejf.650.2020.06.17.19.40.30; Wed, 17 Jun 2020 19:40:52 -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=if59RPg9; 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 S1730180AbgFRCix (ORCPT + 99 others); Wed, 17 Jun 2020 22:38:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:42436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729094AbgFRBNT (ORCPT ); Wed, 17 Jun 2020 21:13:19 -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 A41CA21924; Thu, 18 Jun 2020 01:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442799; bh=9yZlXAG/MHQ78T8tk7wwzf6znHSrNc5RQYFaFYd/Xkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=if59RPg9f8pKzhV11AgQQQ/ASmqzEGF4I5zNeiP4GYXJ12Ru9wuQjo1EBzA6CJx2o wh1yHid2if1x5YAvAMcODyfmQMTpl2FGAsMFunF6f/Q2BmFYfLNNsyA9CE2m9VEh3x CCAGSMdQXHrL8LC3FnfODr+bXIyinPZcPrDMH+68= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lijun Ou , Weihang Li , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 240/388] RDMA/hns: Bugfix for querying qkey Date: Wed, 17 Jun 2020 21:05:37 -0400 Message-Id: <20200618010805.600873-240-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: Lijun Ou [ Upstream commit 349be276509455ac2f19fa4051ed773082c6a27e ] The qkey queried through the query ud qp verb is a fixed value and it should be read from qp context. Fixes: 926a01dc000d ("RDMA/hns: Add QP operations support for hip08 SoC") Link: https://lore.kernel.org/r/1588931159-56875-2-git-send-email-liweihang@huawei.com Signed-off-by: Lijun Ou Signed-off-by: Weihang Li Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index c3316672b70e..96ff610bbdc4 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -4639,7 +4639,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, qp_attr->path_mig_state = IB_MIG_ARMED; qp_attr->ah_attr.type = RDMA_AH_ATTR_TYPE_ROCE; if (hr_qp->ibqp.qp_type == IB_QPT_UD) - qp_attr->qkey = V2_QKEY_VAL; + qp_attr->qkey = le32_to_cpu(context.qkey_xrcd); qp_attr->rq_psn = roce_get_field(context.byte_108_rx_reqepsn, V2_QPC_BYTE_108_RX_REQ_EPSN_M, -- 2.25.1