From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 F3F11C43387 for ; Fri, 11 Jan 2019 15:05:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C737921841 for ; Fri, 11 Jan 2019 15:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547219138; bh=fTirCCThVsvFij15lWoZgU88AB6HPdzIF55lLaq/Wbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tYpWtRQaSVHDXmyAbJvFlMqscprpllBuZtzzQi5AK33n03P6xHp4VxG9lF2c+j2Zb r3IkiNx/h+J9xzCkpIIUogzqB3OO8sZT5gXw7oaEhUpWn93DJvoCUfGmaYosJenb+8 EhqHpuhNErHxjsP9ka2wTB38I/egvJDxnFABWiII= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388282AbfAKPFc (ORCPT ); Fri, 11 Jan 2019 10:05:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:48690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388749AbfAKO3i (ORCPT ); Fri, 11 Jan 2019 09:29:38 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 4AE072063F; Fri, 11 Jan 2019 14:29:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216977; bh=fTirCCThVsvFij15lWoZgU88AB6HPdzIF55lLaq/Wbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xogi6cwR5XMGWbwRi3nRBeMAqDQ+pOAd6zGTtSPKazn7AfLZEo+CEyYqmXruxlxT4 Aits4BwnBHVYGnlbiUkoco/VevbHfhuHjKRCwvgL+8t3BfQaYiWULX0urM2bAeVrlc g7m7yCVTQ1ptXtkrz3L79RkBo0XzEf1fdu+w6Ujw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yonglong Liu , Peng Li , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 23/63] net: hns: Clean rx fbd when ae stopped. Date: Fri, 11 Jan 2019 15:14:26 +0100 Message-Id: <20190111131049.459891920@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131046.387528003@linuxfoundation.org> References: <20190111131046.387528003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 31f6b61d810654fb3ef43f4d8afda0f44b142fad ] If there are packets in hardware when changing the speed or duplex, it may cause hardware hang up. This patch adds the code to wait rx fbd clean up when ae stopped. Signed-off-by: Yonglong Liu Signed-off-by: Peng Li Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c index b7c8433a7a37..0b4d90ceea7a 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c @@ -290,6 +290,9 @@ void hns_ae_stop(struct hnae_handle *handle) hns_ae_ring_enable_all(handle, 0); + /* clean rx fbd. */ + hns_rcb_wait_fbd_clean(handle->qs, handle->q_num, RCB_INT_FLAG_RX); + (void)hns_mac_vm_config_bc_en(mac_cb, 0, false); } -- 2.19.1