kernel: bump 4.9 to 4.9.57
[openwrt/staging/chunkeey.git] / target / linux / mediatek / patches-4.9 / 0063-atomic-sleep.patch
1 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
2 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
3 @@ -1533,7 +1533,10 @@ static void mtk_hwlro_rx_uninit(struct m
4 for (i = 0; i < 10; i++) {
5 val = mtk_r32(eth, MTK_PDMA_LRO_CTRL_DW0);
6 if (val & MTK_LRO_RING_RELINQUISH_DONE) {
7 - msleep(20);
8 + if (in_atomic())
9 + mdelay(20);
10 + else
11 + msleep(20);
12 continue;
13 }
14 break;
15 @@ -1951,7 +1954,10 @@ static void mtk_stop_dma(struct mtk_eth
16 for (i = 0; i < 10; i++) {
17 val = mtk_r32(eth, glo_cfg);
18 if (val & (MTK_TX_DMA_BUSY | MTK_RX_DMA_BUSY)) {
19 - msleep(20);
20 + if (in_atomic())
21 + mdelay(20);
22 + else
23 + msleep(20);
24 continue;
25 }
26 break;
27 @@ -1996,7 +2002,10 @@ static void ethsys_reset(struct mtk_eth
28 reset_bits,
29 reset_bits);
30
31 - usleep_range(1000, 1100);
32 + if (in_atomic())
33 + udelay(1000);
34 + else
35 + usleep_range(1000, 1100);
36 regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL,
37 reset_bits,
38 ~reset_bits);