fuzz cleanup

diff --git a/queue-6.18/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch b/queue-6.18/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch
index 6f47129494cebbb33fb2baa016b212faac454646..6ce44c849aa58d9491624744077d2c74d9c9445e 100644 (file)
--- a/queue-6.18/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch
+++ b/queue-6.18/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch
@@ -38,15 +38,13 @@ Link: https://patch.msgid.link/20260303145828.7845-5-ovidiu.panait.rb@renesas.co
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c |  3 ++
- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 42 ++++++++++---------
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    3 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c |   42 ++++++++++++----------
  2 files changed, 26 insertions(+), 19 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index d423ee979bd09..30064e4a33938 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -6613,6 +6613,9 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
+@@ -6578,6 +6578,9 @@ static int stmmac_vlan_update(struct stm
                hash = 0;
        }
  
@@ -56,11 +54,9 @@ index d423ee979bd09..30064e4a33938 100644
        return stmmac_update_vlan_hash(priv, priv->hw, hash, pmatch, is_double);
  }
  
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-index fcc34867405ed..e24efe3bfedbe 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-@@ -76,7 +76,9 @@ static int vlan_add_hw_rx_fltr(struct net_device *dev,
+@@ -76,7 +76,9 @@ static int vlan_add_hw_rx_fltr(struct ne
                }
  
                hw->vlan_filter[0] = vid;
@@ -71,7 +67,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
  
                return 0;
        }
