mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
2ad898e091
Removed upstreamed: generic/backport-6.1/789-STABLE-01-net-dsa-mt7530-prevent-possible-incorrect-XTAL-frequ.patch [1] generic/backport-6.1/789-STABLE-02-net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch [2] generic/backport-6.1/789-STABLE-03-net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch [3] generic/pending-6.1/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch [4] generic/pending-6.1/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch [5] Manual adjusted the following patches: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=be4512b9ac6fc53e1ca8daccbda84f643215c547 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f1fa919ea59655f73cb3972264e157b8831ba546 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=86c0c154a759f2af9612a04bdf29110f02dce956 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=6b62bad2da1b338f452a9380639fc9b093d75a25 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f78807362828ad01db2a9ed005bf79501b620f27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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
|
|
@@ -3687,6 +3687,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++) {
|
|
@@ -3724,6 +3729,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
|
|
};
|