diff options
| author | Yong-hyu, Ban <perillamint@quendi.moe> | 2020-04-26 18:43:22 +0900 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-04-27 22:32:07 +0200 |
| commit | 8fdf77878f46cac683115c10ee91956a35e61046 (patch) | |
| tree | b3f09db27e9f999104ee98eba84dfa05895c43f0 /target/linux | |
| parent | 1c008b61bd1284ea68abdc59173de484110986c9 (diff) | |
| download | upstream-8fdf77878f46cac683115c10ee91956a35e61046.tar.gz upstream-8fdf77878f46cac683115c10ee91956a35e61046.tar.bz2 upstream-8fdf77878f46cac683115c10ee91956a35e61046.zip | |
mediatek: fix compile error caused by upstreamed mtk_m32 function
This fixes following compile error:
```
CC drivers/net/ethernet/mediatek/mtk_eth_soc.o
drivers/net/ethernet/mediatek/mtk_eth_soc.c:70:5: error: conflicting types for 'mtk_m32'
u32 mtk_m32(struct mtk_eth *eth, u32 mask, u32 set, unsigned reg)
^~~~~~~
In file included from drivers/net/ethernet/mediatek/mtk_eth_soc.c:25:
drivers/net/ethernet/mediatek/mtk_eth_soc.h:964:6: note: previous declaration of 'mtk_m32' was here
void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg);
^~~~~~~
```
which caused by 5.4.34 mainlining of mtk_m32 function.
Fixes: faf668be354a ("kernel: bump 5.4 to 5.4.34")
Signed-off-by: Yong-hyu, Ban <perillamint@quendi.moe>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0999-hnat.patch | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/target/linux/mediatek/patches-5.4/0999-hnat.patch b/target/linux/mediatek/patches-5.4/0999-hnat.patch index b8c81459ae..5e4b4734e5 100644 --- a/target/linux/mediatek/patches-5.4/0999-hnat.patch +++ b/target/linux/mediatek/patches-5.4/0999-hnat.patch @@ -147,26 +147,20 @@ #include "mtk_eth_soc.h" -@@ -76,6 +78,18 @@ u32 mtk_m32(struct mtk_eth *eth, u32 mas - return reg; - } +@@ -69,10 +71,12 @@ u32 mtk_m32(struct mtk_eth *eth, u32 mas + { + u32 val; -+void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg) -+{ -+ u32 val; -+ + spin_lock(ð->page_lock); -+ val = __raw_readl(eth->base + reg); -+ val &= ~clear; -+ val |= set; -+ __raw_writel(val, eth->base + reg); + val = mtk_r32(eth, reg); + val &= ~mask; + val |= set; + mtk_w32(eth, val, reg); + spin_unlock(ð->page_lock); -+} -+ - static int mtk_mdio_busy_wait(struct mtk_eth *eth) - { - unsigned long t_start = jiffies; -@@ -1298,8 +1312,16 @@ static int mtk_poll_rx(struct napi_struc + return reg; + } + +@@ -1298,8 +1302,16 @@ static int mtk_poll_rx(struct napi_struc (trxd.rxd2 & RX_DMA_VTAG)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), RX_DMA_VID(trxd.rxd3)); @@ -185,7 +179,7 @@ ring->data[idx] = new_data; rxd->rxd1 = (unsigned int)dma_addr; -@@ -2216,6 +2238,9 @@ static int mtk_open(struct net_device *d +@@ -2216,6 +2228,9 @@ static int mtk_open(struct net_device *d mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); mtk_rx_irq_enable(eth, MTK_RX_DONE_INT); refcount_set(ð->dma_refcnt, 1); @@ -195,7 +189,7 @@ } else refcount_inc(ð->dma_refcnt); -@@ -2274,6 +2299,9 @@ static int mtk_stop(struct net_device *d +@@ -2274,6 +2289,9 @@ static int mtk_stop(struct net_device *d mtk_dma_free(eth); @@ -205,7 +199,7 @@ return 0; } -@@ -2733,6 +2761,27 @@ static int mtk_set_rxnfc(struct net_devi +@@ -2733,6 +2751,27 @@ static int mtk_set_rxnfc(struct net_devi return ret; } @@ -233,7 +227,7 @@ static const struct ethtool_ops mtk_ethtool_ops = { .get_link_ksettings = mtk_get_link_ksettings, .set_link_ksettings = mtk_set_link_ksettings, -@@ -2764,6 +2813,9 @@ static const struct net_device_ops mtk_n +@@ -2764,6 +2803,9 @@ static const struct net_device_ops mtk_n #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = mtk_poll_controller, #endif @@ -243,7 +237,7 @@ }; static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) -@@ -3097,6 +3149,7 @@ static const struct mtk_soc_data mt7622_ +@@ -3097,6 +3139,7 @@ static const struct mtk_soc_data mt7622_ .hw_features = MTK_HW_FEATURES, .required_clks = MT7622_CLKS_BITMAP, .required_pctl = false, @@ -320,7 +314,7 @@ void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg); u32 mtk_r32(struct mtk_eth *eth, unsigned reg); -+void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg); ++u32 mtk_m32(struct mtk_eth *eth, u32 mask, u32 set, unsigned reg); int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *np, u32 ana_rgc3); |