From nobody Sun Sep 14 22:53:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79EF7C54EE9 for ; Tue, 13 Sep 2022 14:37:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234327AbiIMOhP (ORCPT ); Tue, 13 Sep 2022 10:37:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233730AbiIMOfu (ORCPT ); Tue, 13 Sep 2022 10:35:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02C6965650; Tue, 13 Sep 2022 07:20:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 387BB614B6; Tue, 13 Sep 2022 14:18:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47FB4C433B5; Tue, 13 Sep 2022 14:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663078728; bh=+Ag2veBKk7JDxVF+yQUnmaeHMEDCpSp6zmSNW62pFGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C9bbp/8gpbIt5VFGtGlizqz065f7Z/rOrbgUfgJ4K+5H/ryykd/VRfn6mEZy2UJ5a dALu9FBasxubKd0T1KrfNL6/5CIe98EbytS8LfRNmFk081S5yY8+qZyowkkEYxhDCp soUekZkIPBxnONvw19MiqtqoTtZCcyiNl76N2E/I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenpeng Liang , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.15 059/121] RDMA/hns: Fix wrong fixed value of qp->rq.wqe_shift Date: Tue, 13 Sep 2022 16:04:10 +0200 Message-Id: <20220913140359.888221737@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140357.323297659@linuxfoundation.org> References: <20220913140357.323297659@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Wenpeng Liang [ Upstream commit 0c8b5d6268d92d141bfd64d21c870d295a84dee1 ] The value of qp->rq.wqe_shift of HIP08 is always determined by the number of sge. So delete the wrong branch. Fixes: cfc85f3e4b7f ("RDMA/hns: Add profile support for hip08 driver") Fixes: 926a01dc000d ("RDMA/hns: Add QP operations support for hip08 SoC") Link: https://lore.kernel.org/r/20220829105021.1427804-3-liangwenpeng@huawe= i.com Signed-off-by: Wenpeng Liang Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/hns_roce_qp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/h= w/hns/hns_roce_qp.c index 9af4509894e68..5d50d2d1deca9 100644 --- a/drivers/infiniband/hw/hns/hns_roce_qp.c +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c @@ -495,11 +495,8 @@ static int set_rq_size(struct hns_roce_dev *hr_dev, st= ruct ib_qp_cap *cap, hr_qp->rq.max_gs =3D roundup_pow_of_two(max(1U, cap->max_recv_sge) + hr_qp->rq.rsv_sge); =20 - if (hr_dev->caps.max_rq_sg <=3D HNS_ROCE_SGE_IN_WQE) - hr_qp->rq.wqe_shift =3D ilog2(hr_dev->caps.max_rq_desc_sz); - else - hr_qp->rq.wqe_shift =3D ilog2(hr_dev->caps.max_rq_desc_sz * - hr_qp->rq.max_gs); + hr_qp->rq.wqe_shift =3D ilog2(hr_dev->caps.max_rq_desc_sz * + hr_qp->rq.max_gs); =20 hr_qp->rq.wqe_cnt =3D cnt; if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RQ_INLINE && --=20 2.35.1