答复: [Patch net-next] net: hns3: fix return value error while hclge_cmd_csq_clean failed

[tanhuazhong]

Sorry, please ignore this patch. I will resend it.

-----邮件原件-----
发件人: netdev-ow...@vger.kernel.org [mailto:netdev-ow...@vger.kernel.org] 代表 
Huazhong Tan
发送时间: 2018年8月1日 17:53
收件人: da...@davemloft.net
抄送: netdev@vger.kernel.org; Linuxarm <linux...@huawei.com>
主题: [Patch net-next] net: hns3: fix return value error while 
hclge_cmd_csq_clean failed

From: fredalu <fred...@yeah.net>

While cleaning the command queue, the value of the HEAD register is not in the 
range of next_to_clean and next_to_use, meaning that this value is invalid. 
This also means that there is a hardware error and the hardware will trigger a 
reset soon. At this time we should return an error code instead of 0, and 
HCLGE_STATE_CMD_DISABLE needs to be set to prevent sending command again.

Fixes: 3ff504908f95 ("net: hns3: fix a dead loop in hclge_cmd_csq_clean")
Signed-off-by: Huazhong Tan <tanhuazh...@huawei.com>wq
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c 
b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
index 165c3d5..ac13cb2 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
@@ -147,7 +147,12 @@ static int hclge_cmd_csq_clean(struct hclge_hw *hw)
        if (!is_valid_csq_clean_head(csq, head)) {
                dev_warn(&hdev->pdev->dev, "wrong cmd head (%d, %d-%d)\n", head,
                         csq->next_to_use, csq->next_to_clean);
-               return 0;
+               dev_warn(&hdev->pdev->dev,
+                        "Disabling any further commands to IMP firmware\n");
+               set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);
+               dev_warn(&hdev->pdev->dev,
+                        "IMP firmware watchdog reset soon expected!\n");
+               return -EIO;
        }
 
        clean = (head - csq->next_to_clean + csq->desc_num) % csq->desc_num; @@ 
-267,10 +272,11 @@ int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc 
*desc, int num)
 
        /* Clean the command send queue */
        handle = hclge_cmd_csq_clean(hw);
-       if (handle != num) {
+       if (handle < 0)
+               retval = handle;
+       else if (handle != num)
                dev_warn(&hdev->pdev->dev,
                         "cleaned %d, need to clean %d\n", handle, num);
-       }
 
        spin_unlock_bh(&hw->cmq.csq.lock);
 
--
2.7.4