KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mediatek: fix a sleep while atomic bug inside the ethernet driver

Browse source 
this sometimes happens when we have hw nat enabled.

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2017-10-09 11:29:01 +02:00
parent 9e9696afc8
commit c972779e98
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
target/linux/mediatek/patches-4.9/0063-atomic-sleep.patch Normal file
View file

@ -0,0 +1,40 @@
Index: linux-4.9.50/drivers/net/ethernet/mediatek/mtk_eth_soc.c
===================================================================
--- linux-4.9.50.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ linux-4.9.50/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1533,7 +1533,10 @@ static void mtk_hwlro_rx_uninit(struct m
for (i = 0; i < 10; i++) {
val = mtk_r32(eth, MTK_PDMA_LRO_CTRL_DW0);
if (val & MTK_LRO_RING_RELINQUISH_DONE) {
- msleep(20);
+ if (in_atomic())
+ mdelay(20);
+ else
+ msleep(20);
continue;
}
break;
@@ -1951,7 +1954,10 @@ static void mtk_stop_dma(struct mtk_eth
for (i = 0; i < 10; i++) {
val = mtk_r32(eth, glo_cfg);
if (val & (MTK_TX_DMA_BUSY | MTK_RX_DMA_BUSY)) {
- msleep(20);
+ if (in_atomic())
+ mdelay(20);
+ else
+ msleep(20);
continue;
}
break;
@@ -1996,7 +2002,10 @@ static void ethsys_reset(struct mtk_eth
reset_bits,
reset_bits);
- usleep_range(1000, 1100);
+ if (in_atomic())
+ udelay(1000);
+ else
+ usleep_range(1000, 1100);
regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL,
reset_bits,
~reset_bits);