lkml.org 
[lkml]   [2021]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 068/162] net: hns3: fix a return value error in hclge_get_reset_status()
    Date
    From: Yufeng Mo <moyufeng@huawei.com>

    [ Upstream commit 5126b9d3d4acdebc12b9d436282f88d8a1b5146c ]

    hclge_get_reset_status() should return the tqp reset status.
    However, if the CMDQ fails, the caller will take it as tqp reset
    success status by mistake. Therefore, uses a parameters to get
    the tqp reset status instead.

    Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
    Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
    Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    index 556dfc854763..90a72c79fec9 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    @@ -10719,7 +10719,8 @@ static int hclge_reset_tqp_cmd_send(struct hclge_dev *hdev, u16 queue_id,
    return 0;
    }

    -static int hclge_get_reset_status(struct hclge_dev *hdev, u16 queue_id)
    +static int hclge_get_reset_status(struct hclge_dev *hdev, u16 queue_id,
    + u8 *reset_status)
    {
    struct hclge_reset_tqp_queue_cmd *req;
    struct hclge_desc desc;
    @@ -10737,7 +10738,9 @@ static int hclge_get_reset_status(struct hclge_dev *hdev, u16 queue_id)
    return ret;
    }

    - return hnae3_get_bit(req->ready_to_reset, HCLGE_TQP_RESET_B);
    + *reset_status = hnae3_get_bit(req->ready_to_reset, HCLGE_TQP_RESET_B);
    +
    + return 0;
    }

    u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id)
    @@ -10756,7 +10759,7 @@ static int hclge_reset_tqp_cmd(struct hnae3_handle *handle)
    struct hclge_vport *vport = hclge_get_vport(handle);
    struct hclge_dev *hdev = vport->back;
    u16 reset_try_times = 0;
    - int reset_status;
    + u8 reset_status;
    u16 queue_gid;
    int ret;
    u16 i;
    @@ -10772,7 +10775,11 @@ static int hclge_reset_tqp_cmd(struct hnae3_handle *handle)
    }

    while (reset_try_times++ < HCLGE_TQP_RESET_TRY_TIMES) {
    - reset_status = hclge_get_reset_status(hdev, queue_gid);
    + ret = hclge_get_reset_status(hdev, queue_gid,
    + &reset_status);
    + if (ret)
    + return ret;
    +
    if (reset_status)
    break;

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-09-27 19:37    [W:2.797 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site