From patchwork Tue Mar 3 17:42:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229882 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C9D8C3F2D1 for ; Tue, 3 Mar 2020 18:12:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0064B20838 for ; Tue, 3 Mar 2020 18:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583259141; bh=uaI06Q+VT+zupIXMyse4ElXQfxh08km6yMMEEHSyq+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rZj+Hgbq61jk8YzUqwJOSWAk329m9/zjAJ8qPuRJ4fAtU8g/zrCriKna0GEZVX2nv O87BWwoDb5LHh+5Cdo4mfQYUS/CyBXFC94xhZClNZgpalMvahkPzGl6Ybc0oxXGWhv TlTeKlyX7ghvGioGB8FudKRYpr5Iq7u1RxqdzQGk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731551AbgCCRse (ORCPT ); Tue, 3 Mar 2020 12:48:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:55720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731527AbgCCRsd (ORCPT ); Tue, 3 Mar 2020 12:48:33 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1D3D20870; Tue, 3 Mar 2020 17:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257713; bh=uaI06Q+VT+zupIXMyse4ElXQfxh08km6yMMEEHSyq+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cw03c+UxYReLX6x9gCDbiuW13PYo4uUraenBaEIu2hXOz8IAOCv/cbl33CJRqhkK/ Z3EtezM/ZygbSxe9KIk74SrfqL2kWfuPCV/LNIlzCtHkx6wqRvS1FaKMe8hUqZ2Y44 TUr2s2s8erl3smz/p6bw8+m7nm3lNTZAauJOE4Jk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yufeng Mo , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 075/176] net: hns3: add management table after IMP reset Date: Tue, 3 Mar 2020 18:42:19 +0100 Message-Id: <20200303174313.320196547@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yufeng Mo [ Upstream commit d0db7ed397517c8b2be24a0d1abfa15df776908e ] In the current process, the management table is missing after the IMP reset. This patch adds the management table to the reset process. Fixes: f5aac71c0327 ("net: hns3: add manager table initialization for hardware") Signed-off-by: Yufeng Mo Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 13dbd249f35fa..bfdb08572f0cc 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -9821,6 +9821,13 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev) return ret; } + ret = init_mgr_tbl(hdev); + if (ret) { + dev_err(&pdev->dev, + "failed to reinit manager table, ret = %d\n", ret); + return ret; + } + ret = hclge_init_fd_config(hdev); if (ret) { dev_err(&pdev->dev, "fd table init fail, ret=%d\n", ret);