-
Notifications
You must be signed in to change notification settings - Fork 19.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mediatek: re-add missing patch for Linux 6.1
The patch was wrongly tagged as being part of Linux 6.0 even though it was only committed with Linux 6.2 and hence needs to be backported for Linux 6.1. Fixes: fa79baf ("generic: copy backport, hack, pending patch and config from 5.15 to 6.1") Signed-off-by: Daniel Golle <[email protected]>
- Loading branch information
Showing
7 changed files
with
35 additions
and
9 deletions.
There are no files selected for viewing
File renamed without changes.
26 changes: 26 additions & 0 deletions
26
.../generic/backport-6.1/724-v6.2-net-ethernet-mtk_eth_soc-enable-flow-offloading-supp.patch
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 |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 1b9827ceab08450308f7971d6fd700ec88b6ce67 Mon Sep 17 00:00:00 2001 | ||
From: Lorenzo Bianconi <[email protected]> | ||
Date: Sat, 3 Dec 2022 14:20:37 +0100 | ||
Subject: [PATCH 098/250] net: mtk_eth_soc: enable flow offload support for | ||
MT7986 SoC | ||
|
||
Since Wireless Ethernet Dispatcher is now available for mt7986 in mt76, | ||
enable hw flow support for MT7986 SoC. | ||
|
||
Signed-off-by: Lorenzo Bianconi <[email protected]> | ||
Link: https://lore.kernel.org/r/fdcaacd827938e6a8c4aa1ac2c13e46d2c08c821.1670072898.git.lorenzo@kernel.org | ||
Signed-off-by: Jakub Kicinski <[email protected]> | ||
--- | ||
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c | ||
@@ -4331,6 +4331,7 @@ static const struct mtk_soc_data mt7986_ | ||
.hw_features = MTK_HW_FEATURES, | ||
.required_clks = MT7986_CLKS_BITMAP, | ||
.required_pctl = false, | ||
+ .offload_version = 2, | ||
.hash_offset = 4, | ||
.foe_entry_size = sizeof(struct mtk_foe_entry), | ||
.txrx = { |
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 |
---|---|---|
|
@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
static const struct mtk_soc_data mt7986_data = { | ||
.reg_map = &mt7986_reg_map, | ||
.ana_rgc3 = 0x128, | ||
@@ -4845,6 +4865,7 @@ const struct of_device_id of_mtk_match[] | ||
@@ -4843,6 +4863,7 @@ const struct of_device_id of_mtk_match[] | ||
{ .compatible = "mediatek,mt7622-eth", .data = &mt7622_data}, | ||
{ .compatible = "mediatek,mt7623-eth", .data = &mt7623_data}, | ||
{ .compatible = "mediatek,mt7629-eth", .data = &mt7629_data}, | ||
|
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
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 |
---|---|---|
|
@@ -117,15 +117,15 @@ Signed-off-by: Daniel Golle <[email protected]> | |
.txrx = { | ||
.txd_size = sizeof(struct mtk_tx_dma_v2), | ||
.rxd_size = sizeof(struct mtk_rx_dma_v2), | ||
@@ -4904,6 +4930,7 @@ static const struct mtk_soc_data mt7986_ | ||
.required_clks = MT7986_CLKS_BITMAP, | ||
@@ -4902,6 +4928,7 @@ static const struct mtk_soc_data mt7986_ | ||
.required_pctl = false, | ||
.offload_version = 2, | ||
.hash_offset = 4, | ||
+ .num_devs = 2, | ||
.foe_entry_size = sizeof(struct mtk_foe_entry), | ||
.has_accounting = true, | ||
.txrx = { | ||
@@ -4922,6 +4949,7 @@ static const struct mtk_soc_data rt5350_ | ||
@@ -4920,6 +4947,7 @@ static const struct mtk_soc_data rt5350_ | ||
.hw_features = MTK_HW_FEATURES_MT7628, | ||
.required_clks = MT7628_CLKS_BITMAP, | ||
.required_pctl = false, | ||
|
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
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