mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
125 lines
3.3 KiB
Diff
125 lines
3.3 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 14 Jan 2023 18:01:32 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_wed: add reset/reset_complete callbacks
|
|
|
|
Introduce reset and reset_complete wlan callback to schedule WLAN driver
|
|
reset when ethernet/wed driver is resetting.
|
|
|
|
Tested-by: Daniel Golle <daniel@makrotopia.org>
|
|
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -3646,6 +3646,11 @@ static void mtk_pending_work(struct work
|
|
set_bit(MTK_RESETTING, ð->state);
|
|
|
|
mtk_prepare_for_reset(eth);
|
|
+ mtk_wed_fe_reset();
|
|
+ /* Run again reset preliminary configuration in order to avoid any
|
|
+ * possible race during FE reset since it can run releasing RTNL lock.
|
|
+ */
|
|
+ mtk_prepare_for_reset(eth);
|
|
|
|
/* stop all devices to make sure that dma is properly shut down */
|
|
for (i = 0; i < MTK_MAC_COUNT; i++) {
|
|
@@ -3683,6 +3688,8 @@ static void mtk_pending_work(struct work
|
|
|
|
clear_bit(MTK_RESETTING, ð->state);
|
|
|
|
+ mtk_wed_fe_reset_complete();
|
|
+
|
|
rtnl_unlock();
|
|
}
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
@@ -205,6 +205,48 @@ mtk_wed_wo_reset(struct mtk_wed_device *
|
|
iounmap(reg);
|
|
}
|
|
|
|
+void mtk_wed_fe_reset(void)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ mutex_lock(&hw_lock);
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
|
|
+ struct mtk_wed_hw *hw = hw_list[i];
|
|
+ struct mtk_wed_device *dev = hw->wed_dev;
|
|
+ int err;
|
|
+
|
|
+ if (!dev || !dev->wlan.reset)
|
|
+ continue;
|
|
+
|
|
+ /* reset callback blocks until WLAN reset is completed */
|
|
+ err = dev->wlan.reset(dev);
|
|
+ if (err)
|
|
+ dev_err(dev->dev, "wlan reset failed: %d\n", err);
|
|
+ }
|
|
+
|
|
+ mutex_unlock(&hw_lock);
|
|
+}
|
|
+
|
|
+void mtk_wed_fe_reset_complete(void)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ mutex_lock(&hw_lock);
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
|
|
+ struct mtk_wed_hw *hw = hw_list[i];
|
|
+ struct mtk_wed_device *dev = hw->wed_dev;
|
|
+
|
|
+ if (!dev || !dev->wlan.reset_complete)
|
|
+ continue;
|
|
+
|
|
+ dev->wlan.reset_complete(dev);
|
|
+ }
|
|
+
|
|
+ mutex_unlock(&hw_lock);
|
|
+}
|
|
+
|
|
static struct mtk_wed_hw *
|
|
mtk_wed_assign(struct mtk_wed_device *dev)
|
|
{
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
@@ -128,6 +128,8 @@ void mtk_wed_add_hw(struct device_node *
|
|
void mtk_wed_exit(void);
|
|
int mtk_wed_flow_add(int index);
|
|
void mtk_wed_flow_remove(int index);
|
|
+void mtk_wed_fe_reset(void);
|
|
+void mtk_wed_fe_reset_complete(void);
|
|
#else
|
|
static inline void
|
|
mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth,
|
|
@@ -147,6 +149,13 @@ static inline void mtk_wed_flow_remove(i
|
|
{
|
|
}
|
|
|
|
+static inline void mtk_wed_fe_reset(void)
|
|
+{
|
|
+}
|
|
+
|
|
+static inline void mtk_wed_fe_reset_complete(void)
|
|
+{
|
|
+}
|
|
#endif
|
|
|
|
#ifdef CONFIG_DEBUG_FS
|
|
--- a/include/linux/soc/mediatek/mtk_wed.h
|
|
+++ b/include/linux/soc/mediatek/mtk_wed.h
|
|
@@ -151,6 +151,8 @@ struct mtk_wed_device {
|
|
void (*release_rx_buf)(struct mtk_wed_device *wed);
|
|
void (*update_wo_rx_stats)(struct mtk_wed_device *wed,
|
|
struct mtk_wed_wo_rx_stats *stats);
|
|
+ int (*reset)(struct mtk_wed_device *wed);
|
|
+ void (*reset_complete)(struct mtk_wed_device *wed);
|
|
} wlan;
|
|
#endif
|
|
};
|