-@@ -97,12 +99,15 @@ static int vlan_add_hw_rx_fltr(struct net_device *dev,
+@@ -97,12 +99,15 @@ static int vlan_add_hw_rx_fltr(struct ne
                return -EPERM;
        }
  
@@ -91,7 +87,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
  }
  
  static int vlan_del_hw_rx_fltr(struct net_device *dev,
-@@ -115,7 +120,9 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,
+@@ -115,7 +120,9 @@ static int vlan_del_hw_rx_fltr(struct ne
        if (hw->num_vlan == 1) {
                if ((hw->vlan_filter[0] & VLAN_TAG_VID) == vid) {
                        hw->vlan_filter[0] = 0;
@@ -102,7 +98,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
                }
                return 0;
        }
-@@ -124,22 +131,23 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,
+@@ -124,22 +131,23 @@ static int vlan_del_hw_rx_fltr(struct ne
        for (i = 0; i < hw->num_vlan; i++) {
                if ((hw->vlan_filter[i] & VLAN_TAG_DATA_VEN) &&
                    ((hw->vlan_filter[i] & VLAN_TAG_DATA_VID) == vid)) {
@@ -133,7 +129,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
        int i;
  
        /* Single Rx VLAN Filter */
-@@ -149,12 +157,8 @@ static void vlan_restore_hw_rx_fltr(struct net_device *dev,
+@@ -149,12 +157,8 @@ static void vlan_restore_hw_rx_fltr(stru
        }
  
        /* Extended Rx VLAN Filter Enable */
@@ -148,6 +144,3 @@ index fcc34867405ed..e24efe3bfedbe 100644
  }
  
  static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
--- 
-2.51.0
-

diff --git a/queue-6.18/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch b/queue-6.18/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch
index 64b6c9cb1fbd4a9b3fcbc8c39946dc6996bbcb6c..93c5084512fd359bc44dacda931663d895a85d48 100644 (file)
--- a/queue-6.18/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch
+++ b/queue-6.18/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch
@@ -26,14 +26,12 @@ Link: https://patch.msgid.link/20260303145828.7845-2-ovidiu.panait.rb@renesas.co
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c  | 18 ++++++++++++++----
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 46299b7925b44..769342e4bafa1 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -6638,9 +6638,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6603,9 +6603,13 @@ static int stmmac_vlan_rx_add_vid(struct
  
        if (priv->hw->num_vlan) {
                ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
@@ -48,7 +46,7 @@ index 46299b7925b44..769342e4bafa1 100644
  err_pm_put:
        pm_runtime_put(priv->device);
  
-@@ -6664,15 +6668,21 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6629,15 +6633,21 @@ static int stmmac_vlan_rx_kill_vid(struc
                is_double = true;
  
        clear_bit(vid, priv->active_vlans);
@@ -73,6 +71,3 @@ index 46299b7925b44..769342e4bafa1 100644
  del_vlan_error:
        pm_runtime_put(priv->device);
  
--- 
-2.51.0
-

diff --git a/queue-6.18/net-stmmac-fix-vlan-hw-state-restore.patch b/queue-6.18/net-stmmac-fix-vlan-hw-state-restore.patch
index c4c879b19b06cbe87c08fafefad9bf40d03107da..3c709bbf8b9cc3ba6825152789257c34760e0495 100644 (file)
--- a/queue-6.18/net-stmmac-fix-vlan-hw-state-restore.patch
+++ b/queue-6.18/net-stmmac-fix-vlan-hw-state-restore.patch
@@ -33,15 +33,13 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Stable-dep-of: 2cd70e3968f5 ("net: stmmac: Defer VLAN HW configuration when interface is down")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +++++++++++++++++--
- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 10 --------
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   24 ++++++++++++++++++++--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c |   10 ---------
  2 files changed, 22 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 6bebc57e6ae7c..d423ee979bd09 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -139,6 +139,7 @@ static void stmmac_tx_timer_arm(struct stmmac_priv *priv, u32 queue);
+@@ -139,6 +139,7 @@ static void stmmac_tx_timer_arm(struct s
  static void stmmac_flush_tx_descriptors(struct stmmac_priv *priv, int queue);
  static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode,
                                          u32 rxmode, u32 chan);
@@ -49,7 +47,7 @@ index 6bebc57e6ae7c..d423ee979bd09 100644
  
  #ifdef CONFIG_DEBUG_FS
  static const struct net_device_ops stmmac_netdev_ops;
-@@ -3967,6 +3968,8 @@ static int __stmmac_open(struct net_device *dev,
+@@ -3932,6 +3933,8 @@ static int __stmmac_open(struct net_devi
        /* We may have called phylink_speed_down before */
        phylink_speed_up(priv->phylink);
  
@@ -58,7 +56,7 @@ index 6bebc57e6ae7c..d423ee979bd09 100644
        ret = stmmac_request_irq(dev);
        if (ret)
                goto irq_error;
-@@ -6697,6 +6700,23 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6662,6 +6665,23 @@ del_vlan_error:
        return ret;
  }
  
@@ -82,7 +80,7 @@ index 6bebc57e6ae7c..d423ee979bd09 100644
  static int stmmac_bpf(struct net_device *dev, struct netdev_bpf *bpf)
  {
        struct stmmac_priv *priv = netdev_priv(dev);
-@@ -7931,10 +7951,10 @@ int stmmac_resume(struct device *dev)
+@@ -7895,10 +7915,10 @@ int stmmac_resume(struct device *dev)
        stmmac_init_coalesce(priv);
        phylink_rx_clk_stop_block(priv->phylink);
        stmmac_set_rx_mode(ndev);
@@ -95,11 +93,9 @@ index 6bebc57e6ae7c..d423ee979bd09 100644
        stmmac_enable_all_queues(priv);
        stmmac_enable_all_dma_irq(priv);
  
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-index de1a70e1c86ef..fcc34867405ed 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-@@ -139,9 +139,6 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,
+@@ -139,9 +139,6 @@ static int vlan_del_hw_rx_fltr(struct ne
  static void vlan_restore_hw_rx_fltr(struct net_device *dev,
                                    struct mac_device_info *hw)
  {
@@ -109,7 +105,7 @@ index de1a70e1c86ef..fcc34867405ed 100644
        u32 val;
        int i;
  
-@@ -158,13 +155,6 @@ static void vlan_restore_hw_rx_fltr(struct net_device *dev,
+@@ -158,13 +155,6 @@ static void vlan_restore_hw_rx_fltr(stru
                        vlan_write_filter(dev, hw, i, val);
                }
        }
@@ -123,6 +119,3 @@ index de1a70e1c86ef..fcc34867405ed 100644
  }
  
  static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
--- 
-2.51.0
-

diff --git a/queue-6.18/net-stmmac-improve-double-vlan-handling.patch b/queue-6.18/net-stmmac-improve-double-vlan-handling.patch
index 65f1917bfd74cb82866c95b8abc8d32febf5b2bb..a40c89f1d3639c999874e6ca2ace80e237a240ee 100644 (file)
--- a/queue-6.18/net-stmmac-improve-double-vlan-handling.patch
+++ b/queue-6.18/net-stmmac-improve-double-vlan-handling.patch
@@ -36,16 +36,14 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Stable-dep-of: 2cd70e3968f5 ("net: stmmac: Defer VLAN HW configuration when interface is down")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/stmicro/stmmac/stmmac.h     |  1 +
- .../net/ethernet/stmicro/stmmac/stmmac_main.c    | 16 ++++++++++++----
- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c    |  8 ++++++++
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h      |    1 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   16 ++++++++++++----
+ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c |    8 ++++++++
  3 files changed, 21 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-index 7ca5477be390b..81706f175d330 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-@@ -318,6 +318,7 @@ struct stmmac_priv {
+@@ -316,6 +316,7 @@ struct stmmac_priv {
        void __iomem *ptpaddr;
        void __iomem *estaddr;
        unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
@@ -53,11 +51,9 @@ index 7ca5477be390b..81706f175d330 100644
        int sfty_irq;
        int sfty_ce_irq;
        int sfty_ue_irq;
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 769342e4bafa1..6bebc57e6ae7c 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -6619,6 +6619,7 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
+@@ -6584,6 +6584,7 @@ static int stmmac_vlan_update(struct stm
  static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
  {
        struct stmmac_priv *priv = netdev_priv(ndev);
@@ -65,7 +61,7 @@ index 769342e4bafa1..6bebc57e6ae7c 100644
        bool is_double = false;
        int ret;
  
-@@ -6630,7 +6631,8 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6595,7 +6596,8 @@ static int stmmac_vlan_rx_add_vid(struct
                is_double = true;
  
        set_bit(vid, priv->active_vlans);
@@ -75,7 +71,7 @@ index 769342e4bafa1..6bebc57e6ae7c 100644
        if (ret) {
                clear_bit(vid, priv->active_vlans);
                goto err_pm_put;
-@@ -6640,11 +6642,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6605,11 +6607,13 @@ static int stmmac_vlan_rx_add_vid(struct
                ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
                if (ret) {
                        clear_bit(vid, priv->active_vlans);
@@ -90,7 +86,7 @@ index 769342e4bafa1..6bebc57e6ae7c 100644
  err_pm_put:
        pm_runtime_put(priv->device);
  
-@@ -6657,6 +6661,7 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6622,6 +6626,7 @@ err_pm_put:
  static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
  {
        struct stmmac_priv *priv = netdev_priv(ndev);
@@ -98,7 +94,7 @@ index 769342e4bafa1..6bebc57e6ae7c 100644
        bool is_double = false;
        int ret;
  
-@@ -6668,7 +6673,8 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6633,7 +6638,8 @@ static int stmmac_vlan_rx_kill_vid(struc
                is_double = true;
  
        clear_bit(vid, priv->active_vlans);
@@ -108,7 +104,7 @@ index 769342e4bafa1..6bebc57e6ae7c 100644
        if (ret) {
                set_bit(vid, priv->active_vlans);
                goto del_vlan_error;
-@@ -6678,11 +6684,13 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6643,11 +6649,13 @@ static int stmmac_vlan_rx_kill_vid(struc
                ret = stmmac_del_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
                if (ret) {
                        set_bit(vid, priv->active_vlans);
@@ -123,11 +119,9 @@ index 769342e4bafa1..6bebc57e6ae7c 100644
  del_vlan_error:
        pm_runtime_put(priv->device);
  
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-index b18404dd5a8be..de1a70e1c86ef 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-@@ -183,6 +183,10 @@ static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
+@@ -183,6 +183,10 @@ static void vlan_update_hash(struct mac_
                        value |= VLAN_EDVLP;
                        value |= VLAN_ESVL;
                        value |= VLAN_DOVLTC;
@@ -138,7 +132,7 @@ index b18404dd5a8be..de1a70e1c86ef 100644
                }
  
                writel(value, ioaddr + VLAN_TAG);
-@@ -193,6 +197,10 @@ static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
+@@ -193,6 +197,10 @@ static void vlan_update_hash(struct mac_
                        value |= VLAN_EDVLP;
                        value |= VLAN_ESVL;
                        value |= VLAN_DOVLTC;
@@ -149,6 +143,3 @@ index b18404dd5a8be..de1a70e1c86ef 100644
                }
  
                writel(value | perfect_match, ioaddr + VLAN_TAG);
--- 
-2.51.0
-

diff --git a/queue-6.19/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch b/queue-6.19/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch
index fba3bbcfdf0cf20b1c4271c84ac01af2dc62100a..a22058f1bf4de2ec06209930d33d4aa73797aad8 100644 (file)
--- a/queue-6.19/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch
+++ b/queue-6.19/net-stmmac-defer-vlan-hw-configuration-when-interfac.patch
@@ -38,15 +38,13 @@ Link: https://patch.msgid.link/20260303145828.7845-5-ovidiu.panait.rb@renesas.co
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c |  3 ++
- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 42 ++++++++++---------
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    3 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c |   42 ++++++++++++----------
  2 files changed, 26 insertions(+), 19 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 293efccb5d312..a76b2acffde5a 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -6756,6 +6756,9 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
+@@ -6721,6 +6721,9 @@ static int stmmac_vlan_update(struct stm
                hash = 0;
        }
  
@@ -56,11 +54,9 @@ index 293efccb5d312..a76b2acffde5a 100644
        return stmmac_update_vlan_hash(priv, priv->hw, hash, pmatch, is_double);
  }
  
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-index fcc34867405ed..e24efe3bfedbe 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-@@ -76,7 +76,9 @@ static int vlan_add_hw_rx_fltr(struct net_device *dev,
+@@ -76,7 +76,9 @@ static int vlan_add_hw_rx_fltr(struct ne
                }
  
                hw->vlan_filter[0] = vid;
@@ -71,7 +67,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
  
                return 0;
        }
-@@ -97,12 +99,15 @@ static int vlan_add_hw_rx_fltr(struct net_device *dev,
+@@ -97,12 +99,15 @@ static int vlan_add_hw_rx_fltr(struct ne
                return -EPERM;
        }
  
@@ -91,7 +87,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
  }
  
  static int vlan_del_hw_rx_fltr(struct net_device *dev,
-@@ -115,7 +120,9 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,
+@@ -115,7 +120,9 @@ static int vlan_del_hw_rx_fltr(struct ne
        if (hw->num_vlan == 1) {
                if ((hw->vlan_filter[0] & VLAN_TAG_VID) == vid) {
                        hw->vlan_filter[0] = 0;
@@ -102,7 +98,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
                }
                return 0;
        }
-@@ -124,22 +131,23 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,
+@@ -124,22 +131,23 @@ static int vlan_del_hw_rx_fltr(struct ne
        for (i = 0; i < hw->num_vlan; i++) {
                if ((hw->vlan_filter[i] & VLAN_TAG_DATA_VEN) &&
                    ((hw->vlan_filter[i] & VLAN_TAG_DATA_VID) == vid)) {
@@ -133,7 +129,7 @@ index fcc34867405ed..e24efe3bfedbe 100644
        int i;
  
        /* Single Rx VLAN Filter */
-@@ -149,12 +157,8 @@ static void vlan_restore_hw_rx_fltr(struct net_device *dev,
+@@ -149,12 +157,8 @@ static void vlan_restore_hw_rx_fltr(stru
        }
  
        /* Extended Rx VLAN Filter Enable */
@@ -148,6 +144,3 @@ index fcc34867405ed..e24efe3bfedbe 100644
  }
  
  static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
--- 
-2.51.0
-

diff --git a/queue-6.19/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch b/queue-6.19/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch
index 08bd8a300ea42435e9eb5481bdf5142197c5ba3a..c076462c17f12476162c6d3142b9efbd5be03732 100644 (file)
--- a/queue-6.19/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch
+++ b/queue-6.19/net-stmmac-fix-error-handling-in-vlan-add-and-delete.patch
@@ -26,14 +26,12 @@ Link: https://patch.msgid.link/20260303145828.7845-2-ovidiu.panait.rb@renesas.co
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c  | 18 ++++++++++++++----
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index f98fd254315f6..74dc64c5156e9 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -6781,9 +6781,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6746,9 +6746,13 @@ static int stmmac_vlan_rx_add_vid(struct
  
        if (priv->hw->num_vlan) {
                ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
@@ -48,7 +46,7 @@ index f98fd254315f6..74dc64c5156e9 100644
  err_pm_put:
        pm_runtime_put(priv->device);
  
-@@ -6807,15 +6811,21 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6772,15 +6776,21 @@ static int stmmac_vlan_rx_kill_vid(struc
                is_double = true;
  
        clear_bit(vid, priv->active_vlans);
@@ -73,6 +71,3 @@ index f98fd254315f6..74dc64c5156e9 100644
  del_vlan_error:
        pm_runtime_put(priv->device);
  
--- 
-2.51.0
-

diff --git a/queue-6.19/net-stmmac-fix-vlan-hw-state-restore.patch b/queue-6.19/net-stmmac-fix-vlan-hw-state-restore.patch
index d03bda0c23362bd7f519463ad699d1d5c3a6f887..744ddc472b5c8708aeae60f38c1af77e8a419930 100644 (file)
--- a/queue-6.19/net-stmmac-fix-vlan-hw-state-restore.patch
+++ b/queue-6.19/net-stmmac-fix-vlan-hw-state-restore.patch
@@ -32,15 +32,13 @@ Link: https://patch.msgid.link/20260303145828.7845-4-ovidiu.panait.rb@renesas.co
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +++++++++++++++++--
- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 10 --------
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   24 ++++++++++++++++++++--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c |   10 ---------
  2 files changed, 22 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index a21c34d23681c..293efccb5d312 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -140,6 +140,7 @@ static void stmmac_tx_timer_arm(struct stmmac_priv *priv, u32 queue);
+@@ -140,6 +140,7 @@ static void stmmac_tx_timer_arm(struct s
  static void stmmac_flush_tx_descriptors(struct stmmac_priv *priv, int queue);
  static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode,
                                          u32 rxmode, u32 chan);
@@ -48,7 +46,7 @@ index a21c34d23681c..293efccb5d312 100644
  
  #ifdef CONFIG_DEBUG_FS
  static const struct net_device_ops stmmac_netdev_ops;
-@@ -4099,6 +4100,8 @@ static int __stmmac_open(struct net_device *dev,
+@@ -4064,6 +4065,8 @@ static int __stmmac_open(struct net_devi
  
        phylink_start(priv->phylink);
  
@@ -57,7 +55,7 @@ index a21c34d23681c..293efccb5d312 100644
        ret = stmmac_request_irq(dev);
        if (ret)
                goto irq_error;
-@@ -6840,6 +6843,23 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6805,6 +6808,23 @@ del_vlan_error:
        return ret;
  }
  
@@ -81,7 +79,7 @@ index a21c34d23681c..293efccb5d312 100644
  static int stmmac_bpf(struct net_device *dev, struct netdev_bpf *bpf)
  {
        struct stmmac_priv *priv = netdev_priv(dev);
-@@ -8233,10 +8253,10 @@ int stmmac_resume(struct device *dev)
+@@ -8197,10 +8217,10 @@ int stmmac_resume(struct device *dev)
        stmmac_init_coalesce(priv);
        phylink_rx_clk_stop_block(priv->phylink);
        stmmac_set_rx_mode(ndev);
@@ -94,11 +92,9 @@ index a21c34d23681c..293efccb5d312 100644
        stmmac_enable_all_queues(priv);
        stmmac_enable_all_dma_irq(priv);
  
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-index de1a70e1c86ef..fcc34867405ed 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-@@ -139,9 +139,6 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,
+@@ -139,9 +139,6 @@ static int vlan_del_hw_rx_fltr(struct ne
  static void vlan_restore_hw_rx_fltr(struct net_device *dev,
                                    struct mac_device_info *hw)
  {
@@ -108,7 +104,7 @@ index de1a70e1c86ef..fcc34867405ed 100644
        u32 val;
        int i;
  
-@@ -158,13 +155,6 @@ static void vlan_restore_hw_rx_fltr(struct net_device *dev,
+@@ -158,13 +155,6 @@ static void vlan_restore_hw_rx_fltr(stru
                        vlan_write_filter(dev, hw, i, val);
                }
        }
@@ -122,6 +118,3 @@ index de1a70e1c86ef..fcc34867405ed 100644
  }
  
  static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
--- 
-2.51.0
-

diff --git a/queue-6.19/net-stmmac-improve-double-vlan-handling.patch b/queue-6.19/net-stmmac-improve-double-vlan-handling.patch
index d6d55562f388ac9fb84d87be944c776af29ffcfd..ad62e21a0982946bde594d926c14de34c42712bc 100644 (file)
--- a/queue-6.19/net-stmmac-improve-double-vlan-handling.patch
+++ b/queue-6.19/net-stmmac-improve-double-vlan-handling.patch
@@ -36,16 +36,14 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 Stable-dep-of: bd7ad51253a7 ("net: stmmac: Fix VLAN HW state restore")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/stmicro/stmmac/stmmac.h     |  1 +
- .../net/ethernet/stmicro/stmmac/stmmac_main.c    | 16 ++++++++++++----
- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c    |  8 ++++++++
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h      |    1 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   16 ++++++++++++----
+ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c |    8 ++++++++
  3 files changed, 21 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-index 012b0a477255d..a2e838688118b 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
-@@ -324,6 +324,7 @@ struct stmmac_priv {
+@@ -322,6 +322,7 @@ struct stmmac_priv {
        void __iomem *ptpaddr;
        void __iomem *estaddr;
        unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
@@ -53,11 +51,9 @@ index 012b0a477255d..a2e838688118b 100644
        int sfty_irq;
        int sfty_ce_irq;
        int sfty_ue_irq;
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 74dc64c5156e9..a21c34d23681c 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -6762,6 +6762,7 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
+@@ -6727,6 +6727,7 @@ static int stmmac_vlan_update(struct stm
  static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
  {
        struct stmmac_priv *priv = netdev_priv(ndev);
@@ -65,7 +61,7 @@ index 74dc64c5156e9..a21c34d23681c 100644
        bool is_double = false;
        int ret;
  
-@@ -6773,7 +6774,8 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6738,7 +6739,8 @@ static int stmmac_vlan_rx_add_vid(struct
                is_double = true;
  
        set_bit(vid, priv->active_vlans);
@@ -75,7 +71,7 @@ index 74dc64c5156e9..a21c34d23681c 100644
        if (ret) {
                clear_bit(vid, priv->active_vlans);
                goto err_pm_put;
-@@ -6783,11 +6785,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6748,11 +6750,13 @@ static int stmmac_vlan_rx_add_vid(struct
                ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
                if (ret) {
                        clear_bit(vid, priv->active_vlans);
@@ -90,7 +86,7 @@ index 74dc64c5156e9..a21c34d23681c 100644
  err_pm_put:
        pm_runtime_put(priv->device);
  
-@@ -6800,6 +6804,7 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid
+@@ -6765,6 +6769,7 @@ err_pm_put:
  static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
  {
        struct stmmac_priv *priv = netdev_priv(ndev);
@@ -98,7 +94,7 @@ index 74dc64c5156e9..a21c34d23681c 100644
        bool is_double = false;
        int ret;
  
-@@ -6811,7 +6816,8 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6776,7 +6781,8 @@ static int stmmac_vlan_rx_kill_vid(struc
                is_double = true;
  
        clear_bit(vid, priv->active_vlans);
@@ -108,7 +104,7 @@ index 74dc64c5156e9..a21c34d23681c 100644
        if (ret) {
                set_bit(vid, priv->active_vlans);
                goto del_vlan_error;
-@@ -6821,11 +6827,13 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi
+@@ -6786,11 +6792,13 @@ static int stmmac_vlan_rx_kill_vid(struc
                ret = stmmac_del_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
                if (ret) {
                        set_bit(vid, priv->active_vlans);
@@ -123,11 +119,9 @@ index 74dc64c5156e9..a21c34d23681c 100644
  del_vlan_error:
        pm_runtime_put(priv->device);
  
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-index b18404dd5a8be..de1a70e1c86ef 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-@@ -183,6 +183,10 @@ static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
+@@ -183,6 +183,10 @@ static void vlan_update_hash(struct mac_
                        value |= VLAN_EDVLP;
                        value |= VLAN_ESVL;
                        value |= VLAN_DOVLTC;
@@ -138,7 +132,7 @@ index b18404dd5a8be..de1a70e1c86ef 100644
                }
  
                writel(value, ioaddr + VLAN_TAG);
-@@ -193,6 +197,10 @@ static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
+@@ -193,6 +197,10 @@ static void vlan_update_hash(struct mac_
                        value |= VLAN_EDVLP;
                        value |= VLAN_ESVL;
                        value |= VLAN_DOVLTC;
@@ -149,6 +143,3 @@ index b18404dd5a8be..de1a70e1c86ef 100644
                }
  
                writel(value | perfect_match, ioaddr + VLAN_TAG);
--- 
-2.51.0
-