diff mbox series

[4.14,36/59] ftgmac100: Restart MAC HW once

Message ID	20210329075610.070177031@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Dylan Hung <dylan_hung@aspeedtech.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Joel Stanley <joel@jms.id.au>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.14 36/59] ftgmac100: Restart MAC HW once Date: Mon, 29 Mar 2021 09:58:16 +0200 Message-Id: <20210329075610.070177031@linuxfoundation.org> In-Reply-To: <20210329075608.898173317@linuxfoundation.org> References: <20210329075608.898173317@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.14,02/59] powerpc/4xx: Fix build errors from mfdcr() [4.14,03/59] atm: eni: dont release is never initialized [4.14,04/59] atm: lanai: dont run lanai_dev_close if not open [4.14,05/59] Revert "r8152: adjust the settings about MAC clock speed down for RTL8153" [4.14,06/59] ixgbe: Fix memleak in ixgbe_configure_clsu32 [4.14,07/59] net: tehuti: fix error return code in bdx_probe() [4.14,08/59] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count [4.14,09/59] gpiolib: acpi: Add missing IRQF_ONESHOT [4.14,10/59] nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default [4.14,11/59] NFS: Correct size calculation for create reply length [4.14,12/59] net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch() [4.14,13/59] net: wan: fix error return code of uhdlc_init() [4.14,14/59] atm: uPD98402: fix incorrect allocation [4.14,15/59] atm: idt77252: fix null-ptr-dereference [4.14,16/59] sparc64: Fix opcode filtering in handling of no fault loads [4.14,17/59] u64_stats,lockdep: Fix u64_stats_init() vs lockdep [4.14,18/59] drm/radeon: fix AGP dependency [4.14,19/59] nfs: we dont support removing system.nfs4_acl [4.14,20/59] ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls [4.14,21/59] ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign [4.14,22/59] squashfs: fix inode lookup sanity checks [4.14,23/59] squashfs: fix xattr id and id lookup sanity checks [4.14,24/59] arm64: dts: ls1046a: mark crypto engine dma coherent [4.14,25/59] arm64: dts: ls1012a: mark crypto engine dma coherent [4.14,26/59] arm64: dts: ls1043a: mark crypto engine dma coherent [4.14,27/59] ARM: dts: at91-sama5d27_som1: fix phy address to 7 [4.14,28/59] dm ioctl: fix out of bounds array access when no devices [4.14,29/59] bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD [4.14,30/59] libbpf: Fix INSTALL flag order [4.14,31/59] macvlan: macvlan_count_rx() needs to be aware of preemption [4.14,32/59] net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port [4.14,33/59] e1000e: add rtnl_lock() to e1000_reset_task [4.14,34/59] e1000e: Fix error handling in e1000_set_d0_lplu_state_82571 [4.14,35/59] net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template [4.14,36/59] ftgmac100: Restart MAC HW once [4.14,37/59] can: peak_usb: add forgotten supported devices [4.14,38/59] can: c_can_pci: c_can_pci_remove(): fix use-after-free [4.14,39/59] can: c_can: move runtime PM enable/disable to c_can_platform [4.14,40/59] can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning [4.14,41/59] mac80211: fix rate mask reset [4.14,42/59] net: cdc-phonet: fix data-interface release on probe failure [4.14,43/59] net: stmmac: dwmac-sun8i: Provide TX and RX fifo sizes [4.14,44/59] drm/msm: fix shutdown hook in case GPU components failed to bind [4.14,45/59] arm64: kdump: update ppos when reading elfcorehdr [4.14,46/59] net/mlx5e: Fix error path for ethtool set-priv-flag [4.14,47/59] RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server [4.14,48/59] ACPI: scan: Rearrange memory allocation in acpi_device_add() [4.14,49/59] ACPI: scan: Use unique number for instance_no [4.14,50/59] perf auxtrace: Fix auxtrace queue conflict [4.14,51/59] scsi: qedi: Fix error return code of qedi_alloc_global_queues() [4.14,52/59] scsi: mpt3sas: Fix error return code of mpt3sas_base_attach() [4.14,53/59] locking/mutex: Fix non debug version of mutex_lock_io_nested() [4.14,54/59] can: dev: Move device back to init netns on owning netns delete [4.14,55/59] net: sched: validate stab values [4.14,56/59] net: qrtr: fix a kernel-infoleak in qrtr_recvmsg() [4.14,57/59] mac80211: fix double free in ibss_leave [4.14,58/59] ext4: add reclaim checks to xattr code [4.14,59/59] can: peak_usb: Revert "can: peak_usb: add forgotten supported devices"

Commit Message

Greg Kroah-Hartman March 29, 2021, 7:58 a.m. UTC

From: Dylan Hung <dylan_hung@aspeedtech.com>

[ Upstream commit 6897087323a2fde46df32917462750c069668b2f ]

The interrupt handler may set the flag to reset the mac in the future,
but that flag is not cleared once the reset has occurred.

Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling")
Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/faraday/ftgmac100.c | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index b28425f4cfac..f35c5dbe54ee 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1328,6 +1328,7 @@  static int ftgmac100_poll(struct napi_struct *napi, int budget)
 	 */
 	if (unlikely(priv->need_mac_restart)) {
 		ftgmac100_start_hw(priv);
+		priv->need_mac_restart = false;
 
 		/* Re-enable "bad" interrupts */
 		iowrite32(FTGMAC100_INT_BAD,