-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
50 changed files
with
160 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.1 = .59 | ||
LINUX_KERNEL_HASH-6.1.59 = 627f7724c675036639290fb5c39e3fdeb3d566b80b192c45f4a808ab54c8c0a0 | ||
LINUX_VERSION-6.1 = .60 | ||
LINUX_KERNEL_HASH-6.1.60 = 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -335,23 +335,23 @@ Signed-off-by: T.J. Mercier <[email protected]> | |
if (order > 0) | ||
return 0; | ||
|
||
@@ -5383,6 +5396,7 @@ static int mem_cgroup_css_online(struct | ||
@@ -5386,6 +5399,7 @@ static int mem_cgroup_css_online(struct | ||
if (unlikely(mem_cgroup_is_root(memcg))) | ||
queue_delayed_work(system_unbound_wq, &stats_flush_dwork, | ||
2UL*HZ); | ||
+ lru_gen_online_memcg(memcg); | ||
return 0; | ||
offline_kmem: | ||
memcg_offline_kmem(memcg); | ||
@@ -5414,6 +5428,7 @@ static void mem_cgroup_css_offline(struc | ||
@@ -5417,6 +5431,7 @@ static void mem_cgroup_css_offline(struc | ||
memcg_offline_kmem(memcg); | ||
reparent_shrinker_deferred(memcg); | ||
wb_memcg_offline(memcg); | ||
+ lru_gen_offline_memcg(memcg); | ||
|
||
drain_all_stock(memcg); | ||
|
||
@@ -5425,6 +5440,7 @@ static void mem_cgroup_css_released(stru | ||
@@ -5428,6 +5443,7 @@ static void mem_cgroup_css_released(stru | ||
struct mem_cgroup *memcg = mem_cgroup_from_css(css); | ||
|
||
invalidate_reclaim_iterators(memcg); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -3478,11 +3478,8 @@ static void mtk_pending_work(struct work | ||
@@ -3481,11 +3481,8 @@ static void mtk_pending_work(struct work | ||
rtnl_lock(); | ||
|
||
dev_dbg(eth->dev, "[%s][%d] reset\n", __func__, __LINE__); | ||
|
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
/* stop all devices to make sure that dma is properly shut down */ | ||
for (i = 0; i < MTK_MAC_COUNT; i++) { | ||
if (!eth->netdev[i]) | ||
@@ -3516,7 +3513,7 @@ static void mtk_pending_work(struct work | ||
@@ -3519,7 +3516,7 @@ static void mtk_pending_work(struct work | ||
|
||
dev_dbg(eth->dev, "[%s][%d] reset done\n", __func__, __LINE__); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -3254,6 +3254,27 @@ static void mtk_set_mcr_max_rx(struct mt | ||
@@ -3257,6 +3257,27 @@ static void mtk_set_mcr_max_rx(struct mt | ||
mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id)); | ||
} | ||
|
||
|
@@ -44,7 +44,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
static int mtk_hw_init(struct mtk_eth *eth) | ||
{ | ||
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA | | ||
@@ -3293,22 +3314,9 @@ static int mtk_hw_init(struct mtk_eth *e | ||
@@ -3296,22 +3317,9 @@ static int mtk_hw_init(struct mtk_eth *e | ||
return 0; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -3275,7 +3275,54 @@ static void mtk_hw_reset(struct mtk_eth | ||
@@ -3278,7 +3278,54 @@ static void mtk_hw_reset(struct mtk_eth | ||
0x3ffffff); | ||
} | ||
|
||
|
@@ -73,7 +73,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
{ | ||
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA | | ||
ETHSYS_DMA_AG_MAP_PPE; | ||
@@ -3314,7 +3361,12 @@ static int mtk_hw_init(struct mtk_eth *e | ||
@@ -3317,7 +3364,12 @@ static int mtk_hw_init(struct mtk_eth *e | ||
return 0; | ||
} | ||
|
||
|
@@ -87,7 +87,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) { | ||
/* Set FE to PDMAv2 if necessary */ | ||
@@ -3505,7 +3557,7 @@ static void mtk_pending_work(struct work | ||
@@ -3508,7 +3560,7 @@ static void mtk_pending_work(struct work | ||
if (eth->dev->pins) | ||
pinctrl_select_state(eth->dev->pins->p, | ||
eth->dev->pins->default_state); | ||
|
@@ -96,7 +96,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
/* restart DMA and enable IRQs */ | ||
for (i = 0; i < MTK_MAC_COUNT; i++) { | ||
@@ -4107,7 +4159,7 @@ static int mtk_probe(struct platform_dev | ||
@@ -4110,7 +4162,7 @@ static int mtk_probe(struct platform_dev | ||
eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE); | ||
INIT_WORK(ð->pending_work, mtk_pending_work); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -2842,14 +2842,29 @@ static void mtk_dma_free(struct mtk_eth | ||
@@ -2845,14 +2845,29 @@ static void mtk_dma_free(struct mtk_eth | ||
kfree(eth->scratch_head); | ||
} | ||
|
||
|
@@ -48,7 +48,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
schedule_work(ð->pending_work); | ||
} | ||
|
||
@@ -3329,15 +3344,17 @@ static int mtk_hw_init(struct mtk_eth *e | ||
@@ -3332,15 +3347,17 @@ static int mtk_hw_init(struct mtk_eth *e | ||
const struct mtk_reg_map *reg_map = eth->soc->reg_map; | ||
int i, val, ret; | ||
|
||
|
@@ -72,7 +72,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
if (eth->ethsys) | ||
regmap_update_bits(eth->ethsys, ETHSYS_DMA_AG_MAP, dma_mask, | ||
@@ -3466,8 +3483,10 @@ static int mtk_hw_init(struct mtk_eth *e | ||
@@ -3469,8 +3486,10 @@ static int mtk_hw_init(struct mtk_eth *e | ||
return 0; | ||
|
||
err_disable_pm: | ||
|
@@ -85,7 +85,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
return ret; | ||
} | ||
@@ -3529,30 +3548,53 @@ static int mtk_do_ioctl(struct net_devic | ||
@@ -3532,30 +3551,53 @@ static int mtk_do_ioctl(struct net_devic | ||
return -EOPNOTSUPP; | ||
} | ||
|
||
|
@@ -148,7 +148,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
if (eth->dev->pins) | ||
pinctrl_select_state(eth->dev->pins->p, | ||
@@ -3563,15 +3605,19 @@ static void mtk_pending_work(struct work | ||
@@ -3566,15 +3608,19 @@ static void mtk_pending_work(struct work | ||
for (i = 0; i < MTK_MAC_COUNT; i++) { | ||
if (!test_bit(i, &restart)) | ||
continue; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
}; | ||
|
||
/* strings used by ethtool */ | ||
@@ -3337,6 +3343,102 @@ static void mtk_hw_warm_reset(struct mtk | ||
@@ -3340,6 +3346,102 @@ static void mtk_hw_warm_reset(struct mtk | ||
val, rst_mask); | ||
} | ||
|
||
|
@@ -152,23 +152,23 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
static int mtk_hw_init(struct mtk_eth *eth, bool reset) | ||
{ | ||
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA | | ||
@@ -3655,6 +3757,7 @@ static int mtk_cleanup(struct mtk_eth *e | ||
@@ -3658,6 +3760,7 @@ static int mtk_cleanup(struct mtk_eth *e | ||
mtk_unreg_dev(eth); | ||
mtk_free_dev(eth); | ||
cancel_work_sync(ð->pending_work); | ||
+ cancel_delayed_work_sync(ð->reset.monitor_work); | ||
|
||
return 0; | ||
} | ||
@@ -4092,6 +4195,7 @@ static int mtk_probe(struct platform_dev | ||
@@ -4095,6 +4198,7 @@ static int mtk_probe(struct platform_dev | ||
|
||
eth->rx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE; | ||
INIT_WORK(ð->rx_dim.work, mtk_dim_rx); | ||
+ INIT_DELAYED_WORK(ð->reset.monitor_work, mtk_hw_reset_monitor_work); | ||
|
||
eth->tx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE; | ||
INIT_WORK(ð->tx_dim.work, mtk_dim_tx); | ||
@@ -4294,6 +4398,8 @@ static int mtk_probe(struct platform_dev | ||
@@ -4297,6 +4401,8 @@ static int mtk_probe(struct platform_dev | ||
netif_napi_add(ð->dummy_dev, ð->rx_napi, mtk_napi_rx); | ||
|
||
platform_set_drvdata(pdev, eth); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -3686,6 +3686,11 @@ static void mtk_pending_work(struct work | ||
@@ -3689,6 +3689,11 @@ static void mtk_pending_work(struct work | ||
set_bit(MTK_RESETTING, ð->state); | ||
|
||
mtk_prepare_for_reset(eth); | ||
|
@@ -26,7 +26,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
/* stop all devices to make sure that dma is properly shut down */ | ||
for (i = 0; i < MTK_MAC_COUNT; i++) { | ||
@@ -3723,6 +3728,8 @@ static void mtk_pending_work(struct work | ||
@@ -3726,6 +3731,8 @@ static void mtk_pending_work(struct work | ||
|
||
clear_bit(MTK_RESETTING, ð->state); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -122,7 +122,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
ring->dma_pdma, ring->phys_pdma); | ||
ring->dma_pdma = NULL; | ||
} | ||
@@ -2830,7 +2836,7 @@ static void mtk_dma_free(struct mtk_eth | ||
@@ -2833,7 +2839,7 @@ static void mtk_dma_free(struct mtk_eth | ||
netdev_reset_queue(eth->netdev[i]); | ||
if (eth->scratch_ring) { | ||
dma_free_coherent(eth->dma_dev, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -4477,7 +4477,7 @@ static const struct mtk_soc_data mt7621_ | ||
@@ -4480,7 +4480,7 @@ static const struct mtk_soc_data mt7621_ | ||
.hw_features = MTK_HW_FEATURES, | ||
.required_clks = MT7621_CLKS_BITMAP, | ||
.required_pctl = false, | ||
|
@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
.hash_offset = 2, | ||
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16, | ||
.txrx = { | ||
@@ -4516,7 +4516,7 @@ static const struct mtk_soc_data mt7623_ | ||
@@ -4519,7 +4519,7 @@ static const struct mtk_soc_data mt7623_ | ||
.hw_features = MTK_HW_FEATURES, | ||
.required_clks = MT7623_CLKS_BITMAP, | ||
.required_pctl = true, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -424,7 +424,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} else { | ||
mtk_w32(eth, ring->phys_pdma, MT7628_TX_BASE_PTR0); | ||
mtk_w32(eth, ring_size, MT7628_TX_MAX_CNT0); | ||
@@ -2960,7 +3076,7 @@ static int mtk_start_dma(struct mtk_eth | ||
@@ -2963,7 +3079,7 @@ static int mtk_start_dma(struct mtk_eth | ||
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) | ||
val |= MTK_MUTLI_CNT | MTK_RESV_BUF | | ||
MTK_WCOMP_EN | MTK_DMAD_WR_WDONE | | ||
|
@@ -433,7 +433,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
else | ||
val |= MTK_RX_BT_32DWORDS; | ||
mtk_w32(eth, val, reg_map->qdma.glo_cfg); | ||
@@ -3006,6 +3122,45 @@ static void mtk_gdm_config(struct mtk_et | ||
@@ -3009,6 +3125,45 @@ static void mtk_gdm_config(struct mtk_et | ||
mtk_w32(eth, 0, MTK_RST_GL); | ||
} | ||
|
||
|
@@ -479,7 +479,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
static int mtk_open(struct net_device *dev) | ||
{ | ||
struct mtk_mac *mac = netdev_priv(dev); | ||
@@ -3048,7 +3203,8 @@ static int mtk_open(struct net_device *d | ||
@@ -3051,7 +3206,8 @@ static int mtk_open(struct net_device *d | ||
refcount_inc(ð->dma_refcnt); | ||
|
||
phylink_start(mac->phylink); | ||
|
@@ -489,7 +489,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
return 0; | ||
} | ||
|
||
@@ -3757,8 +3913,12 @@ static int mtk_unreg_dev(struct mtk_eth | ||
@@ -3760,8 +3916,12 @@ static int mtk_unreg_dev(struct mtk_eth | ||
int i; | ||
|
||
for (i = 0; i < MTK_MAC_COUNT; i++) { | ||
|
@@ -502,7 +502,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
unregister_netdev(eth->netdev[i]); | ||
} | ||
|
||
@@ -3975,6 +4135,23 @@ static int mtk_set_rxnfc(struct net_devi | ||
@@ -3978,6 +4138,23 @@ static int mtk_set_rxnfc(struct net_devi | ||
return ret; | ||
} | ||
|
||
|
@@ -526,23 +526,23 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
static const struct ethtool_ops mtk_ethtool_ops = { | ||
.get_link_ksettings = mtk_get_link_ksettings, | ||
.set_link_ksettings = mtk_set_link_ksettings, | ||
@@ -4009,6 +4186,7 @@ static const struct net_device_ops mtk_n | ||
@@ -4012,6 +4189,7 @@ static const struct net_device_ops mtk_n | ||
.ndo_setup_tc = mtk_eth_setup_tc, | ||
.ndo_bpf = mtk_xdp, | ||
.ndo_xdp_xmit = mtk_xdp_xmit, | ||
+ .ndo_select_queue = mtk_select_queue, | ||
}; | ||
|
||
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) | ||
@@ -4018,6 +4196,7 @@ static int mtk_add_mac(struct mtk_eth *e | ||
@@ -4021,6 +4199,7 @@ static int mtk_add_mac(struct mtk_eth *e | ||
struct phylink *phylink; | ||
struct mtk_mac *mac; | ||
int id, err; | ||
+ int txqs = 1; | ||
|
||
if (!_id) { | ||
dev_err(eth->dev, "missing mac id\n"); | ||
@@ -4035,7 +4214,10 @@ static int mtk_add_mac(struct mtk_eth *e | ||
@@ -4038,7 +4217,10 @@ static int mtk_add_mac(struct mtk_eth *e | ||
return -EINVAL; | ||
} | ||
|
||
|
@@ -554,7 +554,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!eth->netdev[id]) { | ||
dev_err(eth->dev, "alloc_etherdev failed\n"); | ||
return -ENOMEM; | ||
@@ -4143,6 +4325,11 @@ static int mtk_add_mac(struct mtk_eth *e | ||
@@ -4146,6 +4328,11 @@ static int mtk_add_mac(struct mtk_eth *e | ||
else | ||
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
skb_record_rx_queue(skb, 0); | ||
@@ -2856,15 +2863,30 @@ static netdev_features_t mtk_fix_feature | ||
@@ -2859,15 +2866,30 @@ static netdev_features_t mtk_fix_feature | ||
|
||
static int mtk_set_features(struct net_device *dev, netdev_features_t features) | ||
{ | ||
|
@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
/* wait for DMA to finish whatever it is doing before we start using it again */ | ||
@@ -3161,11 +3183,45 @@ found: | ||
@@ -3164,11 +3186,45 @@ found: | ||
return NOTIFY_DONE; | ||
} | ||
|
||
|
@@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0); | ||
if (err) { | ||
@@ -3686,6 +3742,10 @@ static int mtk_hw_init(struct mtk_eth *e | ||
@@ -3689,6 +3745,10 @@ static int mtk_hw_init(struct mtk_eth *e | ||
*/ | ||
val = mtk_r32(eth, MTK_CDMQ_IG_CTRL); | ||
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL); | ||
|
@@ -146,7 +146,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
/* Enable RX VLan Offloading */ | ||
mtk_w32(eth, 1, MTK_CDMP_EG_CTRL); | ||
@@ -3905,6 +3965,12 @@ static int mtk_free_dev(struct mtk_eth * | ||
@@ -3908,6 +3968,12 @@ static int mtk_free_dev(struct mtk_eth * | ||
free_netdev(eth->netdev[i]); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -3199,7 +3199,8 @@ static int mtk_open(struct net_device *d | ||
@@ -3202,7 +3202,8 @@ static int mtk_open(struct net_device *d | ||
struct mtk_eth *eth = mac->hw; | ||
int i, err; | ||
|
||
|
@@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) { | ||
struct metadata_dst *md_dst = eth->dsa_meta[i]; | ||
|
||
@@ -3216,7 +3217,8 @@ static int mtk_open(struct net_device *d | ||
@@ -3219,7 +3220,8 @@ static int mtk_open(struct net_device *d | ||
} | ||
} else { | ||
/* Hardware special tag parsing needs to be disabled if at least | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -3134,7 +3134,7 @@ static void mtk_gdm_config(struct mtk_et | ||
@@ -3137,7 +3137,7 @@ static void mtk_gdm_config(struct mtk_et | ||
|
||
val |= config; | ||
|
||
|
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
val |= MTK_GDMA_SPECIAL_TAG; | ||
|
||
mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i)); | ||
@@ -3199,8 +3199,7 @@ static int mtk_open(struct net_device *d | ||
@@ -3202,8 +3202,7 @@ static int mtk_open(struct net_device *d | ||
struct mtk_eth *eth = mac->hw; | ||
int i, err; | ||
|
||
|
@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) { | ||
struct metadata_dst *md_dst = eth->dsa_meta[i]; | ||
|
||
@@ -3217,8 +3216,7 @@ static int mtk_open(struct net_device *d | ||
@@ -3220,8 +3219,7 @@ static int mtk_open(struct net_device *d | ||
} | ||
} else { | ||
/* Hardware special tag parsing needs to be disabled if at least | ||
|
Oops, something went wrong.