Commit 2ce960f8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-fixes' 



Huazhong Tan says:

====================
net: hns3: add some fixes for -net

This series adds some fixes for the HNS3 ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a70f659 b4047aac

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+5 −0
Original line number Diff line number Diff line
@@ -4616,6 +4616,11 @@ static int hns3_reset_notify_up_enet(struct hnae3_handle *handle) 
	struct hns3_nic_priv *priv = netdev_priv(kinfo->netdev);

	int ret = 0;



	if (!test_bit(HNS3_NIC_STATE_INITED, &priv->state)) {

		netdev_err(kinfo->netdev, "device is not initialized yet\n");

		return -EFAULT;

	}



	clear_bit(HNS3_NIC_STATE_RESETTING, &priv->state);



	if (netif_running(kinfo->netdev)) {

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c

+2 −1
Original line number Diff line number Diff line
@@ -753,8 +753,9 @@ static int hclge_config_igu_egu_hw_err_int(struct hclge_dev *hdev, bool en) 


	/* configure IGU,EGU error interrupts */

	hclge_cmd_setup_basic_desc(&desc, HCLGE_IGU_COMMON_INT_EN, false);

	desc.data[0] = cpu_to_le32(HCLGE_IGU_ERR_INT_TYPE);

	if (en)

		desc.data[0] = cpu_to_le32(HCLGE_IGU_ERR_INT_EN);

		desc.data[0] |= cpu_to_le32(HCLGE_IGU_ERR_INT_EN);



	desc.data[1] = cpu_to_le32(HCLGE_IGU_ERR_INT_EN_MASK);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 
#define HCLGE_TQP_ECC_ERR_INT_EN_MASK	0x0FFF

#define HCLGE_MSIX_SRAM_ECC_ERR_INT_EN_MASK	0x0F000000

#define HCLGE_MSIX_SRAM_ECC_ERR_INT_EN	0x0F000000

#define HCLGE_IGU_ERR_INT_EN	0x0000066F

#define HCLGE_IGU_ERR_INT_EN	0x0000000F

#define HCLGE_IGU_ERR_INT_TYPE	0x00000660

#define HCLGE_IGU_ERR_INT_EN_MASK	0x000F

#define HCLGE_IGU_TNL_ERR_INT_EN    0x0002AABF

#define HCLGE_IGU_TNL_ERR_INT_EN_MASK  0x003F

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static void hclge_get_link_mode(struct hclge_vport *vport, 
	unsigned long advertising;

	unsigned long supported;

	unsigned long send_data;

	u8 msg_data[10];

	u8 msg_data[10] = {};

	u8 dest_vfid;



	advertising = hdev->hw.mac.advertising[0];