Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp11982752rwb; Sat, 26 Nov 2022 02:32:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf68/1PFVzLBNFV3YIvILDnrS0QNAw1mULrD11ujrinEjJ07v4WC1omvGGPPn8RS0prd+sQV X-Received: by 2002:a17:902:ef93:b0:189:3998:17d4 with SMTP id iz19-20020a170902ef9300b00189399817d4mr19860883plb.25.1669458751972; Sat, 26 Nov 2022 02:32:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669458751; cv=none; d=google.com; s=arc-20160816; b=HZl2SdEptZQEEufIp44qnPWkP0PRAtvglnNXgWucEfRDS3eWRHhsbawB8qCfmzepTF 4IQxw2iKjoVng9HdLICPbWWSZ8FDQz10vo2ariFaM3Vu6yhFcNyv5rOC2D3XqrRCCg3T J31EqhQ3DkzAsAVEJ++6eD1fAEltpy5EKd7yDWjTS9zzJrHIh18xQA0xZLDxKS4PFbC+ NT4GDFcuFpO4kIOjBZLfmwhyc6VsfMJygttOw6pLrKwvS/Dwl3vF75nAJEAmNjuIJP4u JKxGeno1h85QNZGh94vfsFflZAFd0uAy1di0TzAtzzhO3P5ZNIUOVdd0oEEC6+I9dl70 JGqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=g8DU68VCQqo7pA0b7hDjwDPxwXNqNR8a1TLnCVFDxpo=; b=LJRMSy387dXWGNkcvLPEUtXIx1KIcyhhmgBmb6P+SSt5g9TFKpEm+kIjAMBNR4cNGE akN+4uAijWPV5mgDeYK67nDQQs5tvwfZAR3z9Qj6CdPVfge3EJ1jbU3jS3TEDV2PihHl Ywf+0HbatkhHymsdZlnExQ92NailHe3WXGGRR9/O+FhqFAltNww9rVhG31TSvwhMMGSZ R7KzrM8tOsRy1M52lSDJOxWb7cYlciVr3ggDWFZi4Pvonw6Qek7NaV5/Ug310YHePGQg UfGbNqy0PuCGs5Lofirkzr0FugzGRqgCcOAlWd0aQG7rcVJzf6kq55gdN+qPXB/rTyAl Mlnw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s16-20020a056a0008d000b005739d652a89si7057262pfu.223.2022.11.26.02.32.21; Sat, 26 Nov 2022 02:32:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbiKZKaY (ORCPT + 84 others); Sat, 26 Nov 2022 05:30:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbiKZKaK (ORCPT ); Sat, 26 Nov 2022 05:30:10 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CC1A2870D; Sat, 26 Nov 2022 02:30:08 -0800 (PST) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NK7Dc4MtfzpW9j; Sat, 26 Nov 2022 18:26:08 +0800 (CST) Received: from kwepemm600013.china.huawei.com (7.193.23.68) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 26 Nov 2022 18:30:07 +0800 Received: from localhost.localdomain (10.67.165.2) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 26 Nov 2022 18:30:06 +0800 From: Haoyue Xu To: , CC: , , , Subject: [PATCH for-next 4/6] RDMA/hns: Fix page size cap from firmwall Date: Sat, 26 Nov 2022 18:29:09 +0800 Message-ID: <20221126102911.2921820-5-xuhaoyue1@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20221126102911.2921820-1-xuhaoyue1@hisilicon.com> References: <20221126102911.2921820-1-xuhaoyue1@hisilicon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600013.china.huawei.com (7.193.23.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengchang Tang Add verification to make sure the roce page size cap is supported by the system page size. Fixes: ba6bb7e97421 ("RDMA/hns: Add interfaces to get pf capabilities from firmware") Signed-off-by: Chengchang Tang Signed-off-by: Haoyue Xu --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 41835cb05983..6e74735bbcf8 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -2345,6 +2345,9 @@ static int hns_roce_query_pf_caps(struct hns_roce_dev *hr_dev) caps->wqe_sge_hop_num = hr_reg_read(resp_d, PF_CAPS_D_EX_SGE_HOP_NUM); caps->wqe_rq_hop_num = hr_reg_read(resp_d, PF_CAPS_D_RQWQE_HOP_NUM); + if (!(caps->page_size_cap & PAGE_SIZE)) + caps->page_size_cap = HNS_ROCE_V2_PAGE_SIZE_SUPPORTED; + return 0; } -- 2.30.0