mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
Merge branch 'there-are-some-bugfix-for-the-hns3-ethernet-driver'
Jijie Shao says: ==================== There are some bugfix for the HNS3 ethernet driver ==================== Link: https://lore.kernel.org/r/20240325124311.1866197-1-shaojijie@huawei.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
commit
c1fd3a9433
3 changed files with 22 additions and 3 deletions
|
@ -85,7 +85,7 @@ int hclge_comm_tqps_update_stats(struct hnae3_handle *handle,
|
||||||
hclge_comm_cmd_setup_basic_desc(&desc, HCLGE_OPC_QUERY_TX_STATS,
|
hclge_comm_cmd_setup_basic_desc(&desc, HCLGE_OPC_QUERY_TX_STATS,
|
||||||
true);
|
true);
|
||||||
|
|
||||||
desc.data[0] = cpu_to_le32(tqp->index & 0x1ff);
|
desc.data[0] = cpu_to_le32(tqp->index);
|
||||||
ret = hclge_comm_cmd_send(hw, &desc, 1);
|
ret = hclge_comm_cmd_send(hw, &desc, 1);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&hw->cmq.csq.pdev->dev,
|
dev_err(&hw->cmq.csq.pdev->dev,
|
||||||
|
|
|
@ -78,6 +78,9 @@ static const struct hns3_stats hns3_rxq_stats[] = {
|
||||||
#define HNS3_NIC_LB_TEST_NO_MEM_ERR 1
|
#define HNS3_NIC_LB_TEST_NO_MEM_ERR 1
|
||||||
#define HNS3_NIC_LB_TEST_TX_CNT_ERR 2
|
#define HNS3_NIC_LB_TEST_TX_CNT_ERR 2
|
||||||
#define HNS3_NIC_LB_TEST_RX_CNT_ERR 3
|
#define HNS3_NIC_LB_TEST_RX_CNT_ERR 3
|
||||||
|
#define HNS3_NIC_LB_TEST_UNEXECUTED 4
|
||||||
|
|
||||||
|
static int hns3_get_sset_count(struct net_device *netdev, int stringset);
|
||||||
|
|
||||||
static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en)
|
static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en)
|
||||||
{
|
{
|
||||||
|
@ -418,18 +421,26 @@ static void hns3_do_external_lb(struct net_device *ndev,
|
||||||
static void hns3_self_test(struct net_device *ndev,
|
static void hns3_self_test(struct net_device *ndev,
|
||||||
struct ethtool_test *eth_test, u64 *data)
|
struct ethtool_test *eth_test, u64 *data)
|
||||||
{
|
{
|
||||||
|
int cnt = hns3_get_sset_count(ndev, ETH_SS_TEST);
|
||||||
struct hns3_nic_priv *priv = netdev_priv(ndev);
|
struct hns3_nic_priv *priv = netdev_priv(ndev);
|
||||||
struct hnae3_handle *h = priv->ae_handle;
|
struct hnae3_handle *h = priv->ae_handle;
|
||||||
int st_param[HNAE3_LOOP_NONE][2];
|
int st_param[HNAE3_LOOP_NONE][2];
|
||||||
bool if_running = netif_running(ndev);
|
bool if_running = netif_running(ndev);
|
||||||
|
int i;
|
||||||
|
|
||||||
|
/* initialize the loopback test result, avoid marking an unexcuted
|
||||||
|
* loopback test as PASS.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < cnt; i++)
|
||||||
|
data[i] = HNS3_NIC_LB_TEST_UNEXECUTED;
|
||||||
|
|
||||||
if (hns3_nic_resetting(ndev)) {
|
if (hns3_nic_resetting(ndev)) {
|
||||||
netdev_err(ndev, "dev resetting!");
|
netdev_err(ndev, "dev resetting!");
|
||||||
return;
|
goto failure;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(eth_test->flags & ETH_TEST_FL_OFFLINE))
|
if (!(eth_test->flags & ETH_TEST_FL_OFFLINE))
|
||||||
return;
|
goto failure;
|
||||||
|
|
||||||
if (netif_msg_ifdown(h))
|
if (netif_msg_ifdown(h))
|
||||||
netdev_info(ndev, "self test start\n");
|
netdev_info(ndev, "self test start\n");
|
||||||
|
@ -451,6 +462,10 @@ static void hns3_self_test(struct net_device *ndev,
|
||||||
|
|
||||||
if (netif_msg_ifdown(h))
|
if (netif_msg_ifdown(h))
|
||||||
netdev_info(ndev, "self test end\n");
|
netdev_info(ndev, "self test end\n");
|
||||||
|
return;
|
||||||
|
|
||||||
|
failure:
|
||||||
|
eth_test->flags |= ETH_TEST_FL_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hns3_update_limit_promisc_mode(struct net_device *netdev,
|
static void hns3_update_limit_promisc_mode(struct net_device *netdev,
|
||||||
|
|
|
@ -11626,6 +11626,8 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_pci_uninit;
|
goto err_pci_uninit;
|
||||||
|
|
||||||
|
devl_lock(hdev->devlink);
|
||||||
|
|
||||||
/* Firmware command queue initialize */
|
/* Firmware command queue initialize */
|
||||||
ret = hclge_comm_cmd_queue_init(hdev->pdev, &hdev->hw.hw);
|
ret = hclge_comm_cmd_queue_init(hdev->pdev, &hdev->hw.hw);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -11805,6 +11807,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
|
||||||
|
|
||||||
hclge_task_schedule(hdev, round_jiffies_relative(HZ));
|
hclge_task_schedule(hdev, round_jiffies_relative(HZ));
|
||||||
|
|
||||||
|
devl_unlock(hdev->devlink);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_mdiobus_unreg:
|
err_mdiobus_unreg:
|
||||||
|
@ -11817,6 +11820,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
|
||||||
err_cmd_uninit:
|
err_cmd_uninit:
|
||||||
hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
|
hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);
|
||||||
err_devlink_uninit:
|
err_devlink_uninit:
|
||||||
|
devl_unlock(hdev->devlink);
|
||||||
hclge_devlink_uninit(hdev);
|
hclge_devlink_uninit(hdev);
|
||||||
err_pci_uninit:
|
err_pci_uninit:
|
||||||
pcim_iounmap(pdev, hdev->hw.hw.io_base);
|
pcim_iounmap(pdev, hdev->hw.hw.io_base);
|
||||||
|
|
Loading…
Reference in a new issue