Commit 8d78e7b4 authored by Wenpeng Liang's avatar Wenpeng Liang Committed by Jason Gunthorpe

RDMA/hns: Modify prints for mailbox and command queue

Use ratelimited print in mbox and cmq. And print mailbox operation if
mailbox fails because it's useful information for the user.

Link: https://lore.kernel.org/r/1617262341-37571-4-git-send-email-liweihang@huawei.comSigned-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarLang Cheng <chenglang@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 0835cf58
...@@ -54,14 +54,15 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param, ...@@ -54,14 +54,15 @@ static int __hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,
u8 op_modifier, u16 op, u8 op_modifier, u16 op,
unsigned int timeout) unsigned int timeout)
{ {
struct device *dev = hr_dev->dev;
int ret; int ret;
ret = hns_roce_cmd_mbox_post_hw(hr_dev, in_param, out_param, ret = hns_roce_cmd_mbox_post_hw(hr_dev, in_param, out_param,
in_modifier, op_modifier, op, in_modifier, op_modifier, op,
CMD_POLL_TOKEN, 0); CMD_POLL_TOKEN, 0);
if (ret) { if (ret) {
dev_err(dev, "[cmd_poll]hns_roce_cmd_mbox_post_hw failed\n"); dev_err_ratelimited(hr_dev->dev,
"failed to post mailbox %x in poll mode, ret = %d.\n",
op, ret);
return ret; return ret;
} }
...@@ -127,19 +128,25 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, ...@@ -127,19 +128,25 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,
ret = hns_roce_cmd_mbox_post_hw(hr_dev, in_param, out_param, ret = hns_roce_cmd_mbox_post_hw(hr_dev, in_param, out_param,
in_modifier, op_modifier, op, in_modifier, op_modifier, op,
context->token, 1); context->token, 1);
if (ret) if (ret) {
dev_err_ratelimited(dev,
"failed to post mailbox %x in event mode, ret = %d.\n",
op, ret);
goto out; goto out;
}
if (!wait_for_completion_timeout(&context->done, if (!wait_for_completion_timeout(&context->done,
msecs_to_jiffies(timeout))) { msecs_to_jiffies(timeout))) {
dev_err(dev, "[cmd] token %x timeout, drop.\n", context->token); dev_err_ratelimited(dev, "[cmd] token %x mailbox %x timeout.\n",
context->token, op);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
ret = context->result; ret = context->result;
if (ret) if (ret)
dev_err(dev, "[cmd] token %x error %d\n", context->token, ret); dev_err_ratelimited(dev, "[cmd] token %x mailbox %x error %d\n",
context->token, op, ret);
out: out:
context->busy = 0; context->busy = 0;
...@@ -182,12 +189,10 @@ int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, ...@@ -182,12 +189,10 @@ int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param,
int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) int hns_roce_cmd_init(struct hns_roce_dev *hr_dev)
{ {
struct device *dev = hr_dev->dev;
sema_init(&hr_dev->cmd.poll_sem, 1); sema_init(&hr_dev->cmd.poll_sem, 1);
hr_dev->cmd.use_events = 0; hr_dev->cmd.use_events = 0;
hr_dev->cmd.max_cmds = CMD_MAX_NUM; hr_dev->cmd.max_cmds = CMD_MAX_NUM;
hr_dev->cmd.pool = dma_pool_create("hns_roce_cmd", dev, hr_dev->cmd.pool = dma_pool_create("hns_roce_cmd", hr_dev->dev,
HNS_ROCE_MAILBOX_SIZE, HNS_ROCE_MAILBOX_SIZE,
HNS_ROCE_MAILBOX_SIZE, 0); HNS_ROCE_MAILBOX_SIZE, 0);
if (!hr_dev->cmd.pool) if (!hr_dev->cmd.pool)
......
...@@ -1209,6 +1209,9 @@ static int hns_roce_alloc_cmq_desc(struct hns_roce_dev *hr_dev, ...@@ -1209,6 +1209,9 @@ static int hns_roce_alloc_cmq_desc(struct hns_roce_dev *hr_dev,
ring->desc_dma_addr = 0; ring->desc_dma_addr = 0;
kfree(ring->desc); kfree(ring->desc);
ring->desc = NULL; ring->desc = NULL;
dev_err_ratelimited(hr_dev->dev,
"failed to map cmq desc addr.\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -1283,14 +1286,16 @@ static int hns_roce_v2_cmq_init(struct hns_roce_dev *hr_dev) ...@@ -1283,14 +1286,16 @@ static int hns_roce_v2_cmq_init(struct hns_roce_dev *hr_dev)
/* Init CSQ */ /* Init CSQ */
ret = hns_roce_init_cmq_ring(hr_dev, TYPE_CSQ); ret = hns_roce_init_cmq_ring(hr_dev, TYPE_CSQ);
if (ret) { if (ret) {
dev_err(hr_dev->dev, "Init CSQ error, ret = %d.\n", ret); dev_err_ratelimited(hr_dev->dev,
"failed to init CSQ, ret = %d.\n", ret);
return ret; return ret;
} }
/* Init CRQ */ /* Init CRQ */
ret = hns_roce_init_cmq_ring(hr_dev, TYPE_CRQ); ret = hns_roce_init_cmq_ring(hr_dev, TYPE_CRQ);
if (ret) { if (ret) {
dev_err(hr_dev->dev, "Init CRQ error, ret = %d.\n", ret); dev_err_ratelimited(hr_dev->dev,
"failed to init CRQ, ret = %d.\n", ret);
goto err_crq; goto err_crq;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment