-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net: hibmcge: Add reset supported in this module
Sometimes, if the port doesn't work, we can try to fix it by resetting it. This patch supports reset triggered by ethtool or FLR of PCIe, For example: ethtool --reset eth0 dedicated echo 1 > /sys/bus/pci/devices/0000\:83\:00.1/reset We hope that the reset can be performed only when the port is down, and the port cannot be up during the reset. Therefore, the entire reset process is protected by the rtnl lock. After the reset is complete, the hardware registers are restored to their default values. Therefore, some rebuild operations are required to rewrite the user configuration to the registers. Signed-off-by: Jijie Shao <shaojijie@huawei.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20241216040532.1566229-7-shaojijie@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
- Loading branch information
Jijie Shao
authored and
Jakub Kicinski
committed
Dec 18, 2024
1 parent
3a03763
commit 3f5a61f
Showing
8 changed files
with
226 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
// SPDX-License-Identifier: GPL-2.0+ | ||
// Copyright (c) 2024 Hisilicon Limited. | ||
|
||
#include <linux/etherdevice.h> | ||
#include <linux/netdevice.h> | ||
#include <linux/phy.h> | ||
#include <linux/rtnetlink.h> | ||
#include "hbg_common.h" | ||
#include "hbg_err.h" | ||
#include "hbg_hw.h" | ||
|
||
static void hbg_restore_mac_table(struct hbg_priv *priv) | ||
{ | ||
struct hbg_mac_filter *filter = &priv->filter; | ||
u64 addr; | ||
u32 i; | ||
|
||
for (i = 0; i < filter->table_max_len; i++) | ||
if (!is_zero_ether_addr(filter->mac_table[i].addr)) { | ||
addr = ether_addr_to_u64(filter->mac_table[i].addr); | ||
hbg_hw_set_uc_addr(priv, addr, i); | ||
} | ||
|
||
hbg_hw_set_mac_filter_enable(priv, priv->filter.enabled); | ||
} | ||
|
||
static void hbg_restore_user_def_settings(struct hbg_priv *priv) | ||
{ | ||
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); | ||
} | ||
|
||
int hbg_rebuild(struct hbg_priv *priv) | ||
{ | ||
int ret; | ||
|
||
ret = hbg_hw_init(priv); | ||
if (ret) | ||
return ret; | ||
|
||
hbg_restore_user_def_settings(priv); | ||
return 0; | ||
} | ||
|
||
static int hbg_reset_prepare(struct hbg_priv *priv, enum hbg_reset_type type) | ||
{ | ||
int ret; | ||
|
||
ASSERT_RTNL(); | ||
|
||
if (netif_running(priv->netdev)) { | ||
dev_warn(&priv->pdev->dev, | ||
"failed to reset because port is up\n"); | ||
return -EBUSY; | ||
} | ||
|
||
priv->reset_type = type; | ||
set_bit(HBG_NIC_STATE_RESETTING, &priv->state); | ||
clear_bit(HBG_NIC_STATE_RESET_FAIL, &priv->state); | ||
ret = hbg_hw_event_notify(priv, HBG_HW_EVENT_RESET); | ||
if (ret) { | ||
set_bit(HBG_NIC_STATE_RESET_FAIL, &priv->state); | ||
clear_bit(HBG_NIC_STATE_RESETTING, &priv->state); | ||
} | ||
|
||
return ret; | ||
} | ||
|
||
static int hbg_reset_done(struct hbg_priv *priv, enum hbg_reset_type type) | ||
{ | ||
int ret; | ||
|
||
if (!test_bit(HBG_NIC_STATE_RESETTING, &priv->state) || | ||
type != priv->reset_type) | ||
return 0; | ||
|
||
ASSERT_RTNL(); | ||
|
||
clear_bit(HBG_NIC_STATE_RESETTING, &priv->state); | ||
ret = hbg_rebuild(priv); | ||
if (ret) { | ||
set_bit(HBG_NIC_STATE_RESET_FAIL, &priv->state); | ||
dev_err(&priv->pdev->dev, "failed to rebuild after reset\n"); | ||
return ret; | ||
} | ||
|
||
dev_info(&priv->pdev->dev, "reset done\n"); | ||
return ret; | ||
} | ||
|
||
/* must be protected by rtnl lock */ | ||
int hbg_reset(struct hbg_priv *priv) | ||
{ | ||
int ret; | ||
|
||
ASSERT_RTNL(); | ||
ret = hbg_reset_prepare(priv, HBG_RESET_TYPE_FUNCTION); | ||
if (ret) | ||
return ret; | ||
|
||
return hbg_reset_done(priv, HBG_RESET_TYPE_FUNCTION); | ||
} | ||
|
||
static void hbg_pci_err_reset_prepare(struct pci_dev *pdev) | ||
{ | ||
struct net_device *netdev = pci_get_drvdata(pdev); | ||
struct hbg_priv *priv = netdev_priv(netdev); | ||
|
||
rtnl_lock(); | ||
hbg_reset_prepare(priv, HBG_RESET_TYPE_FLR); | ||
} | ||
|
||
static void hbg_pci_err_reset_done(struct pci_dev *pdev) | ||
{ | ||
struct net_device *netdev = pci_get_drvdata(pdev); | ||
struct hbg_priv *priv = netdev_priv(netdev); | ||
|
||
hbg_reset_done(priv, HBG_RESET_TYPE_FLR); | ||
rtnl_unlock(); | ||
} | ||
|
||
static const struct pci_error_handlers hbg_pci_err_handler = { | ||
.reset_prepare = hbg_pci_err_reset_prepare, | ||
.reset_done = hbg_pci_err_reset_done, | ||
}; | ||
|
||
void hbg_set_pci_err_handler(struct pci_driver *pdrv) | ||
{ | ||
pdrv->err_handler = &hbg_pci_err_handler; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
/* SPDX-License-Identifier: GPL-2.0+ */ | ||
/* Copyright (c) 2024 Hisilicon Limited. */ | ||
|
||
#ifndef __HBG_ERR_H | ||
#define __HBG_ERR_H | ||
|
||
#include <linux/pci.h> | ||
|
||
void hbg_set_pci_err_handler(struct pci_driver *pdrv); | ||
int hbg_reset(struct hbg_priv *priv); | ||
int hbg_rebuild(struct hbg_priv *priv); | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.