diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c index 0e928c4f65129a712e9a2fee1ecc8530c7836bab..d3aab10ebc26c441a2230c85e0220218a00938bd 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hem.c +++ b/drivers/infiniband/hw/hns/hns_roce_hem.c @@ -942,7 +942,7 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev, obj = i * table->table_chunk_size / table->obj_size; ret = hr_dev->hw->clear_hem(hr_dev, table, obj, 0); if (ret) - dev_err(dev, "Clear HEM base address failed, ret = %d.\n", + dev_err(dev, "clear HEM base address failed, ret = %d.\n", ret); hns_roce_free_hem(hr_dev, table->hem[i]); diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h index 1dabe052b08f1bf8d083c4789acc025f9c3b813b..ad1f5771974f75bdfff05c23ba6ce89f05b63bb1 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h @@ -42,7 +42,7 @@ #define HNS_ROCE_V2_MAX_SRQWQE_SEGS 0x1000000 #define HNS_ROCE_V2_MAX_IDX_SEGS 0x1000000 -#define HNS_ROCE_V2_QP_ACK_TIMEOUT_OFS_HIP08 10 +#define HNS_ROCE_V2_QP_ACK_TIMEOUT_OFS_HIP08 10 #define HNS_ROCE_V3_SCCC_SZ 64 #define HNS_ROCE_V3_GMV_ENTRY_SZ 32 diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c index e6af8cd520f11226d84db035d4338ce254548e7e..97f1fec61d7d752c9c2c41097a44894985a5e56c 100644 --- a/drivers/infiniband/hw/hns/hns_roce_mr.c +++ b/drivers/infiniband/hw/hns/hns_roce_mr.c @@ -1073,40 +1073,40 @@ static int mtr_init_buf_cfg(struct hns_roce_dev *hr_dev, static u64 cal_pages_per_l1ba(unsigned int ba_per_bt, unsigned int hopnum) { - return int_pow(ba_per_bt, hopnum - 1); + return int_pow(ba_per_bt, hopnum - 1); } static unsigned int cal_best_bt_pg_sz(struct hns_roce_dev *hr_dev, - struct hns_roce_mtr *mtr, - unsigned int pg_shift) + struct hns_roce_mtr *mtr, + unsigned int pg_shift) { - unsigned long cap = hr_dev->caps.page_size_cap; - struct hns_roce_buf_region *re; - unsigned int pgs_per_l1ba; - unsigned int ba_per_bt; - unsigned int ba_num; - int i; - - for_each_set_bit_from(pg_shift, &cap, sizeof(cap) * BITS_PER_BYTE) { - if (!(BIT(pg_shift) & cap)) - continue; - - ba_per_bt = BIT(pg_shift) / BA_BYTE_LEN; - ba_num = 0; - for (i = 0; i < mtr->hem_cfg.region_count; i++) { - re = &mtr->hem_cfg.region[i]; - if (re->hopnum == 0) - continue; - - pgs_per_l1ba = cal_pages_per_l1ba(ba_per_bt, re->hopnum); - ba_num += DIV_ROUND_UP(re->count, pgs_per_l1ba); - } - - if (ba_num <= ba_per_bt) - return pg_shift; - } - - return 0; + unsigned long cap = hr_dev->caps.page_size_cap; + struct hns_roce_buf_region *re; + unsigned int pgs_per_l1ba; + unsigned int ba_per_bt; + unsigned int ba_num; + int i; + + for_each_set_bit_from(pg_shift, &cap, sizeof(cap) * BITS_PER_BYTE) { + if (!(BIT(pg_shift) & cap)) + continue; + + ba_per_bt = BIT(pg_shift) / BA_BYTE_LEN; + ba_num = 0; + for (i = 0; i < mtr->hem_cfg.region_count; i++) { + re = &mtr->hem_cfg.region[i]; + if (re->hopnum == 0) + continue; + + pgs_per_l1ba = cal_pages_per_l1ba(ba_per_bt, re->hopnum); + ba_num += DIV_ROUND_UP(re->count, pgs_per_l1ba); + } + + if (ba_num <= ba_per_bt) + return pg_shift; + } + + return 0; } static int mtr_alloc_mtt(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr,