Revert "net: eth-mux: try decoupling work-queue suggested by chatgpt"

This reverts commit 87e190f.

Author: frank-w

drivers/net/ethernet/mediatek/mtk_eth_soc.c

@@ -4919,17 +4919,26 @@ static const struct net_device_ops mtk_netdev_ops = {
 	.ndo_select_queue	= mtk_select_queue,
 };
 
-static void mtk_mux_reconfig_work(struct work_struct *work)
+static void mux_poll(struct work_struct *work)
 {
-	struct mtk_mux *mux = container_of(work, struct mtk_mux, reconfig_work);
+	struct mtk_mux *mux = container_of(work, struct mtk_mux, poll.work);
 	struct mtk_mac *mac = mux->mac;
 	struct mtk_eth *eth = mac->hw;
 	struct net_device *dev = eth->netdev[mac->id];
-	unsigned int new_channel = mux->pending_channel;
+	unsigned int new_channel;
+	int sfp_present;
 
-	if (!netif_running(dev))
-		return;
+	//dev_info(eth->dev, "ethernet mux: %s:%d\n",__func__,__LINE__);
+	if (IS_ERR(mux->mod_def0_gpio) || IS_ERR(mux->chan_sel_gpio))
+		goto reschedule;
 
+	sfp_present = gpiod_get_value_cansleep(mux->mod_def0_gpio);
+	new_channel = sfp_present ? mux->sfp_present_channel : !mux->sfp_present_channel;
+
+	if (mux->channel == new_channel || !netif_running(dev))
+		goto reschedule;
+
+	dev_info(eth->dev, "ethernet mux: line:%d new channel:%d,sfp:%d\n",__LINE__, new_channel,sfp_present);
 	rtnl_lock();
 
 	mtk_stop(dev);
@@ -4941,32 +4950,13 @@ static void mtk_mux_reconfig_work(struct work_struct *work)
 
 	gpiod_set_value_cansleep(mux->chan_sel_gpio, new_channel);
 
-	mtk_open(dev);
+	usleep_range(100000,200000);
 
-	mux->channel = new_channel;
+	mtk_open(dev);
 
 	rtnl_unlock();
-}
 
-static void mux_poll(struct work_struct *work)
-{
-	struct mtk_mux *mux = container_of(work, struct mtk_mux, poll.work);
-	struct mtk_mac *mac = mux->mac;
-	struct mtk_eth *eth = mac->hw;
-	struct net_device *dev = eth->netdev[mac->id];
-	unsigned int new_channel;
-	int sfp_present;
-
-	if (IS_ERR(mux->mod_def0_gpio) || IS_ERR(mux->chan_sel_gpio))
-		goto reschedule;
-
-	sfp_present = gpiod_get_value_cansleep(mux->mod_def0_gpio);
-	new_channel = sfp_present ? mux->sfp_present_channel : !mux->sfp_present_channel;
-
-	if (mux->channel != new_channel && netif_running(dev)) {
-		mux->pending_channel = new_channel;
-		schedule_work(&mux->reconfig_work);
-	}
+	mux->channel = new_channel;
 
 reschedule:
 	mod_delayed_work(system_wq, &mux->poll, msecs_to_jiffies(100));
@@ -5035,7 +5025,6 @@ static void mtk_release_mux(struct mtk_eth *eth, int id)
 		return;
 
 	cancel_delayed_work_sync(&mux->poll);
-	cancel_work_sync(&mux->reconfig_work);
 
 	if (!IS_ERR_OR_NULL(mux->mod_def0_gpio))
 		gpiod_put(mux->mod_def0_gpio);
@@ -5127,7 +5116,6 @@ static int mtk_add_mux(struct mtk_eth *eth, struct device_node *np)
 	dev_info(eth->dev, "ethernet mux: line:%d added new mux\n",__LINE__);
 	INIT_DELAYED_WORK(&mux->poll, mux_poll);
 	mod_delayed_work(system_wq, &mux->poll, msecs_to_jiffies(3000));
-	INIT_WORK(&mux->reconfig_work, mtk_mux_reconfig_work);
 
 	return 0;
 

drivers/net/ethernet/mediatek/mtk_eth_soc.h

@@ -1491,13 +1491,11 @@ struct mtk_mux_data {
  */
 struct mtk_mux {
 	struct delayed_work		poll;
-	struct work_struct		reconfig_work;
 	struct gpio_desc		*mod_def0_gpio;
 	struct gpio_desc		*chan_sel_gpio;
 	struct mtk_mux_data		*data[2];
 	struct mtk_mac			*mac;
 	unsigned int			channel;
-	unsigned int			pending_channel;
 	unsigned int			sfp_present_channel;
 };