diff mbox series

[5.9,31/49] net: stmmac: increase the timeout for dma reset

Message ID	20201219125346.194761917@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, Fugang Duan <fugang.duan@nxp.com>, Joakim Zhang <qiangqing.zhang@nxp.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 5.9 31/49] net: stmmac: increase the timeout for dma reset Date: Sat, 19 Dec 2020 13:58:35 +0100 Message-Id: <20201219125346.194761917@linuxfoundation.org> In-Reply-To: <20201219125344.671832095@linuxfoundation.org> References: <20201219125344.671832095@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 [5.9,03/49] net: ipa: pass the correct size when freeing DMA memory [5.9,04/49] ipv4: fix error return code in rtm_to_fib_config() [5.9,06/49] net: bridge: vlan: fix error return code in __vlan_add() [5.9,07/49] vrf: packets with lladdr src needs dst at input with orig_iif when needs strict [5.9,08/49] net: mscc: ocelot: fix dropping of unknown IPv4 multicast on Seville [5.9,09/49] net: hns3: remove a misused pragma packed [5.9,10/49] udp: fix the proto value passed to ip_protocol_deliver_rcu for the segments [5.9,12/49] bridge: Fix a deadlock when enabling multicast snooping [5.9,13/49] mptcp: print new line in mptcp_seq_show() if mptcp isnt in use [5.9,18/49] net: stmmac: overwrite the dma_cap.addr64 according to HW design [5.9,21/49] e1000e: fix S0ix flow to allow S0i3.2 subset entry [5.9,24/49] net: flow_offload: Fix memory leak for indirect flow block [5.9,27/49] net: sched: Fix dump of MPLS_OPT_LSE_LABEL attribute in cls_flower [5.9,29/49] ch_ktls: fix build warning for ipv4-only config [5.9,31/49] net: stmmac: increase the timeout for dma reset [5.9,32/49] net: tipc: prevent possible null deref of link [5.9,34/49] ktest.pl: Fix the logic for truncating the size of the log file for email [5.9,35/49] USB: dummy-hcd: Fix uninitialized array use in init() [5.9,37/49] ALSA: usb-audio: Fix potential out-of-bounds shift [5.9,41/49] xhci-pci: Allow host runtime PM as default for Intel Maple Ridge xHCI [5.9,43/49] USB: sisusbvga: Make console support depend on BROKEN [5.9,44/49] ALSA: pcm: oss: Fix potential out-of-bounds shift [5.9,47/49] membarrier: Explicitly sync remote cores when SYNC_CORE is requested [5.9,49/49] x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled

Commit Message

Greg KH Dec. 19, 2020, 12:58 p.m. UTC

From: Fugang Duan <fugang.duan@nxp.com>

[ Upstream commit 9d14edfdeabf37d8d8f045e63e5873712aadcd6b ]

Current timeout value is not enough for gmac5 dma reset
on imx8mp platform, increase the timeout range.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
@@ -22,7 +22,7 @@  int dwmac4_dma_reset(void __iomem *ioadd
 
 	return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,
 				 !(value & DMA_BUS_MODE_SFT_RESET),
-				 10000, 100000);
+				 10000, 1000000);
 }
 
 void dwmac4_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan)