gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mediatek: fix compile error caused by upstreamed mtk_m32 function

Browse Source 
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>
This commit is contained in:
Yong-hyu, Ban 2020-04-26 18:43:22 +09:00 committed by Hauke Mehrtens
parent 1c008b61bd
commit 8fdf77878f
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
target/linux/mediatek/patches-5.4/0999-hnat.patch
View File

@ -147,26 +147,20 @@
#include "mtk_eth_soc.h" #include "mtk_eth_soc.h"
@@ -76,6 +78,18 @@ u32 mtk_m32(struct mtk_eth *eth, u32 mas @@ -69,10 +71,12 @@ u32 mtk_m32(struct mtk_eth *eth, u32 mas
{
u32 val;
+ spin_lock(&eth->page_lock);
val = mtk_r32(eth, reg);
val &= ~mask;
val |= set;
mtk_w32(eth, val, reg);
+ spin_unlock(&eth->page_lock);
return reg; return reg;
} }
+void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg) @@ -1298,8 +1302,16 @@ static int mtk_poll_rx(struct napi_struc
+{
+ u32 val;
+
+ spin_lock(&eth->page_lock);
+ val = __raw_readl(eth->base + reg);
+ val &= ~clear;
+ val |= set;
+ __raw_writel(val, eth->base + reg);
+ spin_unlock(&eth->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
(trxd.rxd2 & RX_DMA_VTAG)) (trxd.rxd2 & RX_DMA_VTAG))
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
RX_DMA_VID(trxd.rxd3)); RX_DMA_VID(trxd.rxd3));
@ -185,7 +179,7 @@
ring->data[idx] = new_data; ring->data[idx] = new_data;
rxd->rxd1 = (unsigned int)dma_addr; 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_tx_irq_enable(eth, MTK_TX_DONE_INT);
mtk_rx_irq_enable(eth, MTK_RX_DONE_INT); mtk_rx_irq_enable(eth, MTK_RX_DONE_INT);
refcount_set(&eth->dma_refcnt, 1); refcount_set(&eth->dma_refcnt, 1);
@ -195,7 +189,7 @@
} }
else else
refcount_inc(&eth->dma_refcnt); refcount_inc(&eth->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); mtk_dma_free(eth);
@ -205,7 +199,7 @@
return 0; 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; return ret;
} }
@ -233,7 +227,7 @@
static const struct ethtool_ops mtk_ethtool_ops = { static const struct ethtool_ops mtk_ethtool_ops = {
.get_link_ksettings = mtk_get_link_ksettings, .get_link_ksettings = mtk_get_link_ksettings,
.set_link_ksettings = mtk_set_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 #ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = mtk_poll_controller, .ndo_poll_controller = mtk_poll_controller,
#endif #endif
@ -243,7 +237,7 @@
}; };
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) 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, .hw_features = MTK_HW_FEATURES,
.required_clks = MT7622_CLKS_BITMAP, .required_clks = MT7622_CLKS_BITMAP,
.required_pctl = false, .required_pctl = false,
@ -320,7 +314,7 @@
void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg); void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg);
u32 mtk_r32(struct mtk_eth *eth, 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, int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *np,
u32 ana_rgc3); u32 ana_rgc3);