提交 f376e38d 编写于 作者: Z ZhouJuan

Revert "RDMA/hns: Add clear_hem return value to log"

driver inclusion
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I7RKQ1

---------------------------------------------------------------------------

This reverts commit 33e7f3b4.
Signed-off-by: NJuan Zhou <zhoujuan51@h-partners.com>
上级 64307761
...@@ -619,7 +619,6 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev, ...@@ -619,7 +619,6 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev,
u32 hop_num = mhop->hop_num; u32 hop_num = mhop->hop_num;
u32 chunk_ba_num; u32 chunk_ba_num;
u32 step_idx; u32 step_idx;
int ret;
index->inited = HEM_INDEX_BUF; index->inited = HEM_INDEX_BUF;
chunk_ba_num = mhop->bt_chunk_size / BA_BYTE_LEN; chunk_ba_num = mhop->bt_chunk_size / BA_BYTE_LEN;
...@@ -643,24 +642,16 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev, ...@@ -643,24 +642,16 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev,
else else
step_idx = hop_num; step_idx = hop_num;
ret = hr_dev->hw->clear_hem(hr_dev, table, obj, step_idx); if (hr_dev->hw->clear_hem(hr_dev, table, obj, step_idx))
if (ret) ibdev_warn(ibdev, "failed to clear hop%u HEM.\n", hop_num);
ibdev_warn(ibdev, "failed to clear hop%u HEM, ret = %d.\n",
hop_num, ret);
if (index->inited & HEM_INDEX_L1) {
ret = hr_dev->hw->clear_hem(hr_dev, table, obj, 1);
if (ret)
ibdev_warn(ibdev, "failed to clear HEM step 1, ret = %d.\n",
ret);
}
if (index->inited & HEM_INDEX_L0) { if (index->inited & HEM_INDEX_L1)
ret = hr_dev->hw->clear_hem(hr_dev, table, obj, 0); if (hr_dev->hw->clear_hem(hr_dev, table, obj, 1))
if (ret) ibdev_warn(ibdev, "failed to clear HEM step 1.\n");
ibdev_warn(ibdev, "failed to clear HEM step 0, ret = %d.\n",
ret); if (index->inited & HEM_INDEX_L0)
} if (hr_dev->hw->clear_hem(hr_dev, table, obj, 0))
ibdev_warn(ibdev, "failed to clear HEM step 0.\n");
} }
} }
...@@ -697,7 +688,6 @@ void hns_roce_table_put(struct hns_roce_dev *hr_dev, ...@@ -697,7 +688,6 @@ void hns_roce_table_put(struct hns_roce_dev *hr_dev,
{ {
struct device *dev = hr_dev->dev; struct device *dev = hr_dev->dev;
unsigned long i; unsigned long i;
int ret;
if (hns_roce_check_whether_mhop(hr_dev, table->type)) { if (hns_roce_check_whether_mhop(hr_dev, table->type)) {
hns_roce_table_mhop_put(hr_dev, table, obj, 1); hns_roce_table_mhop_put(hr_dev, table, obj, 1);
...@@ -710,10 +700,8 @@ void hns_roce_table_put(struct hns_roce_dev *hr_dev, ...@@ -710,10 +700,8 @@ void hns_roce_table_put(struct hns_roce_dev *hr_dev,
&table->mutex)) &table->mutex))
return; return;
ret = hr_dev->hw->clear_hem(hr_dev, table, obj, HEM_HOP_STEP_DIRECT); if (hr_dev->hw->clear_hem(hr_dev, table, obj, HEM_HOP_STEP_DIRECT))
if (ret) dev_warn(dev, "failed to clear HEM base address.\n");
dev_warn(dev, "failed to clear HEM base address, ret = %d.\n",
ret);
hns_roce_free_hem(hr_dev, table->hem[i]); hns_roce_free_hem(hr_dev, table->hem[i]);
table->hem[i] = NULL; table->hem[i] = NULL;
...@@ -929,8 +917,6 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev, ...@@ -929,8 +917,6 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev,
{ {
struct device *dev = hr_dev->dev; struct device *dev = hr_dev->dev;
unsigned long i; unsigned long i;
int obj;
int ret;
if (hns_roce_check_whether_mhop(hr_dev, table->type)) { if (hns_roce_check_whether_mhop(hr_dev, table->type)) {
hns_roce_cleanup_mhop_hem_table(hr_dev, table); hns_roce_cleanup_mhop_hem_table(hr_dev, table);
...@@ -939,11 +925,9 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev, ...@@ -939,11 +925,9 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev,
for (i = 0; i < table->num_hem; ++i) for (i = 0; i < table->num_hem; ++i)
if (table->hem[i]) { if (table->hem[i]) {
obj = i * table->table_chunk_size / table->obj_size; if (hr_dev->hw->clear_hem(hr_dev, table,
ret = hr_dev->hw->clear_hem(hr_dev, table, obj, 0); i * table->table_chunk_size / table->obj_size, 0))
if (ret) dev_err(dev, "Clear HEM base address failed.\n");
dev_err(dev, "Clear HEM base address failed, ret = %d.\n",
ret);
hns_roce_free_hem(hr_dev, table->hem[i]); hns_roce_free_hem(hr_dev, table->hem[i]);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册