projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.15 to 5.15.132
[openwrt/staging/stintel.git]
/
target
/
linux
/
generic
/
backport-5.15
/
750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
diff --git
a/target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
b/target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
index 58729cec5215106786b0fd5bcaeb327c4fee3774..281291252b45a55383be66ea56f14e230e93b4f0 100644
(file)
--- a/
target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
+++ b/
target/linux/generic/backport-5.15/750-v6.5-07-net-ethernet-mtk_eth_soc-rely-on-MTK_MAX_DEVS-and-re.patch
@@
-53,7
+53,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
!eth->netdev[mac]))
goto release_desc;
!eth->netdev[mac]))
goto release_desc;
-@@ -284
1,7 +2841
,7 @@ static void mtk_dma_free(struct mtk_eth
+@@ -284
4,7 +2844
,7 @@ static void mtk_dma_free(struct mtk_eth
const struct mtk_soc_data *soc = eth->soc;
int i;
const struct mtk_soc_data *soc = eth->soc;
int i;
@@
-62,7
+62,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
if (eth->netdev[i])
netdev_reset_queue(eth->netdev[i]);
if (eth->scratch_ring) {
if (eth->netdev[i])
netdev_reset_queue(eth->netdev[i]);
if (eth->scratch_ring) {
-@@ -299
5,8 +2995
,13 @@ static void mtk_gdm_config(struct mtk_et
+@@ -299
8,8 +2998
,13 @@ static void mtk_gdm_config(struct mtk_et
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
return;
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
return;
@@
-78,7
+78,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* default setup the forward port to send frame to PDMA */
val &= ~0xffff;
/* default setup the forward port to send frame to PDMA */
val &= ~0xffff;
-@@ -300
6,7 +3011
,7 @@ static void mtk_gdm_config(struct mtk_et
+@@ -300
9,7 +3014
,7 @@ static void mtk_gdm_config(struct mtk_et
val |= config;
val |= config;
@@
-87,7
+87,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
val |= MTK_GDMA_SPECIAL_TAG;
mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
val |= MTK_GDMA_SPECIAL_TAG;
mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
-@@ -360
5,15 +3610
,15 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -360
8,15 +3613
,15 @@ static int mtk_hw_init(struct mtk_eth *e
* up with the more appropriate value when mtk_mac_config call is being
* invoked.
*/
* up with the more appropriate value when mtk_mac_config call is being
* invoked.
*/
@@
-109,7
+109,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
}
/* Indicates CDM to parse the MTK special tag from CPU
}
/* Indicates CDM to parse the MTK special tag from CPU
-@@ -379
3,7 +3798
,7 @@ static void mtk_pending_work(struct work
+@@ -379
6,7 +3801
,7 @@ static void mtk_pending_work(struct work
mtk_prepare_for_reset(eth);
/* stop all devices to make sure that dma is properly shut down */
mtk_prepare_for_reset(eth);
/* stop all devices to make sure that dma is properly shut down */
@@
-118,7
+118,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
if (!eth->netdev[i] || !netif_running(eth->netdev[i]))
continue;
if (!eth->netdev[i] || !netif_running(eth->netdev[i]))
continue;
-@@ -38
09,8 +3814
,8 @@ static void mtk_pending_work(struct work
+@@ -38
12,8 +3817
,8 @@ static void mtk_pending_work(struct work
mtk_hw_init(eth, true);
/* restart DMA and enable IRQs */
mtk_hw_init(eth, true);
/* restart DMA and enable IRQs */
@@
-129,7
+129,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
continue;
if (mtk_open(eth->netdev[i])) {
continue;
if (mtk_open(eth->netdev[i])) {
-@@ -38
37,7 +3842
,7 @@ static int mtk_free_dev(struct mtk_eth *
+@@ -38
40,7 +3845
,7 @@ static int mtk_free_dev(struct mtk_eth *
{
int i;
{
int i;
@@
-138,7
+138,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
if (!eth->netdev[i])
continue;
free_netdev(eth->netdev[i]);
if (!eth->netdev[i])
continue;
free_netdev(eth->netdev[i]);
-@@ -385
6,7 +3861
,7 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -385
9,7 +3864
,7 @@ static int mtk_unreg_dev(struct mtk_eth
{
int i;
{
int i;
@@
-147,7
+147,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
struct mtk_mac *mac;
if (!eth->netdev[i])
continue;
struct mtk_mac *mac;
if (!eth->netdev[i])
continue;
-@@ -41
57,7 +4162
,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -41
60,7 +4165
,7 @@ static int mtk_add_mac(struct mtk_eth *e
}
id = be32_to_cpup(_id);
}
id = be32_to_cpup(_id);
@@
-156,7
+156,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
dev_err(eth->dev, "%d is not a valid mac id\n", id);
return -EINVAL;
}
dev_err(eth->dev, "%d is not a valid mac id\n", id);
return -EINVAL;
}
-@@ -430
2,7 +4307
,7 @@ void mtk_eth_set_dma_device(struct mtk_e
+@@ -430
5,7 +4310
,7 @@ void mtk_eth_set_dma_device(struct mtk_e
rtnl_lock();
rtnl_lock();
@@
-165,7
+165,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
dev = eth->netdev[i];
if (!dev || !(dev->flags & IFF_UP))
dev = eth->netdev[i];
if (!dev || !(dev->flags & IFF_UP))
-@@ -461
0,7 +4615
,7 @@ static int mtk_remove(struct platform_de
+@@ -461
3,7 +4618
,7 @@ static int mtk_remove(struct platform_de
int i;
/* stop all devices to make sure that dma is properly shut down */
int i;
/* stop all devices to make sure that dma is properly shut down */