]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: hibmcge: fix not restore rx pause mac addr after reset issue
authorJijie Shao <shaojijie@huawei.com>
Thu, 10 Apr 2025 02:13:26 +0000 (10:13 +0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 12 Apr 2025 03:17:36 +0000 (20:17 -0700)
The MAC hardware supports receiving two types of
pause frames from link partner.
One is a pause frame with a destination address
of 01:80:C2:00:00:01.
The other is a pause frame whose destination address
is the address of the hibmcge driver.

01:80:C2:00:00:01 is supported by default.

In .ndo_set_mac_address(), the hibmcge driver calls
.hbg_hw_set_rx_pause_mac_addr() to set its mac address as the
destination address of the rx puase frame.
Therefore, pause frames with two types of MAC addresses can be received.

Currently, the rx pause addr does not restored after reset.
As a result, pause frames whose destination address is
the hibmcge driver address cannot be correctly received.

This patch restores the configuration by calling
.hbg_hw_set_rx_pause_mac_addr() after reset is complete.

Fixes: 3f5a61f6d504 ("net: hibmcge: Add reset supported in this module")
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250410021327.590362-7-shaojijie@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c

index 4e8cb66f601c0e1ad21ab794bbbf79051d8191e3..a0bcfb5a713d13f9f21e47ea49d1d84a889d365d 100644 (file)
@@ -26,12 +26,15 @@ static void hbg_restore_mac_table(struct hbg_priv *priv)
 
 static void hbg_restore_user_def_settings(struct hbg_priv *priv)
 {
+       /* The index of host mac is always 0. */
+       u64 rx_pause_addr = ether_addr_to_u64(priv->filter.mac_table[0].addr);
        struct ethtool_pauseparam *pause_param = &priv->user_def.pause_param;
 
        hbg_restore_mac_table(priv);
        hbg_hw_set_mtu(priv, priv->netdev->mtu);
        hbg_hw_set_pause_enable(priv, pause_param->tx_pause,
                                pause_param->rx_pause);
+       hbg_hw_set_rx_pause_mac_addr(priv, rx_pause_addr);
 }
 
 int hbg_rebuild(struct hbg_priv *priv)