From: Jason Gunthorpe Date: Thu, 6 Oct 2022 22:47:03 +0000 (-0300) Subject: Merge tag 'v6.0' into rdma.git for-next X-Git-Tag: v6.1-rc5~270^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33331a728c83f380e53a3dbf2be0c1893da1d739;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'v6.0' into rdma.git for-next Trvial merge conflicts against rdma.git for-rc resolved matching linux-next: drivers/infiniband/hw/hns/hns_roce_hw_v2.c drivers/infiniband/hw/hns/hns_roce_main.c https://lore.kernel.org/r/20220929124005.105149-1-broonie@kernel.org Signed-off-by: Jason Gunthorpe --- 33331a728c83f380e53a3dbf2be0c1893da1d739 diff --cc drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 2d01920,c780646..1ead35f --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@@ -2270,7 -2272,7 +2270,6 @@@ static int hns_roce_query_pf_caps(struc caps->max_sq_inline = le16_to_cpu(resp_a->max_sq_inline); caps->max_rq_sg = le16_to_cpu(resp_a->max_rq_sg); caps->max_rq_sg = roundup_pow_of_two(caps->max_rq_sg); - caps->num_qpc_timer = le16_to_cpu(resp_a->num_qpc_timer); - caps->max_extend_sg = le32_to_cpu(resp_a->max_extend_sg); caps->max_srq_sges = le16_to_cpu(resp_a->max_srq_sges); caps->max_srq_sges = roundup_pow_of_two(caps->max_srq_sges); caps->num_aeq_vectors = resp_a->num_aeq_vectors; diff --cc drivers/infiniband/hw/hns/hns_roce_main.c index 53c53c2,4ccb217..dcf8968 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@@ -734,10 -725,10 +734,10 @@@ static int hns_roce_init_hem(struct hns ret = hns_roce_init_hem_table(hr_dev, &hr_dev->qpc_timer_table, HEM_TYPE_QPC_TIMER, hr_dev->caps.qpc_timer_entry_sz, - hr_dev->caps.num_qpc_timer); - hr_dev->caps.qpc_timer_bt_num, 1); ++ hr_dev->caps.qpc_timer_bt_num); if (ret) { dev_err(dev, - "Failed to init QPC timer memory, aborting.\n"); + "failed to init QPC timer memory, aborting.\n"); goto err_unmap_ctx; } }